1927 files changed, 114159 insertions, 126193 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index f35bab45293..4000438a4b5 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -6,10 +6,10 @@
   <link rev=made href="mailto:schmidt@cs.wustl.edu">
 </HEAD>
 
-<BODY text    = "#000000"
-      link    = "#000fff"
-      vlink   = "#ff0f0f"
-      bgcolor = "#ffffff">
+<BODY text = "#000000"
+link="#000fff"
+vlink="#ff0f0f"
+bgcolor="#ffffff">
 
 <HR>
 <H3>Building and Installing ACE and Its Network Services</H3>
@@ -38,7 +38,6 @@ Mistakes page</a>.<P>
   <LI><A HREF="#egcs">Compiling ACE with egcs</A>
   <LI><A HREF="#aceinstall">Building and Installing ACE</A>
   <LI><A HREF="#svcsinstall">Building and Installing ACE Network Services</A>
-  <LI><A HREF="#resource_requirements">System Resource Requirements</A>
   <LI><A HREF="#advanced">Advanced Topics</A>
 </UL>
 
@@ -60,13 +59,12 @@ Mistakes page</a>.<P>
   <tr valign=top bgcolor="#AFAFAF">
    <td><b>Nearly fully supported, i.e., periodically tested</b></td>
    <td>Windows 95, MVS, DEC Alpha Windows NT (MSVC++ 5.0), Chorus,
-     QNX Neutrino 2.0, PharLap TNT Embedded ToolSuite 9.1
+     QNX Neutrino 2.0
    </td>
   </tr>
   <tr valign=top>
     <td><b>Partially supported, i.e., infrequently tested</b></td>
-    <td> Windows NT (Borland C++ Builder 4.0 and IBM VisualAge C++),
-         Windows CE, Tandem, SCO, UnixWare, SunOS 4.x, FreeBSD, NetBSD
+    <td> Windows CE, Tandem, SCO, UnixWare, SunOS 4.x, FreeBSD, NetBSD
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
@@ -89,38 +87,34 @@ try to help you fix the problems.
 <UL>
   <LI><B>Win32 (Windows NT/i386, NT/Alpha and Windows '95) </B><P>
 
-      All of ACE has been ported to the Win32 API (which includes
-      Windows NT and Windows '95).  The entire release now compiles
-      using the Microsoft Visual C++ 4.x, 5.0, and 6.0 compilers (the
-      2.0 compiler may also work, but we haven't tested it recently).
-      ACE can be built as both a static and dynamic library, using the
-      Win32 installation process described below.<P>
+      All of ACE has been ported to the Win32 API (which includes Windows NT
+      and Windows '95).  The entire release now compiles using the Microsoft
+      Visual C++ 4.x, 5.0, and 6.0 compilers (the 2.0 compiler may also work,
+      but we haven't tested it recently).  ACE can be built as both a static and
+      dynamic library, using the Win32 installation process described
+      below.<P>
 
       Please see the <A HREF="#Non-static Object Manager">Non-static
       ACE_Object_Manager</A> discussion below.<p>
 
-      We've also added some support for Borland C++ Builder 4.0 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>
-
   <li><b>Windows CE</b><p>
 
-      Most of ACE has been ported to Windows CE using Visual C++ 5.0
-      with CE Toolkit.  ACE has been tested on x86 Emulator and an HP
-      360LX with an SH series CPU.  Please be sure to read this file
-      (<a href="docs/CE-status.txt">CE-status.txt</a>) for up-to-date
-      information about ACE on CE.  ACE can only be built as DLL
-      library now.<p>
+      Most of ACE has been ported to Windows CE using Visual C++ 5.0 with CE
+      Toolkit.  ACE has been tested on x86 Emulator and an HP 360LX
+      with an SH series CPU.  Please be sure to read this file (<a
+      href="docs/CE-status.txt">CE-status.txt</a>) for
+      up-to-date information about ACE on CE.  ACE can only be built as
+      DLL library now.<p>
 
   <LI><B> Sun OS 5.x/4.x (a.k.a. Solaris 2.x/1.x, Solaris 7) using Sun
-      CC 3.0.1, Sun C++ 4.2 and 5.x, Centerline C++ 2.x, GNU gcc 2.7.x
-      and later (except 2.8.x), and KAI C++ 3.3.</B><P>
+      CC 3.0.1, Sun C++ 4.2 and 5.x, Centerline C++ 2.x, and
+      GNU gcc 2.7.x and later (except 2.8.x).</B><P>
 
-      All the source code and tests should build and run without any
-      problems on Solaris 2.5.1, 2.6 and 7 platforms using the Sun C++
-      compiler.  We use this version/patchlevel of Sun C++:<p> <pre>
+      All the source code and tests should build and run without
+      any problems on Solaris 2.5.1, 2.6 and 7 platforms using the
+      Sun C++ compiler.  We use this version/patchlevel of
+      Sun C++:<p>
+      <pre>
       CC: WorkShop Compilers 4.2 21 Apr 1997 C++ 4.2 patch 104631-02
       </pre><p>
 
@@ -130,82 +124,82 @@ try to help you fix the problems.
       Thanks to Susan Liebeskind &lt;shl@janis.gtri.gatech.edu&gt;
       for providing the following useful information:<p>
 
-      The home page for Sun technical patches is <a
-      href="http://access1.sun.com">http://access1.sun.com</a>.
-      Searching for 104631 will bring you to a page allowing you to
-      access the latest version of the C++ 4.2 patches.<p>
+      The home page for Sun technical patches is
+      <a href="http://access1.sun.com">http://access1.sun.com</a>.
+      Searching for 104631 will bring you to a page allowing you to access
+      the latest version of the C++ 4.2 patches.<p>
 
-      By default, ACE uses both the Solaris and POSIX thread
-      interface.  To disable use of the Solaris thread interface, add
-      <code>-D_POSIX_PTHREAD_SEMANTICS</code> to the
-      <code>CFLAGS</code> in your
+      By default, ACE uses both the Solaris and POSIX thread interface.
+      To disable use of the Solaris thread interface, add
+      <code>-D_POSIX_PTHREAD_SEMANTICS</code> to the <code>CFLAGS</code>
+      in your
       <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>.
       See the Solaris Intro (3) man page for more information.<p>
 
       To disable ACE thread support completely, build with the
-      <code>threads=0</code> make flag.  See the <a
-      href="#flags">Makefile Flags</a> section below for more
-      information on make flags.<p>
+      <code>threads=0</code> make flag.  See the <a href="#flags">Makefile
+      Flags</a> section below for more information on make flags.<p>
 
       If you use g++ or egcs on Solaris 7, you might need to rebuild
-      it on a SunOS 5.7 (Solaris 7) host.  Some versions of g++ and
-      egcs provide replacements for system header files.  The
-      replacements on older SunOS systems are not compatible with the
-      SunOS 5.7 system headers.  See <a
+      it on a SunOS 5.7 (Solaris 7) host.  Some versions of g++ and egcs
+      provide replacements for system header files.  The replacements on
+      older SunOS systems are not compatible with the SunOS 5.7 system
+      headers.  See <a
       href="http://www.cs.wustl.edu/~levine/Hints.html">David Levine's
-      Hints page</a> for instructions on how to build egcs on a SunOS
-      5.7 host, using a g++ or egcs that was built on an older SunOS
-      host. <P>
+      Hints page</a>
+      for instructions on how to build egcs on a SunOS 5.7 host, using
+      a g++ or egcs that was built on an older SunOS host.
 
-      The Sun/C++ 5.0 compilers has several problems with templates,
-      we have worked around most of them but this is not a compiler
-      that we test very often.  Hopefully as new patches for the
-      compiler show up we will be able to make that our compiler of
-      choice on Solaris.</p>
+        <p>The Sun/C++ 5.0 compilers has several problems with
+          templates, we have worked around most of them but this is
+          not a compiler that we test very often.  Hopefully as new
+          patches for the compiler show up we will be able to make
+          that our compiler of choice on Solaris.</p>
 
   <LI><B>Sun OS 4.1.x using Centerline C++ 2.x, Sun CC 3.x, and Lucid
       Energize 3.2.</B><P>
 
       Note that shared libraries do not interact very well with
-      Centerline C++ or Sun C++ on SunOS 4.1.x.  This is due to odd
-      behavior of the SunOS 4.1.x linker, which (1) does not properly
-      call constructors of global objects within shared libraries and
-      (2) does not call the init() and fini() functions in shared
-      libraries, even though the manual claims that these functions
-      are called!  In particular, this means that the tests in the
-      directory $ACE_ROOT/tests/Service_Configurator/IPC-tests/server/
+      Centerline C++ or Sun C++ on SunOS 4.1.x.  This is due to
+      odd behavior of the SunOS 4.1.x linker, which (1) does not
+      properly call constructors of global objects within shared
+      libraries and (2) does not call the init() and fini()
+      functions in shared libraries, even though the manual claims
+      that these functions are called!  In particular, this means
+      that the tests in the directory
+      $ACE_ROOT/tests/Service_Configurator/IPC-tests/server/
       will not work for statically linked services.<P>
 
       Some versions of SunOS 4.1.x do not contain the
-      /usr/lib/libnsl.a library.  This library seems to be optional
-      since System V Transport Layer Interface (TLI) support is
-      optional on SunOS 4.1.x (in contrast, it's the "preferred"
-      transport interface on Solaris).<P>
+      /usr/lib/libnsl.a library.  This library seems to be
+      optional since System V Transport Layer Interface (TLI)
+      support is optional on SunOS 4.1.x (in contrast, it's the
+      "preferred" transport interface on Solaris).<P>
 
-      The best work-around for now is probably to either add a dummy
-      libnsl.a in /lib (which may not be feasible) or simply comment
-      out the line:<P>
+      The best work-around for now is probably to either add a
+      dummy libnsl.a in /lib (which may not be feasible) or simply
+      comment out the line:<P>
 
       LIBS += -lnsl<P>
 
-      in the
-      <CODE>$ACE_ROOT/include/makeinclude/wrapper_macros.GNU</CODE>
-      file.  Naturally, any programs, e.g., the TLI_SAP tests, that
-      use the TLI wrappers aren't going to work!<P>
+      in the <CODE>$ACE_ROOT/include/makeinclude/wrapper_macros.GNU</CODE>
+      file.  Naturally, any programs, e.g., the TLI_SAP tests,
+      that use the TLI wrappers aren't going to work!<P>
 
-      Note that on SunOS 4.x you may get warnings from the linker that
-      "archive has no table of contents; add one using ranlib(1)" for
-      certain libraries, e.g., libASX.a, libThreads.a, and libSPIPE.a.
-      This occurs since SunOS 4.x does not support these features.<P>
+      Note that on SunOS 4.x you may get warnings from the linker
+      that "archive has no table of contents; add one using
+      ranlib(1)" for certain libraries, e.g., libASX.a,
+      libThreads.a, and libSPIPE.a.  This occurs since SunOS 4.x
+      does not support these features.<P>
 
   <LI><B>AIX</B><P>
 
-      The ACE port to AIX assumes that the user has installed the AIX
-      patch containing the dl*() APIs.  To use these APIs, IBM has
-      created a separate product (free to AIX licensees) called shared
-      library hookable symbols (or slhs/6000).  If you don't have this
-      patch, the sv* commands for compiling and linking will not be
-      present on the system.<P>
+      The ACE port to AIX assumes that the user has installed the
+      AIX patch containing the dl*() APIs.  To use these APIs, IBM
+      has created a separate product (free to AIX licensees)
+      called shared library hookable symbols (or slhs/6000).  If
+      you don't have this patch, the sv* commands for compiling
+      and linking will not be present on the system.<P>
 
       If you are using AIX 4.2.1 or later, this patch isn't needed;
       the dynamic library APIs are included in the base operating
@@ -225,24 +219,23 @@ ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information.
 make: *** [libACE.so] Error 8
       </pre>
 
-      To fix this error, you need a patch to the supporting xlC
-      related libraries.  To obtain this patch, go to the <a
-      href="http://service.software.ibm.com/support/rs6000">IBM public
-      patch website</a>, and retrieve the patch PTF U453697, or its
-      successor, for xlC.<p>
+      To fix this error, you need a patch to the supporting xlC related
+      libraries.  To obtain this patch, go to the
+      <a href="http://service.software.ibm.com/support/rs6000">IBM
+      public patch website</a>, and retrieve the patch
+      PTF U453697, or its successor, for xlC.<p>
 
       You may wish to retrieve this patch with the fixdist tool, also
-      available at the website.  Installation of this patch will
-      install patched versions of the C++ libraries, which correctly
-      define this symbol.<p>
+      available at the website.  Installation of this patch will install
+      patched versions of the C++ libraries, which correctly define this
+      symbol.<p>
 
       BTW, here's a technique from Rob Jordan &lt<A
       HREF="mailto:jordan@hursley.ibm.com">jordan@hursley.ibm.com</A>&gt
-      that can reduce the size of the ACE libraries by about one
-      third, and can also be applied to applications.  It works by
-      optimising the sharing of template functions, which are created
-      in an ``unusual'' way under AIX. It also speeds up
-      compilation.<P>
+      that can reduce the size of the ACE libraries by
+      about one third, and can also be applied to applications.  It works
+      by optimising the sharing of template functions, which are created in an
+      ``unusual'' way under AIX. It also speeds up compilation.<P>
 
       Here's how to optimise the ACE library generation:<P>
 
@@ -257,36 +250,29 @@ make: *** [libACE.so] Error 8
       <CODE>TEMPLATE_FILES=</CODE> in the Makefile. Now update the Makefile so that
       <CODE>FILES=ACE_All_Src</CODE> and <CODE>TEMPLATE_FILES=ACE_All_Tmp</CODE>.<P>
 
-  <LI><B><a name="Linux">Linux</a></B><P>
+  <LI><B>Linux</B><P>
 
       ACE has been ported to <A
-      HREF="http://www.cs.wustl.edu/~cleeland/ace/">Linux</A> on both
-      Intel and Alpha platforms.  If you use a RedHat 5.x
-      distribution, it's best to use RedHat 5.1 or later.  ACE works
-      without any modifications on RedHat 5.1, 5.2, and 6.0, and on
-      Debian 2.1 on both Intel and Alpha; use the
-      <code>include/makeinclude/platform_linux_lxpthreads.GNU</code>
+      HREF="http://www.cs.wustl.edu/~cleeland/ace/">Linux</A> on both Intel
+      and Alpha platforms.  If you use a RedHat 5.x distribution, it's best
+      to use RedHat 5.1 or later.  ACE works without any modifications on
+      RedHat 5.1, 5.2, and 6.0, and on Debian 2.1 on both Intel and Alpha;
+      use the <code>include/makeinclude/platform_linux_lxpthreads.GNU</code>
       and <code>ace/config-linux-lxpthreads.h</code> platform/config
       files.<p>
 
-      If you run out of memory, it's easy to add virtual memory on
-      Linux.  Please see the <code>mkswap</code> man page.<p>
+      The glibc 2.0 dynamic loader isn't thread safe. If you want to use the
+      Invocation API you'll have to set <code>LD_BIND_NOW=true</code>. If you
+      want to use <code>dlopen</code>, you should use <code>RTLD_NOW</code>.
+      The dynamic loader in glibc 2.1 is thread safe.<p>
 
-      The glibc 2.0 dynamic loader isn't thread safe. If you want to
-      use the Invocation API you'll have to set
-      <code>LD_BIND_NOW=true</code>. If you want to use
-      <code>dlopen</code>, you should use <code>RTLD_NOW</code>.  The
-      dynamic loader in glibc 2.1 is thread safe.<p>
-
-      The ACE <code>Tokens_Test</code> hangs with egcs 1.1b on Linux.
-      It runs properly when built with egcs 1.0.2, egcs 1.0.3 and egcs
-      1.1.1.  All other ACE tests run properly with these egcs
-      versions.<p>
+      The ACE <code>Tokens_Test</code> hangs with egcs 1.1b on   Linux.  It
+      runs properly when built with egcs 1.0.2, egcs 1.0.3 and egcs 1.1.1.
+      All other ACE tests run properly with these egcs versions.<p>
 
       <strong>NOTE:</strong> The TAO NameService uses IP multicasting
       by default, though it is not required.  IP multicast on Linux
       requires the following:<p>
-
       <ul>
         <li>Enable IP multicast in the Linux kernel.  It is enabled in
             the default RedHat 5.1 kernel.  In older distributions, you
@@ -307,46 +293,46 @@ make: *** [libACE.so] Error 8
             </pre><p>
       </ul>
 
-      With RedHat 5.0, you'll need some <a
-      href="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>
+      With RedHat 5.0, you'll need some
+      <a href="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
-      <code>/usr</code>, such as <code>/usr/local</code>, and set your
-      <code>PATH</code> and <code>LD_LIBRARY_PATH</code>
-      accordingly.<p>
+      systems.  If you don't remove your old gcc and libg++ RPMs, it's best
+      to install egcs in a different directory than <code>/usr</code>, such as
+      <code>/usr/local</code>, and set your <code>PATH</code> and
+      <code>LD_LIBRARY_PATH</code> accordingly.<p>
 
       Some of the ACE tests fail on older, pre-glibc2 Linux platforms,
-      such as RedHat 4.2.  The problems are with threads and
-      thread-specific storage.<p>
+      such as RedHat 4.2.  The problems are with threads and thread-specific
+      storage.<p>
 
   <LI><B>SCO UNIX</B><P>
 
-      ACE has been ported to SCO UNIX using the GNU g++ 2.7.2
-      compiler.  Arturo Montes &lt<A
+      ACE has been ported to SCO UNIX using the GNU g++ 2.7.2 compiler.
+      Arturo Montes &lt<A
       HREF="mailto:mitosys@colomsat.net.co">mitosys@colomsat.net.co</A>&gt
-      maintains this code.  In addition, he also maintains a version
-      of <A HREF="FSU-threads.tar.gz">FSU pthreads</A>.<P>
+      maintains this code.  In addition, he also maintains a version of <A
+      HREF="FSU-threads.tar.gz">FSU
+      pthreads</A>.<P>
 
   <LI><B>SGI IRIX 5.x and 6.x</B><P>
 
-      ACE used to build fine using the SGI C++ and GNU GCC compilers
-      for IRIX 5.x.  It has been ported to IRIX 6.x using the SGI
-      MipsPro 7.1 C++ compiler; be aware that in IRIX 6.2 there is a
-      number of patches that have to be installed and exceptions
-      appear to fail with the O32 ABI.  Please check the config files
-      for the details.<P>
+      ACE used to build fine using the SGI C++ and GNU GCC compilers for
+      IRIX 5.x.
+      It has been ported to IRIX 6.x using the SGI MipsPro 7.1 C++
+      compiler;
+      be aware that in IRIX 6.2 there is a number of patches that
+      have to be installed and exceptions appear to fail with the
+      O32 ABI.
+      Please check the config files for the details.<P>
 
   <LI><B> HP-UX 9.x, 10.x, and 11.00 </B> <P>
 
-      HP sells 2 C++ compilers for HP-UX 10.x and 11.00.  If you are
-      using 9.x, there's only the first one.
-
+      HP sells 2 C++ compilers for HP-UX 10.x and 11.00.  If you are using 9.x,
+      there's only the first one.
       <UL>
         <LI>HP C++ - this is CC, HP's cfront-based compiler.  As of ACE 4.4, it
             can be used, but some people have problems with templates.
@@ -368,20 +354,20 @@ make: *** [libACE.so] Error 8
       The Digital UNIX C++ 5.4 through 5.7 compilers have problems
       with ACE's templates.  They compile the lib and most of the test
       programs, although they warn about template usage.  Most tests
-      run, some dump core.  If you use a 5.x version of cxx, be sure
-      to set the CXX_VER variable to CXX_5, either on your make
-      command line or in an environment variable.  The ACE Makefiles
-      assume by default that the cxx version is 6.x or later.<P>
+      run, some dump core.  If you use a 5.x version of cxx, be sure to
+      set the CXX_VER variable to CXX_5, either on your make command
+      line or in an environment variable.  The ACE Makefiles assume by
+      default that the cxx version is 6.x or later.<P>
 
-      CXX 6.0 and 6.1 are much improved over 5.x: V6.0-020, V6.1-025,
+      CXX 6.0 and 6.1 are much improved over 5.x:  V6.0-020, V6.1-025,
       and later build all of ACE cleanly.  All of the tests in
       ACE_wrappers/tests run successfully with CXX 6.0 and CXX 6.1.
-      Please note that problems have been reported with some versions
-      of CXX 6.1, notably versions -021 and earlier.  It's best to use
+      Please note that problems have been reported with some versions of
+      CXX 6.1, notably versions -021 and earlier.  It's best to use
       V6.1-022 or later.<p>
 
-      GNU gcc 2.7.2.1 compiles without problems. All tests run
-      (besides minor problems).  Thanks to Thilo Kielmann &lt<A
+      GNU gcc 2.7.2.1 compiles without problems. All tests run (besides
+      minor problems).  Thanks to Thilo Kielmann &lt<A
       HREF="mailto:kielmann@informatik.uni-siegen.de">kielmann@informatik.uni-siegen.de</A>&gt
       and David Trumble &lt<A
       HREF="mailto:trumble@cvg.enet.dec.com">trumble@cvg.enet.dec.com</A>&gt
@@ -390,18 +376,18 @@ make: *** [libACE.so] Error 8
   <li><b> FreeBSD </b><p>
 
       FreeBSD is a fast evolving platform.  However, it has the
-      advantage of having standard releases.  At this moment, ACE is
-      only perodically tested against -stable (3.1R) and we rely a lot
-      on FreeBSD users' feedbacks.  <p>
+      advantage of having standard releases.  At this moment, ACE
+      is only perodically tested against -stable (3.1R) and we rely
+      a lot on FreeBSD users' feedbacks.  <p>
 
-      Notice that on older FreeBSD, <code>ld.so</code> only looks for
-      so libraries with <b>version number</b> appended.  ACE makefiles
+      Notice that on older FreeBSD, <code>ld.so</code> only looks for so
+      libraries with <b>version number</b> appended.  ACE makefiles
       create symlink for most shared libraries if
       <code>versioned_so</code> is defined to 1 in
       <code>$ACE_ROOT/ace</code> with appropriate ACE version.
       However, this does not work for libACE.so itself so you have to
-      create it manually (If you figure out how to do this, please let
-      us know) like this: <p>
+      create it manually (If you figure out how to do this, please
+      let us know) like this: <p>
 
       <code>ln -sf $ACE_ROOT/ace/libACE.so $ACE_ROOT/ace/libACE.so.4.5</code><p>
 
@@ -414,44 +400,27 @@ make: *** [libACE.so] Error 8
 
   <LI><B> UnixWare </B> <P>
 
-      Steve Huston &lt<A
-      HREF="mailto:shuston@riverace.com">shuston@riverace.com</A>&gt
+      Steve Huston &lt<A HREF="mailto:shuston@riverace.com">shuston@riverace.com</A>&gt
       has ported ACE to work with UnixWare 2.01 and g++.<P>
 
-      Ganesh Pai &lt<A
-      HREF="mailto:gpai@voicetek.com">gpai@voicetek.com</A>&gt
+      Ganesh Pai &lt<A HREF="mailto:gpai@voicetek.com">gpai@voicetek.com</A>&gt
       subsequently did the port for version 2.1.2, also with g++.<P>
 
   <LI><B>Chorus</B> <P>
 
-      Wei Chiang &lt<A
-      HREF="mailto:chiang@tele.nokia.fi">chiang@tele.nokia.fi</A>&gt
+      Wei Chiang &lt<A HREF="mailto:chiang@tele.nokia.fi">chiang@tele.nokia.fi</A>&gt
       has ported ACE to Chorus 3.1 using GNU g++ 2.7.2.<P>
 
-  <LI><B><a name="LynxOS">LynxOS</a></B><P>
+  <LI><B>LynxOS</B> <P>
 
-      ACE builds and runs properly on LynxOS 3.0.0 for Intel and
-      PowerPC targets.
-      ACE's Naming_Test fails; it is disabled in <a
-      href="tests/run_tests.sh"><code>ACE_wrappers/tests/run_tests.sh</code></a>.<p>
+      ACE builds and runs properly on LynxOS 3.0.0 for Intel targets.
+      Some of the ACE tests fail; they are disabled in
+      <code>ACE_wrappers/tests/run_tests.sh</code>.<p>
 
-      If you run out of memory on LynxOS, these might help:<p>
-
-      <ul>
-        <li>Increase the limits in <code>/etc/starttab</code>,
-          then logout and login again.  We use these limits:
-          <pre>
-# Data, stack, and core file limits (in Kbytes)
-240000
-80000
-102400</pre><p>
-        <li>Enable or expand virtual memory, with something like:
-          <pre>
-# mkcontig /swap 320
-# prio 17 vmstart /swap</pre>
-          See the <code>mkcontig</code> and <code>vmstart</code>
-          man pages, and <code>/bin/rc</code>.<p>
-      </ul>
+      ACE builds cleanly on LynxOS 3.0.0 for PowerPC targets.  For
+      the most part, it runs properly.  But, there appears to be
+      a problem with registering signal handlers.  So, some of the
+      ACE tests seg fault when attempting to do that.<p>
 
       Please see the comments in the
       <a href="include/makeinclude/platform_lynxos.GNU">ACE
@@ -467,28 +436,25 @@ make: *** [libACE.so] Error 8
         /bin/route add "224.0.0.0" "$my_name"
       </code></pre>
 
-      Dave Mayerhoefer &lt<A
-      HREF="mailto:davem@lynx.com">davem@lynx.com</A>&gt has ported
-      ACE to LynxOS 2.5 using GNU g++ 2.7.2.  However, you may need to
-      apply some <A HREF="os-patches/lynxos-patches.html">patches to
-      LynxOS</A> to get ACE working.<P>
+      Dave Mayerhoefer &lt<A HREF="mailto:davem@lynx.com">davem@lynx.com</A>&gt
+      has ported ACE to LynxOS 2.5 using GNU g++ 2.7.2.  However, you may need
+      to apply some <A HREF="os-patches/lynxos-patches.html">patches
+      to LynxOS</A> to get ACE working.<P>
 
   <LI><STRONG>VxWorks</STRONG><P>
 
-      <A HREF="http://www.cs.wustl.edu/~levine/">David Levine</A>
-      &lt<A
+      <A HREF="http://www.cs.wustl.edu/~levine/">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 with the GreenHills 1.8.8
       and g++ 2.7.2 compilers.  An anonymous contributor has also
       provided <a href="os-patches/vxworks-5.1.txt">notes for using
       ACE with VxWorks 5.1.</a><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>
-
+      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>
       <OL>
         <LI>The program entry point cannot be called ``main'' with g++.  ACE
             renames it to ``ace_main'' (configurable via ACE_MAIN) on VxWorks.
@@ -514,85 +480,59 @@ make: *** [libACE.so] Error 8
             very unlikely situation where it becomes a problem.
             Please see ace/config-vxworks5.2-g++.h for more information.<P>
       </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.  And, -O2 is not supported on
-      some targets.<P>
+      -fno-implicit-templates is broken.  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
-      can easily be changed to one of the other spare fields, if
-      necessary.<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 can easily be changed to one
+      of the other spare fields, if necessary.<P>
 
       Versions of ACE from 4.3.3 and beyond destroy 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
-      the module, using unld, and reload it between runs.
-      Alternatively, you could try calling <code>cplusDtors</code> and
-      then <code>cplusCtors</code> between runs.<P>
+      running a program multiple times, it may be necessary to
+      unload the module, using unld, and reload it between runs.
+      Alternatively, you could try calling <code>cplusDtors</code>
+      and then <code>cplusCtors</code> between runs.<P>
 
   <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>&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>
-
-      MVS does not support the dynamic linking dl...() calls that the
-      Service Configurator uses to dynamically link services at run
-      time. As a result, all the examples and apps that use a svc.conf
-      file (for dynamically configuring service objects) do not work,
-      however, most of these apps can be built/run statically.  Also,
-      the Svc_Conf_l.cpp and Svc_Conf_y.cpp files are generated using
-      flex and yacc on a ascii (not ebcdic) machine and as a result
-      they don't work very well with ebcdic svc.conf files.  We should
-      be able to regenerate these files on MVS but MVS doesn't have
-      flex.  This is something that needs to be done.<P>
-
-      Some of the tests do not execute properly.  This is a minority
-      and over time the goal is to get to 100%.<P>
-
-      The make scheme for some of the apps still doesn't work
-      perfectly on MVS.  This is mainly due to the way shared
-      libraries are handled on MVS.  See <A HREF="#mvs">additional
-      build tips for MVS</A> for more on this.<P>
-
-  <li><strong>QNX Neutrino</strong><p>
-
-      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="ace/config-qnx-neutrino.h">ace/config-qnx-neutrino.h</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
-      us.<p>
-
-  <li><strong>PharLap TNT Embedded ToolSuite (ETS)</strong><p>
-
-      ACE has been ported to <a
-      href="http://www.pharlap.com">PharLap's</a> TNT Embedded
-      ToolSuite (ETS) version 9.1. The port is being tested with
-      Microsoft Visual C++ 6.<p> To build for PharLap, use the
-      ace/config-pharlap.h configuration file, and the instructions
-      for building on Win32. Building the ACE library is the same as
-      for regular Win32 platforms, except you choose one of the PharLap
-      ETS configurations to build within Visual C++. Only static
-      library configurations are available for PharLap at this time.
-      For an example of how to build
-      binaries, see the tests directory. The tests_pharlap_msvc.lnk
-      file is a LinkLoc commands file that the ACE tests are built
-      with. It is likely that local sites may need to adjust this file
-      for their target environment.  <p> If you have any fixes or
-      suggestions for improving this port, please contact <a
-      href="mailto:shuston@riverace.com">Steve Huston</a>.
+      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>
+
+      MVS does not support the dynamic linking dl...() calls that the Service
+      Configurator uses to dynamically link services at run time. As a result, all
+      the examples and apps that use a svc.conf file (for dynamically configuring
+      service objects) do not work, however, most of these apps can be built/run
+      statically.  Also, the Svc_Conf_l.cpp and Svc_Conf_y.cpp files are generated
+      using flex and yacc on a ascii (not ebcdic) machine and as a result they don't
+      work very well with ebcdic svc.conf files.  We should be able to regenerate
+      these files on MVS but MVS doesn't have flex.  This is something that needs
+      to be done.<P>
+
+      Some of the tests do not execute properly.  This is a minority and over time
+      the goal is to get to 100%.<P>
+
+      The make scheme for some of the apps still doesn't work perfectly on MVS.
+      This is mainly due to the way shared libraries are handled on MVS.  See
+      <A HREF="#mvs">additional build tips for MVS</A> for more on
+      this.<P>
+
+  <li><strong>QNX Neutrino</strong></p>
+    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="ace/config-qnx-neutrino.h">ace/config-qnx-neutrino.h</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 us.
 </UL>
 
 <HR>
@@ -643,20 +583,21 @@ If you use the GNU GCC g++ compiler please note the following:
   <LI>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies
       where to install the binary files that gcc uses.  For example,
-      it specifies whether to use Solaris's <code>/usr/ccs/bin</code>
-      binary utils or GNU binary utils.  The
-      <code>config.status</code> file is an output of the gcc
-      <code>configure</code> script; it is preferable to use the
-      <code>--prefix</code> option to <code>configure</code> instead
+      it specifies whether to use Solaris's
+      <code>/usr/ccs/bin</code> binary utils or GNU binary
+      utils.  The <code>config.status</code> file is an output of
+      the gcc <code>configure</code> script; it is preferable to use
+      the <code>--prefix</code> option to <code>configure</code> instead
       of hacking its output.<P>
 
   <LI>If you are getting weird link errors when building libACE
-      on Solaris you are probably using the GNU linker.  Try using the
-      Sun linker (/usr/ccs/bin/ld) instead.  Note that gcc first looks
-      for the GNU linker if it is installed along with gcc.  The only
-      way to not use the GNU linker is to delete it from the
-      installation or to build your own compiler with no linker.  Be
-      aware that you still need the libraries and includes of gcc.<P>
+      on Solaris you are probably using the GNU linker.  Try using
+      the Sun linker (/usr/ccs/bin/ld) instead.  Note that gcc
+      first looks for the GNU linker if it is installed along
+      with gcc.  The only way to not use the GNU linker is to
+      delete it from the installation or to build your own
+      compiler with no linker.  Be aware that you still need the
+      libraries and includes of gcc.<P>
 
       NOTE: if you do use the GNU linker, you might need to change
       the <code>-G</code> flag to <code>-shared</code> in
@@ -672,53 +613,52 @@ If you use the GNU GCC g++ compiler please note the following:
       documentation for using <CODE>collect2</CODE>.<P>
 
   <LI>By default, gcc (thru version 2.7.2, at least) uses
-      implicit template instantiation.  Besides wasting space, this
-      breaks the use of ACE_Singleton: instead of one singleton
-      instance, there could be one instance per object (.o) file that
-      "sees" the template.  Therefore, we have overridden this default
-      in ACE by enabling the -fno-implicit-templates option to CCFLAGS
-      in all include/makeinclude/platform_*.GNU files that set CXX to
-      g++.<P>
+      implicit template instantiation.  Besides wasting space,
+      this breaks the use of ACE_Singleton:  instead of one
+      singleton instance, there could be one instance per object
+      (.o) file that "sees" the template.  Therefore, we have
+      overridden this default in ACE by enabling the
+      -fno-implicit-templates option to CCFLAGS in all
+      include/makeinclude/platform_*.GNU files that set CXX to g++.<P>
 
   <LI>The disadvantage of this approach is that you must
       add template specializations for all templates that your
       application uses to your own code.  (The ACE libraries are
-      self-contained: you don't need to add the templates that they
-      use internally.)  Examples of template specializations occur in
-      quite a few ACE .cpp files; see the end of <A
-      HREF="apps/Gateway/Gateway/Connection_Handler.cpp">apps/Gateway/Gateway/Connection_Handler.cpp</A>
-      for one example.  An easy way to figure out what template
-      instantiations are need is to try to build your executable and
-      pipe the output through c++filt.  The linker will report the
-      missing instantiations as undefined symbols.  Iteration may be
+      self-contained:  you don't need to add the templates that
+      they use internally.)  Examples of template specializations
+      occur in quite a few ACE .cpp files; see the end of
+      <A HREF="apps/Gateway/Gateway/Connection_Handler.cpp">apps/Gateway/Gateway/Connection_Handler.cpp</A> for one example.
+      An easy way to figure out what template instantiations are
+      need is to try to build your executable and pipe the output
+      through c++filt.  The linker will report the missing
+      instantiations as undefined symbols.  Iteration may be
       necessary, if the template instantiations themselves reference
       other templates.<P>
 
   <LI>Alternatively, you could apply the
-      <a href="ftp://ftp.cygnus.com/pub/g++/">Cygnus template
-      repository patches</a> and use the -frepo option instead of
+      <a href="ftp://ftp.cygnus.com/pub/g++/">Cygnus template repository
+      patches</a> and use the -frepo option instead of
       -fno-implicit-templates.  ACE readily this option for
-      application code: to enable it just add <code>repo=1</code> to
-      your <code>make</code> invocation, or to your
-      <code>include/makeinclude/platform_macros.GNU</code>.  ACE still
-      uses explicit template instantiation for building its libraries
-      to help avoid link conflicts.  Please see the g++ FAQ and gcc
-      manual for more information on the -frepo option.<p>
+      application code:  to enable it just add <code>repo=1</code>
+      to your <code>make</code> invocation, or to your
+      <code>include/makeinclude/platform_macros.GNU</code>.  ACE
+      still uses explicit template instantiation for building its
+      libraries to help avoid link conflicts.  Please see the g++
+      FAQ and gcc manual for more information on the -frepo option.<p>
 
   <li>The implementation of templates for g++ version 2.8
-      eliminates the restriction against static data members in
-      template classes.<p>
+      eliminates the restriction against static data members
+      in template classes.<p>
 
   <li>A final alternative is to
       remove the <code>-fno-implicit-templates</code> option from the
-      CCFLAGS macro in your include/makeinclude/platform_macros.GNU,
-      and thereby use the default g++ implicit template
-      instantiation.<P>
+      CCFLAGS macro in your include/makeinclude/platform_macros.GNU, and
+      thereby use the default g++ implicit template instantiation.<P>
 
   <LI>Thanks to Thilo Kielmann &lt<A
       HREF="mailto:kielmann@informatik.uni-siegen.de">kielmann@informatik.uni-siegen.de</A>&gt;
-      for reporting the problem with ACE_Singleton on g++, and for
-      helping to find and implement these solutions.<P>
+      for reporting the problem with ACE_Singleton on g++, and
+      for helping to find and implement these solutions.<P>
 
   <LI>On VxWorks only, g++ (thru version 2.7.2, at least, distributed
       with Tornado 1.0.1/VxWorks 5.3.1), -fno-implicit-templates is
@@ -736,12 +676,12 @@ If you use the GNU GCC g++ compiler please note the following:
 
   <li><strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
       The default behavior of the ACE Makefiles is to add
-      <code>-fno-exceptions</code> to egcs (and g++ starting with
-      version 2.8.0) invocations.  This disables exception handling
-      support.  On Solaris/sparc and Linux/alpha, it results in a 25
-      percent reduction in the size of libACE.so.  To enable exception
-      handling, add <code>exceptions=1</code> to your
-      <code>make</code> command line invocation, or to your
+      <code>-fno-exceptions</code> to egcs (and g++ starting with version
+      2.8.0) invocations.  This disables exception handling support.  On
+      Solaris/sparc and Linux/alpha, it results in a 25 percent reduction
+      in the size of libACE.so.  To enable exception handling, add
+      <code>exceptions=1</code> to your <code>make</code> command line
+      invocation, or to your
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>.<p>
 
   <li>egcs may have trouble linking some executables, such as the ACE
@@ -821,25 +761,24 @@ need to do:<P>
   <LI>Edit the $ACE_ROOT/ace/OS.h file to update things like default
       hostname and port numbers you'd like the programs in the
       $ACE_ROOT/{apps,tests} directories to use by default.  Note,
-      however that you can normally skip this step because the
-      defaults are typically fine for most systems. <P>
+      however that you can normally skip this step because the defaults
+      are typically fine for most systems. <P>
 
   <LI>Create a <code>$ACE_ROOT/ace/config.h</code> file that includes
       the appropriate platform/compiler-specific header configurations
       (such as <code>config-sunos5-sunc++-4.x.h</code>).  This file
-      contains the #defines that are used throughout ACE to indicate
-      which features your system supports (see the
-      <code>$ACE_ROOT/ace/OS.h</code> file for many examples of how
-      the ACE build configuration is affected by these macro
-      settings).  Make sure you settings are placed
+      contains the #defines that
+      are used throughout ACE to indicate which features your system
+      supports (see the <code>$ACE_ROOT/ace/OS.h</code> file for many
+      examples of how the ACE build configuration is affected by these
+      macro settings).  Make sure you settings are placed
       <strong>before</strong> the inclusion of the platform-specific
       header file.<P>
 
-      There are config files for most versions of UNIX.  If there
-      isn't a version of this file that matches your
-      platform/compiler, you'll need to make one.  Please send me
-      email if you get it working so I can add it to the master ACE
-      release.<P>
+      There are config files for most versions of UNIX.  If there isn't a
+      version of this file that matches your platform/compiler, you'll
+      need to make one.  Please send me email if you get it working so I
+      can add it to the master ACE release.<P>
 
   <LI>Set the $ACE_ROOT/include/makeinclude/platform_macros.GNU file
       to point to the appropriate platform/compiler-specific Makefile
@@ -849,8 +788,8 @@ need to do:<P>
 
   <LI>Note that since ACE builds shared libraries, you'll need to set
       LD_LIBRARY_PATH to whereever you put the binary version of the
-      ACE library.  For example, you probably want to do something
-      like the following<P>
+      ACE library.  For example, you probably want to do something like
+      the following<P>
 
       <pre><code>
       % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$LD_LIBRARY_PATH
@@ -888,44 +827,42 @@ need to do:<P>
 <H4><A NAME="win32">Building and Installing ACE on Win32</A></H4>
 
 First, if you are upgrading from an older release, clean up everything
-and rebuild from scratch to ensure that everything is rebuilt
-correctly.  You might have to manually go through the ACE directories
-and delete all *.obj, *.dll, *.lib, *.ilk, *.pdb, *.idb, *.ncb, *.opt,
-and *.exp files in order to start over from scratch (the Clean command
-in MSVC may not do this).  <P>
+and rebuild from scratch to ensure that everything is rebuilt correctly.
+You might have to manually go through the ACE directories and delete
+all *.obj, *.dll, *.lib, *.ilk, *.pdb, *.idb, *.ncb, *.opt, and *.exp
+files in order to start over from scratch (the Clean command in MSVC
+may not do this).
+<P>
 
 ACE contains project files for Microsoft Visual C++ 4.x (*.mdp) and
-5.0 with Service Pack 3, and 6.0 (*.dsw), Borland C++ 5.x (ace.ide),
-IBM's VisualAge C++ compiler (*.icc).  There are also Makefile.bor
-files to compile ACE, the ACE one-button tests, and TAO with Borland
-C++ Builder 4.0. <P>
+5.0 with Service Pack 3, and 6.0 (*.dsw), as well as Borland C++ 5.x
+(ace.ide).  <P>
 
-The port of ACE and TAO to the VisualAge C++ compiler has been done by
-<A HREF="mailto:matteau@ca.ibm.com">Rene Matteau</A>, whom you should
-contact if you have any problems.  Likewise, the Borland C++ Builder
-4.0 port has been done by <A HREF="mailto:jody@atdesk.com">Jody
-Hagins</A>, so contact him for any questions.<P>
+There are also project group files (BPG) to compile ACE and the
+one-button tests with Borland C++ Builder 3.0. This port has not
+been completed yet, so basically you are on your own here. The
+port was started by <A HREF="mailto:gonzo@ing.puc.cl">Gonzalo A.
+Diethelm</A>, so contact him for any further directions.<P>
 
 <EM>Note concerning MSVC 5.0 and Service Pack 3:</EM> There has been
-confusion regarding MSVC 5 and its Service Pack 3.  Some ACE users
-have, in the past, had problems with SP3 that were not present in SP2.
-Thanks to the diligent efforts of <A
-HREF="mailto:fultonb@pcnet1.ascs.aro.allied.com">Bill Fulton</A>, the
-mystery appears to be solved.  The key?  (Oh, this is a good one...)
-It would appear that there are actually multiple versions of SP3 in
-existence.  The earlier ones have the bug, while later ones have it
-fixed.  The service pack downloadable from Microsoft's web site as of
-June 16, 1998 works fine.  The CD containing SP3, if it has part
-number X03-50158 on the disc (the part number on the jacket is
-probably different), also works fine.  <P>
-
+confusion regarding MSVC 5 and its Service Pack 3.  Some ACE
+users have, in the past, had problems with SP3 that were not present in SP2.
+Thanks to the diligent efforts of
+<A HREF="mailto:fultonb@pcnet1.ascs.aro.allied.com">Bill Fulton</A>,
+the mystery appears to be solved.
+The key?  (Oh, this is a good one...) It would appear that there are
+actually multiple versions of SP3 in existence.  The
+earlier ones have the bug, while later ones have it fixed.  The service
+pack downloadable from Microsoft's web site as of June 16, 1998 works fine.
+The CD containing SP3, if it has part number X03-50158 on the disc (the part
+number on the jacket is probably different), also works fine.
+<P>
 So, if you are experiencing problems with SP3, get a newer one - it'll
 probably work.  Sheesh...
 <P>
-
-Note, however, that regardless of the version of SP3, there are some
-STL bugs in SP3 which you should get corrected.  Please see <A
-HREF="http://www.dinkumware.com/vc_fixes.html">http://www.dinkumware.com/vc_fixes.html</A>
+Note, however, that regardless of the version of SP3,
+there are some STL bugs in SP3 which you should get corrected.  Please see
+<A HREF="http://www.dinkumware.com/vc_fixes.html">http://www.dinkumware.com/vc_fixes.html</A>
 for details.  Thank you to <A HREF="mailto:ben@jetpen.com">Ben Eng</A>
 for the pointer to the STL fixes.
 
@@ -988,7 +925,7 @@ for the pointer to the STL fixes.
       <code>ACE_HAS_DLL=0</code><br>
       <code>ACE_NO_INLINE</code><br>
       <br>
-      You should also have them defined in you application projects if you
+      You should also have them defined in you application projects if you 
       want to use the default static ACE libraries with them.<p>
 
   <li>If you are building for Windows CE, you need to add the line <BR>
@@ -1247,7 +1184,7 @@ first executable that was loaded.<p>
 <h5><a name="VxWorks/SharedLibs">Building Shared Libraries for VxWorks</a>.</h5>
 ACE now 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_only=1</code> to either
+static libraries, added <code>static_libs_only=1</code> to either
 your <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
 or your <code>make</code> invocation.  Then, be sure to load
 the ACE (and any other) shared library before loading your
@@ -1280,17 +1217,21 @@ A few additional Windows Notes, from Paul von Behren:<p>
   <li>Cygnus has created a Win32 API which is compatible with a
       ``generic'' Unix environment.  Using this library, they have ported a
       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>
+      gcc/g++.  See <A href="http://www.cygnus.com/misc/gnu-win32/">
+      http://www.cygnus.com/misc/gnu-win32/</A>
       WindRiver provides a subset of these tools - including make
-      and gcc cross-compilers.  (Note:  it appears that the make
-      that is provided with Tornado 2.0 cannot be used to build ACE.
-      Use Cygnus' make (version 3.75) instead.)<p>
+      and gcc cross-compilers.<p>
   <li>To set up the command-prompt build environemnt, run
       <code>Tornado\host\x86-win32\bin\TorVars.bat</code>.  This is done
       implicitly within the Tornado IDE.<p>
   <li>To run <code>ace_ld</code>, you still need perl installed -
-      see <A href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</A>
-      for Windows perl.<p>
+      see <A href="http://www.activestate.com/software/default.htm">
+      http://www.activestate.com/software/default.htm</A> for Windows
+      perl.<p>
+  <li>But make does work in "leaf" directories (those with no
+      subdirectories).  You can make the <code>ACE_ROOT\ace directory</code>
+      creating the library libACE.a.  If perl is available, make also works
+      in the ACE_ROOT\tests directory.<p>
   <li>The Tornado IDE will use a standard Makefile for project
       builds, but does not have a GUI interface for managing the
       Makefile.  By default, it will use rules from Makefile in the current
@@ -1300,39 +1241,6 @@ A few additional Windows Notes, from Paul von Behren:<p>
       target and Tornado will then call make from the menu.<p>
 </ul>
 
-Using the Cygnus tools, this approach should work:
-<ul>
-  <li>You'll build both your NT and VxWorks executables in the same
-    workspace (directory hierarchy).  This works because the NT
-    compiler and ACE's Makefiles put their output in different
-    directories.<p>
-  <li>Set up your
-    <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
-    as usual for VxWorks.  See
-    <a href="include/makeinclude/platform_vxworks5.x_g++.GNU">the
-    g++/VxWorks platform file</a> for more information.  You may
-    also want to add this line, because there's no need to install
-    libraries in the VxWorks build:
-<pre>
-INSTALL=
-</pre><p>
-  <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
-    native exception handling, because that's not available on VxWorks.
-<pre>
-#if defined (_MSC_VER)  ||  defined (__BORLANDC__)
-# include "ace/config-win32.h"
-# undef ACE_HAS_EXCEPTIONS
-#else
-# include "ace/config-vxworks.h"
-#endif
-</pre><p>
-   <li>Set your <code>ACE_ROOT</code>, <code>CPP_LOCATION</code>,
-     <code>WIND_BASE</code>, and <code>WIND_HOST_TYPE</code> environment
-     variables.<p>
-   <li>Build for NT, then build for VxWorks.<p>
-</ul>
-
 And Chris Ryan's instructions for building for VxWorks targets
 on Windows NT hosts:
 
@@ -1401,6 +1309,8 @@ on Windows NT hosts:
   <li>Basically, follow documented procedure for ACE build/install on UNIX
       platform. Create a <code>$ACE_ROOT/ace/config.h</code> that looks like:<p>
       <pre>
+      #define __ACE_INLINE__ 0
+      #define ACE_HAS_DLL 0
       #include "config-vxworks5.x.h"
       </pre>
 
@@ -1545,45 +1455,6 @@ your global include and library paths, ACE_ROOT/netsvcs/lib.  When you
 use the dynamic libraries, make sure to also include ACE_ROOT/netsvcs/lib
 in your PATH.<P>
 
-
-<HR><P>
-<H3><A NAME="resource_requirements">System Resource Requirements</A></H3>
-The amount of system resources required to build ACE and TAO varies
-greatly.  Platform, build options, and components built primarily
-influence the required system resources.  As a rough guide, the
-typical peak memory requirement could be about 256 Mb (notably, for
-TAO's orbsvcs).  An <strong>entire</strong> build of ACE and TAO
-can use well over 1300 Mb of disk space.  It's usually not necessary
-to build <strong>all</strong> of ACE and TAO, though.<p>
-
-Much less disk space is required for just the libraries.  For example,
-see the <a href="docs/ACE-subsets.html#ACE Library Size Breakdown">ACE
-library subset sizes</a>.<p>
-
-If you run out of memory when building, you might consider trying
-some or all of these suggestions:<p>
-<ul>
-  <li>Enable or increase virtual memory.  If you're on a <a
-    href="#Linux">Linux</a> or <a href="#LynxOS">LynxOS</a> platform,
-    please see the appropriate sections above.<p>
-  <li>Disable/enable optimization and/or debugging.  See the
-    <a href="#flags">Makefile Flags</a> discussion for information
-    on how to do that via ACE's Makefiles.<p>
-  <li>If you're using g++, try removing <code>-pipe</code> from
-    <code>CFLAGS</code> in your
-    <code>include/makeinclude/platform_macros.GNU</code> file.<p>
-  <li>Restrict the components that you build.  For ACE and TAO, see the
-    discussion of <code>ACE_COMPONENTS</code> in the
-    <a href="docs/ACE-subsets.html">ACE subsets</a> page.  For TAO's
-    orbsvcs, see the discussion of <code>TAO_ORBSVCS</code> in
-    <a href="TAO/docs/configurations.html#orbsvcs">orbsvcs Library configuration information</a>.<p>
-
-If disk space is a problem, disabling debugging should greatly
-reduce object code, and therefore, library size.  This is especially
-true with g++.<p>
-</ul>
-
-
 <HR><P>
 <H3><A NAME="advanced">Advanced Topics</A></H3>
 
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 046975f76fc..7cc2b42080b 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,7 +1,3 @@
-Tue Jun 22 13:34:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * agent/Makefile: replaced rm -f with $(RM).
-
 Thu Apr 29 06:46:46 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * tests/Makefile: changed SRC to PSRC (for make depend).
diff --git a/ASNMP/agent/Makefile b/ASNMP/agent/Makefile
index 18886acd2a7..043ccfa45e0 100644
--- a/ASNMP/agent/Makefile
+++ b/ASNMP/agent/Makefile
@@ -1,4 +1,4 @@
-# Sample SNMPv1 Agent
+# Sample SNMPv1 Agent 
 # Makefile for Solaris 2.x
 # $Id$
 
@@ -6,17 +6,17 @@ OBJS = main.o snmp_agent.o agent_impl.o
 INCL = -I$(ACE_ROOT) -I$(ACE_ROOT)/ASNMP
 CC=CC
 SOL_FLAGS=-mt -R $(ACE_ROOT)/ASNMP/asnmp:$(ACE_ROOT)/ace
-DEBUG = -g $(SOL_FLAGS)
+DEBUG = -g $(SOL_FLAGS) 
 CFLAGS =$(INCL) $(DEBUG)
-RUNPATH =
-LIBS = -L $(ACE_ROOT)/ASNMP/asnmp -lasnmp -L $(ACE_ROOT)/ace -lACE -ldl
+RUNPATH = 
+LIBS = -L $(ACE_ROOT)/ASNMP/asnmp -lasnmp -L $(ACE_ROOT)/ace -lACE -ldl  
 
 agent: $(OBJS)
 	$(CC) -o agent $(DEBUG) $(OBJS) $(LIBS) $(RUNPATH)
 
 
-main.o: main.cpp
-	$(CC) -c $(CFLAGS) main.cpp
+main.o: main.cpp 
+	$(CC) -c $(CFLAGS) main.cpp 
 
 snmp_agent.o: snmp_agent.cpp snmp_agent.h
 	$(CC) -c $(CFLAGS) snmp_agent.cpp
@@ -25,4 +25,4 @@ agent_impl.o: agent_impl.cpp agent_impl.h
 	$(CC) -c $(CFLAGS) agent_impl.cpp
 
 clean:
-	-$(RM) *.o agent *~
+	-rm *.o agent *~
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 67d624b93aa..00000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Douglas C. Schmidt <schmidt@cs.wustl.edu>
-Director of the Center for Distributed Object Computing
-
-The Center for Distributed Object Computing
-One Brookings Drive
-St. Louis, Missouri 63130-4899
-http://www.cs.wustl.edu/~schmidt/doc-center.html
diff --git a/ChangeLog-97a b/ChangeLog-97a
index d8a4de991ba..0563ae1c093 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,2763 +1,2763 @@
 Thu Jul  3 20:36:19 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
 
-        * performance-tests/Misc/childbirth_time.cpp: Changed the
-          parameter type of "Profiler" from int to size_t to make g++
-          happy.
+	* performance-tests/Misc/childbirth_time.cpp: Changed the
+ 	  parameter type of "Profiler" from int to size_t to make g++
+ 	  happy.
 
 Thu Jul 03 20:03:18 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Reactor.cpp (remove_handler): added ACE_UNUSED_ARG
-          when NSIG != 0.
+	* ace/Reactor.cpp (remove_handler): added ACE_UNUSED_ARG
+	  when NSIG != 0.
 
 Wed Jul  2 23:41:43 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
 
-        * performance-tests/Misc/childbirth_time.cpp: Fixed some typos.
+	* performance-tests/Misc/childbirth_time.cpp: Fixed some typos.
 
 Wed Jul  2 23:13:10 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * performance-tests/Misc/childbirth_time.cpp: Revised the
-          code to use ACE programming style.
+	* performance-tests/Misc/childbirth_time.cpp: Revised the
+	  code to use ACE programming style.
 
 Wed Jul 02 23:02:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.15, released Wed Jul 02 23:02:24 1997.
+	* ACE version 4.2.15, released Wed Jul 02 23:02:24 1997.
 
 Wed Jul  2 22:23:49 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Service_Config.cpp: Used the new ACE_LACKS_UNIX_SIGNALS
-          macro to reduce the #ifdef complexity somewhat.
+	* ace/Service_Config.cpp: Used the new ACE_LACKS_UNIX_SIGNALS
+	  macro to reduce the #ifdef complexity somewhat.
 
-        * ace/config-{chorus,win32-common}.h: Added #define for
-          ACE_LACKS_UNIX_SIGNALS.
+	* ace/config-{chorus,win32-common}.h: Added #define for
+ 	  ACE_LACKS_UNIX_SIGNALS.
 
-        * ace/OS.h: If a platform (e.g., Chorus) doesn't support signals
-          then #define NSIG 0.
+	* ace/OS.h: If a platform (e.g., Chorus) doesn't support signals
+	  then #define NSIG 0.
 
-        * ace/Reactor.cpp: Chorus does not support signals.  Make the call
-          to register/remove_handler(sig_set, evnet_handler) return
-          succesfully so that some of the examples and test programs do
-          not need to be changed.  Thanks to Wei Chiang for this.
+	* ace/Reactor.cpp: Chorus does not support signals.  Make the call
+	  to register/remove_handler(sig_set, evnet_handler) return
+	  succesfully so that some of the examples and test programs do
+	  not need to be changed.  Thanks to Wei Chiang for this.
 
-        * ace/config-chorus.h: Added a new macro for
-          ACE_LACKS_NAMED_POSIX_SEM to handle Chorus.  Thanks to Wei
-          Chiang for this.
+	* ace/config-chorus.h: Added a new macro for
+ 	  ACE_LACKS_NAMED_POSIX_SEM to handle Chorus.  Thanks to Wei
+ 	  Chiang for this.
 
-        * ace/OS.i: Define macros ACE_PTHREAD_CLEANUP_* so that the
-          related code does not need to be surrounded with #ifdefs.
-          Thanks to Wei Chiang for this.
+	* ace/OS.i: Define macros ACE_PTHREAD_CLEANUP_* so that the
+	  related code does not need to be surrounded with #ifdefs.
+	  Thanks to Wei Chiang for this.
 
-        * ace/OS.i: Chorus does not support named semaphores. The code
-          that to do with names in sema_init() and sema_destory() is
-          therefore disabled.  Thanks to Wei Chiang for this.
+	* ace/OS.i: Chorus does not support named semaphores. The code
+	  that to do with names in sema_init() and sema_destory() is
+	  therefore disabled.  Thanks to Wei Chiang for this.
 
-        * ace/config-chorus.h: Added support for ACE_LACKS_PTHREAD_CLEANUP
-          and ACE_HAS_POSIX_SEM to the Chorus port.  Thanks to Wei Chiang
-          for this.
+	* ace/config-chorus.h: Added support for ACE_LACKS_PTHREAD_CLEANUP
+	  and ACE_HAS_POSIX_SEM to the Chorus port.  Thanks to Wei Chiang
+	  for this.
 
 Wed Jul  2 17:37:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Hash_Map_Manager.cpp: Clarified the behavior of close_i() a
-          bit more.
+	* ace/Hash_Map_Manager.cpp: Clarified the behavior of close_i() a
+ 	  bit more.
 
 Wed Jul  2 09:54:36 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Hash_Map_Manager.cpp: Fixed a couple more size_t->u_long
-          conversions for ACE_Hash_Map_Manager::hash().  This didn't harm
-          anything but it's good to be consistent.
+	* ace/Hash_Map_Manager.cpp: Fixed a couple more size_t->u_long
+ 	  conversions for ACE_Hash_Map_Manager::hash().  This didn't harm
+ 	  anything but it's good to be consistent.
 
 Wed Jul  2 16:46:59 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
 
-        * performance-tests/Misc/childbirth_time.cpp: Added this program
-          to measure child process/thread creation mechanisms on various
-          platforms.  Native thread creation test only supports Solaris
-          and NT threads so far. But you can still use ACE_OS::thr_create
-          method on your platform if not supported.
+	* performance-tests/Misc/childbirth_time.cpp: Added this program
+	  to measure child process/thread creation mechanisms on various
+ 	  platforms.  Native thread creation test only supports Solaris
+ 	  and NT threads so far. But you can still use ACE_OS::thr_create
+ 	  method on your platform if not supported.
 
 Wed Jul  2 15:59:53 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/High_Res_Timer.cpp: Created a function get_registry_scale_factor
-          that finds out the speed of the processor using the NT registry (in
-          megahertz).  This means that ACE_High_Res_Timers should automatically 
-          get the correct scale factor.
+	* ace/High_Res_Timer.cpp: Created a function get_registry_scale_factor
+	  that finds out the speed of the processor using the NT registry (in
+	  megahertz).  This means that ACE_High_Res_Timers should automatically 
+	  get the correct scale factor.
 
-        * tests/Timer_Queue_Test.cpp: Removed the call to 
-          get_env_global_scale_factor().
+	* tests/Timer_Queue_Test.cpp: Removed the call to 
+	  get_env_global_scale_factor().
 
 Wed Jul  2 15:39:33 1997  Tim H. Harrison  <harrison@waltz.cs.wustl.edu>
 
-        * ace/Process.cpp: Modified spawn to check for the NO_EXEC
-          flag after forking on UNIX.  If it's set, spawn returns the
-          child pid without exec'ing.  Updated the NT version to
-          always return the child pid on success.
+	* ace/Process.cpp: Modified spawn to check for the NO_EXEC
+	  flag after forking on UNIX.  If it's set, spawn returns the
+	  child pid without exec'ing.  Updated the NT version to
+	  always return the child pid on success.
 
 Wed Jul 02 10:55:23 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/SPIPE_Test.cpp,UPIPE_SAP_Test.cpp: tweaked the static
-          functions a bit to avoid warnings about unused statics on VxWorks.
+	* tests/SPIPE_Test.cpp,UPIPE_SAP_Test.cpp: tweaked the static
+	  functions a bit to avoid warnings about unused statics on VxWorks.
 
 Wed Jul 02 00:16:07 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.14, released Wed Jul 02 00:16:07 1997.
+	* ACE version 4.2.14, released Wed Jul 02 00:16:07 1997.
 
 Tue Jul  1 22:49:58 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Strategies_T.h: Changed the return value of all the hash()
-          methods to be u_long.
+	* ace/Strategies_T.h: Changed the return value of all the hash()
+ 	  methods to be u_long.
 
-        * tests/Map_Manager_Test.cpp (hash): Changed the return value of
-          all the hash() methods to be u_long.
+	* tests/Map_Manager_Test.cpp (hash): Changed the return value of
+ 	  all the hash() methods to be u_long.
 
-        * ace/SString.cpp: Changed the return value of all the hash()
-          methods to be u_long.
+	* ace/SString.cpp: Changed the return value of all the hash()
+	  methods to be u_long.
 
-        * ace/Hash_Map_Manager: Changed the return value of hash()
-          to return a u_long in order to (1) be consistent with
-          the return value of hash_pjw() and (2) give the maximal
-          range for the hash function.  Thanks to Marina Spivak
-          <marina@cs.wustl.edu> for reporting this.
+	* ace/Hash_Map_Manager: Changed the return value of hash()
+	  to return a u_long in order to (1) be consistent with
+	  the return value of hash_pjw() and (2) give the maximal
+	  range for the hash function.  Thanks to Marina Spivak
+	  <marina@cs.wustl.edu> for reporting this.
 
 Tue Jul 01 14:47:22 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/High_Res_Timer.{h,i} (gettime): use gettime () static function
-          to wrap all calls to ACE_OS::gethrtime ().  On ACE_WIN32, if the
-          global scale factor has not been set, then gettime () uses
-          ACE_OS::gettimeofday () instead of ACE_OS::gethrtime (), because
-          gettimeofday doesn't need the scale factor.
+	* ace/High_Res_Timer.{h,i} (gettime): use gettime () static function
+	  to wrap all calls to ACE_OS::gethrtime ().  On ACE_WIN32, if the
+	  global scale factor has not been set, then gettime () uses
+	  ACE_OS::gettimeofday () instead of ACE_OS::gethrtime (), because
+	  gettimeofday doesn't need the scale factor.
 
 Mon Jun 30 17:28:53 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * Makefile (RELEASE_FILES): Removed the rpc++ directory from the
-          main release since this doesn't seem to be widely used and the
-          GPL copyleft confuses people.
+	* Makefile (RELEASE_FILES): Removed the rpc++ directory from the
+ 	  main release since this doesn't seem to be widely used and the
+ 	  GPL copyleft confuses people.
 
 Mon Jun 30 15:08:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/platform_vxworks5.x_g++.GNU: added -lgcc
-          to LDFLAGS.
+	* include/makeinclude/platform_vxworks5.x_g++.GNU: added -lgcc
+	  to LDFLAGS.
 
 Mon Jun 30 12:00:02 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.13, released Mon Jun 30 12:00:02 1997.
+	* ACE version 4.2.13, released Mon Jun 30 12:00:02 1997.
 
 Sat Jun 28 08:27:27 1997  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/OS.h: added definitions of ACE_SHLIB_HANDLE and
-          ACE_DEFAULT_SHLIB_MODE on platforms other than
-          ACE_HAS_SVR4_DYNAMIC_LINKING and hpux.
+	  ACE_DEFAULT_SHLIB_MODE on platforms other than
+	  ACE_HAS_SVR4_DYNAMIC_LINKING and hpux.
 
-        * ace/OS.i: split definitions of ACE_OS::cond_* member
-          functions into two:  for ACE_WIN32/VXWORKS and all others.
-          That allows us to break the circular dependencies between
-          those functions and the ACE_OS::sema_* member functions.
+	* ace/OS.i: split definitions of ACE_OS::cond_* member
+	  functions into two:  for ACE_WIN32/VXWORKS and all others.
+	  That allows us to break the circular dependencies between
+	  those functions and the ACE_OS::sema_* member functions.
 
-        * ace/Svc_Conf_y.cpp: commented out unused args and wrapped
-          assignments in "if" conditionals with parenthesis to avoid
-          g++ warnings.
+	* ace/Svc_Conf_y.cpp: commented out unused args and wrapped
+	  assignments in "if" conditionals with parenthesis to avoid
+	  g++ warnings.
 
-        * ace/{ACE,INET_Addr,OS}.cpp (VxWorks only): added ACE_UNUSED_ARG
-          calls.
+	* ace/{ACE,INET_Addr,OS}.cpp (VxWorks only): added ACE_UNUSED_ARG
+	  calls.
 
-        * ace/Parse_Node.cpp (ACE_Stream_Node,ACE_Dynamic_Node,ACE_Dummy_Node
-          constructors): reordered initializers to match declaration order.
+	* ace/Parse_Node.cpp (ACE_Stream_Node,ACE_Dynamic_Node,ACE_Dummy_Node
+	  constructors): reordered initializers to match declaration order.
 
-        * ace/Profile_Timer.h (elapsed_time): commented out unused arg "et".
+	* ace/Profile_Timer.h (elapsed_time): commented out unused arg "et".
 
-        * ace/Read_Buffer.cpp (rec_read): initialized local variable "c" to
-          make sure that it is always defined before use.
+	* ace/Read_Buffer.cpp (rec_read): initialized local variable "c" to
+	  make sure that it is always defined before use.
 
-        * ace/SPIPE_Acceptor.cpp (remove): don't declare local variable
-          "result" if ! ACE_HAS_STREAM_PIPES, because it's not used in
-          that case.
+	* ace/SPIPE_Acceptor.cpp (remove): don't declare local variable
+	  "result" if ! ACE_HAS_STREAM_PIPES, because it's not used in
+	  that case.
 
-        * ace/config-vxworks5.x-g++.h: added ACE_LACKS_IOSTREAM_FX,
-          ACE_LACKS_LINEBUFFERED_STREAMBUF, and ACE_LACKS_SIGNED_CHAR.
+	* ace/config-vxworks5.x-g++.h: added ACE_LACKS_IOSTREAM_FX,
+	  ACE_LACKS_LINEBUFFERED_STREAMBUF, and ACE_LACKS_SIGNED_CHAR.
 
-        * ace/IOStream_T.h (ipfx): comment out unused variable "need".
+	* ace/IOStream_T.h (ipfx): comment out unused variable "need".
 
-        * platform_vxworks5.2_g++.GNU: added -Wall now that the ACE library
-          builds cleanly with it.
+	* platform_vxworks5.2_g++.GNU: added -Wall now that the ACE library
+	  builds cleanly with it.
 
-        * platform_vxworks5.x_g{++,hs}.GNU: renamed 5.x instead of 5.2.
+	* platform_vxworks5.x_g{++,hs}.GNU: renamed 5.x instead of 5.2.
 
-        * netsvcs/lib/Token_Handler.cpp: reordered initializers to match
-          declaration order.
+	* netsvcs/lib/Token_Handler.cpp: reordered initializers to match
+	  declaration order.
 
-        * tests/SV_Shared_Memory_Test.cpp: moved template specializations
-          so that they're not done on platforms that don't support SV IPC.
+	* tests/SV_Shared_Memory_Test.cpp: moved template specializations
+	  so that they're not done on platforms that don't support SV IPC.
 
-        * examples/IOStream/client/iostream_client.cpp,
-          examples/IOStream/server/iostream_server.cpp:
-          use ACE_HAS_STRING_CLASS rather than __GNUC__ to determine whether
-          the platform has a String class.
+	* examples/IOStream/client/iostream_client.cpp,
+	  examples/IOStream/server/iostream_server.cpp:
+	  use ACE_HAS_STRING_CLASS rather than __GNUC__ to determine whether
+	  the platform has a String class.
 
 Fri Jun 27 13:10:46 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
 
-        * ace: Changed the name of config-vxworks5.2-g++.h to
-          config-vxworks5.x-g++.h since it works with 5.2 and 5.3.
+	* ace: Changed the name of config-vxworks5.2-g++.h to
+ 	  config-vxworks5.x-g++.h since it works with 5.2 and 5.3.
 
-        * examples/Mem_Map/IO-tests/IO_Test.cpp: Fixed some bugs that were
-          preventing this from running correctly.
+	* examples/Mem_Map/IO-tests/IO_Test.cpp: Fixed some bugs that were
+ 	  preventing this from running correctly.
 
 Fri Jun 27 13:37:37 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/Svc_Conf.y: Finished the sanity checks started below.
+	* ace/Svc_Conf.y: Finished the sanity checks started below.
 
 Fri Jun 27 11:55:13 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Timer_Queue_T.cpp: added a check for an empty queue in expire
+	* ace/Timer_Queue_T.cpp: added a check for an empty queue in expire
 
 Fri Jun 27 07:53:58 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Message_Queue_Notifications_Test.cpp (handle_output,
-          handle_exception,main): added ACE_UNUSED_ARG (fd) to avoid
-          compilation warnings about unused arguments.
+	* tests/Message_Queue_Notifications_Test.cpp (handle_output,
+	  handle_exception,main): added ACE_UNUSED_ARG (fd) to avoid
+	  compilation warnings about unused arguments.
 
 Fri Jun 27 01:08:54 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Connector.cpp (create_AST): Replaced the gratuitous #ifdef
-          for ACE_WIN32 and EXCEPT_MASK with the new CONNECT_MASK.  This
-          is much cleaner!
+	* ace/Connector.cpp (create_AST): Replaced the gratuitous #ifdef
+ 	  for ACE_WIN32 and EXCEPT_MASK with the new CONNECT_MASK.  This
+ 	  is much cleaner!
 
-        * ace/Event_Handler.h: Added a new CONNECT_MASK that defaults to
-          READ_MASK | WRITE_MASK (with | EXCEPT_MASK thrown in for Win32).
-          Thanks to Irfan for this suggestion.
+	* ace/Event_Handler.h: Added a new CONNECT_MASK that defaults to
+ 	  READ_MASK | WRITE_MASK (with | EXCEPT_MASK thrown in for Win32).
+  	  Thanks to Irfan for this suggestion.
 
 Thu Jun 26 19:53:11 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/OS.i (strtok_r): Added check on a null string so we won't go
-          past the end of a string.
+	* ace/OS.i (strtok_r): Added check on a null string so we won't go
+ 	  past the end of a string.
 
-        * performance-tests/Misc/context_switch_time.cpp (main): Added
-          get_env_gloval_scale_factor() at the very beginning so that high
-          resolution timer can return correct time in millisecond.
+	* performance-tests/Misc/context_switch_time.cpp (main): Added
+	  get_env_gloval_scale_factor() at the very beginning so that high
+	  resolution timer can return correct time in millisecond.
 
 Thu Jun 26 15:29:55 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * tests/Timer_Queue_Test.cpp: Changed the random scheduling to use
-          past times instead of future time.  This should fix some unusual
-          behavior of this test.  Thanks to Gonzalo A. Diethelm 
-          <gonzo@ing.puc.cl> for reporting this.
+	* tests/Timer_Queue_Test.cpp: Changed the random scheduling to use
+	  past times instead of future time.  This should fix some unusual
+	  behavior of this test.  Thanks to Gonzalo A. Diethelm 
+	  <gonzo@ing.puc.cl> for reporting this.
 
 Thu Jun 26 12:38:16 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.12, released Thu Jun 26 12:38:16 1997.
+	* ACE version 4.2.12, released Thu Jun 26 12:38:16 1997.
 
 Thu Jun 26 01:11:10 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Svc_Conf.y: Added some sanity checks to make sure we don't
-          segfault when things go wrong during the svc.conf file parsing.
-          Thanks to Steve Huston for this suggestion.
+	* ace/Svc_Conf.y: Added some sanity checks to make sure we don't
+ 	  segfault when things go wrong during the svc.conf file parsing.
+  	  Thanks to Steve Huston for this suggestion.
 
 Thu Jun 26 08:36:37 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile: fix UPTODATE check (for release target) by not
-          running it in a sub-shell.  Also, added ACE-lessons.html
-          to RELEASE_FILES.
+	* Makefile: fix UPTODATE check (for release target) by not
+	  running it in a sub-shell.  Also, added ACE-lessons.html
+	  to RELEASE_FILES.
 
-        * performance-tests/Misc/context_switch_time.cpp: use same priority
-          values on Win32 platforms as on Solaris, because thread priority
-          increases with increasing priority values on both of those platforms.
+	* performance-tests/Misc/context_switch_time.cpp: use same priority
+	  values on Win32 platforms as on Solaris, because thread priority
+	  increases with increasing priority values on both of those platforms.
 
 Thu Jun 26 01:34:46 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * performance-tests/Misc/misc.{mak,mdp}: Added makefile for NT.
-        
-        * ace/{FILE,DEV}.{h,i}: Added the disable(int signum) function to
-          prevent NT from disabling a FILE/DEV using socket calls.
+	* performance-tests/Misc/misc.{mak,mdp}: Added makefile for NT.
+	
+	* ace/{FILE,DEV}.{h,i}: Added the disable(int signum) function to
+ 	  prevent NT from disabling a FILE/DEV using socket calls.
 
 Wed Jun 25 12:59:00 1997    <irfan@TWOSTEP>
 
-        * ace/Synch_T.h (ACE_SYNCH_PROCESS_MUTEX and
-          ACE_SYNCH_NULL_MUTEX): Added new template typedef to the list. 
+	* ace/Synch_T.h (ACE_SYNCH_PROCESS_MUTEX and
+ 	  ACE_SYNCH_NULL_MUTEX): Added new template typedef to the list. 
 
-        * tests/Message_Queue_Notifications_Test.cpp: New test for
-          demonstrating notification qualities of Message_Queue.
+	* tests/Message_Queue_Notifications_Test.cpp: New test for
+ 	  demonstrating notification qualities of Message_Queue.
 
-        * ace/Strategies.h: Added accessors to these classes to make them
-          more usable.
+	* ace/Strategies.h: Added accessors to these classes to make them
+ 	  more usable.
 
 Wed Jun 25 10:47:34 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/Parse_Node.cpp: Insure that ACE_Object_Node::symbol(void)
-          returns 0 if the underlying shared library can't be loaded.
+	* ace/Parse_Node.cpp: Insure that ACE_Object_Node::symbol(void)
+	  returns 0 if the underlying shared library can't be loaded.
 
-        * ace/OS.h: Added a new type, ACE_SHLIB_HANDLE to allow dynamic
-          linking using correct types on all platforms that support it.
-          Also added a const ACE_SHLIB_DEFAULT_MODE for the 'mode' argument
-          when doing a dlopen-like operation.
-          Moved the ACE_OSCALL_* macros to this file from OS.i
+	* ace/OS.h: Added a new type, ACE_SHLIB_HANDLE to allow dynamic
+	  linking using correct types on all platforms that support it.
+	  Also added a const ACE_SHLIB_DEFAULT_MODE for the 'mode' argument
+	  when doing a dlopen-like operation.
+	  Moved the ACE_OSCALL_* macros to this file from OS.i
 
-        * ace/OS.i: Moved ACE_OSCALL_* macros out of here and into OS.h.
-          Added support for dlopen/close/sym/error on HP-UX.  Note - the
-          Service_Configurator tests do not run yet on HP - I'm working on
-          that.
+	* ace/OS.i: Moved ACE_OSCALL_* macros out of here and into OS.h.
+	  Added support for dlopen/close/sym/error on HP-UX.  Note - the
+	  Service_Configurator tests do not run yet on HP - I'm working on
+	  that.
 
-        * ace/Service_Record.{h, i, cpp}: Use new ACE_SHLIB_HANDLE type for
-          dynamic loading operations.
+	* ace/Service_Record.{h, i, cpp}: Use new ACE_SHLIB_HANDLE type for
+	  dynamic loading operations.
 
-        * ace/Parse_Node.{h, cpp}: Use new ACE_SHLIB_HANDLE where appropriate.
+	* ace/Parse_Node.{h, cpp}: Use new ACE_SHLIB_HANDLE where appropriate.
 
-        * ace/Strategies_T.cpp: Use new ACE_SHLIB_HANDLE type.
+	* ace/Strategies_T.cpp: Use new ACE_SHLIB_HANDLE type.
 
 Wed Jun 25 02:36:05 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/OS.i (gmtime_r): Modified the implementation of gmtime_r
-          when OS doesn't provide one.  Notice that the implementation
-          only simulate the semantic and is not thread-safe. 
+	* ace/OS.i (gmtime_r): Modified the implementation of gmtime_r
+ 	  when OS doesn't provide one.  Notice that the implementation
+	  only simulate the semantic and is not thread-safe. 
 
-        * ace/OS.h: Moved definition of ACE_SHLIB_HANDLE typedef and
-          ACE_DEFAULT_SHLIB_MODE global variable for Win32 to where it
-          belongs.
-          
-        * ace/OS.i: Changed the return type of dlopen() when ACE_HAS_UNICODE to
-          ACE_SHLIB_HANDLE.
-        
-        * ace/OS.{h,i}: Moved ACE_OSCALL and ACE_OSCALL_RETURN for WIN32
-          from OS.i to OS.h.
+	* ace/OS.h: Moved definition of ACE_SHLIB_HANDLE typedef and
+ 	  ACE_DEFAULT_SHLIB_MODE global variable for Win32 to where it
+ 	  belongs.
+	  
+	* ace/OS.i: Changed the return type of dlopen() when ACE_HAS_UNICODE to
+ 	  ACE_SHLIB_HANDLE.
+	
+	* ace/OS.{h,i}: Moved ACE_OSCALL and ACE_OSCALL_RETURN for WIN32
+ 	  from OS.i to OS.h.
 
 Wed Jun 25 01:23:58 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ace/OS.i (strtok_r): Modified the implementation when OS does
-          not provide reentrant strtok_r so that our imp. comforms with
-          the semantic of strtok_r ().
+	* ace/OS.i (strtok_r): Modified the implementation when OS does
+	  not provide reentrant strtok_r so that our imp. comforms with
+	  the semantic of strtok_r ().
 
 Wed Jun 25 00:37:56 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.11, released Wed Jun 25 00:37:56 1997.
+	* ACE version 4.2.11, released Wed Jun 25 00:37:56 1997.
 
 Tue Jun 24 21:30:53 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Svc_Conf_y.cpp: commented out unused args and wrapped
-          assignments in "if" conditionals with parenthesis to avoid
-          g++ warnings.
+	* ace/Svc_Conf_y.cpp: commented out unused args and wrapped
+	  assignments in "if" conditionals with parenthesis to avoid
+	  g++ warnings.
 
 Tue Jun 24 18:15:46 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ace/Reactor.cpp (wait_for_multiple_events): Modified the way to
-          manipulate timeout value so that we can differentiate when there
-          are timeout events to be handle from no timer and we want to
-          wait indefinitely.
+	* ace/Reactor.cpp (wait_for_multiple_events): Modified the way to
+	  manipulate timeout value so that we can differentiate when there
+	  are timeout events to be handle from no timer and we want to
+	  wait indefinitely.
 
 Tue Jun 24 16:52:22 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: reverted ACE_hrtime_t to unsigned __int64 with VC++.
-          This might break something, but we need to know what.
+	* ace/OS.h: reverted ACE_hrtime_t to unsigned __int64 with VC++.
+	  This might break something, but we need to know what.
 
 Tue Jun 24 16:38:52 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * Added Visual C++ 5.0 specific workspace (.dsw) and project (.dsp)
-          files to both the ace and tests subdirectory.  ACE.DSW in the root
-          directory contains all the project files, so a batch build should
-          be able to build all the project files.
+	* Added Visual C++ 5.0 specific workspace (.dsw) and project (.dsp)
+	  files to both the ace and tests subdirectory.  ACE.DSW in the root
+	  directory contains all the project files, so a batch build should
+	  be able to build all the project files.
 
 Tue Jun 24 14:27:47 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Timer_{Hash,Heap,List,Wheel}_T.cpp: Changed cancel (type..)
-          to call cancellation() even if there are no timers to cancel.  
-          This causes the correct behavior of calling handle_close () 
-          during expire when handle_timeout() returns -1.  Thanks to 
-          Hamutal Yanay <hamutal_yanay_at_quantum@mail.icomverse.com> for 
-          pointing this out.
+	* ace/Timer_{Hash,Heap,List,Wheel}_T.cpp: Changed cancel (type..)
+	  to call cancellation() even if there are no timers to cancel.  
+	  This causes the correct behavior of calling handle_close () 
+	  during expire when handle_timeout() returns -1.  Thanks to 
+	  Hamutal Yanay <hamutal_yanay_at_quantum@mail.icomverse.com> for 
+	  pointing this out.
 
-        * tests/Timer_Queue_Test.cpp: Updated to correctly test this.
+	* tests/Timer_Queue_Test.cpp: Updated to correctly test this.
 
 Tue Jun 24 13:02:51 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/SString.h (ACE_SString ctor): changed "allocator" to "alloc".
-          Thanks to Brian Mendel <bmendel@mdc.com> for reporting this.
+	* ace/SString.h (ACE_SString ctor): changed "allocator" to "alloc".
+	  Thanks to Brian Mendel <bmendel@mdc.com> for reporting this.
 
 Tue Jun 24 12:58:28 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * include/makeinclude/platform_irix6.4*: Shuts up useless warnings
-          about multiply defined template instances.
+	* include/makeinclude/platform_irix6.4*: Shuts up useless warnings
+	  about multiply defined template instances.
 
 Tue Jun 24 12:50:52 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ACE version 4.2.10, released Tue Jun 24 12:50:52 1997.
+	* ACE version 4.2.10, released Tue Jun 24 12:50:52 1997.
 
 Tue Jun 24 00:44:30 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/SPIPE.{h,i}: Added the disable(int signum) function to
-          prevent NT from disabling an SPIPE using socket calls.
+	* ace/SPIPE.{h,i}: Added the disable(int signum) function to
+	  prevent NT from disabling an SPIPE using socket calls.
 
 Mon Jun 23 22:14:39 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Svc_Conf*: Changed the name of the YYSTYPE field
-          ACE_Static_Node_ to static_node_ to be consistent with the other
-          fields.
+	* ace/Svc_Conf*: Changed the name of the YYSTYPE field
+ 	  ACE_Static_Node_ to static_node_ to be consistent with the other
+ 	  fields.
 
 Mon Jun 23 18:28:55 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/ACE.cpp: added auto_basic_array_ptr specialization.
+	* ace/ACE.cpp: added auto_basic_array_ptr specialization.
 
-        * ace/Service_Config.cpp, tests/Future_Test.cpp,
-          examples/Threads/future[12].cpp: added auto_basic_ptr
-          specializations.
+	* ace/Service_Config.cpp, tests/Future_Test.cpp,
+	  examples/Threads/future[12].cpp: added auto_basic_ptr
+	  specializations.
 
-        * include/makeinclude/platform_vxworks5.2_g++.GNU:
-          reworked to supported different targets, instead of only PowerPC.
+	* include/makeinclude/platform_vxworks5.2_g++.GNU:
+	  reworked to supported different targets, instead of only PowerPC.
 
 Mon Jun 23 16:06:35 1997  James C. Hu  <jxh@swarm.cs.wustl.edu>
 
-        * ace/OS.i: Moved definition of sema_* methods to follow cond_*
-          methods to remove compiler warnings on SGI.
+	* ace/OS.i: Moved definition of sema_* methods to follow cond_*
+	  methods to remove compiler warnings on SGI.
 
 Mon Jun 23 09:42:08 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * tests/Timer_Queue_Test.cpp: added testing for cancellation 
-          during expire (when of handle_timeout() in an event handler 
-          returning -1).
+	* tests/Timer_Queue_Test.cpp: added testing for cancellation 
+	  during expire (when of handle_timeout() in an event handler 
+	  returning -1).
 
 Mon Jun 23 09:18:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile: added up-to-date check for "make release" from
-          /project/adaptive/ACE_wrappers.  Also, "make release" now
-          adds release entry to latest ChangeLog.
+	* Makefile: added up-to-date check for "make release" from
+	  /project/adaptive/ACE_wrappers.  Also, "make release" now
+	  adds release entry to latest ChangeLog.
 
-        * ace/Makefile: build shared library before static library. 
-          This appears to fix a problem with Sun C++ 4.{1,2} possibly 
-          related to its template instantiation scheme.  If the
-          static library is built first, then .shobj/Reactor.so
-          and .shobj/Timer_Hash.so (and possibly others) fail to
-          build due to ACE_TimeValue::normalize () "relocations remain
-          against allocatable but non-writable sections".
-          Thanks to Steve Huston <shuston@riverace.com> and
-          Satoshi Ueno <satoshi.ueno@gs.com> for reporting this, and
-          to Satoshi for verifying the fix.
+	* ace/Makefile: build shared library before static library. 
+	  This appears to fix a problem with Sun C++ 4.{1,2} possibly 
+	  related to its template instantiation scheme.  If the
+	  static library is built first, then .shobj/Reactor.so
+	  and .shobj/Timer_Hash.so (and possibly others) fail to
+	  build due to ACE_TimeValue::normalize () "relocations remain
+	  against allocatable but non-writable sections".
+	  Thanks to Steve Huston <shuston@riverace.com> and
+	  Satoshi Ueno <satoshi.ueno@gs.com> for reporting this, and
+	  to Satoshi for verifying the fix.
 
-        * ace/ACE.cpp (terminate_process): removed used of
-          ACE_OSCALL_RETURN macro because its defined in OS.i, and so
-          not available if inlining is disabled.
+	* ace/ACE.cpp (terminate_process): removed used of
+	  ACE_OSCALL_RETURN macro because its defined in OS.i, and so
+	  not available if inlining is disabled.
 
-        * ace/Auto_Ptr.{h,i}: made "p_" protected instead of private
-          so that it can be accessed with the new class arrangement.
-          Also, made the auto_array_ptr operator-> const.
+	* ace/Auto_Ptr.{h,i}: made "p_" protected instead of private
+	  so that it can be accessed with the new class arrangement.
+	  Also, made the auto_array_ptr operator-> const.
 
-        * ace/Sched_Params.cpp (previous_priority, VxWorks only):
-          removed ACE_UNUSED_ARG (policy) because policy is used in
-          this function. 
+	* ace/Sched_Params.cpp (previous_priority, VxWorks only):
+	  removed ACE_UNUSED_ARG (policy) because policy is used in
+	  this function. 
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): wrapped TCHAR
-          argument to sizeof in parenthesis.
+	* netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): wrapped TCHAR
+	  argument to sizeof in parenthesis.
 
 Mon Jun 23 09:12:04 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/Auto_Ptr.i (auto_array_ptr): Fixed a typo.
+	* ace/Auto_Ptr.i (auto_array_ptr): Fixed a typo.
 
 Mon Jun 23 08:03:46 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Auto_Ptr.h: changed inheritance of auto_basic_array_ptr in 
-          auto_array_ptr to include the template parameter X.
+	* ace/Auto_Ptr.h: changed inheritance of auto_basic_array_ptr in 
+	  auto_array_ptr to include the template parameter X.
 
-        * ace/IOStream_T.i: removed default parameter in the definition
-          of ACE_Streambut_T::recv_n() and ACE_SOCK_Dgram_SC::recv_n()
+	* ace/IOStream_T.i: removed default parameter in the definition
+	  of ACE_Streambut_T::recv_n() and ACE_SOCK_Dgram_SC::recv_n()
 
 Mon Jun 23 01:13:15 1997    <irfan@TWOSTEP>
 
-        * ace/OS.cpp (fork_exec): Fixed the usage of ACE_WIDE_STRING.
+	* ace/OS.cpp (fork_exec): Fixed the usage of ACE_WIDE_STRING.
 
-        * test_registry_iterator.cpp (main): Fixed the usage of
-          ACE_WIDE_STRING.
+	* test_registry_iterator.cpp (main): Fixed the usage of
+ 	  ACE_WIDE_STRING.
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): Fixed the usage
-          of ACE_WIDE_STRING.
+	* netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): Fixed the usage
+ 	  of ACE_WIDE_STRING.
 
-        * ace/Auto_Ptr.h: Added support for basic types by seperating the
-          auto_ptr classes into two. One that requires the -> operator
-          support and the other that does not. The former inherits from
-          the latter.
+	* ace/Auto_Ptr.h: Added support for basic types by seperating the
+ 	  auto_ptr classes into two. One that requires the -> operator
+ 	  support and the other that does not. The former inherits from
+ 	  the latter.
 
-        * ace/{FILE,DEV,SPIPE}_Addr.h: Added support for multibyte and
-          wide character addr_to_string and string_to_addr functionality.
+	* ace/{FILE,DEV,SPIPE}_Addr.h: Added support for multibyte and
+ 	  wide character addr_to_string and string_to_addr functionality.
 
-        * ace/Connector.cpp && ace/Acceptor.cpp (info): Fixed sizeof bug.
+	* ace/Connector.cpp && ace/Acceptor.cpp (info): Fixed sizeof bug.
 
-        * examples/Connection/blocking/SPIPE: Added UNICODE support for
-          this example.
+	* examples/Connection/blocking/SPIPE: Added UNICODE support for
+ 	  this example.
 
-        * ace/OS.h: Added new macro ACE_MULTIBYTE_STRING.
+	* ace/OS.h: Added new macro ACE_MULTIBYTE_STRING.
 
-        * ace/ACE.cpp (terminate_process): Fixed unused args errors.
+	* ace/ACE.cpp (terminate_process): Fixed unused args errors.
 
 Sun Jun 22 09:58:36 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * Released version 4.2.9 for testing.
+	* Released version 4.2.9 for testing.
 
-        * ace/Log_Msg.cpp (open): Changed the use of ACE_LOG_MSG-> within
-          the open() method to use this-> in order to avoid deadlocks.
-          Thanks to Per Andersson for reporting this.
+	* ace/Log_Msg.cpp (open): Changed the use of ACE_LOG_MSG-> within
+ 	  the open() method to use this-> in order to avoid deadlocks.
+	  Thanks to Per Andersson for reporting this.
 
-        * ace/ACE.cpp: Changed the use of __SVR4 and __unix to sparc and
-          unix to work better with various UNIX environments.  Thanks to
-          Michael R. MacFaden <mrm@cisco.com> for these changes.
+	* ace/ACE.cpp: Changed the use of __SVR4 and __unix to sparc and
+ 	  unix to work better with various UNIX environments.  Thanks to
+ 	  Michael R. MacFaden <mrm@cisco.com> for these changes.
 
-        * ace/Handle_Set.cpp (count_bits): Added special code to handle
-          the case where fdmask is typedef'd as a long rather than an int.
-          Thanks to Eric Newton <ecn@smart.net> and James Johnson for
-          reporting this.
+	* ace/Handle_Set.cpp (count_bits): Added special code to handle
+ 	  the case where fdmask is typedef'd as a long rather than an int.
+  	  Thanks to Eric Newton <ecn@smart.net> and James Johnson for
+	  reporting this.
 
-        * ace/IOStream.h: Changed the name of QuotedString to
-          ACE_Quoted_String to be consistent with the ACE naming scheme.
-          Thanks to James Johnson for suggesting this.
+	* ace/IOStream.h: Changed the name of QuotedString to
+ 	  ACE_Quoted_String to be consistent with the ACE naming scheme.
+  	  Thanks to James Johnson for suggesting this.
 
-        * ace/IOStream_T.i: Added this new file to split off the inlined
-          code from the header file.
+	* ace/IOStream_T.i: Added this new file to split off the inlined
+ 	  code from the header file.
 
-        * ace/ACE.cpp (terminate_process): Remove the
-          ACE_UNUSED_ARG(signum) from terminate_process().  Thanks to Wei
-          Chiang for reporting this.
+	* ace/ACE.cpp (terminate_process): Remove the
+ 	  ACE_UNUSED_ARG(signum) from terminate_process().  Thanks to Wei
+ 	  Chiang for reporting this.
 
 Sun Jun 22 17:19:18 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/Threads/process_manager.cpp (main): replaced call to
-          kill with terminate.
+	* examples/Threads/process_manager.cpp (main): replaced call to
+	  kill with terminate.
 
 Sat Jun 21 10:48:34 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/Reactor/FIFO: Added a new example that illustrates
-          how the Reactor and the FIFO wrappers work together.  Thanks
-          to Johannes Gutleber <Johannes.Gutleber@cern.ch> for sending
-          this.
+	* examples/Reactor/FIFO: Added a new example that illustrates
+	  how the Reactor and the FIFO wrappers work together.  Thanks
+	  to Johannes Gutleber <Johannes.Gutleber@cern.ch> for sending
+	  this.
 
-        * tests/Time_Service_Test.cpp (main): Replaced the kill() call
-          with the terminate() call since kill() isn't portable across
-          platforms.
+	* tests/Time_Service_Test.cpp (main): Replaced the kill() call
+ 	  with the terminate() call since kill() isn't portable across
+ 	  platforms.
 
-        * ace/Process: The kill() method on this class was being used
-          incorrectly.  I've created a new method called terminate() that
-          terminates the process.
+	* ace/Process: The kill() method on this class was being used
+ 	  incorrectly.  I've created a new method called terminate() that
+ 	  terminates the process.
 
-        * ace/Process_Manager: Renamed the kill() method to terminate()
-          and updated the implementation to use the new
-          ACE::terminate_process() call.
+	* ace/Process_Manager: Renamed the kill() method to terminate()
+ 	  and updated the implementation to use the new
+ 	  ACE::terminate_process() call.
 
-        * ace/ACE: Moved the incorrect Win32 and Chorus implementations of
-          ACE_OS::kill() and put them in a new static method called
-          ACE::terminate_process().
+	* ace/ACE: Moved the incorrect Win32 and Chorus implementations of
+ 	  ACE_OS::kill() and put them in a new static method called
+ 	  ACE::terminate_process().
 
-        * ace/ACE: Changed the name of the is_process_active() to the
-          more concise process_active().
+	* ace/ACE: Changed the name of the is_process_active() to the
+ 	  more concise process_active().
 
-        * ace/OS.i: Added an implementation of ACE_OS::kill() for Chorus.
-          Note that this doesn't behave as UNIX does -- it kills the
-          process id rather than sending a signal!  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for these fixes.
+	* ace/OS.i: Added an implementation of ACE_OS::kill() for Chorus.
+  	  Note that this doesn't behave as UNIX does -- it kills the
+ 	  process id rather than sending a signal!  Thanks to Wei Chiang
+ 	  <chiang@tele.nokia.fi> for these fixes.
 
-        * examples/Reactor/Misc/notification.cpp: Added patches to run
-          this example under Chorus.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for these fixes.
+	* examples/Reactor/Misc/notification.cpp: Added patches to run
+ 	  this example under Chorus.  Thanks to Wei Chiang
+ 	  <chiang@tele.nokia.fi> for these fixes.
 
-        * ace/Connector.cpp (create_AST): Changed the order of some
-          instructions in Connector::create_AST method to make it more
-          safer to use in multi-thread environment.  Thank to Paul Han
-          <phan@CCGATE.HAC.COM> for reporting the problem and the fix.
+	* ace/Connector.cpp (create_AST): Changed the order of some
+ 	  instructions in Connector::create_AST method to make it more
+ 	  safer to use in multi-thread environment.  Thank to Paul Han
+ 	  <phan@CCGATE.HAC.COM> for reporting the problem and the fix.
 
-        * ace/Connector.cpp (create_AST): Make sure to pass in the "mask"
-          when calling remove_handler() so that we get the right set of
-          bits removed from the Reactor.
+	* ace/Connector.cpp (create_AST): Make sure to pass in the "mask"
+ 	  when calling remove_handler() so that we get the right set of
+ 	  bits removed from the Reactor.
 
-        * tests/Reactor_Timer_Test.cpp (class Time_Handler): Changed int
-          to long to avoid type conversion problems on 64 bit SGI.  Thanks
-          to Fred LaBar <flabar@fallschurch.esys.com> for reporting this.
+	* tests/Reactor_Timer_Test.cpp (class Time_Handler): Changed int
+ 	  to long to avoid type conversion problems on 64 bit SGI.  Thanks
+ 	  to Fred LaBar <flabar@fallschurch.esys.com> for reporting this.
 
-        * examples/Reactor/FIFO: Added a test program to illustrate the
-          interaction of the ACE Reactor with the FIFO IPC mechanism.
-          Thanks to Johannes Gutleber <Johannes.Gutleber@cern.ch> for this
-          test.
+	* examples/Reactor/FIFO: Added a test program to illustrate the
+ 	  interaction of the ACE Reactor with the FIFO IPC mechanism.
+  	  Thanks to Johannes Gutleber <Johannes.Gutleber@cern.ch> for this
+ 	  test.
 
-        * examples/Reactor/Misc/pingpong.cpp: Added support for Chorus.
-          Thanks to Wei Chiang <chiang@tele.nokia.fi> for this.
+	* examples/Reactor/Misc/pingpong.cpp: Added support for Chorus.
+  	  Thanks to Wei Chiang <chiang@tele.nokia.fi> for this.
 
-        * ace: Added a number of minor changes to signal assignment
-          code so that ACE will compile with Tandem NonStop.  Thanks
-          to Jan Perman <uabjjpp@osd.ericsson.se> for these fixes.
+	* ace: Added a number of minor changes to signal assignment
+	  code so that ACE will compile with Tandem NonStop.  Thanks
+	  to Jan Perman <uabjjpp@osd.ericsson.se> for these fixes.
 
-        * ace/config-tandem.h:  Added a new config file for the
-          Tandem NonStop-UX 4.2MP platform.  Thanks to Jan Perman
-          <uabjjpp@osd.ericsson.se> for contributing this.
+	* ace/config-tandem.h:  Added a new config file for the
+	  Tandem NonStop-UX 4.2MP platform.  Thanks to Jan Perman
+	  <uabjjpp@osd.ericsson.se> for contributing this.
 
-        * include/makeinclude/platform_tandem.GNU:  Added a new platform 
-          file for the Tandem NonStop-UX 4.2MP platform.  Thanks to
-          Jan Perman <uabjjpp@osd.ericsson.se> for contributing this.
+	* include/makeinclude/platform_tandem.GNU:  Added a new platform 
+	  file for the Tandem NonStop-UX 4.2MP platform.  Thanks to
+	  Jan Perman <uabjjpp@osd.ericsson.se> for contributing this.
 
-        * ace/config-unixware-2.1.2-g++.h: Added a new config file for
-          UNIXWARE 2.1.2.  Thanks to Ganesh Pai (gpai@voicetek.com) for
-          contributing this.
+	* ace/config-unixware-2.1.2-g++.h: Added a new config file for
+ 	  UNIXWARE 2.1.2.  Thanks to Ganesh Pai (gpai@voicetek.com) for
+ 	  contributing this.
 
-        * include/makeinclude/platform_unixware_g++.GNU: Updated the
-          UNIXWARE platform config file to work for version 2.1.2.  Thanks
-          to Ganesh Pai (gpai@voicetek.com) for contributing this.
+	* include/makeinclude/platform_unixware_g++.GNU: Updated the
+ 	  UNIXWARE platform config file to work for version 2.1.2.  Thanks
+ 	  to Ganesh Pai (gpai@voicetek.com) for contributing this.
 
-        * ace/Handle_Set.cpp (count_bits): Added another 0xff mask to
-          prevent problems with sign extension on machines with 32 bit
-          ints and 64 bit longs.  Thanks to James Johnson for reporting
-          this.
+	* ace/Handle_Set.cpp (count_bits): Added another 0xff mask to
+ 	  prevent problems with sign extension on machines with 32 bit
+ 	  ints and 64 bit longs.  Thanks to James Johnson for reporting
+ 	  this.
 
-        * ace/OS.h: Updated all of the ACE_DEFAULT* macros in OS.h so that
-          they can be overridden by #defines in the config.h file.  Thanks
-          to Chuck Gehr for suggesting this.
+	* ace/OS.h: Updated all of the ACE_DEFAULT* macros in OS.h so that
+ 	  they can be overridden by #defines in the config.h file.  Thanks
+ 	  to Chuck Gehr for suggesting this.
 
 Thu Jun 19 22:20:20 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h (VxWorks/g++ only): added horrible hack to work around
-          mismatch of memcmp, etc., prototypes in <string.h>.
+	* ace/OS.h (VxWorks/g++ only): added horrible hack to work around
+	  mismatch of memcmp, etc., prototypes in <string.h>.
 
-        * ace/OS.i: reordered many function definitions to avoid use
-          before definition.  Building with g++ 2.7.2 on VxWorks 5.3.1
-          revealed them.
+	* ace/OS.i: reordered many function definitions to avoid use
+	  before definition.  Building with g++ 2.7.2 on VxWorks 5.3.1
+	  revealed them.
 
-        * ace/config-vxworks5.2-g++.h: removed ACE_HAS_STRING_CLASS and
-          ACE_HAS_GNU_CSTRING_H, because those aren't distributed with
-          Tornado 1.0.1.
+	* ace/config-vxworks5.2-g++.h: removed ACE_HAS_STRING_CLASS and
+	  ACE_HAS_GNU_CSTRING_H, because those aren't distributed with
+	  Tornado 1.0.1.
 
 Thu Jun 19 15:31:53 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Timer_Wheel_T.cpp: Fixed problem with expire () not
-          expiring timers with a timeout of the current time. This was
-	  causing problems with Timer_Queue_Test when high profile
-	  timers were disabled (such as Windows NT when the
-	  environment variable ACE_SCALE_FACTOR was undefined)
+	* ace/Timer_Wheel_T.cpp: Fixed problem with expire () not expiring
+	  timers with a timeout of the current time. This was causing 
+	  problems with Timer_Queue_Test when high profile timers were 
+	  disabled (such as Windows NT when the environment variable 
+	  ACE_SCALE_FACTOR was undefined)
 
 Wed Jun 18 19:43:35 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Signal.cpp: 'removed "const" from #define of
-          ACE_MAX_SIGNAL_HANDLERS because it broke Irix 6.2 build.  Thanks
-          to Gonzalo A. Diethelm <gonzo@ing.puc.cl> for reporting this.
+	* ace/Signal.cpp: 'removed "const" from #define of
+	  ACE_MAX_SIGNAL_HANDLERS because it broke Irix 6.2 build.  Thanks
+	  to Gonzalo A. Diethelm <gonzo@ing.puc.cl> for reporting this.
 
-        * examples/Threads/task_four.cpp (Invoker_Task::svc): fixed typo,
-          n_tasks instead of ntasks.
+	* examples/Threads/task_four.cpp (Invoker_Task::svc): fixed typo,
+	  n_tasks instead of ntasks.
 
 Wed Jun 18 11:25:14 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * examples/Threads/{task_four,token}.cpp: Changed the use of
-          cerr/cout to ACE_DEBUG macro.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for pointing these out.
-        
+	* examples/Threads/{task_four,token}.cpp: Changed the use of
+	  cerr/cout to ACE_DEBUG macro.  Thanks to Chuck Gehr
+ 	  <gehr@sweng.stortek.com> for pointing these out.
+	
 Tue Jun 17 15:11:09 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos5.5-sunc++-4.x.h,
-          include/makeinclude/platform_sunos5_sunc++.GNU: support enabling of
-          exception handling via "exceptions=1" make flag.  Exception handling
-          does seem to work with Sun C++ 4.2, even on MP machines, if patch
-              104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC"
-          is applied.  Please beware that enabling of exception handling can
-          adversely affect peformance, even if the program doesn't use it.
-          So, we haven't enabled it by default.  Thanks to Chris Cleeland
-          for suggesting not to enable it by default.
+	* ace/config-sunos5.5-sunc++-4.x.h,
+	  include/makeinclude/platform_sunos5_sunc++.GNU: support enabling of
+	  exception handling via "exceptions=1" make flag.  Exception handling
+	  does seem to work with Sun C++ 4.2, even on MP machines, if patch
+	      104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC"
+	  is applied.  Please beware that enabling of exception handling can
+	  adversely affect peformance, even if the program doesn't use it.
+	  So, we haven't enabled it by default.  Thanks to Chris Cleeland
+	  for suggesting not to enable it by default.
 
-        * ace/IOStream.h: added #include of "ace/config.h" so that
-          ACE_LACKS_ACE_IOSTREAM can be checked.  Thanks to Ganesh Pai
-          <gpai@voicetek.com> for reporting this problem.
+	* ace/IOStream.h: added #include of "ace/config.h" so that
+	  ACE_LACKS_ACE_IOSTREAM can be checked.  Thanks to Ganesh Pai
+	  <gpai@voicetek.com> for reporting this problem.
 
-        * ace/ACE.cpp (get_handle): use /dev/udp instead of /dev/ip on
-          SVR4 machines because it has other read permission by default
-          (on Solaris 2.x).
+	* ace/ACE.cpp (get_handle): use /dev/udp instead of /dev/ip on
+	  SVR4 machines because it has other read permission by default
+	  (on Solaris 2.x).
 
-        * ace/ACE.cpp (get_ip_interfaces): use auto_array_ptr instead of
-          auto_ptr so that the array gets deleted properly, and zero it
-          out to avoid unitialized memory read reports from Purify.
+	* ace/ACE.cpp (get_ip_interfaces): use auto_array_ptr instead of
+	  auto_ptr so that the array gets deleted properly, and zero it
+	  out to avoid unitialized memory read reports from Purify.
 
-        * ace/Timer_Hash_T.cpp (cancel): added "[]" to delete of timer_ids
-          array.  Purify rules.
+	* ace/Timer_Hash_T.cpp (cancel): added "[]" to delete of timer_ids
+	  array.  Purify rules.
 
-        * Timer_Queue_Test.cppc (test_performance): added "[]" to delete of
-          times array.  Purify rules.
+	* Timer_Queue_Test.cppc (test_performance): added "[]" to delete of
+	  times array.  Purify rules.
 
 Tue Jun 17 15:31:01 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/ACE.cpp: Fixed get_ip_interfaces (and count_interfaces) to
-          work properly on HP-UX (and probably other similar UNIXes).  Needed
-          to work with non-IP interfaces present, and fixed to copy the
-          IP address without the fudge factor being applied.
+	* ace/ACE.cpp: Fixed get_ip_interfaces (and count_interfaces) to
+	  work properly on HP-UX (and probably other similar UNIXes).  Needed
+	  to work with non-IP interfaces present, and fixed to copy the
+	  IP address without the fudge factor being applied.
 
 Tue Jun 17 14:02:01 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/{Free_List.h,Free_List.cpp,Timer_Queue_T.h}: Added #include
-          "ace/Synch_T.h" to Free_List.h and removed related inclusion
-          from Free_List.cpp and Timer_Queue_T.h.  Thanks to
-          Jack Erickson <jack@cibc.com> for reporting this problem.
+	* ace/{Free_List.h,Free_List.cpp,Timer_Queue_T.h}: Added #include
+ 	  "ace/Synch_T.h" to Free_List.h and removed related inclusion
+ 	  from Free_List.cpp and Timer_Queue_T.h.  Thanks to
+	  Jack Erickson <jack@cibc.com> for reporting this problem.
 
 Tue Jun 17 09:41:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Enum_Interfaces_Test.cpp: changed name of log file to match
-          the program name, so that the one-button test can easily find it.
+	* tests/Enum_Interfaces_Test.cpp: changed name of log file to match
+	  the program name, so that the one-button test can easily find it.
 
 Tue Jun 17 04:58:38 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
 
-        * ace/Timer_Queue_T.h: Added include file "ace/Synch_T.h" to avoid
-          compilation errors in SC 4.1.  We didn't notice this because
-          most of us have moved to SC 4.2.  Don't know why this didn't
-          cause any problem in SC 4.2.  Thanks to Jack Erickson
-          <jack@cibc.com> for reporting this bug.
+	* ace/Timer_Queue_T.h: Added include file "ace/Synch_T.h" to avoid
+ 	  compilation errors in SC 4.1.  We didn't notice this because
+ 	  most of us have moved to SC 4.2.  Don't know why this didn't
+ 	  cause any problem in SC 4.2.  Thanks to Jack Erickson
+ 	  <jack@cibc.com> for reporting this bug.
 
 Mon Jun 16 22:25:18 1997  Steve Huston <shuston@riverace.com>
 
-        * ace/ACE.cpp: Fixed conditional compiles to compile the 
-          interface counting code for HP - it reports 0 interfaces,
-          so it needs more debugging still.
+	* ace/ACE.cpp: Fixed conditional compiles to compile the 
+	  interface counting code for HP - it reports 0 interfaces,
+	  so it needs more debugging still.
 
-        * include/makeinclude/platform_hpux_aCC.GNU: added -g to link
-          command for building shared library.
+	* include/makeinclude/platform_hpux_aCC.GNU: added -g to link
+	  command for building shared library.
 
-        * tests/Buffer_Stream_Test.cpp: fixes to execute correctly and only
-          fail assertions on real failures.
+	* tests/Buffer_Stream_Test.cpp: fixes to execute correctly and only
+	  fail assertions on real failures.
 
 Mon Jun 16 19:05:13 1997  Steve Huston <shuston@riverace.com>
 
-        * ace/Free_List.cpp: added #include ace/Synch.h, needed by
-          Free_List.i.  Fixes compile errors on HP-UX.
+	* ace/Free_List.cpp: added #include ace/Synch.h, needed by
+	  Free_List.i.  Fixes compile errors on HP-UX.
 
 Mon Jun 16 10:59:55 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Timer_Wheel_T.cpp: Changed expire () so it doesn't
-	  access past the end of an array when it finds nothing to
-	  expire.  Thanks to Norbert Rapp
-	  <norbert.rapp@nexus-informatics.de> for catching this.
+	* ace/Timer_Wheel_T.cpp: Changed expire () so it doesn't access past
+	  the end of an array when it finds nothing to expire.  Thanks to
+	  Norbert Rapp <norbert.rapp@nexus-informatics.de> for catching this.
 
 Sun Jun 15 03:44:21 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * examples/Threads/thread_specific.cpp (worker): Changed the
-          output of diagnostics from using cout to using printf.  Also
-          corrected several portability problems.  Thanks for Chuck Gehr
-          <gehr@sweng.stortek.com> for pointing these out.
-        
-        * ace/OS.i (thread_mutex_trylock): Corrected the code for NT.  Now
-          this function returns 0 if lock is obtained and -1 otherwise.
-          Thanks to Robert V. Head <rhead@virtc.com> for noticing this.
-
-        * performance-tests/Synch-Benchmarks/Synch_Tests.{mdp.mak}:
-          Added project workspace and makefile for NT to this directory.
-        
-        * performance-tests/Synch-Benchmarks/svc.conf: 
-        * performance-tests/Synch-Benchmarks/{Options,Benchmark}.h:
-        * performance-tests/Synch-Benchmarks/*.cpp: Reworked these
-          files to have them compiled on NT.
+	* examples/Threads/thread_specific.cpp (worker): Changed the
+ 	  output of diagnostics from using cout to using printf.  Also
+ 	  corrected several portability problems.  Thanks for Chuck Gehr
+ 	  <gehr@sweng.stortek.com> for pointing these out.
+	
+	* ace/OS.i (thread_mutex_trylock): Corrected the code for NT.  Now
+ 	  this function returns 0 if lock is obtained and -1 otherwise.
+  	  Thanks to Robert V. Head <rhead@virtc.com> for noticing this.
+
+	* performance-tests/Synch-Benchmarks/Synch_Tests.{mdp.mak}:
+	  Added project workspace and makefile for NT to this directory.
+	
+	* performance-tests/Synch-Benchmarks/svc.conf: 
+	* performance-tests/Synch-Benchmarks/{Options,Benchmark}.h:
+	* performance-tests/Synch-Benchmarks/*.cpp: Reworked these
+ 	  files to have them compiled on NT.
 
 Sat Jun 14 03:53:13 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * performance-tests/Synch-Benchmarks/pipe_proc_test.cpp (class
-          Pipe_Proc_Test): Changed the type of pipe_handles[] from int to
-          ACE_HANDLE.
+	* performance-tests/Synch-Benchmarks/pipe_proc_test.cpp (class
+ 	  Pipe_Proc_Test): Changed the type of pipe_handles[] from int to
+ 	  ACE_HANDLE.
 
-        * performance-tests/Synch-Benchmarks/sysvsema_test.cpp: When
-          creating the semaphore, explicitly cast the key value to (key_t)
-          since NT couldn't handle the conversion.
+	* performance-tests/Synch-Benchmarks/sysvsema_test.cpp: When
+ 	  creating the semaphore, explicitly cast the key value to (key_t)
+ 	  since NT couldn't handle the conversion.
 
 Fri Jun 13 19:32:03 1997  Steve Huston <shuston@riverace.com>
 
-        * ace/ACE.cpp: Fixed count_interfaces to compile on non-SVR4
-          systems such as HP-UX.  Not tested yet.
+	* ace/ACE.cpp: Fixed count_interfaces to compile on non-SVR4
+	  systems such as HP-UX.  Not tested yet.
 
-        * ace/OS.i: Fixed mis-arranged conditional compile for HP-UX in
-          asctime_r.
+	* ace/OS.i: Fixed mis-arranged conditional compile for HP-UX in
+	  asctime_r.
 
 Fri Jun 13 03:13:51 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ace/config-win32-common.h: Added a "pragma comment" directive to
-          direct MSVC to link in mswsock.lib automatically.  Thanks to
-          Bill Tang <btang@magellan.com> for reminding this.
+	* ace/config-win32-common.h: Added a "pragma comment" directive to
+ 	  direct MSVC to link in mswsock.lib automatically.  Thanks to
+ 	  Bill Tang <btang@magellan.com> for reminding this.
 
-        * ace/ace.{mak,mdp}: Removed explicit inclusion of mswsock.lib.
-          Thanks to Bill Tang <btang@magellan.com> for reminding this.
+	* ace/ace.{mak,mdp}: Removed explicit inclusion of mswsock.lib.
+  	  Thanks to Bill Tang <btang@magellan.com> for reminding this.
 
-        * examples/OS/Process/Process.{mdp,mak}: For some reasons, I got
-          an "unknown link error, please refer to documentation for
-          appropriate technical supports" when building this example on NT
-          (didn't help much, did it?)  Reassigning the linked library
-          solved the problem.
+	* examples/OS/Process/Process.{mdp,mak}: For some reasons, I got
+ 	  an "unknown link error, please refer to documentation for
+ 	  appropriate technical supports" when building this example on NT
+ 	  (didn't help much, did it?)  Reassigning the linked library
+ 	  solved the problem.
 
-        * examples/OS/Process/process.cpp: Updated class name
-          ACE_ProcessEX to ACE_Process because ACE_ProcessEX no longer
-          exists.  Also, all exec'ed programs' absolute names have been
-          changed and let the environment variable "path" to decide which
-          program(s) to exec.
+	* examples/OS/Process/process.cpp: Updated class name
+ 	  ACE_ProcessEX to ACE_Process because ACE_ProcessEX no longer
+ 	  exists.  Also, all exec'ed programs' absolute names have been
+ 	  changed and let the environment variable "path" to decide which
+ 	  program(s) to exec.
 
 Thu Jun 12 15:48:16 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/ACE.cpp (get_ip_interfaces): Corrected code in the BSDish
-          section so that it at least compiles on Linux.  I haven't tested
-          this AT ALL.
+	* ace/ACE.cpp (get_ip_interfaces): Corrected code in the BSDish
+ 	  section so that it at least compiles on Linux.  I haven't tested
+ 	  this AT ALL.
 
-        * ace/Timer_Queue_T.cpp (calculate_timeout): When this was called
-          with the default argument from handle_events(), max_timeout was
-          passed as zero, which would cause a SEGV when attempts were made
-          to deref it.  Added protection to simply return a zero ptr in that
-          case.
+	* ace/Timer_Queue_T.cpp (calculate_timeout): When this was called
+ 	  with the default argument from handle_events(), max_timeout was
+ 	  passed as zero, which would cause a SEGV when attempts were made
+ 	  to deref it.  Added protection to simply return a zero ptr in that
+ 	  case.
 
 Thu Jun 12 13:18:03 1997  Steve Huston <shuston@riverace.com>
 
-        * ace/OS.{h,i,cpp}: Changes for HP-UX 10 primarily.  Threads
-          support for DCE Draft 4 threads (bundled with HP-UX 10).
-          Correct usage of reentrant C library functions for HP-UX.
+	* ace/OS.{h,i,cpp}: Changes for HP-UX 10 primarily.  Threads
+	  support for DCE Draft 4 threads (bundled with HP-UX 10).
+	  Correct usage of reentrant C library functions for HP-UX.
 
-        * ace/OS.i: Changed timeout argument to 2nd select function to
-          allow the compiler to pick a conversion operator.  As it was,
-          HP compiler would not compile it.
+	* ace/OS.i: Changed timeout argument to 2nd select function to
+	  allow the compiler to pick a conversion operator.  As it was,
+	  HP compiler would not compile it.
 
-        * ace/Service_Object.cpp: When deleting the service memory pointed
-          to by a void *, use "operator delete" rather than deleting a void,
-          which is prohibited by the current ANSI C++ draft.
+	* ace/Service_Object.cpp: When deleting the service memory pointed
+	  to by a void *, use "operator delete" rather than deleting a void,
+	  which is prohibited by the current ANSI C++ draft.
 
-        * ace/config-hpux-10.x.h: This is now a compiler-independent header
-          file, and is included by config-hpux-10.x-hpc++.h.  This file
-          contains all correct settings for HP-UX 10.x, and compiler-specific
-          config files should use this - see config-hpux-10.x-hpc++.h.
+	* ace/config-hpux-10.x.h: This is now a compiler-independent header
+	  file, and is included by config-hpux-10.x-hpc++.h.  This file
+	  contains all correct settings for HP-UX 10.x, and compiler-specific
+	  config files should use this - see config-hpux-10.x-hpc++.h.
 
-        * ace/config-hpux-10.x-hpc++.h: New config file for either of the HP
-          compilers (HP C++ or HP aC++).  It figures it out internally, and
-          uses config-hpux-10.x.h for OS details.
+	* ace/config-hpux-10.x-hpc++.h: New config file for either of the HP
+	  compilers (HP C++ or HP aC++).  It figures it out internally, and
+	  uses config-hpux-10.x.h for OS details.
 
-        * include/makeinclude/rules.lib.GNU: Allow for doing a PRELIB step
-          when building a shared library, and not using .shobj/*.so files.
-          This allows HP aC++ to close all template instantiations for the
-          entire library at once, rather than separately, reducing the
-          size of the resultant library significantly.
+	* include/makeinclude/rules.lib.GNU: Allow for doing a PRELIB step
+	  when building a shared library, and not using .shobj/*.so files.
+	  This allows HP aC++ to close all template instantiations for the
+	  entire library at once, rather than separately, reducing the
+	  size of the resultant library significantly.
 
-        * include/makeinclude/platform_hpux-aCC.GNU: build libraries with
-          templates instantiated all at once.  Compile with flags for using
-          the reentrant versions of C library functions.
+	* include/makeinclude/platform_hpux-aCC.GNU: build libraries with
+	  templates instantiated all at once.  Compile with flags for using
+	  the reentrant versions of C library functions.
 
 Wed Jun 11 15:20:15 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
-        * ace/Timer_Queue_T.{h,cpp} (calculate_timeout): Changed the
-          second parameter the_timeout from a ref. to a ptr. to a ptr in
-          order to avoid compilation warning.  Since the pointer itself is
-          not modified within the function, it's ok to change this. 
+	* ace/Timer_Queue_T.{h,cpp} (calculate_timeout): Changed the
+	  second parameter the_timeout from a ref. to a ptr. to a ptr in
+	  order to avoid compilation warning.  Since the pointer itself is
+	  not modified within the function, it's ok to change this. 
 
-        * ace/Reactor.cpp (wait_for_multiple_events): Added ACE_Time_Value
-          the_timeout as a place holder for timeout value when
-          max_wait_time is NULL.  Otherwise,
-          Timer_Queue::calculate_timeout won't process the timer queue
-          even it's not empty.
+	* ace/Reactor.cpp (wait_for_multiple_events): Added ACE_Time_Value
+	  the_timeout as a place holder for timeout value when
+	  max_wait_time is NULL.  Otherwise,
+	  Timer_Queue::calculate_timeout won't process the timer queue
+	  even it's not empty.
 
 Wed Jun 11 11:14:29 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * include/makeinclude/platform_mvs.GNU (RANLIB):  Requested change
-          from Check Gehr (gehr@sweng.stortek.com), RANLIB = echo
+	* include/makeinclude/platform_mvs.GNU (RANLIB):  Requested change
+	  from Check Gehr (gehr@sweng.stortek.com), RANLIB = echo
 
 Wed Jun 11 04:47:52 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ACE.cpp (count_interfaces): Two bugs were corrected here.  Both
-          were typo.
+	* ACE.cpp (count_interfaces): Two bugs were corrected here.  Both
+ 	  were typo.
 
-        * tests/Timer_Queue_Test.cpp: Added include file ace/Timer_Queue.h
+	* tests/Timer_Queue_Test.cpp: Added include file ace/Timer_Queue.h
 
 Tue Jun 10 16:02:52 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/SString.{h,cpp}: Changed the parameters in CString::substring()
-          and WString::substring().  Removed const and changed length to a
-          ssize_t because of signed/unsigned comparison warnings.
+	* ace/SString.{h,cpp}: Changed the parameters in CString::substring()
+	  and WString::substring().  Removed const and changed length to a
+	  ssize_t because of signed/unsigned comparison warnings.
 
-        * ace/ACE.cpp: Changed a loop variable in get_ip_interfaces() to 
-          a size_t because of a signed/unsigned comparison warning.
+	* ace/ACE.cpp: Changed a loop variable in get_ip_interfaces() to 
+	  a size_t because of a signed/unsigned comparison warning.
 
 Tue Jun 10 12:47:49 1997    <irfan@TWOSTEP>
 
-        * ace/SString.cpp (operator = and operator +=): There were two
-          bugs here.  operator= forgot to tack on the NULL terminator
-          after the memcpy() and operator+= appended the second string
-          incorrectly. Thanks to Michael R. MacFaden <mrm@cisco.com> for
-          pointing these out.
+	* ace/SString.cpp (operator = and operator +=): There were two
+ 	  bugs here.  operator= forgot to tack on the NULL terminator
+ 	  after the memcpy() and operator+= appended the second string
+ 	  incorrectly. Thanks to Michael R. MacFaden <mrm@cisco.com> for
+ 	  pointing these out.
 
 Tue Jun 10 12:16:04 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Makefile: Updated to reflect newly added files
+	* ace/Makefile: Updated to reflect newly added files
 
-        * ace/Proactor.cpp: Removed template specializations.
+	* ace/Proactor.cpp: Removed template specializations.
 
-        * ace/Reactor.cpp: Removed some template specializations.
+	* ace/Reactor.cpp: Removed some template specializations.
 
-        * ace/Timer_Hash.h: Added an include for Timer_Heap.
+	* ace/Timer_Hash.h: Added an include for Timer_Heap.
 
-        * ace/Timer_Hash_T.cpp: Changed a reference to ACE_Timer_Node
-          to ACE_Timer_Node_T<TYPE>
+	* ace/Timer_Hash_T.cpp: Changed a reference to ACE_Timer_Node
+	  to ACE_Timer_Node_T<TYPE>
 
-        * ace/Timer_{Hash,Heap,List,Wheel}_T.h: Changed #include 
-          "ace/Timer_{...}.h" to "ace/Timer_{...}_T.h".
+	* ace/Timer_{Hash,Heap,List,Wheel}_T.h: Changed #include 
+	  "ace/Timer_{...}.h" to "ace/Timer_{...}_T.h".
 
-        * ace/Timer_Queue.cpp: Removed some template specializations.
+	* ace/Timer_Queue.cpp: Removed some template specializations.
 
-        * ace/Timer_Queue.h: Removed the including of Timer_Queue.cpp
-          since there are no templates to warrant it. 
+	* ace/Timer_Queue.h: Removed the including of Timer_Queue.cpp
+	  since there are no templates to warrant it. 
 
-        * ace/Timer_{Hash,Heap,List,Wheel}.cpp: Added these and put the
-          appropriate template specializations here.
+	* ace/Timer_{Hash,Heap,List,Wheel}.cpp: Added these and put the
+	  appropriate template specializations here.
 
 Tue Jun 10 02:08:25 1997  Nanbor Wang  <nw1@siesta.cs.wustl.edu>
 
-        * examples/Log_Msg/README: Revised.
+	* examples/Log_Msg/README: Revised.
 
-        * examples/Log_Msg/test_log_msg.cpp: Revised program output so
-          that it's clearer to explain.
+	* examples/Log_Msg/test_log_msg.cpp: Revised program output so
+ 	  that it's clearer to explain.
 
 Mon Jun 09 15:46:41 1997    <irfan@TWOSTEP>
 
-        * OS.i (mutex_lock): When WaitForSingleObject returns
-          WAIT_ABANDONED, the lock is held by the calling thread.
-          Therefore we must return 0 from the method.  I have added a new
-          mutex_lock() method that takes an extra "abandoned" parameter.
-          This is set wehen the mutex is abandoned.  Thanks to Dieter
-          Quehl <dietrich.quehl@med.siemens.de> for pointing this out.
+	* OS.i (mutex_lock): When WaitForSingleObject returns
+ 	  WAIT_ABANDONED, the lock is held by the calling thread.
+  	  Therefore we must return 0 from the method.  I have added a new
+ 	  mutex_lock() method that takes an extra "abandoned" parameter.
+  	  This is set wehen the mutex is abandoned.  Thanks to Dieter
+ 	  Quehl <dietrich.quehl@med.siemens.de> for pointing this out.
 
 Mon Jun  9 02:31:36 1997  Nanbor Wang  <nw1@siesta.cs.wustl.edu>
 
-        * tests/Sigset_Ops_Test.cpp (main): Comment out testing of invalid
-          sigset checking for most platforms don't seem to support it.
-          Perhaps the ACE's sigset* functions should remove this check for
-          compatibility.  
+	* tests/Sigset_Ops_Test.cpp (main): Comment out testing of invalid
+	  sigset checking for most platforms don't seem to support it.
+	  Perhaps the ACE's sigset* functions should remove this check for
+	  compatibility.  
 
 Sun Jun  8 11:39:06 1997  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
 
-        * ace/OS.i (set): There was a typo here where 
+	* ace/OS.i (set): There was a typo here where 
 
-          ((long) (d - (double) l)) * 1000000
+	  ((long) (d - (double) l)) * 1000000
 
-          should be 
+	  should be 
 
-          (long) ((d - (double) l) * 1000000)
+	  (long) ((d - (double) l) * 1000000)
 
-          since otherwise the values are always 0.  Thanks to Jim Crossley
-          <jim@lads.com> for reporting this.
+	  since otherwise the values are always 0.  Thanks to Jim Crossley
+ 	  <jim@lads.com> for reporting this.
 
-        * tests/Enum_Interfaces_Test.cpp (main): Changed ACE_UINT32 to
-          size_t to be consistent with the class definition.  Thanks to
-          Nanbor Wang for reporting this.
+	* tests/Enum_Interfaces_Test.cpp (main): Changed ACE_UINT32 to
+ 	  size_t to be consistent with the class definition.  Thanks to
+ 	  Nanbor Wang for reporting this.
 
-        * ace/Token.h: Added some no-op method for ACE_Token so that it
-          will still compile even if ACE_HAS_THREADS isn't defined.
+	* ace/Token.h: Added some no-op method for ACE_Token so that it
+ 	  will still compile even if ACE_HAS_THREADS isn't defined.
 
 Sun Jun  8 01:37:52 1997  Nanbor Wang  <nw1@siesta.cs.wustl.edu>
 
-        * examples/Log_Msg/README: Added a README file.
+	* examples/Log_Msg/README: Added a README file.
 
-        * tests/Sigset_Ops_Test.cpp (main): bug fixed.
+	* tests/Sigset_Ops_Test.cpp (main): bug fixed.
 
 
 Sat Jun  7 16:40:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/SString.h (string.): Added a substring() member function to
-          ACE_*String classes.  Thanks to Michael MacFaden <mrm@cisco.com>
-          for contributing this.
+	* ace/SString.h (string.): Added a substring() member function to
+ 	  ACE_*String classes.  Thanks to Michael MacFaden <mrm@cisco.com>
+ 	  for contributing this.
 
-        * ace/ACE: Added a new method called
+	* ace/ACE: Added a new method called
 
-          int get_ip_interfaces(count, address_array) 
+	  int get_ip_interfaces(count, address_array) 
 
-          which will query the OS kernel for the IP addresses for each network
-          interface found and return a count and array of ACE_INET_Addr objects.
-          The reason for adding this method is that most client apps
-          assume gethostbyname(uname|gethostname)) will work.  If the
-          nameservices is misconfigured/broken or the machine is multi-homed,
-          the client apps have alot of coding to do to figure out if an inteface
-          represents a local address or not.  On UNIX, this includes
-          the loopback addr. On NT, the loopback addr is not added
-          (but may change the impl if others think this useful).
-          Thanks to Michael MacFaden <mrm@cisco.com> for contributing
-          this.
+	  which will query the OS kernel for the IP addresses for each network
+	  interface found and return a count and array of ACE_INET_Addr objects.
+	  The reason for adding this method is that most client apps
+	  assume gethostbyname(uname|gethostname)) will work.  If the
+	  nameservices is misconfigured/broken or the machine is multi-homed,
+	  the client apps have alot of coding to do to figure out if an inteface
+	  represents a local address or not.  On UNIX, this includes
+	  the loopback addr. On NT, the loopback addr is not added
+	  (but may change the impl if others think this useful).
+	  Thanks to Michael MacFaden <mrm@cisco.com> for contributing
+	  this.
 
-        * ace/Synch[_T]: Changed all the classes so that internal instance
-          variables are now protected rather than private.  This allows
-          greater flexibility if there's a need to subclass
-          (which shouldn't occur very much...).  Thanks to
-          Reza Roodsari <reza@sprynet.com> for suggesting this.
+	* ace/Synch[_T]: Changed all the classes so that internal instance
+ 	  variables are now protected rather than private.  This allows
+ 	  greater flexibility if there's a need to subclass
+	  (which shouldn't occur very much...).  Thanks to
+	  Reza Roodsari <reza@sprynet.com> for suggesting this.
 
 Fri Jun 06 21:30:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Timer_{Hash,Wheel}_T.cpp:  added #includes of
-          ace/High_Res_Timer.h.  Also, in Timer_Wheel_T.cpp (cancel),
-          moved the declaration of "i" out of the loop because it's
-          used in two different loops.
+	* ace/Timer_{Hash,Wheel}_T.cpp:  added #includes of
+	  ace/High_Res_Timer.h.  Also, in Timer_Wheel_T.cpp (cancel),
+	  moved the declaration of "i" out of the loop because it's
+	  used in two different loops.
 
 Fri Jun 06 17:11:13 1997    <irfan@TWOSTEP>
 
-        * OS.i (sleep): If ACE_POLL_IS_BROKEN is defined, use select() to
-          do micro second sleeps.
+	* OS.i (sleep): If ACE_POLL_IS_BROKEN is defined, use select() to
+ 	  do micro second sleeps.
 
-        * ace/CORBA_Handler.h (ACE_CORBA_*): The new version of Orbix
-          (2.2C01) on NT finally supports namespaces.  So now the macros
-          ACE_CORBA_n need to be defined using the "::" and not the "_"
-          for NT if the new Orbix is being used. Thanks to John Morey
-          (jmorey@tbi.com) for the changes.
+	* ace/CORBA_Handler.h (ACE_CORBA_*): The new version of Orbix
+ 	  (2.2C01) on NT finally supports namespaces.  So now the macros
+ 	  ACE_CORBA_n need to be defined using the "::" and not the "_"
+ 	  for NT if the new Orbix is being used. Thanks to John Morey
+ 	  (jmorey@tbi.com) for the changes.
 
 Fri Jun 06 02:16:08 1997    <nw1@COYOTE>
 
-        * Sigset_Ops_Test.cpp: Added to test correct implementation of
-          sigset manipulating functions. 
-        
-        * run_tests.{sh,bat}, Makefile: Added Sigset_Ops_Test.
+	* Sigset_Ops_Test.cpp: Added to test correct implementation of
+	  sigset manipulating functions. 
+	
+	* run_tests.{sh,bat}, Makefile: Added Sigset_Ops_Test.
 
 Thu Jun 05 20:32:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Timer_Queue_Test.cpp (randomize_array): removed static
-          qualifier now that it's a template function.  It caused a warning
-          with Sun C++.
+	* tests/Timer_Queue_Test.cpp (randomize_array): removed static
+	  qualifier now that it's a template function.  It caused a warning
+	  with Sun C++.
 
 Thu Jun 05 18:28:36 1997    <irfan@TWOSTEP>
 
-        * ace/Asynch_Acceptor.cpp (open): The Proactor was beening passed
-          implicitly. I have made this explicit by making this a parameter
-          to open. Thanks to MehulM@spa-marketing.com (Mehul Mahimtura)
-          for this.
+	* ace/Asynch_Acceptor.cpp (open): The Proactor was beening passed
+ 	  implicitly. I have made this explicit by making this a parameter
+ 	  to open. Thanks to MehulM@spa-marketing.com (Mehul Mahimtura)
+	  for this.
 
 Thu Jun  5 12:06:45 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
 
-        * ace/Timer_Queue_T.h (ACE_Timer_Queue_T): Overloaded
-          calculate_timeout with a version that accepts a pointer to
-          storage for the ACE_Time_Value as an argument.  This has a small
-          performance win over the other b/c it does not take a lock.  The
-          change was made after examining Quantify output for TAO and
-          observing that this lock caused
-          Reactor::wait_for_multiple_events() to consume a substantial
-          percentage of processing time.
+	* ace/Timer_Queue_T.h (ACE_Timer_Queue_T): Overloaded
+ 	  calculate_timeout with a version that accepts a pointer to
+ 	  storage for the ACE_Time_Value as an argument.  This has a small
+ 	  performance win over the other b/c it does not take a lock.  The
+ 	  change was made after examining Quantify output for TAO and
+ 	  observing that this lock caused
+ 	  Reactor::wait_for_multiple_events() to consume a substantial
+ 	  percentage of processing time.
 
-        * ace/Reactor.cpp (wait_for_multiple_events): This now uses a
-          different version of calculate_timeout() that doesn't require
-          taking a lock.
+	* ace/Reactor.cpp (wait_for_multiple_events): This now uses a
+ 	  different version of calculate_timeout() that doesn't require
+ 	  taking a lock.
 
 Thu Jun 05 08:48:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Reactor.cpp: added template specializations.
+	* ace/Reactor.cpp: added template specializations.
 
-        * ace/Timer_Queue_T.cpp (ACE_Timer_Queue_T ctor): rearranged
-          initializers to match declaration order.
+	* ace/Timer_Queue_T.cpp (ACE_Timer_Queue_T ctor): rearranged
+	  initializers to match declaration order.
 
 Thu Jun  5 06:08:06 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ace/OS.i (sigaddset, sigdelset, sigismember): NSIG itself is
-          invalid and must be excluded.
+	* ace/OS.i (sigaddset, sigdelset, sigismember): NSIG itself is
+	  invalid and must be excluded.
 
 Wed Jun 04 21:24:35 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos5.5-g++.h: fixed typo: #define instead of
-          #defined ACE_HAS_CLOCK_GETTIME.
+	* ace/config-sunos5.5-g++.h: fixed typo: #define instead of
+	  #defined ACE_HAS_CLOCK_GETTIME.
 
-        * ace/config-sunos5.5-sunc++*.h: Combined
-          config-sunos5.5-sunc++-4.x.h and config-sunos5.5-sunc++-4.1.h,
-          and removed the latter.  The Orbix config file now #includes
-          config-sunos5.5-sunc++-4.x.h and adds its differences.
+	* ace/config-sunos5.5-sunc++*.h: Combined
+	  config-sunos5.5-sunc++-4.x.h and config-sunos5.5-sunc++-4.1.h,
+	  and removed the latter.  The Orbix config file now #includes
+	  config-sunos5.5-sunc++-4.x.h and adds its differences.
 
-        * include/makeinclude/platform_sunos5_sunc++*.GNU: Combined
-          platform_sunos5_sunc++.GNU and platform_sunos5_sunc++-4.1.GNU,
-          and removed the latter.  platform_sunos5_sunc++_orbix.GNU now
-          includes the non-orbix file and adds its differences.  Also,
-          added optional CC -fast support.  To enable, just add "fast=1"
-          to your "make" invocation.
+	* include/makeinclude/platform_sunos5_sunc++*.GNU: Combined
+	  platform_sunos5_sunc++.GNU and platform_sunos5_sunc++-4.1.GNU,
+	  and removed the latter.  platform_sunos5_sunc++_orbix.GNU now
+	  includes the non-orbix file and adds its differences.  Also,
+	  added optional CC -fast support.  To enable, just add "fast=1"
+	  to your "make" invocation.
 
 Wed Jun 04 12:21:41 1997    <irfan@TWOSTEP>
 
-        * tests: Made the following config files consistent:
-          UNIXclerk.conf UNIXtokens.conf Win32clerk.conf Win32server.conf
-          Win32tokens.conf
+	* tests: Made the following config files consistent:
+ 	  UNIXclerk.conf UNIXtokens.conf Win32clerk.conf Win32server.conf
+ 	  Win32tokens.conf
 
-        * ace/OS.h: Made sure that some #defines were guarded for
-          redefinition specially for the Bristol (that provides Win32 API
-          on AIX) headers. Thanks to Rich Christy (rchristy@cccis.com) for
-          suggesting these changes.
+	* ace/OS.h: Made sure that some #defines were guarded for
+ 	  redefinition specially for the Bristol (that provides Win32 API
+ 	  on AIX) headers. Thanks to Rich Christy (rchristy@cccis.com) for
+ 	  suggesting these changes.
 
-        * ace/Handle_Set.h: Changed the type of handle_index from int to
-          u_int on Win32.  Thanks to Jack Erickson (jack@cibc.com) for
-          suggesting this.
+	* ace/Handle_Set.h: Changed the type of handle_index from int to
+ 	  u_int on Win32.  Thanks to Jack Erickson (jack@cibc.com) for
+ 	  suggesting this.
 
-        * ace/FILE.h (ACE_FILE_STREAM): Fixed this #define from
-          ACE_FILE_Stream to ACE_FILE_IO.
+	* ace/FILE.h (ACE_FILE_STREAM): Fixed this #define from
+ 	  ACE_FILE_Stream to ACE_FILE_IO.
 
 Tue Jun  3 21:23:48 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Timer_{Queue,Hash}: Fixed some uses of template typedefs
-          since GCC is too lame to handle them correctly.  Therefore, I
-          had to expand TIMER_QUEUE into the ugly fully expanded name.
+	* ace/Timer_{Queue,Hash}: Fixed some uses of template typedefs
+ 	  since GCC is too lame to handle them correctly.  Therefore, I
+ 	  had to expand TIMER_QUEUE into the ugly fully expanded name.
 
-        * ace/Timer_Queue_T.cpp: Moved the implementation of
-          ACE_Event_Handler_Handle_Timeout_Upcall from Timer_Queue.* into
-          Timer_Queue_T.* since only template classes should go into *_T.*
-          files.
+	* ace/Timer_Queue_T.cpp: Moved the implementation of
+ 	  ACE_Event_Handler_Handle_Timeout_Upcall from Timer_Queue.* into
+ 	  Timer_Queue_T.* since only template classes should go into *_T.*
+ 	  files.
 
 Tue Jun  3 18:16:02 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/Timer_Queue.*:
+	* ace/Timer_Queue.*:
 
-          Templatized ACE_Event_Handler_Handle_Timeout_Upcall with LOCK
-                
-          Added deletion() to Upcall Functors.  This gets called if there
-          are any nodes in a queue and the queue's destructor is called
+	  Templatized ACE_Event_Handler_Handle_Timeout_Upcall with LOCK
+		
+	  Added deletion() to Upcall Functors.  This gets called if there
+ 	  are any nodes in a queue and the queue's destructor is called
 
-        * ace/Timer_Queue_T.*:
+	* ace/Timer_Queue_T.*:
 
-          Changed iterator accessor to public
+	  Changed iterator accessor to public
 
-          Removed two template parameters from ACE_Timer_Node_T so only
-          EVENT is left.  Added accessors instead of using friendships,
-          and deleted the constructor (use set() instead)
+	  Removed two template parameters from ACE_Timer_Node_T so only
+ 	  EVENT is left.  Added accessors instead of using friendships,
+ 	  and deleted the constructor (use set() instead)
 
-          Changed iterator into a general iterator (with first(), next(),
-          isdone() and item () methods)
-          
-          Added remove_first () method that removes and returns the
-          earliest timer in the queue
-          
-          Added ACE_Free_List support
+	  Changed iterator into a general iterator (with first(), next(),
+ 	  isdone() and item () methods)
+	  
+	  Added remove_first () method that removes and returns the
+ 	  earliest timer in the queue
+	  
+	  Added ACE_Free_List support
 
-        * ace/Timer_Heap*:
+	* ace/Timer_Heap*:
 
-          Added upcall functor deletion() support
+	  Added upcall functor deletion() support
 
-          Added remove_first () method that removes and returns the
-          earliest timer in the queue
-          
-        * ace/Timer_List*:
+	  Added remove_first () method that removes and returns the
+ 	  earliest timer in the queue
+	  
+	* ace/Timer_List*:
 
-          Changed to double-linked circular list and changed the timer_id
-          to be a pointer to the node (like it is in Timer Wheel and Timer
-          Hash)
+	  Changed to double-linked circular list and changed the timer_id
+ 	  to be a pointer to the node (like it is in Timer Wheel and Timer
+ 	  Hash)
 
-          Added upcall functor deletion() support
+	  Added upcall functor deletion() support
 
-          Added remove_first () method that removes and returns the
-          earliest timer in the queue
-          
-          Added check for timer_id of -1 so we don't try to delete the
-          error code if it is passed into cancel
+	  Added remove_first () method that removes and returns the
+ 	  earliest timer in the queue
+	  
+	  Added check for timer_id of -1 so we don't try to delete the
+ 	  error code if it is passed into cancel
 
-          Changed Timer_List_Iterator_T constructor parameter from list to
-          listParm to resolve a conflict with STL.  Thanks to Todd
-          Barkalow <barkate@louisville.stortek.com> for this fix
+	  Changed Timer_List_Iterator_T constructor parameter from list to
+ 	  listParm to resolve a conflict with STL.  Thanks to Todd
+ 	  Barkalow <barkate@louisville.stortek.com> for this fix
 
-        * ace/Timer_Wheel*:
-          Added HighRes timer support
-	  
-          Added upcall functor deletion() support
-	  
-          Added earliest_pos_ variable to keep track of the list with
-	  the earliest node
+	* ace/Timer_Wheel*:
 
-          Created an expire that is specialized for ACE_Timer_Wheel
+	  Added HighRes timer support
 
-          Added remove_first () method that removes and returns the
-          earliest timer in the queue
-          
-          Added check for timer_id of -1 so we don't try to delete the
-          error code if it is passed into cancel
+	  Added upcall functor deletion() support
 
-        * ace/Timer_Hash*:
+	  Added earliest_pos_ variable to keep track of the list with the
+ 	  earliest node
 
-          Added Timer Hash Queue - This is a class that can take another
-          timer queue type (Timer List, Timer Heap...) as a template
-          parameter (BUCKET) and then do an intermediate hash of a timer
-          to determine which queue among a table of timer queues to put
-          the timer into.  ACE_Timer_Hash is typedefed to the Timer List
-          version and ACE_Timer_Hash_Heap is typedefed to the Timer Heap
-          version
+	  Created an expire that is specialized for ACE_Timer_Wheel
 
-          Added HighRes timer support
+	  Added remove_first () method that removes and returns the
+ 	  earliest timer in the queue
+	  
+	  Added check for timer_id of -1 so we don't try to delete the
+ 	  error code if it is passed into cancel
+
+	* ace/Timer_Hash*:
 
-          Added upcall functor deletion() support
+	  Added Timer Hash Queue - This is a class that can take another
+ 	  timer queue type (Timer List, Timer Heap...) as a template
+ 	  parameter (BUCKET) and then do an intermediate hash of a timer
+ 	  to determine which queue among a table of timer queues to put
+ 	  the timer into.  ACE_Timer_Hash is typedefed to the Timer List
+ 	  version and ACE_Timer_Hash_Heap is typedefed to the Timer Heap
+ 	  version
 
-          Created an expire that is specialized for ACE_Timer_Hash
+	  Added HighRes timer support
 
-          Added remove_first () method that removes and returns the
-          earliest timer in the queue
-          
-          Added check for timer_id of -1 so we don't try to delete the
-          error code if it is passed into cancel
+	  Added upcall functor deletion() support
 
-        * ace/Free_List.*
+	  Created an expire that is specialized for ACE_Timer_Hash
+
+	  Added remove_first () method that removes and returns the
+ 	  earliest timer in the queue
+	  
+	  Added check for timer_id of -1 so we don't try to delete the
+ 	  error code if it is passed into cancel
 
-          Added ACE_Free_List<T> and ACE_Locked_Free_List<T, LOCK>.  These
-          are used to maintain free lists of nodes. ACE_Free_List is a
-          abstract class where ACE_Locked_Free_List is a concrete one that
-          has a mutex parameter (LOCK).
+	* ace/Free_List.*
 
-        * ace/OS.h:
+	  Added ACE_Free_List<T> and ACE_Locked_Free_List<T, LOCK>.  These
+ 	  are used to maintain free lists of nodes. ACE_Free_List is a
+ 	  abstract class where ACE_Locked_Free_List is a concrete one that
+ 	  has a mutex parameter (LOCK).
 
-          Added ACE_DEFAULT_TIMER_HASH_TABLE_SIZE constant
+	* ace/OS.h:
 
-          Added ACE_DEFAULT_FREE_LIST_* constants
+	  Added ACE_DEFAULT_TIMER_HASH_TABLE_SIZE constant
 
-        * ace/Proactor.*:
+	  Added ACE_DEFAULT_FREE_LIST_* constants
 
-          Added deletion() to Upcall Functors.  This gets called if there
-          are any nodes in a queue and the queue's destructor is called.
+	* ace/Proactor.*:
 
-        * tests/Timer_Queue_Test.cpp:
+	  Added deletion() to Upcall Functors.  This gets called if there
+ 	  are any nodes in a queue and the queue's destructor is called.
 
-          Added HighRes timer support
+	* tests/Timer_Queue_Test.cpp:
 
-          Changed the array of timer queues into a list (to more easily
-          add/remove/comment out an entry)
+	  Added HighRes timer support
 
-          Added some more performance tests with randomization
+	  Changed the array of timer queues into a list (to more easily
+ 	  add/remove/comment out an entry)
+
+	  Added some more performance tests with randomization
 
 Tue Jun  3 00:26:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Changed the access protection for ACE_cond_t,
-          ACE_sema_t, ACE_event_t, and ACE_rwlock_t so that it is
-          protected rather than private.  In addition, added ACE_Export to
-          all of these classes so that they are visible outside of a DLL.
-          Thanks to Ivan Murphy for these suggestions.
+	* ace/OS.h: Changed the access protection for ACE_cond_t,
+ 	  ACE_sema_t, ACE_event_t, and ACE_rwlock_t so that it is
+ 	  protected rather than private.  In addition, added ACE_Export to
+ 	  all of these classes so that they are visible outside of a DLL.
+  	  Thanks to Ivan Murphy for these suggestions.
 
-        * ace/OS.h: Changed the value of ACE_MAX_DEFAULT_PORT on Win32 to
-          0 in order to work around a nasty NTism...  Thanks to Jon Biggar
-          <jon@sems.com> for reporting this.
+	* ace/OS.h: Changed the value of ACE_MAX_DEFAULT_PORT on Win32 to
+ 	  0 in order to work around a nasty NTism...  Thanks to Jon Biggar
+	  <jon@sems.com> for reporting this.
 
 Mon Jun  2 16:29:48 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * ace/Process.*:
-          - Fixed ACE_Process::spawn to close descriptors after having
-          been duped.
-          - Fixed ACE_Process::spawn to exit () after an error is
-          encountered in the child process, rather than returning.
-          - Fixed ACE_Process_Options::set_handles to duplicate handles
-          that are passed in, and then to close them in the destructor.
+	* ace/Process.*:
+	  - Fixed ACE_Process::spawn to close descriptors after having
+	  been duped.
+	  - Fixed ACE_Process::spawn to exit () after an error is
+	  encountered in the child process, rather than returning.
+	  - Fixed ACE_Process_Options::set_handles to duplicate handles
+	  that are passed in, and then to close them in the destructor.
 
 Sun Jun 01 22:21:28 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/Threads/tss1.cpp: made some globals non-static or
-          const so that tss1 will link with Sun C++ 4.2 -O3.  I don't
-          know what the problem is; it only shows up with optimization
-          enabled.  These fixes work around it.
+	* examples/Threads/tss1.cpp: made some globals non-static or
+	  const so that tss1 will link with Sun C++ 4.2 -O3.  I don't
+	  know what the problem is; it only shows up with optimization
+	  enabled.  These fixes work around it.
 
 Sun Jun 01 20:29:20 1997  James CE Johnson <jcej@lads.com>
 
-        * ace/IOStream*:
-          - removed the old 4/5/97 comments
-          - made operator>>, << on QuotedString a template
+	* ace/IOStream*:
+	  - removed the old 4/5/97 comments
+	  - made operator>>, << on QuotedString a template
 
-          This last makes QuotedString much more functional.  As
-          templated functions, the QuotedString can now be used on
-          other iostream-type objects.  The previous method of
-          defining the function only for the type of ACE_IOStream
-          being created was didn't provide this flexibility.
+	  This last makes QuotedString much more functional.  As
+	  templated functions, the QuotedString can now be used on
+	  other iostream-type objects.  The previous method of
+	  defining the function only for the type of ACE_IOStream
+	  being created was didn't provide this flexibility.
 
 Sat May 31 07:01:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Log_Msg.cpp (open): To avoid handle leaks, we need to
-          shutdown the message_queue before trying to reopen it.  Thanks
-          to Per Andersson for this suggestion.
+	* ace/Log_Msg.cpp (open): To avoid handle leaks, we need to
+ 	  shutdown the message_queue before trying to reopen it.  Thanks
+ 	  to Per Andersson for this suggestion.
 
-        * include/makeinclude/platform_osf1_4.0.GNU: Added a new platform
-          config file.  Thanks to James Johnson for this.
+	* include/makeinclude/platform_osf1_4.0.GNU: Added a new platform
+ 	  config file.  Thanks to James Johnson for this.
 
 Fri May 30 16:25:25 1997    <irfan@TWOSTEP>
 
-        * CPP-inclient.cpp (main): Properly compare to the "quit"
-          string. Thanks to "Andre Arpin" <arpin@adan.kingston.net> for
-          reporting this.
+	* CPP-inclient.cpp (main): Properly compare to the "quit"
+ 	  string. Thanks to "Andre Arpin" <arpin@adan.kingston.net> for
+ 	  reporting this.
 
-        * tests/UPIPE_SAP_Test.cpp (connector): Changed the eof marker in
-          the strings.
+	* tests/UPIPE_SAP_Test.cpp (connector): Changed the eof marker in
+ 	  the strings.
 
 Fri May 30 14:04:44 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * include/makeinclude/platform_irix6.4_sgic++.GNU: added to make
-          things compile on latest SGI machines.  Removed +pp and -woff...
-          flags from the CCFLAGS variable.  Added new -woff flags to hide
-          other warnings.
+	* include/makeinclude/platform_irix6.4_sgic++.GNU: added to make
+	  things compile on latest SGI machines.  Removed +pp and -woff...
+	  flags from the CCFLAGS variable.  Added new -woff flags to hide
+	  other warnings.
 
-        * ace/config-irix6.4-sgic++*.h: copied corresponding configs from
-          irix6.2 and removed ACE_HAS_SVR4_TIME, since this seems to be no
-          longer true of irix6.4.
+	* ace/config-irix6.4-sgic++*.h: copied corresponding configs from
+	  irix6.2 and removed ACE_HAS_SVR4_TIME, since this seems to be no
+	  longer true of irix6.4.
 
 Fri May 30 02:39:39 1997    <irfan@TWOSTEP>
 
-        * ace/Connector.cpp 
-          
-          (create_AST): On Win32, added the except mask when registering
-          with the Reactor to find out when asynchronous connects
-          complete.
+	* ace/Connector.cpp 
+	  
+	  (create_AST): On Win32, added the except mask when registering
+ 	  with the Reactor to find out when asynchronous connects
+ 	  complete.
 
-          (Svc_Tuple): Made sure that the default value for the timer_id
-          in AST is not 0. 0 is a valid timer_id. I have changed this to
-          be -1.
+	  (Svc_Tuple): Made sure that the default value for the timer_id
+ 	  in AST is not 0. 0 is a valid timer_id. I have changed this to
+ 	  be -1.
 
-          (handle_exception): Added this method. On
-          Win32, the except mask must also be set for asynchronous
-          connects.
+	  (handle_exception): Added this method. On
+ 	  Win32, the except mask must also be set for asynchronous
+ 	  connects.
 
 Thu May 29 21:28:25 1997    <harrison@samba.cs.wustl.edu>
 
-        * Process.*: Removed the ACE_Process_Old class.
+	* Process.*: Removed the ACE_Process_Old class.
 
-        * Local_Tokens_T.*: Removed all these files.  They have not been
-          used by the token library for some time.  They were mistakenly
-          put in the release.
+	* Local_Tokens_T.*: Removed all these files.  They have not been
+	  used by the token library for some time.  They were mistakenly
+	  put in the release.
 
 Thu May 29 02:00:14 1997    <irfan@TWOSTEP>
 
-        * ACE.cpp (is_process_active): Added this method which checks if a
-          process is still alive. Thanks to Chris (CLahey@cccis.com) for
-          this code. 
+	* ACE.cpp (is_process_active): Added this method which checks if a
+ 	  process is still alive. Thanks to Chris (CLahey@cccis.com) for
+	  this code. 
 
-        * ace/OS.i (kill): Changed PROCESS_ALL_ACCESS to
-          PROCESS_TERMINATE.
+	* ace/OS.i (kill): Changed PROCESS_ALL_ACCESS to
+ 	  PROCESS_TERMINATE.
 
-        * ace/ACE.cpp (bind_port): Changed the implementation of this
-          method such that a recently used port is not used again in the
-          next call to this method on Win32, i.e., upper limit is
-          decreased even in the successful case. This fixes the problem on
-          Win32 where binding to a recently used port works but the
-          following connect fails.
+	* ace/ACE.cpp (bind_port): Changed the implementation of this
+ 	  method such that a recently used port is not used again in the
+ 	  next call to this method on Win32, i.e., upper limit is
+ 	  decreased even in the successful case. This fixes the problem on
+ 	  Win32 where binding to a recently used port works but the
+ 	  following connect fails.
 
-        * ace/Acceptor.cpp (close): Added a close method that allows us
-          to shutdown the Acceptor (without having to destroy it).
+	* ace/Acceptor.cpp (close): Added a close method that allows us
+ 	  to shutdown the Acceptor (without having to destroy it).
 
-        * ace/Connector.cpp (close): Added a close method that allows us
-          to shutdown the Connector (without having to destroy it).
+	* ace/Connector.cpp (close): Added a close method that allows us
+ 	  to shutdown the Connector (without having to destroy it).
 
-        * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
+	* apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
 
-          (handle_close): Removed this method. This code seemed to be
-          duplicating the code in the handle_close of the proxies.
+	  (handle_close): Removed this method. This code seemed to be
+ 	  duplicating the code in the handle_close of the proxies.
 
-          (initiate_connection): Removed the code that did
-          rescheduling. The proxies are responsible for this.
+	  (initiate_connection): Removed the code that did
+ 	  rescheduling. The proxies are responsible for this.
 
-        * apps/Gateway/Gateway/Event_Channel.cpp
+	* apps/Gateway/Gateway/Event_Channel.cpp
 
-          (initiate_proxy_connection): Must *always* use the correct synch
-          options while connecting.
+	  (initiate_proxy_connection): Must *always* use the correct synch
+ 	  options while connecting.
 
-          (reinitiate_proxy_connection): Always register for timeouts if
-          we are not disconnecting. This allows us to remove duplicated
-          logic in Proxy_Handler_Connector. 
+	  (reinitiate_proxy_connection): Always register for timeouts if
+	  we are not disconnecting. This allows us to remove duplicated
+	  logic in Proxy_Handler_Connector. 
 
-          The new logic of close() allows us to remove the code that use
-          to remove the proxy from the map to prevent double deletes.
+	  The new logic of close() allows us to remove the code that use
+ 	  to remove the proxy from the map to prevent double deletes.
 
-          (close): Changed the shutdown logic to: Tell everyone that the
-          spaceship is here (behind the comet), close down the connector,
-          close down the acceptor, tell everyone that it is now time to
-          commit suicide.
+	  (close): Changed the shutdown logic to: Tell everyone that the
+ 	  spaceship is here (behind the comet), close down the connector,
+ 	  close down the acceptor, tell everyone that it is now time to
+ 	  commit suicide.
 
-        * apps/Gateway/Gateway/Proxy_Handler.cpp (handle_timeout): Must
-          return 0, or else the timer queue will cancel the handler and
-          *all* its timeouts.
+	* apps/Gateway/Gateway/Proxy_Handler.cpp (handle_timeout): Must
+ 	  return 0, or else the timer queue will cancel the handler and
+ 	  *all* its timeouts.
 
-        * apps/Gateway/Peer/svc.conf,Makefile: We now generate a Peer
-          shared library (instead of just an .so). The svc.conf was
-          changed to reflect this.
+	* apps/Gateway/Peer/svc.conf,Makefile: We now generate a Peer
+ 	  shared library (instead of just an .so). The svc.conf was
+ 	  changed to reflect this.
 
-        * tests/UPIPE_SAP_Test.cpp: Fixed output message.
+	* tests/UPIPE_SAP_Test.cpp: Fixed output message.
 
-        * Handle_Set.i (operator): Fixed typo.
+	* Handle_Set.i (operator): Fixed typo.
 
 Thu May 29 11:09:52 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/rules.local.GNU: check for directory
-          write permission before attempting to install.  This helps
-          support shared ACE workspaces.  There are two easy ways
-          to not install "private" libraries in the shared workspace:
-          1) remove write permission from $WRAPPER_ROOT/ace, or
-          2) add "INSTALL=" to invocations of "make".
+	* include/makeinclude/rules.local.GNU: check for directory
+	  write permission before attempting to install.  This helps
+	  support shared ACE workspaces.  There are two easy ways
+	  to not install "private" libraries in the shared workspace:
+	  1) remove write permission from $WRAPPER_ROOT/ace, or
+	  2) add "INSTALL=" to invocations of "make".
 
 Thu May 29 06:07:18 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i (thr_join): Revised some code in the #ifdef'd out
-          version of ACE_OS::thr_join() so that it will compile correctly.
-          Note that this code isn't currently used, but someday it will
-          be.  Thanks to Hamutal Yanay for reporting this.
+	* ace/OS.i (thr_join): Revised some code in the #ifdef'd out
+ 	  version of ACE_OS::thr_join() so that it will compile correctly.
+  	  Note that this code isn't currently used, but someday it will
+ 	  be.  Thanks to Hamutal Yanay for reporting this.
 
 Wed May 28 16:37:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,i} (ACE_Time_Value): added default constructor,
-          which does not call normalize ().  ACE_Time_Value::normalize ()
-          was showing up as a relatively minor, but signficant hot
-          spot in Event Channel latency tests.
+	* ace/OS.{h,i} (ACE_Time_Value): added default constructor,
+	  which does not call normalize ().  ACE_Time_Value::normalize ()
+	  was showing up as a relatively minor, but signficant hot
+	  spot in Event Channel latency tests.
 
 Wed May 28 16:02:53 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * ace/OS.i: Changes to strdup and getpid for CHORUS, as per Wei
-          Chiang's suggestions.
+	* ace/OS.i: Changes to strdup and getpid for CHORUS, as per Wei
+	  Chiang's suggestions.
 
 Tue May 27 18:26:51 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/config-hpux-10.x-decthreads.h: Added support for HP/UX 10.10
-          with DCE threads.  Thanks to Shankar Krishnamoorthy
-          <kshankar@lucent.com> for these fixes.
+	* ace/config-hpux-10.x-decthreads.h: Added support for HP/UX 10.10
+ 	  with DCE threads.  Thanks to Shankar Krishnamoorthy
+ 	  <kshankar@lucent.com> for these fixes.
 
-        * ace/Local_Tokens_T.h: #if def'd out all of this file since it
-          doesn't seem to be used anymore.  Thanks to Shankar
-          Krishnamoorthy <kshankar@lucent.com> for reporting this.
+	* ace/Local_Tokens_T.h: #if def'd out all of this file since it
+ 	  doesn't seem to be used anymore.  Thanks to Shankar
+ 	  Krishnamoorthy <kshankar@lucent.com> for reporting this.
 
-        * ace/Makefile (TEMPLATE_FILES): Removed Local_Tokens_T since it
-          doesn't appear to be used anywhere.
+	* ace/Makefile (TEMPLATE_FILES): Removed Local_Tokens_T since it
+ 	  doesn't appear to be used anywhere.
 
 Tue May 27 18:47:34 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
-        * tests/*.cpp: Various changes for EBCIDIC compatibility.
-          Thanks to Chuck Gehr for pointing out the need for this!
+	* tests/*.cpp: Various changes for EBCIDIC compatibility.
+	  Thanks to Chuck Gehr for pointing out the need for this!
 
-        * tests/test_config.h: Added ACE_ALPHABET to aid a-z sending and
-          comparing.
+	* tests/test_config.h: Added ACE_ALPHABET to aid a-z sending and
+	  comparing.
 
 Tue May 27 15:03:25 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Future_Test.cpp: added ACE_Future{_Rep}<int> template
-          specializations.
+	* tests/Future_Test.cpp: added ACE_Future{_Rep}<int> template
+	  specializations.
 
 Tue May 27 07:49:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Future.cpp: Made a few minor reformatting changes to Per's
-          new Future enhancements.
+	* ace/Future.cpp: Made a few minor reformatting changes to Per's
+ 	  new Future enhancements.
 
 Tue May 27 14:19:14 1997  Per Andersson <Per.Andersson@hfera.ericsson.se>
 
-        * ace/Future: Fixed self assignment bug in ACE_Future<>::operator=().
-          Fixed bug in ACE_Future<>::set(). It is now possible to do a 
-          ACE_Future<>::set() followed by a ACE_Future<>::get() without
-          hanging forever.
+	* ace/Future: Fixed self assignment bug in ACE_Future<>::operator=().
+	  Fixed bug in ACE_Future<>::set(). It is now possible to do a 
+	  ACE_Future<>::set() followed by a ACE_Future<>::get() without
+	  hanging forever.
 
-          Moved all handling of the ACE_Future_Rep<> reference count
-          into three new static ACE_Future_Rep<> member functions,
-          create, attach, assign and detach.
+	  Moved all handling of the ACE_Future_Rep<> reference count
+	  into three new static ACE_Future_Rep<> member functions,
+	  create, attach, assign and detach.
 
-          Removed one mutex from ACE_Future_Rep<> by changing the
-          reference count from an ACE_Atomic_Op<int> into a plain
-          int. The ACE_Future_Rep<>::value_ready_mutex_ mutex is
-          instead used for serializing changes to the reference count. 
-          (ACE_Future_Rep<>::attach, ACE_Future_Rep<>::detach())
+	  Removed one mutex from ACE_Future_Rep<> by changing the
+	  reference count from an ACE_Atomic_Op<int> into a plain
+	  int. The ACE_Future_Rep<>::value_ready_mutex_ mutex is
+	  instead used for serializing changes to the reference count. 
+	  (ACE_Future_Rep<>::attach, ACE_Future_Rep<>::detach())
 
-          Removed mutex from ACE_Future<> the serialization is
-          performed by the ACE_Future_Rep<>::attach,
-          ACE_Future_Rep<>::detach() and ACE_Future_Rep<>::assign()
-          functions.
+	  Removed mutex from ACE_Future<> the serialization is
+	  performed by the ACE_Future_Rep<>::attach,
+	  ACE_Future_Rep<>::detach() and ACE_Future_Rep<>::assign()
+	  functions.
 
-          Changed the ACE_Future<> default constructor to always
-          create a  ACE_Future_Rep<>
+	  Changed the ACE_Future<> default constructor to always
+	  create a  ACE_Future_Rep<>
 
-        * tests/Future_Test.cpp: Added test case for
-          ACE_Future<>::set() followed by ACE_Future<>::get().  Added
-          test for working  ACE_Future::operator=(). The test is not
-          fool proof but it crashes or hangs the test process with the
-          old ACE_Future<> implementation.
+	* tests/Future_Test.cpp: Added test case for
+	  ACE_Future<>::set() followed by ACE_Future<>::get().  Added
+	  test for working  ACE_Future::operator=(). The test is not
+	  fool proof but it crashes or hangs the test process with the
+	  old ACE_Future<> implementation.
 
 Mon May 26 14:19:14 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/OS.{h,i}: Fixed difftime implementation for cases where
-          systems implement it as a macro.  Fixed tempnam by adding
-          ACE_LACKS_TEMPNAM.
+	* ace/OS.{h,i}: Fixed difftime implementation for cases where
+	  systems implement it as a macro.  Fixed tempnam by adding
+	  ACE_LACKS_TEMPNAM.
 
 Sun May 25 11:36:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * examples/Reactor/Misc: Removed test_handle_set.cpp since it 
-          is now completed subsumed by tests/Handle_Set_Test.cpp.
+	* examples/Reactor/Misc: Removed test_handle_set.cpp since it 
+	  is now completed subsumed by tests/Handle_Set_Test.cpp.
 
-        * tests/Handle_Set_Test.cpp: Updated the test of
-          the ACE_Handle_Set so that it shows how fast the iterator works.
+	* tests/Handle_Set_Test.cpp: Updated the test of
+ 	  the ACE_Handle_Set so that it shows how fast the iterator works.
 
-        * ace/Reactor.cpp: Updated the Reactor to use the new
-          ACE_Handle_Set_Iterator (whic no longer requires calling
-          operator++ to advance the iterator).
+	* ace/Reactor.cpp: Updated the Reactor to use the new
+ 	  ACE_Handle_Set_Iterator (whic no longer requires calling
+ 	  operator++ to advance the iterator).
 
-        * ace/Handle_Set: Rewrote the ACE_Handle_Set_Iterator to speed it up. 
-          The result seems to be about 15% faster than the original.
+	* ace/Handle_Set: Rewrote the ACE_Handle_Set_Iterator to speed it up. 
+	  The result seems to be about 15% faster than the original.
 
-        * ace/OS.h: Changed the MSB_MASK static constant into a macro and
-          moved it from Handle_Set.cpp into OS.h, changing its name to
-          ACE_MSB_MASK.
+	* ace/OS.h: Changed the MSB_MASK static constant into a macro and
+ 	  moved it from Handle_Set.cpp into OS.h, changing its name to
+ 	  ACE_MSB_MASK.
 
-        * ace/Sched_Params.cpp (priority_max): Added another #ifdef for
-          Chorus.  Thanks to Wei Chiang for reporting this.
+	* ace/Sched_Params.cpp (priority_max): Added another #ifdef for
+ 	  Chorus.  Thanks to Wei Chiang for reporting this.
 
-        * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: added -l
-          in front of orbixmt.  Thanks to Wei Chiang for pointing this
-          out.
+	* include/makeinclude/platform_sunos5_sunc++_orbix.GNU: added -l
+ 	  in front of orbixmt.  Thanks to Wei Chiang for pointing this
+ 	  out.
 
-        * ace/ACE.cpp: Changed the default port for NT so that it starts
-          at 65279 rather than 65535.  Hopefully, this will fix that
-          annoying bug that has been plaguing us on NT 4.0 for months.
-          Thanks to Goran Lowkrantz <Goran.Lowkrantz@Infologigruppen.se>
-          for reporting this.
+	* ace/ACE.cpp: Changed the default port for NT so that it starts
+ 	  at 65279 rather than 65535.  Hopefully, this will fix that
+ 	  annoying bug that has been plaguing us on NT 4.0 for months.
+  	  Thanks to Goran Lowkrantz <Goran.Lowkrantz@Infologigruppen.se>
+ 	  for reporting this.
 
 Sat May 24 23:42:32 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * performance-tests/Misc/test_naming.cpp (do_testing): replaced
-          strlen () calls in character array size with constant expression.
+	* performance-tests/Misc/test_naming.cpp (do_testing): replaced
+	  strlen () calls in character array size with constant expression.
 
 Sat May 24 12:07:48 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * Released version 4.2.1 for testing.
+	* Released version 4.2.1 for testing.
 
-        * ace/Reactor.cpp (bind): Fixed a stupid typo where I was using
-          the ACE_REACTOR_EVENT_HANDLER macro instead of the
-          ACE_REACTOR_HANDLE macro.  Thanks to Detlef for reporting this.
+	* ace/Reactor.cpp (bind): Fixed a stupid typo where I was using
+ 	  the ACE_REACTOR_EVENT_HANDLER macro instead of the
+ 	  ACE_REACTOR_HANDLE macro.  Thanks to Detlef for reporting this.
 
-        * ace/OS.i: Added a new macro called ACE_HAS_THR_MINSTACK to deal
-          with weirdo mangling of names by Tandem.  Thanks to Jan Perman
-          <uabjjpp@osd.ericsson.se> for reporting this.
+	* ace/OS.i: Added a new macro called ACE_HAS_THR_MINSTACK to deal
+ 	  with weirdo mangling of names by Tandem.  Thanks to Jan Perman
+ 	  <uabjjpp@osd.ericsson.se> for reporting this.
 
-        * ace/OS.h: Added a new macro ACE_LACKS_PRI_T for those platforms
-          using STHREADS (e.g., Tandem NonStop OS) that don't have pri_t
-          defined.  Thanks to Jan Perman <uabjjpp@osd.ericsson.se> for
-          reporting this.
+	* ace/OS.h: Added a new macro ACE_LACKS_PRI_T for those platforms
+	  using STHREADS (e.g., Tandem NonStop OS) that don't have pri_t
+	  defined.  Thanks to Jan Perman <uabjjpp@osd.ericsson.se> for
+	  reporting this.
 
-        * ace/Connector.cpp (connect): Make sure to save/restore errno
-          since svc_handler->close() may change it.  Thanks to Michael
-          Hartman <c62nt57@ibx.com> for reporting this.
+	* ace/Connector.cpp (connect): Make sure to save/restore errno
+ 	  since svc_handler->close() may change it.  Thanks to Michael
+ 	  Hartman <c62nt57@ibx.com> for reporting this.
 
-        * include/makeinclude/platform_chorus.GNU: Added a new platform
-          macros file for Chorus.  Thanks to Wei Chang for this.
+	* include/makeinclude/platform_chorus.GNU: Added a new platform
+ 	  macros file for Chorus.  Thanks to Wei Chang for this.
 
-        * ace/OS.cpp (sched_params): Reordered the #ifdefs so that Chorus
-          comes first.
+	* ace/OS.cpp (sched_params): Reordered the #ifdefs so that Chorus
+ 	  comes first.
 
-        * ace/OS.i (sleep): If the platform defines ACE_HAS_CLOCK_GETTIME
-          then we'll use the nanosleep() method rather than sleep().
+	* ace/OS.i (sleep): If the platform defines ACE_HAS_CLOCK_GETTIME
+ 	  then we'll use the nanosleep() method rather than sleep().
 
-        * ace/OS.h: disabled THR_NEW_LWP for Chorus.  Thanks to Wei Chang
-          for reporting this.
+	* ace/OS.h: disabled THR_NEW_LWP for Chorus.  Thanks to Wei Chang
+ 	  for reporting this.
 
-        * ace/Sched_Params.cpp: ACE_SCHED_OTHER and ACE_SCHED_RR have the
-          same value on Chorus.  Thanks to Wei Chang for reporting this.
+	* ace/Sched_Params.cpp: ACE_SCHED_OTHER and ACE_SCHED_RR have the
+ 	  same value on Chorus.  Thanks to Wei Chang for reporting this.
 
 Sat May 24 09:21:08 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: protected second
-          ACE_Svc_Handler specialization for case that ACE_HAS_THREADS,
-          when ACE_HAS_TLI.  It had gotten lost in the last pass of
-          that module.  Thanks to Sandro Doro <doros@aureus.sublink.org>
-          for reporting this problem.
+	* netsvcs/lib/Server_Logging_Handler.cpp: protected second
+	  ACE_Svc_Handler specialization for case that ACE_HAS_THREADS,
+	  when ACE_HAS_TLI.  It had gotten lost in the last pass of
+	  that module.  Thanks to Sandro Doro <doros@aureus.sublink.org>
+	  for reporting this problem.
 
 Sat May 24 03:19:38 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
 
-        * ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset,
-          sigismember): Modified the implementation of these function so
-          as to conform with POSIX standard.  Basically all functions do
-          the same things they did but more conservative protections are
-          added.  The modified semantic becomes,
-          
-          sigemptyset, sigfillset, sigaddset, sigdelset:  return 0 if
-            succeed, -1 otherwise. 
-          sigismember: returns 0 if signum is not in the set, 1 if signum
-            is in the set, and -1 if error occurs.
+	* ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset,
+	  sigismember): Modified the implementation of these function so
+ 	  as to conform with POSIX standard.  Basically all functions do
+	  the same things they did but more conservative protections are
+	  added.  The modified semantic becomes,
+	  
+	  sigemptyset, sigfillset, sigaddset, sigdelset:  return 0 if
+	    succeed, -1 otherwise. 
+	  sigismember: returns 0 if signum is not in the set, 1 if signum
+	    is in the set, and -1 if error occurs.
 
-          If error occured, errno will be set to one of the following
-          value: 
-            EFAULT:  sigset is not a valid address.
-            EINVAL:  signum is not a valid signal number.
+	  If error occured, errno will be set to one of the following
+	  value: 
+	    EFAULT:  sigset is not a valid address.
+	    EINVAL:  signum is not a valid signal number.
 
-          Notice that, so far, this is for NT only.
+	  Notice that, so far, this is for NT only.
 
 Sat May 24 01:53:22 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * performance-tests/Misc/test_naming.cpp (do_testing): Thanks to
-          Sandro Doro, squashed a bug where we were trying to concatenate
-          onto a string constant.
+	* performance-tests/Misc/test_naming.cpp (do_testing): Thanks to
+	  Sandro Doro, squashed a bug where we were trying to concatenate
+	  onto a string constant.
 
 Fri May 23 01:01:01 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/config-hpux-9.x.h: Added
+	* ace/config-hpux-9.x.h: Added
 
-          #define ACE_HAS_BROKEN_ENUMS
-          #define ACE_HAS_IP_MULTICAST
-          #define ACE_LACKS_GETPGID
+	  #define ACE_HAS_BROKEN_ENUMS
+	  #define ACE_HAS_IP_MULTICAST
+	  #define ACE_LACKS_GETPGID
 
-          Thanks to Neil Cohen for reporting these.
+	  Thanks to Neil Cohen for reporting these.
 
-        * ace/Thread_Manager.h: Made the private methods and data members
-          protected so that subclasses can extend it.  Thanks to Hamutal
-          Yanay for this suggestion.
+	* ace/Thread_Manager.h: Made the private methods and data members
+ 	  protected so that subclasses can extend it.  Thanks to Hamutal
+ 	  Yanay for this suggestion.
 
 Fri May 23 21:27:05 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Process.{h,cpp} (env_argv): added "const" to char * type in
-          return type, for argument compatibility in call to ACE_OS::execve ().
-
-        * ace/Process.cpp (spawn): removed unreachable return statement at
-          end of function.
-
-        Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-        reporting the above two problems.
-
-        * ace/{IOStream*,Makefile}: Split out templates into
-          ace/IOStream_T.{h,cpp} files.  This way, automatic template
-          instantiation systems that require templates to be in separate
-          files, such as on Irix 6.2, will be able to build IOStream_Test
-          and the ACE_IOStream examples without warnings.  (The
-          ACE_IOSTREAM_BUILDING_TEMPLATE macro that did this only worked
-          if ACE_TEMPLATES_REQUIRE_SOURCE was defined.  It's no longer
-          needed with the separate template files.)
-
-        * tests/IOStream_Test.cpp,
-          examples/IOStream/client/iostream_client.cpp,
-          examples/IOStream/server/iostream_server.cpp:
-          swapped ACE_Streambuf and ACE_Streambuf_T class names so that
-          the template class has the "_T".  And renamed ACE_IOStream_T
-          for consistency.
-
-        * ace/{IOStream.*,README},
-          tests/IOStream_Test.cpp,
-          examples/IOStream/client/iostream_client.cpp,
-          examples/IOStream/server/iostream_server.cpp,
-          config-hpux-9.x*.h:
-          Added ACE_LACKS_ACE_IOSTREAM protection
-          so that these can easily be built on platforms that have
-          trouble with ACE_IOStream.
-
-        * Priority_Task_Test.cpp: removed close () because it didn't really
-          close the Task, and added printout to main () after all tasks have
-          been spawned to help debug non-termination.
-
-        * ace/OS.cpp: (thr_create, with STHREADS only): *thr_handle was
-          used but *thr_id had been set by ::thr_create, so threads never
-          got activated.  Fixed by using *thr_id instead of *thr_handle
-          in the calls to ACE_OS::thr_setprio and ACE_OS::continue.
-          Thanks to Jan Perman <uabjjpp@osd.ericsson.se> for reporting
-          this problem.
+	* ace/Process.{h,cpp} (env_argv): added "const" to char * type in
+	  return type, for argument compatibility in call to ACE_OS::execve ().
+
+	* ace/Process.cpp (spawn): removed unreachable return statement at
+	  end of function.
+
+	Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	reporting the above two problems.
+
+	* ace/{IOStream*,Makefile}: Split out templates into
+	  ace/IOStream_T.{h,cpp} files.  This way, automatic template
+	  instantiation systems that require templates to be in separate
+	  files, such as on Irix 6.2, will be able to build IOStream_Test
+	  and the ACE_IOStream examples without warnings.  (The
+	  ACE_IOSTREAM_BUILDING_TEMPLATE macro that did this only worked
+	  if ACE_TEMPLATES_REQUIRE_SOURCE was defined.  It's no longer
+	  needed with the separate template files.)
+
+	* tests/IOStream_Test.cpp,
+	  examples/IOStream/client/iostream_client.cpp,
+	  examples/IOStream/server/iostream_server.cpp:
+	  swapped ACE_Streambuf and ACE_Streambuf_T class names so that
+	  the template class has the "_T".  And renamed ACE_IOStream_T
+	  for consistency.
+
+	* ace/{IOStream.*,README},
+	  tests/IOStream_Test.cpp,
+	  examples/IOStream/client/iostream_client.cpp,
+	  examples/IOStream/server/iostream_server.cpp,
+	  config-hpux-9.x*.h:
+	  Added ACE_LACKS_ACE_IOSTREAM protection
+	  so that these can easily be built on platforms that have
+	  trouble with ACE_IOStream.
+
+	* Priority_Task_Test.cpp: removed close () because it didn't really
+	  close the Task, and added printout to main () after all tasks have
+	  been spawned to help debug non-termination.
+
+	* ace/OS.cpp: (thr_create, with STHREADS only): *thr_handle was
+	  used but *thr_id had been set by ::thr_create, so threads never
+	  got activated.  Fixed by using *thr_id instead of *thr_handle
+	  in the calls to ACE_OS::thr_setprio and ACE_OS::continue.
+	  Thanks to Jan Perman <uabjjpp@osd.ericsson.se> for reporting
+	  this problem.
 
 Fri May 23 20:12:33 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * tests/SV_Shared_Memory_Test.cpp: Thanks to Chuck Gehr, fixed
-          ASCII dependent code in the parent and child routines.
+	* tests/SV_Shared_Memory_Test.cpp: Thanks to Chuck Gehr, fixed
+	  ASCII dependent code in the parent and child routines.
 
 Fri May 23 02:58:28 1997  Nanbor Wang  <nw1@siesta.cs.wustl.edu>
 
-        * ace/OS.i (dlsym): Added ACE_USES_ASM_SYMBOL_IN_DLSYM, support
-          for platforms (FreeBSD) which use assembly symbols instead of C
-          symbols in dlsym ().
+	* ace/OS.i (dlsym): Added ACE_USES_ASM_SYMBOL_IN_DLSYM, support
+	  for platforms (FreeBSD) which use assembly symbols instead of C
+	  symbols in dlsym ().
 
-        * ace/config-freebsd[-pthread].h: Added flag ACE_HAS_CHARPTR_DL
-          and ACE_USES_ASM_SYMBOL_IN_DLSYM.
+	* ace/config-freebsd[-pthread].h: Added flag ACE_HAS_CHARPTR_DL
+ 	  and ACE_USES_ASM_SYMBOL_IN_DLSYM.
 
 Thu May 22 08:14:21 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Tokens_Test.cpp: added deletes to avoid memory leaks.
+	* tests/Tokens_Test.cpp: added deletes to avoid memory leaks.
 
 Wed May 21 16:15:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/{config-irix6.2*.h,README}: removed ACE_LACKS_IOSTREAM_SETGET
-          because tests won't build with it.  Also, added
-          ACE_LACKS_SIGNED_CHAR.
+	* ace/{config-irix6.2*.h,README}: removed ACE_LACKS_IOSTREAM_SETGET
+	  because tests won't build with it.  Also, added
+	  ACE_LACKS_SIGNED_CHAR.
 
-        * ace/IOStream.h: removed "const" from PUT_PROT of
-          u_char * and void *.  This should allow the IOStream test
-          and examples to build and run on Irix platforms.  Thanks
-          to Torbjorn Lindgren <tl@funcom.com> and Amos Shapira
-          <amos@dsi.co.il> for reporting this, and to James Hu for
-          helping fix it.
+	* ace/IOStream.h: removed "const" from PUT_PROT of
+	  u_char * and void *.  This should allow the IOStream test
+	  and examples to build and run on Irix platforms.  Thanks
+	  to Torbjorn Lindgren <tl@funcom.com> and Amos Shapira
+	  <amos@dsi.co.il> for reporting this, and to James Hu for
+	  helping fix it.
 
-        * ace/{OS.cpp,Sched_Params.cp} (Solaris only): use 0 min priority
-          again, with workaround in ACE_OS::thr_create to not use
-          ::pthread_attr_setschedparam () if the priority is 0.  Instead,
-          the priority of the newly created thread is set to 0 (if it
-          wasn't created with 0) after the thread is created, with
-          ::pthread_setschedparam ().
+	* ace/{OS.cpp,Sched_Params.cp} (Solaris only): use 0 min priority
+	  again, with workaround in ACE_OS::thr_create to not use
+	  ::pthread_attr_setschedparam () if the priority is 0.  Instead,
+	  the priority of the newly created thread is set to 0 (if it
+	  wasn't created with 0) after the thread is created, with
+	  ::pthread_setschedparam ().
 
 Wed May 21 15:23:37 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/Strategies_T.* (ACE_Hash_Addr): Eliminated the ADDR_T
-          template parameter as a base class.  It is now a wholly-contained
-          member of the ACE_Hash_Addr<> with conversion operators.
+	* ace/Strategies_T.* (ACE_Hash_Addr): Eliminated the ADDR_T
+ 	  template parameter as a base class.  It is now a wholly-contained
+ 	  member of the ACE_Hash_Addr<> with conversion operators.
           This caused problems on certain compilers, notably HP-UX.
 
 Wed May 21 14:13:36 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/OS.{h,i} (difftime): Added implementation to ACE_OS.  I
-          don't expect any problems since it is in ANSI.
+	* ace/OS.{h,i} (difftime): Added implementation to ACE_OS.  I
+	  don't expect any problems since it is in ANSI.
 
-        * ace/OS.{h,i} (tempnam): Added implementation to ACE_OS.
+	* ace/OS.{h,i} (tempnam): Added implementation to ACE_OS.
 
 Wed May 21 01:17:40 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * Released version 4.2.
+	* Released version 4.2.
 
-        * ace/Acceptor.cpp (activate_svc_handler ): Removed an unnecessary
-          return 0.  Thanks to Amos Shapira <amos@dsi.co.il> for reporting
-          this.
+	* ace/Acceptor.cpp (activate_svc_handler ): Removed an unnecessary
+ 	  return 0.  Thanks to Amos Shapira <amos@dsi.co.il> for reporting
+ 	  this.
 
-        * ace/Message_Block.cpp (release): I believe that
-          ACE_Message_Block::release() should return something other than
-          0, i.e., it should return the result of release_i().  Thanks to
-          Amos Shapira <amos@dsi.co.il> for reporting this.
+	* ace/Message_Block.cpp (release): I believe that
+ 	  ACE_Message_Block::release() should return something other than
+ 	  0, i.e., it should return the result of release_i().  Thanks to
+ 	  Amos Shapira <amos@dsi.co.il> for reporting this.
 
 Wed May 21 01:17:40 1997 Per Andersson <Per.Andersson@hfera.ericsson.se>
 
-        * Moved most code from netsvcs/lib/Server_Logging_Handler.* to
-          Server_Logging_Handler_T.*.  Made template out of
-          ACE_Server_Logging_Handler and ACE_Server_Logging_Acceptor. 
-          Factorised out as much as possible to reduce code
-          duplication. The log record processing was moved from
-          ACE_Server_Logging_Handler it should now be handled by the
-          Log_Message_Receiver class. It is now possible to change 
-          how log records processed without changing code in
-          Server_Logging_Handler* and it is possible to have several
-          Server_Logging_Handlers that processes log records
-          in different ways without duplicating all the server code.
-          All that is needed is to write a new/change
-          Log_Message_Receiver and instantiate a couple of templates.
-
-        * netsvcs/lib/Server_Logging_Handler.h added lots of typedefs
-          for making template instantiations easier.
-
-        * netsvcs/lib/Server_Logging_Handler.h addad lots template
-          instatiations, there are now 58 all together.
-
-        * Added netsvc/lib/Log_Message_Receiver.{h,cpp}, implementstwo
-          simple log message receivers that prints the log record to
-          stderr. 
+	* Moved most code from netsvcs/lib/Server_Logging_Handler.* to
+	  Server_Logging_Handler_T.*.  Made template out of
+	  ACE_Server_Logging_Handler and ACE_Server_Logging_Acceptor. 
+	  Factorised out as much as possible to reduce code
+	  duplication. The log record processing was moved from
+	  ACE_Server_Logging_Handler it should now be handled by the
+	  Log_Message_Receiver class. It is now possible to change 
+	  how log records processed without changing code in
+	  Server_Logging_Handler* and it is possible to have several
+	  Server_Logging_Handlers that processes log records
+	  in different ways without duplicating all the server code.
+	  All that is needed is to write a new/change
+	  Log_Message_Receiver and instantiate a couple of templates.
+
+	* netsvcs/lib/Server_Logging_Handler.h added lots of typedefs
+	  for making template instantiations easier.
+
+	* netsvcs/lib/Server_Logging_Handler.h addad lots template
+	  instatiations, there are now 58 all together.
+
+	* Added netsvc/lib/Log_Message_Receiver.{h,cpp}, implementstwo
+	  simple log message receivers that prints the log record to
+	  stderr. 
 
 Tue May 20 13:50:17 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/config-hpux-9.x.h: Added a #define for ACE_HAS_BROKEN_ENUM,
-          ACE_HAS_IP_MULTICAST, and ACE_LACKS_GETPGID.  Thanks to Neil
-          Cohen for reporting this.  
+	* ace/config-hpux-9.x.h: Added a #define for ACE_HAS_BROKEN_ENUM,
+	  ACE_HAS_IP_MULTICAST, and ACE_LACKS_GETPGID.  Thanks to Neil
+	  Cohen for reporting this.  
 
-        * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: Replaced
-          the use of -lITsrv with -lorbixmt.  Thanks to Wei Chiang for
-          this.
+	* include/makeinclude/platform_sunos5_sunc++_orbix.GNU: Replaced
+ 	  the use of -lITsrv with -lorbixmt.  Thanks to Wei Chiang for
+ 	  this.
 
-        * include/makeinclude/platform_osf1_3.2.GNU: Make sure that all
-          the template repositories are in the same directory to work
-          around problems with the C++ compiler.  Also added -lrt to get
-          the apps and tests to run.  Thanks to Tom Dobridge for this
-          help.
+	* include/makeinclude/platform_osf1_3.2.GNU: Make sure that all
+ 	  the template repositories are in the same directory to work
+ 	  around problems with the C++ compiler.  Also added -lrt to get
+ 	  the apps and tests to run.  Thanks to Tom Dobridge for this
+ 	  help.
 
 Tue May 20 17:13:15 1997  Carlos O'Ryan  <coryan@charlie>
 
-        * ace/config-hpux-10.x-nothread.h: 
-        * ace/config-hpux-10.x-aCC.h: 
-        * ace/Stream_Modules.cpp: 
-        ACE_LACKS_STREAM_MODULES is no longer needed, moving the inclusion
-        of "ace/Task.h" to the beginning of "ace/Stream_Modules.h" solved
-        the problem nicely.
-
-        * ace/config-hpux-10.x.h: 
-        * ace/config-hpux-10.x-aCC.h: 
-        ACE_HAS_BROKEN_HPUX_TEMPLATES is not needed on newer HP/CXX
-        compilers; further, old ones will not compile ACE even if the
-        macro is defined.
-
-        * ace/Timer_List_T.h: 
-        * ace/Timer_Queue_T.i: 
-        I moved the definition of ACE_Timer_Queue_T::lock() from the .i
-        file to the .h file, HP/CXX gets completely confused otherwise.
-        I also added a number of ACE_INLINE missing in the .i file.
-
-        * ace/Stream_Modules.h: 
-        * ace/Stream_Modules.cpp: 
-        I had to move the inclusion of "ace/Task.h" outside of the
-        protections against multiple inclusion for Stream_Modules.h.
-        That seems to solve the ciclyc dependancy for
-        Task->Module->Stream_Module->Task.
-        BTW, the same thing was already done in "ace/Log_Record.h".
-        I'll try to remove the ACE_LACKS_STREAM_MODULES macro, it seems
-        that the last change makes it redundant.
-
-        * ace/Signal.cpp: 
-        HP/CXX compiler will not close the library unless
-        ACE_MAX_SIGNAL_HANDLERS is defined as "const size_t". The previous
-        definition ("size_t") did compile tough.
-
-        * ace/Log_Record.h: 
-        We need to include "ace/ACE.h" before "ace/Log_Priority.h".
-
-        * ace/Log_Priority.h: 
-        HP/CXX compiler seems to reserve a few bits in enums, so the
-        ENSURE_32_BITS trick would result in a compile time error.
-        Since HP enums are always 32 bits we could skip the definition for
-        ENSURE_32_BITS altogether, but I prefer to keep a consistent
-        namespace across plaforms, I have found a value for ENSURE_32_BITS
-        that seems to work.
-
-        * include/makeinclude/platform_hpux.GNU: 
-        Some options to improve compile time, since we use explicit
-        template instantiation there is no need for a ptcomp o ptlink
-        phase.
+	* ace/config-hpux-10.x-nothread.h: 
+	* ace/config-hpux-10.x-aCC.h: 
+	* ace/Stream_Modules.cpp: 
+	ACE_LACKS_STREAM_MODULES is no longer needed, moving the inclusion
+	of "ace/Task.h" to the beginning of "ace/Stream_Modules.h" solved
+	the problem nicely.
+
+	* ace/config-hpux-10.x.h: 
+	* ace/config-hpux-10.x-aCC.h: 
+	ACE_HAS_BROKEN_HPUX_TEMPLATES is not needed on newer HP/CXX
+	compilers; further, old ones will not compile ACE even if the
+	macro is defined.
+
+	* ace/Timer_List_T.h: 
+	* ace/Timer_Queue_T.i: 
+	I moved the definition of ACE_Timer_Queue_T::lock() from the .i
+	file to the .h file, HP/CXX gets completely confused otherwise.
+	I also added a number of ACE_INLINE missing in the .i file.
+
+	* ace/Stream_Modules.h: 
+	* ace/Stream_Modules.cpp: 
+	I had to move the inclusion of "ace/Task.h" outside of the
+	protections against multiple inclusion for Stream_Modules.h.
+	That seems to solve the ciclyc dependancy for
+	Task->Module->Stream_Module->Task.
+	BTW, the same thing was already done in "ace/Log_Record.h".
+	I'll try to remove the ACE_LACKS_STREAM_MODULES macro, it seems
+	that the last change makes it redundant.
+
+	* ace/Signal.cpp: 
+	HP/CXX compiler will not close the library unless
+	ACE_MAX_SIGNAL_HANDLERS is defined as "const size_t". The previous
+	definition ("size_t") did compile tough.
+
+	* ace/Log_Record.h: 
+	We need to include "ace/ACE.h" before "ace/Log_Priority.h".
+
+	* ace/Log_Priority.h: 
+	HP/CXX compiler seems to reserve a few bits in enums, so the
+	ENSURE_32_BITS trick would result in a compile time error.
+	Since HP enums are always 32 bits we could skip the definition for
+	ENSURE_32_BITS altogether, but I prefer to keep a consistent
+	namespace across plaforms, I have found a value for ENSURE_32_BITS
+	that seems to work.
+
+	* include/makeinclude/platform_hpux.GNU: 
+	Some options to improve compile time, since we use explicit
+	template instantiation there is no need for a ptcomp o ptlink
+	phase.
 
 Tue May 20 09:10:18 1997  Nanbor Wang  <nw1@number.wustl.edu>
 
-        * ace/config-freebsd-pthread.h: 
-        * ace/config-freebsd.h: Removed "FreeBSD" directive because gcc on
-          FreeBSD defines __FreeBSD__ automatically.
+	* ace/config-freebsd-pthread.h: 
+	* ace/config-freebsd.h: Removed "FreeBSD" directive because gcc on
+	  FreeBSD defines __FreeBSD__ automatically.
 
-        * ace/OS.i (sigaddset, sigdelset, sigismember): Added range
-          checking to these functions in order to avoid disasters.  Sig
-          number should be between 1 and NSIG.
-          (sigwait): Changed ifdef (FreeBSD) to ifdef (__FreeBSD__) since
-          compiler does it for us.      
+	* ace/OS.i (sigaddset, sigdelset, sigismember): Added range
+	  checking to these functions in order to avoid disasters.  Sig
+	  number should be between 1 and NSIG.
+	  (sigwait): Changed ifdef (FreeBSD) to ifdef (__FreeBSD__) since
+	  compiler does it for us.	
 
 Tue May 20 08:41:11 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/Threads/tss2.cpp: added #include of ace/Thread.h
-          because Sun C++ 4.1 needs it.
+	* examples/Threads/tss2.cpp: added #include of ace/Thread.h
+	  because Sun C++ 4.1 needs it.
 
 Mon May 19 16:04:32 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * bin/create_ace_build: changed startup line for compatibility
-          with bash.  This startup line lets the script run without
-          hard-coding the full path to the perl executable, as long as
-          perl is on the user's PATH.
+	* bin/create_ace_build: changed startup line for compatibility
+	  with bash.  This startup line lets the script run without
+	  hard-coding the full path to the perl executable, as long as
+	  perl is on the user's PATH.
 
 Mon May 19 12:45:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/Threads/reader_writer.cpp: Changed the code so that we
-          don't try to treat thread ids as ints!  Thanks to Chuck Gehr for
-          reporting this.
+	* examples/Threads/reader_writer.cpp: Changed the code so that we
+ 	  don't try to treat thread ids as ints!  Thanks to Chuck Gehr for
+ 	  reporting this.
 
 Sun May 18 21:57:54 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/Threads/tss2.cpp: added second parameter to
-          ACE_TSS_Singleton template specialization.
+	* examples/Threads/tss2.cpp: added second parameter to
+	  ACE_TSS_Singleton template specialization.
 
 Sun May 18 09:20:15 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/Threads/TSS_Data.h: Added the second parameter for
-          ACE_SYNCH_MUTEX since Rich and Chris updated ACE_TSS_Singleton.
+	* examples/Threads/TSS_Data.h: Added the second parameter for
+ 	  ACE_SYNCH_MUTEX since Rich and Chris updated ACE_TSS_Singleton.
 
-        * ace/Singleton.cpp: Added the updated version of
-          ACE_TSS_Singleton that implements the Double-Checked Locking
-          pattern.  Thanks to Rich Christy and Chris Lahey for this.
+	* ace/Singleton.cpp: Added the updated version of
+ 	  ACE_TSS_Singleton that implements the Double-Checked Locking
+ 	  pattern.  Thanks to Rich Christy and Chris Lahey for this.
 
-        * ace/Strategies_T.cpp (activate_svc_handler): Fixed the logic so
-          that a value is always returned.  Thanks to David Levine for
-          noticing this.
+	* ace/Strategies_T.cpp (activate_svc_handler): Fixed the logic so
+ 	  that a value is always returned.  Thanks to David Levine for
+ 	  noticing this.
 
 Sun May 18 07:25:11 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: removed second
-          ACE_Svc_Handler specialization for non-threaded, has-TLI case.
-          That's because it is the same as the first; the only difference
-          was that one specialized with ACE_SYNCH and the other with
-          ACE_NULL_SYNCH.  Without threads, those macros expand to the
-          same thing.  Thanks Sandro Doro <doros@aureus.sublink.org> for
-          reporting this.
+	* netsvcs/lib/Server_Logging_Handler.cpp: removed second
+	  ACE_Svc_Handler specialization for non-threaded, has-TLI case.
+	  That's because it is the same as the first; the only difference
+	  was that one specialized with ACE_SYNCH and the other with
+	  ACE_NULL_SYNCH.  Without threads, those macros expand to the
+	  same thing.  Thanks Sandro Doro <doros@aureus.sublink.org> for
+	  reporting this.
 
-        * examples/Threads/tss2.cpp: added ACE_TSS<TSS_Data> template
-          specialization.
+	* examples/Threads/tss2.cpp: added ACE_TSS<TSS_Data> template
+	  specialization.
 
 Sat May 17 23:24:34 1997  Nanbor Wang  <nw1@number.wustl.edu>
 
-        * ace/OS.i (sigismember): Corrected the code when
-          ACE_LACKS_SIGSET.
+	* ace/OS.i (sigismember): Corrected the code when
+	  ACE_LACKS_SIGSET.
 
 Sat May 17 00:06:04 1997    <irfan@TWOSTEP>
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp
-          (Event_Transceiver): Corrected signal registration for Win32.
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp
+	  (Event_Transceiver): Corrected signal registration for Win32.
 
-        * apps/Gateway/Gateway/Gateway.cpp (parse_args): Since the
-          Connector is now fixed, non-blocking is now working fine.
+	* apps/Gateway/Gateway/Gateway.cpp (parse_args): Since the
+ 	  Connector is now fixed, non-blocking is now working fine.
 
-        * ace/Connector.cpp (handle_close,create_AST): Made sure we close
-          down the svc_handler on error.
+	* ace/Connector.cpp (handle_close,create_AST): Made sure we close
+ 	  down the svc_handler on error.
 
-        * ace/{Acceptor.cpp,Connector.cpp} (activate_svc_handler): The
-          if statement logic in these methods was incorrect.
+	* ace/{Acceptor.cpp,Connector.cpp} (activate_svc_handler): The
+	  if statement logic in these methods was incorrect.
 
-        * ace/SOCK_Connector.cpp (connect): Just like in complete(), we
-          start out with non-blocking disabled on the <new_stream>.
+	* ace/SOCK_Connector.cpp (connect): Just like in complete(), we
+ 	  start out with non-blocking disabled on the <new_stream>.
 
-        * ace/OS.h: When ACE_LACKS_SIGSET is defined, changed the
-          definition of sigset_t from void * to unsigned int.
+	* ace/OS.h: When ACE_LACKS_SIGSET is defined, changed the
+ 	  definition of sigset_t from void * to unsigned int.
 
 Sat May 17 12:25:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/{Acceptor,Connector,Strategies_T}: Make sure to either
-          enable or disable ACE_NONBLOCK (depending on the flags).  This
-          ensures that we always start with the I/O mode set to a
-          deterministic state.  Thanks to Irfan for suggesting this.
+	* ace/{Acceptor,Connector,Strategies_T}: Make sure to either
+ 	  enable or disable ACE_NONBLOCK (depending on the flags).  This
+ 	  ensures that we always start with the I/O mode set to a
+ 	  deterministic state.  Thanks to Irfan for suggesting this.
 
-        * ace/Connector: Added a new "flags" parameter to the 
-          ACE_Connector and ACE_Strategy_Connector which keeps track of
-          flags that control how Svc_Handler are initialized prior to
-          being activated.  
+	* ace/Connector: Added a new "flags" parameter to the 
+	  ACE_Connector and ACE_Strategy_Connector which keeps track of
+	  flags that control how Svc_Handler are initialized prior to
+	  being activated.  
 
-        * ace/Strategies_T.cpp (activate_svc_handler): Make sure to set
-          the peer's handle into non-blocking mode *before* calling the
-          Svc_Handler's open() method.  This ensures that things are set
-          up correctly when this hook is called.
+	* ace/Strategies_T.cpp (activate_svc_handler): Make sure to set
+ 	  the peer's handle into non-blocking mode *before* calling the
+ 	  Svc_Handler's open() method.  This ensures that things are set
+ 	  up correctly when this hook is called.
 
 Sat May 17 02:19:27 1997  Nanbor Wang  <nw1@number.wustl.edu>
 
-        * ace/config-freebsd.h (ACE_HAS_BROKEN_TIMESPEC_MEMBERS): 
+	* ace/config-freebsd.h (ACE_HAS_BROKEN_TIMESPEC_MEMBERS): 
 
-        * ace/OS.i (set, timestruct_t, nanosleep): 
+	* ace/OS.i (set, timestruct_t, nanosleep): 
 
-        * ace/High_Res_Timer.cpp (elapsed_time): 
+	* ace/High_Res_Timer.cpp (elapsed_time): 
 
-        * ace/README: Added ACE_HAS_BROKEN_TIMESPEC_MEMBERS so that we can
-          fix that problem FreeBSD 2.1.x brings by defining timespec as {
-          time_t ts_sec ; long ts_nsec }.  Notice:  This is highly
-          non-portable.  Please refer to ACE code and see how to write
-          portable.  Fortunately, only older versions of FreeBSD have
-          this.  Yesterday's hack didn't work, so, it's removed.  Thanks
-          to Satoshi Ueno <satoshi.ueno@gs.com> for reporting and helping
-          debug on his FreeBSD 2.1.7R box.
+	* ace/README: Added ACE_HAS_BROKEN_TIMESPEC_MEMBERS so that we can
+	  fix that problem FreeBSD 2.1.x brings by defining timespec as {
+	  time_t ts_sec ; long ts_nsec }.  Notice:  This is highly
+	  non-portable.  Please refer to ACE code and see how to write
+	  portable.  Fortunately, only older versions of FreeBSD have
+	  this.  Yesterday's hack didn't work, so, it's removed.  Thanks
+	  to Satoshi Ueno <satoshi.ueno@gs.com> for reporting and helping
+	  debug on his FreeBSD 2.1.7R box.
 
 Sat May 17 00:06:04 1997    <irfan@TWOSTEP>
 
-        * apps/Gateway/Gateway/Proxy_Handler.cpp (open): Turn on
-          non-blocking I/O only after the Channel is done sending the id
-          to the Peer.
+	* apps/Gateway/Gateway/Proxy_Handler.cpp (open): Turn on
+ 	  non-blocking I/O only after the Channel is done sending the id
+ 	  to the Peer.
 
-        * apps/Gateway/Gateway/Gateway.cpp: 
+	* apps/Gateway/Gateway/Gateway.cpp: 
 
-          - Added necessary DLL build macros. 
+	  - Added necessary DLL build macros. 
 
-          - Removed error checking for Reactor::remove_handler() for STDIN
-            as STDIN is never registered with the Reactor on Win32.
+	  - Removed error checking for Reactor::remove_handler() for STDIN
+ 	    as STDIN is never registered with the Reactor on Win32.
 
-          - Fixed the registration of SIGINT.
+	  - Fixed the registration of SIGINT.
 
-          - blocking_semantics_ should be 1 when blocking is on and not 0.
+	  - blocking_semantics_ should be 1 when blocking is on and not 0.
 
-          - Since the Connector is currently broken with respect to
-            non-blocking connects, I have put a temporary fix such that
-            only blocking connects are done. Revert this after the
-            Connector is fixed.
+	  - Since the Connector is currently broken with respect to
+ 	    non-blocking connects, I have put a temporary fix such that
+ 	    only blocking connects are done. Revert this after the
+ 	    Connector is fixed.
 
-        * apps/Gateway/Gateway/Event_Channel.cpp: 
+	* apps/Gateway/Gateway/Event_Channel.cpp: 
 
-          - Only if socket_queue_size > 0, do we set a new value.
+	  - Only if socket_queue_size > 0, do we set a new value.
 
-          - In reinitiate_proxy_connection(), we must unbind the proxy
-            from the proxy_map_ as we are no longer responsible for
-            this. The Connector should now be responsible for this.
+	  - In reinitiate_proxy_connection(), we must unbind the proxy
+ 	    from the proxy_map_ as we are no longer responsible for
+ 	    this. The Connector should now be responsible for this.
 
-        * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp: Added
-          necessary DLL build macros.
+	* apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp: Added
+ 	  necessary DLL build macros.
 
-        * apps/Gateway/Peer/Peer.cpp: 
+	* apps/Gateway/Peer/Peer.cpp: 
 
-          - Added include file and necessary DLL build macros. 
+	  - Added include file and necessary DLL build macros. 
 
-          - Removed error checking for Reactor::remove_handler() for STDIN
-            as STDIN is never registered with the Reactor on Win32.
+	  - Removed error checking for Reactor::remove_handler() for STDIN
+ 	    as STDIN is never registered with the Reactor on Win32.
 
-          - Fixed the registration of SIGINT.
+	  - Fixed the registration of SIGINT.
 
-        * apps/Gateway/{Peer,Gateway}: Added Win32 makefiles.
+	* apps/Gateway/{Peer,Gateway}: Added Win32 makefiles.
 
-        * ace/ACE.cpp (read_adapter): Handle for the read_adapter should
-          always be STDIN.
+	* ace/ACE.cpp (read_adapter): Handle for the read_adapter should
+ 	  always be STDIN.
 
 Fri May 16 18:43:17 1997  Nanbor Wang  <nw1@number.wustl.edu>
 
-        * ace/config-freebsd.h: Minor modification for working on FreeBSD
-          2.1.x platform.  Added includion of <sys/time.h> and
-          <sys/types.h>.  Defined ACE_HAS_POSIX_TIME for 2.1.x.  Redefine
-          timespec to timeval to hack around a bug on 2.1.x.  Thanks to
-          Satoshi Ueno <satoshi.ueno@gs.com> for reporting this.
-        
+	* ace/config-freebsd.h: Minor modification for working on FreeBSD
+	  2.1.x platform.  Added includion of <sys/time.h> and
+	  <sys/types.h>.  Defined ACE_HAS_POSIX_TIME for 2.1.x.  Redefine
+	  timespec to timeval to hack around a bug on 2.1.x.  Thanks to
+	  Satoshi Ueno <satoshi.ueno@gs.com> for reporting this.
+	
 Fri May 16 12:25:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * netsvcs/lib: Reverted back to the original Server_Logging_Handler 
-          behavior since the new version is breaking GCC's templates.
+	* netsvcs/lib: Reverted back to the original Server_Logging_Handler 
+	  behavior since the new version is breaking GCC's templates.
 
-        * ace/Log_Record.h: need to #include "ace/ACE.h" before
-          "ace/Log_Priority.h" so that "Log_Priority.h" sees the
-          configuration stuff (otherwise the following fix won't work).
+	* ace/Log_Record.h: need to #include "ace/ACE.h" before
+	  "ace/Log_Priority.h" so that "Log_Priority.h" sees the
+	  configuration stuff (otherwise the following fix won't work).
 
-        * ace/Log_Priority.h: Added a workaround for lame C++ compilers
-          like the one on HP/UX that can't support large enums.  Thanks to
-          Robert Head for reporting this.
+	* ace/Log_Priority.h: Added a workaround for lame C++ compilers
+ 	  like the one on HP/UX that can't support large enums.  Thanks to
+ 	  Robert Head for reporting this.
 
-        * ace/Singleton: Added the new ACE_TSS_Singleton, which stores
-          Singletons in thread-specific storage.  Thanks to Chris Lahey
-          and Rich Christy <rchristy@cccis.com> for this.
+	* ace/Singleton: Added the new ACE_TSS_Singleton, which stores
+ 	  Singletons in thread-specific storage.  Thanks to Chris Lahey
+ 	  and Rich Christy <rchristy@cccis.com> for this.
 
-        * ace/OS.h: Removed the ACE_Singleton_Strategy since we don't need
-          it anymore.
+	* ace/OS.h: Removed the ACE_Singleton_Strategy since we don't need
+ 	  it anymore.
 
-        * netsvcs/lib: Added the new Server_Logging_Handler_T.* and
-          Log_Message_Receiver.* netsvcs.  Thanks to Per Andersson for
-          contributing these.
+	* netsvcs/lib: Added the new Server_Logging_Handler_T.* and
+ 	  Log_Message_Receiver.* netsvcs.  Thanks to Per Andersson for
+ 	  contributing these.
 
-        * examples/Misc/Makefile: Removed the XtReactor tests from the
-          Makefile until we figure out a good way to get them integrated
-          with the appropriate libraries.
+	* examples/Misc/Makefile: Removed the XtReactor tests from the
+ 	  Makefile until we figure out a good way to get them integrated
+ 	  with the appropriate libraries.
 
-        * ace/config-irix6.2-sgic++-nothread.h: Added the following:
+	* ace/config-irix6.2-sgic++-nothread.h: Added the following:
 
-          ACE_LACKS_LINEBUFFERED_STREAMBUF
-          ACE_HAS_SETOWN
-          ACE_HAS_SYSENT_H
-          ACE_HAS_SYSINFO
+	  ACE_LACKS_LINEBUFFERED_STREAMBUF
+	  ACE_HAS_SETOWN
+	  ACE_HAS_SYSENT_H
+	  ACE_HAS_SYSINFO
 
-          Thanks to Torbjorn Lindgren <tl@funcom.com> for reporting
-          this.
+	  Thanks to Torbjorn Lindgren <tl@funcom.com> for reporting
+	  this.
 
-        * ace/Proactor.cpp: Changed the use of lock() to mutex() since we
-          changed the name in Timer_Queue.
+	* ace/Proactor.cpp: Changed the use of lock() to mutex() since we
+ 	  changed the name in Timer_Queue.
 
-        * ace/Timer_Queue_T.i: Changed the name of the lock() method to
-          mutex() to work around compile problems with HP/UX.  Thanks to
-          Robert Head <rhead@mail.virtc.com> for reporting this
-          workaround.
+	* ace/Timer_Queue_T.i: Changed the name of the lock() method to
+ 	  mutex() to work around compile problems with HP/UX.  Thanks to
+ 	  Robert Head <rhead@mail.virtc.com> for reporting this
+ 	  workaround.
 
-        * ace/config-irix5.3-sgic++.h: Made a few changes to get ACE to
-          work on IRIX 5.3.  Thanks to Eugene R. Somdahl <gene@endo.com>
-          for these fixes.
+	* ace/config-irix5.3-sgic++.h: Made a few changes to get ACE to
+ 	  work on IRIX 5.3.  Thanks to Eugene R. Somdahl <gene@endo.com>
+ 	  for these fixes.
 
-        * ace/OS: Added calloc() implementation.  I don't know how
-          this managed to fall through the cracks!
+	* ace/OS: Added calloc() implementation.  I don't know how
+	  this managed to fall through the cracks!
 
-        * include/makeinclude/platform_osf1_4.0.GNU: Added a few more
-          tweaks courtesy of James Johnson.
+	* include/makeinclude/platform_osf1_4.0.GNU: Added a few more
+ 	  tweaks courtesy of James Johnson.
 
-        * include/makeinclude/platform_osf1_3.2.GNU: Added a few more
-          tweaks courtesy of Tom Dobridge.
+	* include/makeinclude/platform_osf1_3.2.GNU: Added a few more
+	  tweaks courtesy of Tom Dobridge.
 
-        * include/makeinclude/platform_osf1_4.0.GNU (DLD): Added -shared
-          -expect_unresolved '*' so that calls to the linker via cxx will
-          work correctly.  Thanks to Thilo for this.
+	* include/makeinclude/platform_osf1_4.0.GNU (DLD): Added -shared
+ 	  -expect_unresolved '*' so that calls to the linker via cxx will
+ 	  work correctly.  Thanks to Thilo for this.
 
-        * include/makeinclude/platform_chorus.GNU: Removed CLASSIXDIR =
-           /usr/home/chiang/chorus/merge/extended-i386at, added the
-           nostdinc flag, and removed extra whitespace.  Thanks to Wei
-           Chiang for reporting this.
+	* include/makeinclude/platform_chorus.GNU: Removed CLASSIXDIR =
+ 	   /usr/home/chiang/chorus/merge/extended-i386at, added the
+ 	   nostdinc flag, and removed extra whitespace.  Thanks to Wei
+ 	   Chiang for reporting this.
 
 Fri May 16 00:02:33 1997 <irfan@TWOSTEP>
 
-        * ace/ReactorEx: Even though changes to the owner field are very
-          well synchronized within the class code, the owner()
-          accessor is public and can be called from out side the
-          class. Therefore, I have added a owner_i() that does not do
-          locking. All internal calls to check the owner will use the
-          new accessor, whereas application code outside the class can
-          still use the old synchronized accessor.
+	* ace/ReactorEx: Even though changes to the owner field are very
+ 	  well synchronized within the class code, the owner()
+	  accessor is public and can be called from out side the
+	  class. Therefore, I have added a owner_i() that does not do
+	  locking. All internal calls to check the owner will use the
+	  new accessor, whereas application code outside the class can
+	  still use the old synchronized accessor.
 
 Fri May 16 11:39:51 1997  Nanbor Wang  <nw1@cs.wustl.edu>
 
-        * ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset,
-          sigismember): Added implementation when ACE_LACKS_SIGSET so that
-          platforms (NT?) without these functions can still manipulate
-          sigset_t variables.
+	* ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset,
+	  sigismember): Added implementation when ACE_LACKS_SIGSET so that
+ 	  platforms (NT?) without these functions can still manipulate
+ 	  sigset_t variables.
 
 Thu May 15 22:19:59 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * examples/ASX/Event_Server/Event_Server: Removed the THR_DETACHED
-          flag from options so that we can wait on the threads
-          correctly.
+	* examples/ASX/Event_Server/Event_Server: Removed the THR_DETACHED
+	  flag from options so that we can wait on the threads
+	  correctly.
 
-        * ace/Stream_Modules.cpp: Changed the logic for determining when
-          to compile the Stream_Modules.cpp code.  Now, we compile it
-          unless ACE_LACKS_STREAM_MODULES is defined (i.e., we're on HP/UX
-          10.x using aCC).
+	* ace/Stream_Modules.cpp: Changed the logic for determining when
+ 	  to compile the Stream_Modules.cpp code.  Now, we compile it
+ 	  unless ACE_LACKS_STREAM_MODULES is defined (i.e., we're on HP/UX
+ 	  10.x using aCC).
 
-        * netsvcs/lib/Server_Logging_Handler.cpp (handle_input): Fixed
-          a bug in handle_input() where we need to return the result, not 
-          just 0 or 1.  Thanks to Per Andersson for reporting this.
+	* netsvcs/lib/Server_Logging_Handler.cpp (handle_input): Fixed
+	  a bug in handle_input() where we need to return the result, not 
+	  just 0 or 1.  Thanks to Per Andersson for reporting this.
 
-        * ace/Log_Priority.h: Changed the values of the enums in
-          ACE_Log_Priority so that they can be dealt with via bitwise
-          operations.  Thanks to Per Andersson for this.
+	* ace/Log_Priority.h: Changed the values of the enums in
+ 	  ACE_Log_Priority so that they can be dealt with via bitwise
+ 	  operations.  Thanks to Per Andersson for this.
 
-        * include/makeinclude/platform_osf1_4.0.GNU: Added support for
-          templates.  Thanks to Steve Huston and James Johnson for
-          verifying this.
+	* include/makeinclude/platform_osf1_4.0.GNU: Added support for
+ 	  templates.  Thanks to Steve Huston and James Johnson for
+ 	  verifying this.
 
-        * include/makeinclude/platform_osf1_3.2.GNU: Got rid of all
-          unresolved symbol warnings using cxx 5.5 on DEC/OSF v3.2 by
-          using the linker flag "-expect_unresolved '*'."  In addition, I
-          added -threads to the DCFLAGS macro.  Thanks to Tom Dobridge
-          <dobridge@persimmon.com> for this.
+	* include/makeinclude/platform_osf1_3.2.GNU: Got rid of all
+ 	  unresolved symbol warnings using cxx 5.5 on DEC/OSF v3.2 by
+ 	  using the linker flag "-expect_unresolved '*'."  In addition, I
+ 	  added -threads to the DCFLAGS macro.  Thanks to Tom Dobridge
+ 	  <dobridge@persimmon.com> for this.
 
-        * ace/Strategies_T: Added a minor ACE_Reactive_Strategy extension
-          to enable non-blocking I/O in active_svc_handler().  Thanks to
-          Arturo Montes <mitosys@colomsat.net.co> for contributing this.
+	* ace/Strategies_T: Added a minor ACE_Reactive_Strategy extension
+ 	  to enable non-blocking I/O in active_svc_handler().  Thanks to
+ 	  Arturo Montes <mitosys@colomsat.net.co> for contributing this.
 
-        * ace/config-osf1-4.0[-g++].h: Added a #define for
-          ACE_POLL_IS_BROKEN since DEC UNIX's poll() doesn't seem to work
-          correctly as a highres timer.  Thanks to James Johnson and Thilo
-          for reporting this.
+	* ace/config-osf1-4.0[-g++].h: Added a #define for
+ 	  ACE_POLL_IS_BROKEN since DEC UNIX's poll() doesn't seem to work
+ 	  correctly as a highres timer.  Thanks to James Johnson and Thilo
+ 	  for reporting this.
 
-        * examples/Threads/thread_specific.cpp (worker): Changes
-          size_t i back to int i to avoid a signed/unsigned complaint.
-          Thanks to David Levine for reporting this.
+	* examples/Threads/thread_specific.cpp (worker): Changes
+	  size_t i back to int i to avoid a signed/unsigned complaint.
+	  Thanks to David Levine for reporting this.
 
-        * ace/config-chorus.h: Added ACE_LACKS_MPROTECT,
-          ACE_HAS_IP_MULTICAST, and ACE_LACKS_SOCKETPAIR to the Chorus
-          port.  Thanks to Wei Chiang <chiang@erebor.tele.nokia.fi> for
-          reporting this.
+	* ace/config-chorus.h: Added ACE_LACKS_MPROTECT,
+ 	  ACE_HAS_IP_MULTICAST, and ACE_LACKS_SOCKETPAIR to the Chorus
+ 	  port.  Thanks to Wei Chiang <chiang@erebor.tele.nokia.fi> for
+ 	  reporting this.
 
-        * ace/OS.i: Added ACE_LACKS_ACCESS to the Chorus config file
-          and VxWorks config file, as well as to OS.i.
+	* ace/OS.i: Added ACE_LACKS_ACCESS to the Chorus config file
+ 	  and VxWorks config file, as well as to OS.i.
 
-:       * ace/OS.i: Added ACE_LACKS_GETSERVBYNAME to the Chorus config
-          file and VxWorks config file, as well as to OS.i.
+: 	* ace/OS.i: Added ACE_LACKS_GETSERVBYNAME to the Chorus config
+ 	  file and VxWorks config file, as well as to OS.i.
 
-        * ace/OS.i: Added ACE_LACKS_SBRK to the Chorus config file, as
-          well as to the definition of the ACE_OS::sbrk() function.
+	* ace/OS.i: Added ACE_LACKS_SBRK to the Chorus config file, as
+ 	  well as to the definition of the ACE_OS::sbrk() function.
 
-        * ace/OS.h: Removed #include /**/ <pwd.h> from the Chorus-specific
-          part of OS.h since it's already included elsewhere.  Thanks to
-          Wei Chiang <chiang@erebor.tele.nokia.fi> for reporting this.
+	* ace/OS.h: Removed #include /**/ <pwd.h> from the Chorus-specific
+ 	  part of OS.h since it's already included elsewhere.  Thanks to
+ 	  Wei Chiang <chiang@erebor.tele.nokia.fi> for reporting this.
 
-        * ace/Reactor: Added a typedef for ACE_Reactor_Token to
-          ACE_Null_Mutex for situations where ACE_MT_SAFE is *disabled*.
-          This makes the code more consistent.
+	* ace/Reactor: Added a typedef for ACE_Reactor_Token to
+ 	  ACE_Null_Mutex for situations where ACE_MT_SAFE is *disabled*.
+  	  This makes the code more consistent.
 
-        * ace/Reactor: Added an interface that makes it possible to
-          acquire a reference to the <ACE_Reactor_Token> that is used to
-          serialize the internal Reactor's processing logic.  This can be
-          useful for situations where you need to avoid deadlock
-          efficiently when <ACE_Event_Handlers> are used in multiple
-          threads.  Thanks to Detlef for pointing out the utility of this.
+	* ace/Reactor: Added an interface that makes it possible to
+ 	  acquire a reference to the <ACE_Reactor_Token> that is used to
+ 	  serialize the internal Reactor's processing logic.  This can be
+ 	  useful for situations where you need to avoid deadlock
+ 	  efficiently when <ACE_Event_Handlers> are used in multiple
+ 	  threads.  Thanks to Detlef for pointing out the utility of this.
 
 Thu May 15 23:34:30 1997  Tim H. Harrison  <harrison@waltz.cs.wustl.edu>
 
-        * ace/Process_Manager.cpp (spawn_n): Changed
-          ACE_Process_Manager::start_n to ACE_Process_Manager::spawn_n.
+	* ace/Process_Manager.cpp (spawn_n): Changed
+	  ACE_Process_Manager::start_n to ACE_Process_Manager::spawn_n.
 
 Thu May 15 15:39:13 1997  Carlos O'Ryan  <coryan@charlie>
 
-        * include/makeinclude/platform_hpux.GNU: 
-        * ace/config-hpux-10.x.h: 
-        * ace/config-hpux-10.x-nothread.h: 
-          HP/CXX cannot achieve template closure, not even using the
-          dummy exec trick: apparently the repository gets a bit
-          corrupted. HP/CXX (version 10.24) support explicit template
-          instantiation, I believe this to be a superior method for
-          ensuring library closure (and it works).
+	* include/makeinclude/platform_hpux.GNU: 
+ 	* ace/config-hpux-10.x.h: 
+ 	* ace/config-hpux-10.x-nothread.h: 
+ 	  HP/CXX cannot achieve template closure, not even using the
+	  dummy exec trick: apparently the repository gets a bit
+	  corrupted. HP/CXX (version 10.24) support explicit template
+	  instantiation, I believe this to be a superior method for
+	  ensuring library closure (and it works).
  
-        * ace/Task_T.cpp: 
-        * ace/Stream_Modules.cpp: 
-          I have changed the hack to compile under HP-UX,
-          "ace/Module.h" is once more included in ace/Task_T.cpp, but
-          "ace/Stream_Modules.cpp" is protected: it will be empty
-          under HP-UX unless included from the
-          "ace/Stream_Modules.h". I still believe that there is a
-          problem in the cyclic dependancy Task -> Module -> Thru_Task
-          -> Task; but it seems that the current hack works better.
+ 	* ace/Task_T.cpp: 
+	* ace/Stream_Modules.cpp: 
+ 	  I have changed the hack to compile under HP-UX,
+	  "ace/Module.h" is once more included in ace/Task_T.cpp, but
+	  "ace/Stream_Modules.cpp" is protected: it will be empty
+	  under HP-UX unless included from the
+	  "ace/Stream_Modules.h". I still believe that there is a
+	  problem in the cyclic dependancy Task -> Module -> Thru_Task
+	  -> Task; but it seems that the current hack works better.
  
-        * ace/OS.h: 
-          Defining ACE_UNUSED_ARG as (a) for HP/CXX does not work so I
-          moved it to the SGI and GCC definition.
+	* ace/OS.h: 
+ 	  Defining ACE_UNUSED_ARG as (a) for HP/CXX does not work so I
+	  moved it to the SGI and GCC definition.
 
-        * ace/OS.i: 
-          More unused args.
+ 	* ace/OS.i: 
+	  More unused args.
 
-        * ace/Handle_Set.h: 
-          Removed the extra qualification for ACE_Handle_Set::NBITS,
-          HP/CXX sends a lot of warnings with that.
+ 	* ace/Handle_Set.h: 
+	  Removed the extra qualification for ACE_Handle_Set::NBITS,
+	  HP/CXX sends a lot of warnings with that.
  
-        * ace/IOStream.h: 
-          It included "IOStream.cpp" I think that "ace/IOStream.cpp"
-          is better. 
+ 	* ace/IOStream.h: 
+	  It included "IOStream.cpp" I think that "ace/IOStream.cpp"
+	  is better. 
  
-        * ace/Local_Name_Space_T.h: 
-          Ditto for "Local_Name_Space.h"
+	* ace/Local_Name_Space_T.h: 
+	  Ditto for "Local_Name_Space.h"
 
 Thu May 15 17:40:06 1997    <irfan@TWOSTEP>
 
-        * ace/ReactorEx.i (owner): Since changes to the owner field are
-          very well synchronized, we do not need to synchronize this
-          accessor.
+	* ace/ReactorEx.i (owner): Since changes to the owner field are
+ 	  very well synchronized, we do not need to synchronize this
+ 	  accessor.
 
-        * ace/IOStream.h: Added /**/ after #include directives.
-        
-        * ace: Update Win32 makefiles to include UNICODE make option.
+	* ace/IOStream.h: Added /**/ after #include directives.
+	
+	* ace: Update Win32 makefiles to include UNICODE make option.
 
 Thu May 15 08:54:53 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile (release, cleanrelease): use -prune option to "find"
-          instead of filtering its output.  Thanks to Chris Cleeland for
-          suggesting this.
+	* Makefile (release, cleanrelease): use -prune option to "find"
+	  instead of filtering its output.  Thanks to Chris Cleeland for
+	  suggesting this.
 
 Wed May 14 21:52:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/UPIPE_Stream.cpp (control): We need to "cast away const" so
-          that this method can call the Stream's control() method
-          (which is non-const).  Thanks to David Levine for locating this.
+	* ace/UPIPE_Stream.cpp (control): We need to "cast away const" so
+ 	  that this method can call the Stream's control() method
+	  (which is non-const).  Thanks to David Levine for locating this.
 
-        * ace/Singleton.cpp: Finished re-implementing ACE_Singleton.
+	* ace/Singleton.cpp: Finished re-implementing ACE_Singleton.
 
-        * examples/ASX/Message_Queue/buffer_stream.cpp: Updated this
-          example to illustrate (1) how filters work in an ACE_Stream and
-          (2) to make sure that resizing buffers work.
+	* examples/ASX/Message_Queue/buffer_stream.cpp: Updated this
+ 	  example to illustrate (1) how filters work in an ACE_Stream and
+	  (2) to make sure that resizing buffers work.
 
-        * ace/UPIPE_Stream.h: Changed the signature of control()
-          to take an int so that it will match the base class
-          signature.
+	* ace/UPIPE_Stream.h: Changed the signature of control()
+	  to take an int so that it will match the base class
+	  signature.
 
-        * ace/Singleton.h: The new ACE_SingletonEx isn't working yet.
-          I've #ifdef'd it out until it works.
+	* ace/Singleton.h: The new ACE_SingletonEx isn't working yet.
+  	  I've #ifdef'd it out until it works.
 
-        * examples/Threads/tss2.cpp: Updated this test program to
-          illustrate the use of the new ACE_SingletonEx class.
+	* examples/Threads/tss2.cpp: Updated this test program to
+ 	  illustrate the use of the new ACE_SingletonEx class.
 
-        * ace/Singleton.h: Added a new instance() method to the ACE
-          Singleton that can be used to set the Singleton.  This is useful
-          for situations where the type being used as the Singleton
-          doesn't have a default constructor.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for this suggestion.
+	* ace/Singleton.h: Added a new instance() method to the ACE
+ 	  Singleton that can be used to set the Singleton.  This is useful
+ 	  for situations where the type being used as the Singleton
+ 	  doesn't have a default constructor.  Thanks to Arturo Montes
+ 	  <mitosys@colomsat.net.co> for this suggestion.
 
-        * ace/Singleton: Factored out common code in the Singleton and
-          SingletonEx implementations so they will be cleaner and more
-          portable.
+	* ace/Singleton: Factored out common code in the Singleton and
+ 	  SingletonEx implementations so they will be cleaner and more
+ 	  portable.
 
-        * ace/Local_Name_Space_T.h,
-          ace/Map_Manager.h,
-          ace/Hash_Map_Manager.h,
-          ace/SString.h,
-          ace/Hash_Map_Manager.cpp: 
-        
-          Changed all uses of the identifier "allocator" to "alloc" to
-          avoid conflicts with MSVC++ STL 5.0.  Thanks to William
-          L. Gerecke <gerecke@rayva.org> for reporting this.
+	* ace/Local_Name_Space_T.h,
+	  ace/Map_Manager.h,
+	  ace/Hash_Map_Manager.h,
+	  ace/SString.h,
+	  ace/Hash_Map_Manager.cpp: 
+	
+	  Changed all uses of the identifier "allocator" to "alloc" to
+ 	  avoid conflicts with MSVC++ STL 5.0.  Thanks to William
+ 	  L. Gerecke <gerecke@rayva.org> for reporting this.
 
-        * ace/config-aix-4.[12].x.h: Replaces
-          ACE_LACKS_PTHREAD_THR_SIGSETMASK with ACE_HAS_SIGTHREADMASK.
-          Thanks to Chris Lahey for this.
+	* ace/config-aix-4.[12].x.h: Replaces
+ 	  ACE_LACKS_PTHREAD_THR_SIGSETMASK with ACE_HAS_SIGTHREADMASK.
+  	  Thanks to Chris Lahey for this.
 
-        * ace/OS.i (thr_sigsetmask): Added the ACE_HAS_SIGTHREADMASK
-          support for AIX.  Thanks to Chris Lahey for this.
+	* ace/OS.i (thr_sigsetmask): Added the ACE_HAS_SIGTHREADMASK
+ 	  support for AIX.  Thanks to Chris Lahey for this.
 
-        * ace/Singleton: Added the new ACE_SingletonEx, which supports
-          both heap-based and thread-specific storage-based Singletons.
-          Thanks to Chris Lahey for this.
+	* ace/Singleton: Added the new ACE_SingletonEx, which supports
+ 	  both heap-based and thread-specific storage-based Singletons.
+  	  Thanks to Chris Lahey for this.
 
-        * ace/OS.h: Added the new ACE_Singleton_Strategy to OS.h.  Thanks
-          to Chris Lahey for this.
+	* ace/OS.h: Added the new ACE_Singleton_Strategy to OS.h.  Thanks
+ 	  to Chris Lahey for this.
 
 Wed May 14 16:32:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile: use cpio instead of tar to allow easy filtering
-          of CVS files from the release.
+	* Makefile: use cpio instead of tar to allow easy filtering
+	  of CVS files from the release.
 
 Wed May 14 15:00:58 1997    <irfan@TWOSTEP>
 
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (main): Fixed code.
+	* examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (main): Fixed code.
 
-        * examples/Naming: Replaced multiple makefiles with one makefile.
+	* examples/Naming: Replaced multiple makefiles with one makefile.
 
-        * ace/OS.h: Added UNICODE support for some #defines.
+	* ace/OS.h: Added UNICODE support for some #defines.
 
-        * OS.i (vsprintf): Added support for this in ACE_OS.
+	* OS.i (vsprintf): Added support for this in ACE_OS.
 
-        * OS.cpp (socket_init && socket_fini): It is ok to print out cout
-          and cerr messages from here (as the C runtime library is still
-          attached) but it is *not* ok to print out ACE_DEBUG
-          messages. God only knows the state of the thread specific LogMsg
-          instance when the process reaches this piece of code.
+	* OS.cpp (socket_init && socket_fini): It is ok to print out cout
+ 	  and cerr messages from here (as the C runtime library is still
+ 	  attached) but it is *not* ok to print out ACE_DEBUG
+ 	  messages. God only knows the state of the thread specific LogMsg
+ 	  instance when the process reaches this piece of code.
 
-          Also added a (handy) sprintf that has the following prototype:
+	  Also added a (handy) sprintf that has the following prototype:
 
-          sprintf (wchar_t *buf, const char *format, ...)
+	  sprintf (wchar_t *buf, const char *format, ...)
 
-        * ace/Process: UNICODE fixes.
+	* ace/Process: UNICODE fixes.
 
-        * tests: Fixed the following such that they work with UNICODE:
+	* tests: Fixed the following such that they work with UNICODE:
 
-          Pipe_Test.cpp 
-          Process_Mutex_Test.cpp 
-          Process_Strategy_Test.cpp 
-          Time_Service_Test.cpp 
-          Tokens_Test.cpp
+	  Pipe_Test.cpp 
+	  Process_Mutex_Test.cpp 
+	  Process_Strategy_Test.cpp 
+	  Time_Service_Test.cpp 
+	  Tokens_Test.cpp
 
-        * Time_Service_Test.cpp (main): Fixed typo in the svc.conf
-          filename for the clerk.
+	* Time_Service_Test.cpp (main): Fixed typo in the svc.conf
+ 	  filename for the clerk.
 
 Tue May 13 18:56:27 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/IOStream.h: To make C++ compilers happy I added
-          the following changes by modifying
+	* ace/IOStream.h: To make C++ compilers happy I added
+	  the following changes by modifying
 
-          ACE_IOStream & operator>>( ACE_Time_Value *& tv );
+	  ACE_IOStream & operator>>( ACE_Time_Value *& tv );
 
-          to be
+	  to be
 
-          ACE_IOStream<STREAM> & operator>>( ACE_Time_Value *& tv );
+	  ACE_IOStream<STREAM> & operator>>( ACE_Time_Value *& tv );
 
-          Thanks to Chuck Gehr for this fix.
+	  Thanks to Chuck Gehr for this fix.
 
 Tue May 13 21:32:12 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Process.cpp (~ACE_Process_Options): delete
-          command_line_buf_ was missing the [].
+	* ace/Process.cpp (~ACE_Process_Options): delete
+	  command_line_buf_ was missing the [].
 
-        * examples/Threads/process_manager.cpp (main): avoid compiler
-          warning due to implicit creation of temporary by explicitly
-          creating an ACE_Process_Options instance.  It gets passed to
-          ACE_Process_Manager::spawn (ACE_Process_Options &), which
-          takes a non-const reference.
+	* examples/Threads/process_manager.cpp (main): avoid compiler
+	  warning due to implicit creation of temporary by explicitly
+	  creating an ACE_Process_Options instance.  It gets passed to
+	  ACE_Process_Manager::spawn (ACE_Process_Options &), which
+	  takes a non-const reference.
 
 Tue May 13 18:08:32 1997    <irfan@TWOSTEP>
 
-        * examples/ASX/UPIPE_Event_Server: Made enough fixes for this to
-          compile on Win32 but more work need to be done for this to
-          work on Win32.
+	* examples/ASX/UPIPE_Event_Server: Made enough fixes for this to
+ 	  compile on Win32 but more work need to be done for this to
+	  work on Win32.
 
-        * ace/OS.i (kill): The error result for ::OpenProcess() is null
-          and *not* invalid handle.
+	* ace/OS.i (kill): The error result for ::OpenProcess() is null
+	  and *not* invalid handle.
 
-        * ace/Process.i (kill): Changed the implementation to remove the
-          ACE_OS::kill() code from ACE_Process::kill() for Win32. This
-          allows us to avoid calling ::OpenProcess() unnecessarily.
+	* ace/Process.i (kill): Changed the implementation to remove the
+ 	  ACE_OS::kill() code from ACE_Process::kill() for Win32. This
+	  allows us to avoid calling ::OpenProcess() unnecessarily.
 
-        * tests: For Win32, added Reactor_Exceptions_Test and
-          Priority_Tasks_Tests. Files changes include run_tests.bat,
-          tests.mak, and tests.mdp.
+	* tests: For Win32, added Reactor_Exceptions_Test and
+	  Priority_Tasks_Tests. Files changes include run_tests.bat,
+	  tests.mak, and tests.mdp.
 
-        * tests/Future_Test.cpp (main): Fixed memory leaks in main() and
-          in name_i().
+	* tests/Future_Test.cpp (main): Fixed memory leaks in main() and
+	  in name_i().
 
-        * tests/Thread_Pool_Test.cpp (open): The loop was messed up
-          causing memory leaks. I fixed it.
+	* tests/Thread_Pool_Test.cpp (open): The loop was messed up
+	  causing memory leaks. I fixed it.
 
-        * ace/UPIPE_Stream.cpp (close): I am not sure why the stream was
-          closed with M_DELETE_NONE. This indicates that close() should
-          not delete any Tasks. This caused a memory leak as the Tasks in
-          the Tail and Head modules were not deleted. I have removed this
-          to fix the memory leak.
+	* ace/UPIPE_Stream.cpp (close): I am not sure why the stream was
+ 	  closed with M_DELETE_NONE. This indicates that close() should
+ 	  not delete any Tasks. This caused a memory leak as the Tasks in
+ 	  the Tail and Head modules were not deleted. I have removed this
+ 	  to fix the memory leak.
 
-          Also added a destructor such that mb_last_ is released if it is
-          still around. 
+	  Also added a destructor such that mb_last_ is released if it is
+	  still around. 
 
 Tue May 13 16:48:18 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/Process.cpp: Added implementations to new interfaces
-          to ACE_Process_Options::setenv (char *envp[]), and
-          ACE_Process_Options::command_line (char *argv[]).
+	* ace/Process.cpp: Added implementations to new interfaces
+	  to ACE_Process_Options::setenv (char *envp[]), and
+	  ACE_Process_Options::command_line (char *argv[]).
 
-        * apps/JAWS/server/HTTP_Response.cpp: Required changes so that CGI
-          processing will work with the new ACE_Process class.
+	* apps/JAWS/server/HTTP_Response.cpp: Required changes so that CGI
+	  processing will work with the new ACE_Process class.
 
-        * apps/JAWS/stress_testing/benchd.cpp: Requried changes due to
-          changes in the ACE_Process interface.
+	* apps/JAWS/stress_testing/benchd.cpp: Requried changes due to
+	  changes in the ACE_Process interface.
 
 Tue May 13 15:22:01 1997  Tim H. Harrison  <harrison@waltz.cs.wustl.edu>
 
-        * ace/Process_Manager.h:  Changed ACE_Process_Manager::start to
-          ACE_Process_Manager::spawn.
+	* ace/Process_Manager.h:  Changed ACE_Process_Manager::start to
+	  ACE_Process_Manager::spawn.
 
-        * ace/Process.cpp (spawn): The check for a null environment argv
-          was incorrect.  Thanks to Nanbor for finding this.
+	* ace/Process.cpp (spawn): The check for a null environment argv
+	  was incorrect.  Thanks to Nanbor for finding this.
 
 Mon May 12 18:59:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-mvs.h: conditionally use ACE_HAS_UCONTEXT_T or
-          ACE_LACKS_UCONTEXT_H depending on __COMPILER_VER__.  Thanks to
-          Chuck Gehr <gehr@sweng.stortek.com> for this fix.
+	* ace/config-mvs.h: conditionally use ACE_HAS_UCONTEXT_T or
+	  ACE_LACKS_UCONTEXT_H depending on __COMPILER_VER__.  Thanks to
+	  Chuck Gehr <gehr@sweng.stortek.com> for this fix.
 
-        * OS.h, OS.cpp (thr_create), Task.h, Thread.h, Thread_Manager.h:
-          use ACE_DEFAULT_THREAD_PRIORITY instead of -1, because -1 is a
-          valid priority on Win32.  Thanks to Irfan for discovering this
-          problem with Priority_Task_Test.
+	* OS.h, OS.cpp (thr_create), Task.h, Thread.h, Thread_Manager.h:
+	  use ACE_DEFAULT_THREAD_PRIORITY instead of -1, because -1 is a
+	  valid priority on Win32.  Thanks to Irfan for discovering this
+	  problem with Priority_Task_Test.
 
-        * ace/Thread_Manager.cpp (wait_grp,wait_task): changed type of loop
-          index "i" from size_t to int to avoid signed/unsigned comparison.
+	* ace/Thread_Manager.cpp (wait_grp,wait_task): changed type of loop
+	  index "i" from size_t to int to avoid signed/unsigned comparison.
 
 Mon May 12 18:41:19 1997  Nanbor Wang  <nw1@cs.wustl.edu>
 
-        * ace/config-freebsd-pthread.h: 
-        * ace/config-freebsd.h: Added ACE_LACKS_RWLOCK_T to FreeBSD config
-          files.  Thanks to Amancio Hasty <hasty@rah.star-gate.com> for
-          noticing this. 
+	* ace/config-freebsd-pthread.h: 
+	* ace/config-freebsd.h: Added ACE_LACKS_RWLOCK_T to FreeBSD config
+	  files.  Thanks to Amancio Hasty <hasty@rah.star-gate.com> for
+	  noticing this. 
 
 Mon May 12 17:11:50 1997  Tim H. Harrison  <harrison@waltz.cs.wustl.edu>
 
-        * ace/Process.h: Changed ACE_Process::start to
-          ACE_Process::spawn.  Added new argv-style methods for
-          ACE_Process::setenv and ACE_Process::command_line.  These new
-          argv-style methods do not have implementations yet.
+	* ace/Process.h: Changed ACE_Process::start to
+	  ACE_Process::spawn.  Added new argv-style methods for
+	  ACE_Process::setenv and ACE_Process::command_line.  These new
+	  argv-style methods do not have implementations yet.
 
 Mon May 12 15:27:41 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/config-aix-4.[12].x.h: Added ACE_HAS_EXCEPTIONS to
-          the AIX 4.* config files.  Thanks to Chris Lahey for this.
+	* ace/config-aix-4.[12].x.h: Added ACE_HAS_EXCEPTIONS to
+	  the AIX 4.* config files.  Thanks to Chris Lahey for this.
 
 Mon May 12 13:49:54 1997    <irfan@TWOSTEP>
 
-        * ace/Thread_Manager.cpp (wait): We have to make sure that while
-          we wait for these threads to exit, we do not have the
-          lock. Therefore we make a copy of all interesting entries and
-          let go of the lock. We then do the join().
+	* ace/Thread_Manager.cpp (wait): We have to make sure that while
+ 	  we wait for these threads to exit, we do not have the
+ 	  lock. Therefore we make a copy of all interesting entries and
+ 	  let go of the lock. We then do the join().
 
-        * ace/Task.cpp (wait): Removed the extra locking in wait(). The
-          Thread Manager will handle this correctly.
+	* ace/Task.cpp (wait): Removed the extra locking in wait(). The
+ 	  Thread Manager will handle this correctly.
 
-        * ace/ACE.cpp (register_stdin_handler): Changed the options such
-          that the Thread Manager used for the adapter is passed along to
-          the method executed by the new thread. We can then notify the
-          thread manager when this adapter thread exits.
+	* ace/ACE.cpp (register_stdin_handler): Changed the options such
+	  that the Thread Manager used for the adapter is passed along to
+	  the method executed by the new thread. We can then notify the
+	  thread manager when this adapter thread exits.
 
-        * examples/ASX/Event_Server/Event_Server: Changed the way the
-          reference count was being kept on the context. Now, the
-          reference count starts with zero and every instance and every
-          active Task increments it. This works well as Task::close() is
-          called one from the module being deleted and from the active
-          thread going away.
+	* examples/ASX/Event_Server/Event_Server: Changed the way the
+ 	  reference count was being kept on the context. Now, the
+ 	  reference count starts with zero and every instance and every
+ 	  active Task increments it. This works well as Task::close() is
+ 	  called one from the module being deleted and from the active
+ 	  thread going away.
 
 Mon May 12 11:11:51 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/Process.*: Removed the old ACE_Process and replaced it with
-          what was ACE_ProcessEx.
+	* ace/Process.*: Removed the old ACE_Process and replaced it with
+	  what was ACE_ProcessEx.
 
-        * ace/Process_Manager.{i,cpp}:  Updated to use the new ACE_Process
-          API.
+	* ace/Process_Manager.{i,cpp}:  Updated to use the new ACE_Process
+	  API.
 
 Mon May 12 08:16:38 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-freebsd*.h: added support for FreeBSD 2.1.7R.
-          Thanks to Satoshi Ueno <satoshi.ueno@gs.com> for figuring
-          out the differences and to Nanbor Wang <nw1@cs.wustl.edu>
-          for updating the config files.
+	* ace/config-freebsd*.h: added support for FreeBSD 2.1.7R.
+	  Thanks to Satoshi Ueno <satoshi.ueno@gs.com> for figuring
+	  out the differences and to Nanbor Wang <nw1@cs.wustl.edu>
+	  for updating the config files.
 
 Sun May 11 17:36:59 1997    <harrison@samba.cs.wustl.edu>
 
-        * tests/{Pipe_Test.cpp, Process_Mutex_Test.cpp,
-          Time_Service_Test.cpp, Token_Service_Test.cpp}:  Updated these
-          files to use the new ACE_Process API.
+	* tests/{Pipe_Test.cpp, Process_Mutex_Test.cpp,
+	  Time_Service_Test.cpp, Token_Service_Test.cpp}:  Updated these
+	  files to use the new ACE_Process API.
 
 Sun May 11 14:40:51 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-osf1-4.0.h: put back ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS.
+	* ace/config-osf1-4.0.h: put back ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS.
 
-        * ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered
-          initializers to match declaration order.
+	* ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered
+	  initializers to match declaration order.
 
 Sat May 10 19:44:28 1997    <harrison@samba.cs.wustl.edu>
 
-        * Process.h: ACE_ProcessEx now works on Solaris and NT.  There
-          have been some changes to the API.  ACE_ProcessEx::cl_options
-          and ACE_ProcessEx::path have been combined into
-          ACE_ProcessEx::command_line.  ACE_ProcessEx::command_line must
-          be used to specify path and command-line arguments.  There is
-          also a second ACE_ProcessEx::setenv method that allows
-          applications to set environment variables in a "VAR=VALUE"
-          format.
+	* Process.h: ACE_ProcessEx now works on Solaris and NT.  There
+	  have been some changes to the API.  ACE_ProcessEx::cl_options
+ 	  and ACE_ProcessEx::path have been combined into
+ 	  ACE_ProcessEx::command_line.  ACE_ProcessEx::command_line must
+ 	  be used to specify path and command-line arguments.  There is
+ 	  also a second ACE_ProcessEx::setenv method that allows
+ 	  applications to set environment variables in a "VAR=VALUE"
+ 	  format.
 
 Sat May 10 10:51:11 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/config-osf1-3.2.h: Added three new flags to the config file
-          for OSF/1 3.2:
+	* ace/config-osf1-3.2.h: Added three new flags to the config file
+	  for OSF/1 3.2:
 
-          #define ACE_LACKS_SETSCHED 
-          #define ACE_LACKS_RWLOCK_T
-          #define ACE_LACKS_GETPGID
+	  #define ACE_LACKS_SETSCHED 
+	  #define ACE_LACKS_RWLOCK_T
+	  #define ACE_LACKS_GETPGID
 
-          Thanks to Tom Dobridge <dobridge@persimmon.com> for reporting
-          this.
+	  Thanks to Tom Dobridge <dobridge@persimmon.com> for reporting
+ 	  this.
 
 Fri May 09 16:37:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-osf1-4.0.h: added DEC_CXX.
+	* ace/config-osf1-4.0.h: added DEC_CXX.
 
-        * ace/config-osf1-4.0-g++.h: removed commented-out
-          ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS.
+	* ace/config-osf1-4.0-g++.h: removed commented-out
+	  ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS.
 
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          patches for the above two OSF config files.
-        
-        * ace/Sched_Params.cpp (priority_min): On Solaris (with STHREADS),
-          don't return priority of 0 because ::pthread_attr_setschedparam ()
-          will refuse to use it (with EINVAL).  So, bump priority of 0 up to 1.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  patches for the above two OSF config files.
+	
+	* ace/Sched_Params.cpp (priority_min): On Solaris (with STHREADS),
+	  don't return priority of 0 because ::pthread_attr_setschedparam ()
+	  will refuse to use it (with EINVAL).	So, bump priority of 0 up to 1.
 
-        * tests/Priority_Task_Test.cpp: retry the task activation with
-          priority 0 if it fails with non-zero priority.  This lets the
-          test run on platforms such as Linux that only let the superuser
-          set non-zero priority.
+	* tests/Priority_Task_Test.cpp: retry the task activation with
+	  priority 0 if it fails with non-zero priority.  This lets the
+	  test run on platforms such as Linux that only let the superuser
+	  set non-zero priority.
 
-        * ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered
-          initializers to match declaration order.
+	* ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered
+	  initializers to match declaration order.
 
-        * examples/Connection/non_blocking/test_lsock_acceptor.cpp: fixed
-          typo in template specializations: ACE_LSOCK_ACCEPTOR instead of
-          ACE_SOCK_LACCEPTOR.
+	* examples/Connection/non_blocking/test_lsock_acceptor.cpp: fixed
+	  typo in template specializations: ACE_LSOCK_ACCEPTOR instead of
+	  ACE_SOCK_LACCEPTOR.
 
 Fri May  9 13:07:20 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/UNIX_Addr: Changed the return values of all the set()
-          methods so that they conform to the signature used by the
-          INET_Addrs.
+	* ace/UNIX_Addr: Changed the return values of all the set()
+ 	  methods so that they conform to the signature used by the
+ 	  INET_Addrs.
 
-        * examples/Connection/non-blocking: Added two new test programs,
-          test_lsock_{connector,acceptor}.cpp that 
-        
+	* examples/Connection/non-blocking: Added two new test programs,
+	  test_lsock_{connector,acceptor}.cpp that 
+	
 
-        * ace/LSOCK_Stream.cpp: Revised the get_remote_addr() method so
-          that it uses the underlying ACE_SOCK::get_remote_addr() method
-          rather than the get_local_addr() method.  Hopefully, this will
-          fix an ACE bug with UNIX domain sockets.  Thanks to Paul Han
-          <phan@CCGATE.HAC.COM> for reporting the problem and the fix.
+	* ace/LSOCK_Stream.cpp: Revised the get_remote_addr() method so
+ 	  that it uses the underlying ACE_SOCK::get_remote_addr() method
+ 	  rather than the get_local_addr() method.  Hopefully, this will
+ 	  fix an ACE bug with UNIX domain sockets.  Thanks to Paul Han
+ 	  <phan@CCGATE.HAC.COM> for reporting the problem and the fix.
 
-        * include/makeinclude/platform_aix4.2.GNU (LLIBS): Changed
-        
-          LLIBS = -lC_r -lC -lpthreads -lbsd -ltli_r -ldl -lc_r -lm -lc $(ACELIB)
+	* include/makeinclude/platform_aix4.2.GNU (LLIBS): Changed
+	
+	  LLIBS = -lC_r -lC -lpthreads -lbsd -ltli_r -ldl -lc_r -lm -lc $(ACELIB)
 
-          to
+	  to
 
-          LLIBS =  -ltli_r -ldl  $(ACELIB)
+	  LLIBS =  -ltli_r -ldl  $(ACELIB)
 
-          MakeC++SharedLib_r includes all the other libs automatically in
-          the search. 
+	  MakeC++SharedLib_r includes all the other libs automatically in
+	  the search. 
 
-        * apps/Gateway/Gateway/Proxy_Handler.h: Moved the handle_close()
-          method into the public section since the Connector now calls it.
+	* apps/Gateway/Gateway/Proxy_Handler.h: Moved the handle_close()
+ 	  method into the public section since the Connector now calls it.
 
-        * ace/Containers.cpp: Updated all the operator= methods so
-          that they no longer try to return *this.  Thanks to Chris Lahey
-          for reporting this.
+	* ace/Containers.cpp: Updated all the operator= methods so
+	  that they no longer try to return *this.  Thanks to Chris Lahey
+	  for reporting this.
 
-        * ace/IOStream.h: Replaced __alpha with DIGITAL_UNIX && DEC_CXX.
-          Thanks to Thilo for reporting this.
+	* ace/IOStream.h: Replaced __alpha with DIGITAL_UNIX && DEC_CXX.
+	  Thanks to Thilo for reporting this.
 
-        * build/gcc/tests/Simple_Message_Block_Test.cpp (main): Changed
-          the use of ACE_Mutex to ACE_SYNCH_MUTEX so that everything will
-          build correctly on non-MT platforms.
+	* build/gcc/tests/Simple_Message_Block_Test.cpp (main): Changed
+ 	  the use of ACE_Mutex to ACE_SYNCH_MUTEX so that everything will
+ 	  build correctly on non-MT platforms.
 
-        * ace/Timer_{Heap,List}_T.cpp: To ensure backwards compatibility
-          with the old "int" return value of Timer_*::schedule() we must
-          cast the long value to int before returning it.  Thanks to Thilo
-          Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
+	* ace/Timer_{Heap,List}_T.cpp: To ensure backwards compatibility
+ 	  with the old "int" return value of Timer_*::schedule() we must
+ 	  cast the long value to int before returning it.  Thanks to Thilo
+ 	  Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
 
-        * ace/Acceptor.cpp,
-          ace/Connector.cpp:
-          If an active or passive connection times out and the Connector
-          or Acceptor calls the handle_timeout() method of the
-          Svc_Handler, we now keep track of whether the handle_timeout()
-          method returns -1.  If so, we call handle_close() on the
-          Svc_Handler automatically.  Thanks to Michael Hartman
-          <c62nt57@ibx.com> for suggesting this.
+	* ace/Acceptor.cpp,
+	  ace/Connector.cpp:
+	  If an active or passive connection times out and the Connector
+ 	  or Acceptor calls the handle_timeout() method of the
+ 	  Svc_Handler, we now keep track of whether the handle_timeout()
+ 	  method returns -1.  If so, we call handle_close() on the
+ 	  Svc_Handler automatically.  Thanks to Michael Hartman
+ 	  <c62nt57@ibx.com> for suggesting this.
 
-        * tests/IOStream_Test.cpp: Fixed this test so that it runs on
-          non-MT platforms.
+	* tests/IOStream_Test.cpp: Fixed this test so that it runs on
+ 	  non-MT platforms.
 
-        * ace/Module.cpp: Changed the implementation of the close_i()
-          method so that it will wait for all active threads in a Task to
-          exit before deleting the task.
+	* ace/Module.cpp: Changed the implementation of the close_i()
+ 	  method so that it will wait for all active threads in a Task to
+ 	  exit before deleting the task.
 
-        * ace/Task: Added a wait() method on an ACE_Task that will use the
-          new ACE_Thread_Manager::wait_task() method to block until all
-          threads have shutdown in a Task.
+	* ace/Task: Added a wait() method on an ACE_Task that will use the
+ 	  new ACE_Thread_Manager::wait_task() method to block until all
+ 	  threads have shutdown in a Task.
 
-        * ace/Thread_Manager: Finally implemented the wait_task() and
-          wait_grp() interfaces on ACE_Thread_Manager.  
+	* ace/Thread_Manager: Finally implemented the wait_task() and
+	  wait_grp() interfaces on ACE_Thread_Manager.  
 
-        * ace/SOCK_Dgram.cpp: Added a timed recv() operation.  Thanks
-          to Hongbo Xu <hxu@mas.co.nz> for contributing this.
+	* ace/SOCK_Dgram.cpp: Added a timed recv() operation.  Thanks
+	  to Hongbo Xu <hxu@mas.co.nz> for contributing this.
 
-        * ace/Timer_Queue_T.cpp: Added #include "ace/Synch.h" to keep the
-          DEC C++ compiler happy.  Thanks to James CE Johnson
-          <jcej@lads.com> for this.
+	* ace/Timer_Queue_T.cpp: Added #include "ace/Synch.h" to keep the
+ 	  DEC C++ compiler happy.  Thanks to James CE Johnson
+ 	  <jcej@lads.com> for this.
 
-        * ace/Containers.i (size): Changed <TYPE> to <T> so that this
-          compiles on the Alpha.  Thanks to James CE Johnson
-          <jcej@lads.com> for this.
+	* ace/Containers.i (size): Changed <TYPE> to <T> so that this
+ 	  compiles on the Alpha.  Thanks to James CE Johnson
+ 	  <jcej@lads.com> for this.
 
-        * ace/IOStream.h: Include the std_macros header on the Alpha.
-          Thanks to James CE Johnson <jcej@lads.com> for this.
+	* ace/IOStream.h: Include the std_macros header on the Alpha.
+  	  Thanks to James CE Johnson <jcej@lads.com> for this.
 
-        * include/makeinclude/platform_osf1_4.0.GNU (SOBUILD): Removed
-          -lACE from the link line.  Thanks to James CE Johnson
-          <jcej@lads.com> for this.
+	* include/makeinclude/platform_osf1_4.0.GNU (SOBUILD): Removed
+ 	  -lACE from the link line.  Thanks to James CE Johnson
+ 	  <jcej@lads.com> for this.
 
-        * tests/Timer_Queue_Test.cpp: Changed all the int timer ids to
-          long so that the test will work on DEC ALPHAs.  Thanks to Thilo
-          Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
+	* tests/Timer_Queue_Test.cpp: Changed all the int timer ids to
+ 	  long so that the test will work on DEC ALPHAs.  Thanks to Thilo
+ 	  Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
 
-        * ace/Process: Fixed a number of compile problems for UNIX.
+	* ace/Process: Fixed a number of compile problems for UNIX.
 
-        * ace/Process.h: Changed the methods named stdin/stdout/stderr to
-          std_in/std_out/std_err to avoid name clashes with the standard C
-          library.
+	* ace/Process.h: Changed the methods named stdin/stdout/stderr to
+ 	  std_in/std_out/std_err to avoid name clashes with the standard C
+ 	  library.
 
-        * ace/OS: Changed the use of ACE_Unbounded_Set to
-          ACE_Unbounded_Stack in order to get the appropriate semantics
-          for TSS cleanup on NT.
+	* ace/OS: Changed the use of ACE_Unbounded_Set to
+ 	  ACE_Unbounded_Stack in order to get the appropriate semantics
+ 	  for TSS cleanup on NT.
 
-        * ace/Containers: Enhanced the ACE_Unbounded_Stack class so
-          that it supports insert()/remove()/find() methods.  These
-          rather unorthodox methods are useful for implementing the
-          TSS semantics required by OS.cpp.
+	* ace/Containers: Enhanced the ACE_Unbounded_Stack class so
+	  that it supports insert()/remove()/find() methods.  These
+	  rather unorthodox methods are useful for implementing the
+	  TSS semantics required by OS.cpp.
 
-        * ace/Containers: Revised all the interfaces for the various
-          containers so that they all have the same "look and feel."
+	* ace/Containers: Revised all the interfaces for the various
+ 	  containers so that they all have the same "look and feel."
 
 Fri May  9 00:00:21 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * apps/JAWS/server/HTTP_Request.{h,cpp}: Added a uritopath
-          translation method, so that CGI location can be computed as it
-          is searched.  Added methods to access the parsed headers.
+	* apps/JAWS/server/HTTP_Request.{h,cpp}: Added a uritopath
+	  translation method, so that CGI location can be computed as it
+	  is searched.  Added methods to access the parsed headers.
 
-        * apps/JAWS/server/HTTP_Response.{h,cpp}: Flushed out the
-          implementation of cgi_response () method.  If all goes well, it
-          should be able to execute a CGI program.  I don't set the IO
-          handles to point at the socket handle yet.
+	* apps/JAWS/server/HTTP_Response.{h,cpp}: Flushed out the
+	  implementation of cgi_response () method.  If all goes well, it
+	  should be able to execute a CGI program.  I don't set the IO
+	  handles to point at the socket handle yet.
 
-        * apps/JAWS/server/README: Updated description of JAWS behavior.
+	* apps/JAWS/server/README: Updated description of JAWS behavior.
 
 Thu May  8 18:04:14 1997  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * ace/Containers: Made the return values of Container methods
-          more consistant with other components of ACE (i.e., 0 for
-          success, -1 for failure).
+	* ace/Containers: Made the return values of Container methods
+	  more consistant with other components of ACE (i.e., 0 for
+	  success, -1 for failure).
 
-        * ace/Containers (ACE_Unbounded_Stack<T>::delete_all_nodes):
-          Fixed subtle bug in delete_all_nodes.
+	* ace/Containers (ACE_Unbounded_Stack<T>::delete_all_nodes):
+	  Fixed subtle bug in delete_all_nodes.
 
-        * ace/OS.cpp (ACE_TSS_Cleanup::exit): Changed because of
-          return value changes in ACE containers. 
+	* ace/OS.cpp (ACE_TSS_Cleanup::exit): Changed because of
+	  return value changes in ACE containers. 
 
-        * Containers: Added size methods to stack containers and
-          consolidated friendship between ACE_Unbounded_Stack_Iterator and
-          ACE_Unbounded_Stack
+	* Containers: Added size methods to stack containers and
+ 	  consolidated friendship between ACE_Unbounded_Stack_Iterator and
+ 	  ACE_Unbounded_Stack
 
-        * tests/Message_Block_Test.cpp: I was incorrect about each data
-          block having its own lock. Since *many* data blocks can share
-          the same lock, for the case of message block chains, we would
-          like to optimize locking. 
+	* tests/Message_Block_Test.cpp: I was incorrect about each data
+	  block having its own lock. Since *many* data blocks can share
+	  the same lock, for the case of message block chains, we would
+	  like to optimize locking. 
 
-          Therefore, the first guy in the chain grabs the lock and passes
-          it to the continuation chain. When each guy in the chain gets
-          it, it compares the passed lock to its own locking strategy. If
-          it is the same lock, no need to acquire the lock again. If our
-          lock is different, then we do our own locking.          
+	  Therefore, the first guy in the chain grabs the lock and passes
+	  it to the continuation chain. When each guy in the chain gets
+	  it, it compares the passed lock to its own locking strategy. If
+	  it is the same lock, no need to acquire the lock again. If our
+	  lock is different, then we do our own locking.	  
 
-        * tests/Simple_Message_Block_Test.cpp: This test program is a
-          torture test that illustrates how ACE_Message_Block reference
-          counting works, how and when locks are used, how memory is
-          managed, and how continuation chains of message blocks are
-          made. Ideally used with purify :-)
+	* tests/Simple_Message_Block_Test.cpp: This test program is a
+ 	  torture test that illustrates how ACE_Message_Block reference
+ 	  counting works, how and when locks are used, how memory is
+ 	  managed, and how continuation chains of message blocks are
+	  made. Ideally used with purify :-)
 
-        * tests: Added new test. Following changed:
-          Makefile run_tests.bat run_tests.sh tests.mak tests.mdp
+	* tests: Added new test. Following changed:
+	  Makefile run_tests.bat run_tests.sh tests.mak tests.mdp
 
 Thu May  8 18:04:14 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * include/makeinclude/platform_irix6.2_sgic++.GNU:  Moved SGI C++
-          options out of CPPFLAGS into CCFLAGS so that gcc won't emit
-          diagnostics during a make depend.
+	* include/makeinclude/platform_irix6.2_sgic++.GNU:  Moved SGI C++
+	  options out of CPPFLAGS into CCFLAGS so that gcc won't emit
+	  diagnostics during a make depend.
 
 Thu May  8 11:52:41 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/{Task,Thread}.h: Added documentation describing
-          thread priority determination to methods where priority
-          is an [optional] argument.  Note that if you want to inspect
-          the REAL documentation, you should look at the code for
-          ACE_OS::thr_create().  But that's convoluted and touchy.
+	* ace/{Task,Thread}.h: Added documentation describing
+	  thread priority determination to methods where priority
+	  is an [optional] argument.  Note that if you want to inspect
+	  the REAL documentation, you should look at the code for
+	  ACE_OS::thr_create().  But that's convoluted and touchy.
 
-        * ace/Strategies_T.h (ACE_Cached_Connection_Strategy): Added
-          documentation for this class.
+	* ace/Strategies_T.h (ACE_Cached_Connection_Strategy): Added
+	  documentation for this class.
 
 Thu May 08 00:10:00 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/Process.*: This is the first pass at the new ACE_Process
-          class.  It is now called ACE_ProcessEx.  When it is completely
-          ported to Solaris, we'll replace the current ACE_Process with
-          ACE_ProcessEx.
+	* ace/Process.*: This is the first pass at the new ACE_Process
+	  class.  It is now called ACE_ProcessEx.  When it is completely
+ 	  ported to Solaris, we'll replace the current ACE_Process with
+ 	  ACE_ProcessEx.
 
-        * examples/OS/Process/process.cpp: Added some examples for the
-          new ACE_ProcessEx.
+	* examples/OS/Process/process.cpp: Added some examples for the
+	  new ACE_ProcessEx.
 
 Wed May 07 21:58:29 1997    <irfan@TWOSTEP>
 
-        * ace/Message_Block.h: ACE_Data_Block calling delete on the
-          ACE_Message_Block was incorrect.  This was a hack to simplify
-          the locking issues! However this optimization leaded to
-          incorrect code. Therefore I have taken this behavior out. The
-          new implementation will lock and unlock multiple times in the
-          case when there are message_blocks in the continuation field,
-          all of which point to same data block. However, this is a
-          strange case that can be optimized later. For now correct code
-          is more important.
-
-          Also, the continuation message blocks are only deleted in the
-          release() method and not in the destructor. This will ensure
-          that if message blocks of the stack are chained together, we
-          will not call release on message blocks of the stack.
-
-          Also note that release() should only be called on message blocks
-          that have been dynamically allocated. Message blocks of the
-          stack will clean up properly when the activation record of the
-          method completes. Dynamically allocated messages blocks should
-          *never* be chained with message blocks allocated of the stack.
-        
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.h: Removed
-          empty definitions of assignment operator and copy constructor.
-
-        * examples/ASX/Event_Server/Event_Server/event_server.cpp
-          (handle_input): Added code here will make sure we actually wait
-          for the user to type something. On platforms like Win32,
-          handle_input() is called prematurely (even when there is no
-          data).
-
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Changed
-          a log message.
+	* ace/Message_Block.h: ACE_Data_Block calling delete on the
+ 	  ACE_Message_Block was incorrect.  This was a hack to simplify
+ 	  the locking issues! However this optimization leaded to
+ 	  incorrect code. Therefore I have taken this behavior out. The
+ 	  new implementation will lock and unlock multiple times in the
+ 	  case when there are message_blocks in the continuation field,
+ 	  all of which point to same data block. However, this is a
+ 	  strange case that can be optimized later. For now correct code
+ 	  is more important.
+
+	  Also, the continuation message blocks are only deleted in the
+ 	  release() method and not in the destructor. This will ensure
+ 	  that if message blocks of the stack are chained together, we
+ 	  will not call release on message blocks of the stack.
+
+	  Also note that release() should only be called on message blocks
+ 	  that have been dynamically allocated. Message blocks of the
+ 	  stack will clean up properly when the activation record of the
+ 	  method completes. Dynamically allocated messages blocks should
+	  *never* be chained with message blocks allocated of the stack.
+	
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.h: Removed
+ 	  empty definitions of assignment operator and copy constructor.
+
+	* examples/ASX/Event_Server/Event_Server/event_server.cpp
+ 	  (handle_input): Added code here will make sure we actually wait
+ 	  for the user to type something. On platforms like Win32,
+ 	  handle_input() is called prematurely (even when there is no
+ 	  data).
+
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Changed
+ 	  a log message.
 
 Wed May  7 22:55:00 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * JAWS/server/*: Debugging changes!  GET and HEAD both work
-          now.  As well as changes to make it compile cleanly on
-          VXWORKS, as reported by David.
+	* JAWS/server/*: Debugging changes!  GET and HEAD both work
+	  now.  As well as changes to make it compile cleanly on
+	  VXWORKS, as reported by David.
 
 Wed May 07 16:05:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Makefile: added Timer_Wheel to FILES.  Thanks to Thilo
-          Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
+	* ace/Makefile: added Timer_Wheel to FILES.  Thanks to Thilo
+	  Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
 
-        * include/makeinclude/platform_irix6.2_sgic++.GNU: enabled CPPFLAGS
-          to instantiate all templates so that gatewayd will build.
-          Thanks to Nathan N. Vuong <nvuong@mail08.mitre.org> for reporting
-          this problem and Eric Dean Russell <edrusse@somnet.sandia.gov>
-          for supplying and the fix.
+	* include/makeinclude/platform_irix6.2_sgic++.GNU: enabled CPPFLAGS
+	  to instantiate all templates so that gatewayd will build.
+	  Thanks to Nathan N. Vuong <nvuong@mail08.mitre.org> for reporting
+	  this problem and Eric Dean Russell <edrusse@somnet.sandia.gov>
+	  for supplying and the fix.
 
-        * ace/Map_Manager.h: updated comments to indicate that find
-          functions return a non-negative integer if the item is found.
+	* ace/Map_Manager.h: updated comments to indicate that find
+	  functions return a non-negative integer if the item is found.
 
-        * ace/Map_Manager.cpp (find_i (const EXT_ID &, INT_ID &)): return
-          index instead of 0 if the item is found, to be consistent with
-          find_i (const EXT_ID &).
+	* ace/Map_Manager.cpp (find_i (const EXT_ID &, INT_ID &)): return
+	  index instead of 0 if the item is found, to be consistent with
+	  find_i (const EXT_ID &).
 
-        * ace/IOStream.cpp (ACE_Streambuf_T ctor): added initializations of
-          eback_saved_ and pbase_saved_ to avoid unitialized memory read
-          reports from Purify.
+	* ace/IOStream.cpp (ACE_Streambuf_T ctor): added initializations of
+	  eback_saved_ and pbase_saved_ to avoid unitialized memory read
+	  reports from Purify.
 
 Tue May  6 07:39:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Service_Config.cpp (open): Make sure to perform the
-          daemonization logic first so that we get a new process created
-          before initializing reactors, etc.  Thanks to Adrian Salt
-          <acsalt@magi.com> for reporting this.
+	* ace/Service_Config.cpp (open): Make sure to perform the
+ 	  daemonization logic first so that we get a new process created
+ 	  before initializing reactors, etc.  Thanks to Adrian Salt
+ 	  <acsalt@magi.com> for reporting this.
 
-        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): 
-          Changed ACE::INVALID_HANDLE to ACE_INVALID_HANDLE.
-          Thanks to Dani Flexer <danif@alice.actcom.co.il> for
-          reporting this.
+	* examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): 
+	  Changed ACE::INVALID_HANDLE to ACE_INVALID_HANDLE.
+	  Thanks to Dani Flexer <danif@alice.actcom.co.il> for
+	  reporting this.
 
-        * tests/Conn_Test.cpp (compare_i): Changed the comparison from
-          a1 == a2 to a1 != a2 since this appears to be what is needed.
-          We need to improve the comments here!
+	* tests/Conn_Test.cpp (compare_i): Changed the comparison from
+	  a1 == a2 to a1 != a2 since this appears to be what is needed.
+	  We need to improve the comments here!
 
-        * tests/Conn_Test.cpp: Split the definition of the Svc_Handler
-          template into its own Conn_Test.h file to work around "features"
-          with AIX C++.  Thanks to Chris Lahey for reporting this.
+	* tests/Conn_Test.cpp: Split the definition of the Svc_Handler
+ 	  template into its own Conn_Test.h file to work around "features"
+ 	  with AIX C++.  Thanks to Chris Lahey for reporting this.
 
-        * ace/Containers.cpp: Fixed a bug in the set() method for
-          ACE_Unbounded_Queue.  Again, thank goodness for cs242!
+	* ace/Containers.cpp: Fixed a bug in the set() method for
+ 	  ACE_Unbounded_Queue.  Again, thank goodness for cs242!
 
-        * ace/Containers.cpp: Fixed a bug in the enqueue_head() logic for
-          ACE_Unbounded_Queue.  Thank goodness for cs242 ;-).
+	* ace/Containers.cpp: Fixed a bug in the enqueue_head() logic for
+ 	  ACE_Unbounded_Queue.  Thank goodness for cs242 ;-).
 
-        * ace/Containers.cpp: Added a destructor for ACE_Node to keep the
-          compilers happy.
+	* ace/Containers.cpp: Added a destructor for ACE_Node to keep the
+ 	  compilers happy.
 
 Tue May 06 11:31:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * netsvcs/lib/*.cpp: removed break statements after
-          ACE_RETURNs to avoid unreachable statement warnings from
-          GHS.  
+	* netsvcs/lib/*.cpp: removed break statements after
+	  ACE_RETURNs to avoid unreachable statement warnings from
+	  GHS.  
 
-        * ace/OS.cpp (mktime): added time_t cast of -1 (error) return
-          to avoid compiler warning.
+	* ace/OS.cpp (mktime): added time_t cast of -1 (error) return
+	  to avoid compiler warning.
 
-        * ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SIGNED_CHAR.
+	* ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SIGNED_CHAR.
 
-        * ace/Containers.cpp (dequeue_head): fixed typos in variable names.
+	* ace/Containers.cpp (dequeue_head): fixed typos in variable names.
 
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-          removed #ifdef ACE_HAS_TLI around some template specializations so
-          that this subproject will build on platforms non-TLI platforms such
-          as Linux.
+	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
+	  removed #ifdef ACE_HAS_TLI around some template specializations so
+	  that this subproject will build on platforms non-TLI platforms such
+	  as Linux.
 
 Tue May  6 17:02:54 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/OS.{h,i}: Added strftime ().  Also, enhanced strcasecmp
-          implementation to account for lexicographical ordering for
-          mismatches.
+	* ace/OS.{h,i}: Added strftime ().  Also, enhanced strcasecmp
+	  implementation to account for lexicographical ordering for
+	  mismatches.
 
-        * apps/JAWS/server/Parse_Headers.{h,cpp} (class Headers_Map):
+	* apps/JAWS/server/Parse_Headers.{h,cpp} (class Headers_Map):
           Changed signature of casting operator to return a pointer
           rather than a reference to a constant pointer, to fix
           anachronism warning Doug found.
@@ -2793,8 +2793,8 @@ Tue May  6 17:02:54 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
 Tue May  6 00:00:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/Message_Block.cpp: Added template specialization for
-          ACE_Guard<> that prevented ACE from compiling under Linux.
+	* ace/Message_Block.cpp: Added template specialization for
+ 	  ACE_Guard<> that prevented ACE from compiling under Linux.
 
 Mon May  5 22:17:15 1997  Sumedh Mungee      <sumedh@cs.wustl.edu>
         
@@ -2803,447 +2803,447 @@ Mon May  5 22:17:15 1997  Sumedh Mungee      <sumedh@cs.wustl.edu>
 
 Mon May 05 21:01:42 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-linux*.h: added ACE_HAS_STRING_CLASS.  Thanks to
-          Luis Lopes <llopes@tick.rcc.Ryerson.CA> for reporting this.
+	* ace/config-linux*.h: added ACE_HAS_STRING_CLASS.  Thanks to
+	  Luis Lopes <llopes@tick.rcc.Ryerson.CA> for reporting this.
 
 Mon May 05 19:58:16 1997    <irfan@TWOSTEP>
 
-        * ace/ace.{mak,mdp}: Readded IOStream.cpp to the makefile. 
+	* ace/ace.{mak,mdp}: Readded IOStream.cpp to the makefile. 
 
-        * ace/Synch_T.h: Added ACE_SYNCH_RECURSIVE_MUTEX.
+	* ace/Synch_T.h: Added ACE_SYNCH_RECURSIVE_MUTEX.
 
-        * ace/Timer_Queue: Added an extra template parameter to
-          Timer_Queues that specifies the type of locking to be used
-          inside of the timer queue.
+	* ace/Timer_Queue: Added an extra template parameter to
+	  Timer_Queues that specifies the type of locking to be used
+	  inside of the timer queue.
 
-          Also changed the functor callback routines so that they are more
-          descriptive compared to operator ().
+	  Also changed the functor callback routines so that they are more
+	  descriptive compared to operator ().
 
 Mon May  5 21:37:01 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Message_Block: Revised the release() logic for
-          ACE_Message_Block and ACE_Data_Block so that we will delete both
-          within the same block of code in order to hold the lock.  This
-          should prevent nasty race conditions in multi-threaded programs.
-          Thanks to Craig Perras <craig.perras@CyberSafe.COM> for
-          reporting this problem.
+	* ace/Message_Block: Revised the release() logic for
+ 	  ACE_Message_Block and ACE_Data_Block so that we will delete both
+ 	  within the same block of code in order to hold the lock.  This
+ 	  should prevent nasty race conditions in multi-threaded programs.
+  	  Thanks to Craig Perras <craig.perras@CyberSafe.COM> for
+ 	  reporting this problem.
 
-        * ace/Message_Block.cpp: Replaced an explicit acquire()/release()
-          of ACE_Lock::locking_strategy_ with a call to an ACE_Guard.
+	* ace/Message_Block.cpp: Replaced an explicit acquire()/release()
+ 	  of ACE_Lock::locking_strategy_ with a call to an ACE_Guard.
 
-        * ace/Containers.cpp (set): Optimized for the common case where
-          we're increasing the size of the set by 1.
+	* ace/Containers.cpp (set): Optimized for the common case where
+ 	  we're increasing the size of the set by 1.
 
-        * ace/Containers: Merged the ACE_Set_Node, ACE_Stack_Node, and
-          ACE_Set_Node into a single "ACE_Node" class.  This tidies up the
-          code quite a bit.
+	* ace/Containers: Merged the ACE_Set_Node, ACE_Stack_Node, and
+	  ACE_Set_Node into a single "ACE_Node" class.  This tidies up the
+	  code quite a bit.
 
-        * ace: Removed the Set.* and Stack.* files and replaced them with
-          the Containers.* files.  This file contains the ACE_*Stack,
-          ACE_*Queue, and ACE_*Set classes.  If this revised file scheme
-          breaks existing code please let me know and I'll provide
-          backwards compatibility.
+	* ace: Removed the Set.* and Stack.* files and replaced them with
+ 	  the Containers.* files.  This file contains the ACE_*Stack,
+ 	  ACE_*Queue, and ACE_*Set classes.  If this revised file scheme
+ 	  breaks existing code please let me know and I'll provide
+ 	  backwards compatibility.
 
-        * ace/Stack: Changed the name of ACE_Unbounded_Queue::enqueue() to
-          ACE_Unbounded_Queue::enqueue_tail() and also added
-          ACE_Unbounded_Queue::enqueue_head().
+	* ace/Stack: Changed the name of ACE_Unbounded_Queue::enqueue() to
+ 	  ACE_Unbounded_Queue::enqueue_tail() and also added
+ 	  ACE_Unbounded_Queue::enqueue_head().
 
-        * ace/OS: Changed the names of the parameters of the ACE_OS::mem*
-          methods from ACE_OS::mem* (void *s, const void *t) to
-          ACE_OS::mem* (void *t, const void *s) since "t" should stand for
-          "target" and "s" for "source."  Thanks to Andres Kruse
-          <Andres.Kruse@cern.ch> for pointing this out.
+	* ace/OS: Changed the names of the parameters of the ACE_OS::mem*
+ 	  methods from ACE_OS::mem* (void *s, const void *t) to
+ 	  ACE_OS::mem* (void *t, const void *s) since "t" should stand for
+ 	  "target" and "s" for "source."  Thanks to Andres Kruse
+ 	  <Andres.Kruse@cern.ch> for pointing this out.
 
-        * ace/Stack: Removed the peek() method from ACE_Unbounded_Queue.
-          This functionality is now subsumed by the get(..., 0) method.
-          If this breaks any existing code please let me know.
+	* ace/Stack: Removed the peek() method from ACE_Unbounded_Queue.
+  	  This functionality is now subsumed by the get(..., 0) method.
+  	  If this breaks any existing code please let me know.
 
-        * ace/Stack.h: Moved all the functionality from ACE_Unbounded_Set
-          into ACE_Unbounded_Queue.  That's really where this belonged in
-          the first place.  Thanks to David Levine for noticing this.
+	* ace/Stack.h: Moved all the functionality from ACE_Unbounded_Set
+ 	  into ACE_Unbounded_Queue.  That's really where this belonged in
+ 	  the first place.  Thanks to David Levine for noticing this.
 
-        * ace/Set.h: Moved ACE_Set_Node from the *.cpp file into the *.cpp
-          file in anticipation of AIX C++ compiler bugs ;-).
+	* ace/Set.h: Moved ACE_Set_Node from the *.cpp file into the *.cpp
+ 	  file in anticipation of AIX C++ compiler bugs ;-).
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp:
-          Rearranged the location where we register to receive standard
-          input so that the socket handle will not be initialized at this
-          point.  Thanks to craig perras <craigp@wolfenet.com> for
-          reporting this.
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp:
+ 	  Rearranged the location where we register to receive standard
+ 	  input so that the socket handle will not be initialized at this
+ 	  point.  Thanks to craig perras <craigp@wolfenet.com> for
+ 	  reporting this.
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp
-          (Event_Transceiver): Make sure to #ifdef around SIGQUIT for
-          WIN32 since it lacks this signal.  Thanks to craig perras
-          <craigp@wolfenet.com> for reporting this.
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp
+ 	  (Event_Transceiver): Make sure to #ifdef around SIGQUIT for
+ 	  WIN32 since it lacks this signal.  Thanks to craig perras
+ 	  <craigp@wolfenet.com> for reporting this.
 
-        * ace/config-osf1-4.0-g++.h: Removed the ACE_LACKS_SIGNED_CHAR
-          since this seems to be compiler specific.  Thanks to Thilo for
-          this insight.
+	* ace/config-osf1-4.0-g++.h: Removed the ACE_LACKS_SIGNED_CHAR
+ 	  since this seems to be compiler specific.  Thanks to Thilo for
+ 	  this insight.
 
-        * ace/Strategies_T: Added a number of fixes and enhancements to
-          the new Hash_Addr and ACE_Cached_Connect_Strategy classes.
+	* ace/Strategies_T: Added a number of fixes and enhancements to
+ 	  the new Hash_Addr and ACE_Cached_Connect_Strategy classes.
 
-        * ace/Strategies_T.h: Added #include for "Hash_Map_Manager.h".
-          Thanks to Amos Shapira <amos@dsi.co.il> for reporting this.
+	* ace/Strategies_T.h: Added #include for "Hash_Map_Manager.h".
+  	  Thanks to Amos Shapira <amos@dsi.co.il> for reporting this.
 
-        * ace/config-hpux-10.*.h: Applied a number of patches courtesy of
-          Carlos O'Ryan.
+	* ace/config-hpux-10.*.h: Applied a number of patches courtesy of
+ 	  Carlos O'Ryan.
 
-        * ace/Dump.cpp: Changed a cast from
+	* ace/Dump.cpp: Changed a cast from
 
-          delete (ACE_Dumpable_Ptr *) this->dumper_;
+  	  delete (ACE_Dumpable_Ptr *) this->dumper_;
 
-          to
+	  to
 
-          delete (ACE_Dumpable *) this->dumper_;
+  	  delete (ACE_Dumpable *) this->dumper_;
 
-          This fixes a potential bug.  Thanks to Carlos O'Ryan for this
-          bug report.
+	  This fixes a potential bug.  Thanks to Carlos O'Ryan for this
+ 	  bug report.
 
-        * ace/DEV_IO.h,
-        * ace/SPIPE_Stream.h: Removed the = 0 default value for one send()
-          method to avoid ambiguity with the other send() method.  Thanks
-          to Carlos O'Ryan for this bug report.
+	* ace/DEV_IO.h,
+	* ace/SPIPE_Stream.h: Removed the = 0 default value for one send()
+ 	  method to avoid ambiguity with the other send() method.  Thanks
+ 	  to Carlos O'Ryan for this bug report.
 
-        * ace/Map_Manager.cpp (advance): Removed a cast to size_t since
-          that is always true.  Thanks to David Levine for pointing this
-          out.
+	* ace/Map_Manager.cpp (advance): Removed a cast to size_t since
+ 	  that is always true.  Thanks to David Levine for pointing this
+ 	  out.
 
-        * ace/XtReactor: Moved the remove_handler_i() and
-          register_handler_i() methods into the protected portion
-          of the class.  Since these should never be called by the
-          client I've moved them into protected portion to ensure this
-          is the case. 
+	* ace/XtReactor: Moved the remove_handler_i() and
+	  register_handler_i() methods into the protected portion
+	  of the class.  Since these should never be called by the
+	  client I've moved them into protected portion to ensure this
+	  is the case. 
 
-        * ace/XtReactor: Changed the implementation of the XtReactor to
-          use long for dealing with timers.  Thanks to Stuart Powell
-          <stuartp@in.ot.com.au> for reporting this.
+	* ace/XtReactor: Changed the implementation of the XtReactor to
+ 	  use long for dealing with timers.  Thanks to Stuart Powell
+ 	  <stuartp@in.ot.com.au> for reporting this.
 
 Mon May 5 17:16:41 1997  Carlos O'Ryan  <coryan@mat.puc.cl>
 
-        * ace/config-hpux-10.x.h, config-hpux-10.x-nothread.h: 
-          Some patches are needed to compile ACE under HP-UX (using HP/C++),
-          I documented those patches.
+ 	* ace/config-hpux-10.x.h, config-hpux-10.x-nothread.h: 
+	  Some patches are needed to compile ACE under HP-UX (using HP/C++),
+	  I documented those patches.
  
 Mon May 05 11:50:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: fixed ACE_Svc_Handler
-          specializations, yet again, for Linux w/LXPthreads.  Thanks to
-          Luis Lopes <llopes@tick.rcc.Ryerson.CA> for reporting this
-          problem with sufficient detail for us to track it down.
+	* netsvcs/lib/Server_Logging_Handler.cpp: fixed ACE_Svc_Handler
+	  specializations, yet again, for Linux w/LXPthreads.  Thanks to
+	  Luis Lopes <llopes@tick.rcc.Ryerson.CA> for reporting this
+	  problem with sufficient detail for us to track it down.
 
-        * ace/Stack.* (ACE_Unbounded_Queue):
+	* ace/Stack.* (ACE_Unbounded_Queue):
 
-          1) made peek () const.
-          2) added another peek (u_int index = 0) function that can peek
+	  1) made peek () const.
+	  2) added another peek (u_int index = 0) function that can peek
              at any queue item, not just the first.  It returns a pointer
              to the item (or 0 if not found), to avoid copying.
-          3) changed return type of size () from int to size_t.
-          4) inlined size ().
+	  3) changed return type of size () from int to size_t.
+	  4) inlined size ().
 
-        * ace/Strategies_T.cpp (connect_svc_handler, operator==):
-          added return type.
+	* ace/Strategies_T.cpp (connect_svc_handler, operator==):
+	  added return type.
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: fixed template
-          specializations for platforms that have neither THREADS nor
-          TLI.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* netsvcs/lib/Server_Logging_Handler.cpp: fixed template
+	  specializations for platforms that have neither THREADS nor
+	  TLI.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
 Sun May  4 12:34:09 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.cpp: If ACE_HAS_THREADS isn't defined then we'll just
-          use mktime() without the locking.
+	* ace/OS.cpp: If ACE_HAS_THREADS isn't defined then we'll just
+	  use mktime() without the locking.
 
-        * ace/Set: Removed the get() methods from the ACE_Fixed_Set and
-          ACE_Bounded_Set since they don't make much sense on these
-          abstractions.
+	* ace/Set: Removed the get() methods from the ACE_Fixed_Set and
+ 	  ACE_Bounded_Set since they don't make much sense on these
+ 	  abstractions.
 
-        * ace/Set: Changed the new "find" method to be called "get" to
-          correspond to the new "set" method I'm adding.
+	* ace/Set: Changed the new "find" method to be called "get" to
+ 	  correspond to the new "set" method I'm adding.
 
-        * ace/SString.cpp: Added a operator << for ACE_CString in 
-          order to print it with iostreams.
+	* ace/SString.cpp: Added a operator << for ACE_CString in 
+	  order to print it with iostreams.
 
-        * ace/Set.cpp: Added a reset method to the ACE_Unbounded_Set to
-          remove all the nodes without completely destroying the set.
+	* ace/Set.cpp: Added a reset method to the ACE_Unbounded_Set to
+ 	  remove all the nodes without completely destroying the set.
 
-        * ace/SString: Added friend operator+ to both ACE_CString and
-          ACE_WString in order to provide a concatenation operator.
+	* ace/SString: Added friend operator+ to both ACE_CString and
+ 	  ACE_WString in order to provide a concatenation operator.
 
-        * ace/SString: Added a compare() method to all the ACE String
-          classes.  This behaves just like the Standard C library strcmp()
-          function.
+	* ace/SString: Added a compare() method to all the ACE String
+ 	  classes.  This behaves just like the Standard C library strcmp()
+ 	  function.
 
-        * ace/Message_Queue.i: Oddly, there were a bunch of methods
-          defined in this *.i file that didn't have ACE_INLINE in front of
-          them.  I'm surprised this didn't give compile errors on some
-          platforms.  I've fixed this by moving these methods into the
-          *.cpp file.
+	* ace/Message_Queue.i: Oddly, there were a bunch of methods
+ 	  defined in this *.i file that didn't have ACE_INLINE in front of
+ 	  them.  I'm surprised this didn't give compile errors on some
+ 	  platforms.  I've fixed this by moving these methods into the
+ 	  *.cpp file.
 
-        * ace/Stream,
-          ace/Service_Repository,
-          ace/Reactor,
-          ace/Message_Queue,
-          ace/Map_Manager,
-          ace/Malloc_T,
-          ace/Hash_Map_Manager,
-          ace/Set: Added a done() method on all the iterators so that
-          we can check within the iteration itself to see if there are any
-          remaining elements.  In addition, updated the return value of
-          advance() on all iterators so that it returns 1 if we're not
-          done and 0 if we're done.
+	* ace/Stream,
+	  ace/Service_Repository,
+	  ace/Reactor,
+	  ace/Message_Queue,
+	  ace/Map_Manager,
+	  ace/Malloc_T,
+	  ace/Hash_Map_Manager,
+	  ace/Set: Added a done() method on all the iterators so that
+ 	  we can check within the iteration itself to see if there are any
+ 	  remaining elements.  In addition, updated the return value of
+	  advance() on all iterators so that it returns 1 if we're not
+	  done and 0 if we're done.
 
 Sun May 04 07:22:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Timer_Heap_T.cpp: changed some more int declarations to longs.
+	* ace/Timer_Heap_T.cpp: changed some more int declarations to longs.
 
 Sat May  3 17:38:19 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * Changed all uses of Reactor::{scheduler_timer,cancel}() and
-          Timer_{Queue,List,Heap,Wheel}::{schedule,cancel}() to use 
-          long rather than int.  This is important since it ensures that
-          we can make the Timing Wheels trick of casting the
-          Timer_Node * to long work correctly on machines that have 64
-          bit pointers, 64 bit longs, and 32 bit ints (e.g,. DEC
-          ALPHA).  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for pointing this out,
-          even though he finds this solution distasteful ;-).
+	* Changed all uses of Reactor::{scheduler_timer,cancel}() and
+	  Timer_{Queue,List,Heap,Wheel}::{schedule,cancel}() to use 
+	  long rather than int.  This is important since it ensures that
+	  we can make the Timing Wheels trick of casting the
+	  Timer_Node * to long work correctly on machines that have 64
+	  bit pointers, 64 bit longs, and 32 bit ints (e.g,. DEC
+	  ALPHA).  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for pointing this out,
+	  even though he finds this solution distasteful ;-).
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp (initiate_connection): I
-          believe there was also a bug here -- if schedule_timer() returns
-          0 that's not an error!
+	* netsvcs/lib/TS_Clerk_Handler.cpp (initiate_connection): I
+ 	  believe there was also a bug here -- if schedule_timer() returns
+ 	  0 that's not an error!
 
-        * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
-          (initiate_connection): I believe there was a bug here -- if
-          schedule_timer() returns 0 that's not an error!
+	* apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
+ 	  (initiate_connection): I believe there was a bug here -- if
+ 	  schedule_timer() returns 0 that's not an error!
 
-        * tests/IOStream_Test.cpp: Added some minor changes for DEC UNIX.
-          Thanks to James CE Johnson <jjohnson@lads.com> for reporting
-          this.
+	* tests/IOStream_Test.cpp: Added some minor changes for DEC UNIX.
+  	  Thanks to James CE Johnson <jjohnson@lads.com> for reporting
+ 	  this.
 
-        * ace/IOStream: Added a number of minor changes for DEC UNIX.
-          Thanks to James CE Johnson <jjohnson@lads.com> for reporting
-          this.
+	* ace/IOStream: Added a number of minor changes for DEC UNIX.
+  	  Thanks to James CE Johnson <jjohnson@lads.com> for reporting
+ 	  this.
 
-        * ace/config-osf1-4.0.h: Added
-          ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS to the config.h file.
-          Thanks to James CE Johnson <jjohnson@lads.com> for reporting
-          this.
+	* ace/config-osf1-4.0.h: Added
+ 	  ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS to the config.h file.
+  	  Thanks to James CE Johnson <jjohnson@lads.com> for reporting
+ 	  this.
 
-        * ace/SString: Made the ace_string_null_string_ a static data
-          member rather than an external constant.  This should control
-          the name space a bit better.
+	* ace/SString: Made the ace_string_null_string_ a static data
+ 	  member rather than an external constant.  This should control
+ 	  the name space a bit better.
 
-        * ace/SString.cpp: Fixed the ACE_CString::operator += so that it
-          won't screw up if this->rep_ initially points to the
-          ACE_String_null_string_.
+	* ace/SString.cpp: Fixed the ACE_CString::operator += so that it
+ 	  won't screw up if this->rep_ initially points to the
+ 	  ACE_String_null_string_.
 
-        * examples/Misc: Added a new test_set.cpp program that exercises
-          the ACE_*_Set classes.
+	* examples/Misc: Added a new test_set.cpp program that exercises
+ 	  the ACE_*_Set classes.
 
 Sat May 03 06:56:10 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Map_Manager.cpp (dtor): removed void return (typo).
+	* ace/Map_Manager.cpp (dtor): removed void return (typo).
 
-        * ace/Set.cpp (ACE_Fixed_Set<T>::operator =): typo: fs instead of bs.
+	* ace/Set.cpp (ACE_Fixed_Set<T>::operator =): typo: fs instead of bs.
 
-        * ace/Set.cpp (ACE_Fixed_Set<T, SIZE>::find): typo: index instead of i.
+	* ace/Set.cpp (ACE_Fixed_Set<T, SIZE>::find): typo: index instead of i.
 
-        * ace/IOStream.cpp: fixed typo: "#if defined" instead of just "#if".
+	* ace/IOStream.cpp: fixed typo: "#if defined" instead of just "#if".
 
-        * tests/Conn_Test.cpp,
-          netsvcs/lib/{Client_Logging_Handler,TS_Clerk_Handler}.cpp,
-          netsvcs/clients/Tokens/manual/manual.cpp,
-          apps/Gateway/Gateway/Event_Channel.cpp,:
-          apps/JAWS/client/Blob.cpp,
-          examples/ASX/Event_Server/Event_Server/Peer_Router.cpp,
-          examples/ASX/Event_Server/Transceiver/transceiver.cpp,
-          examples/ASX/UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp,
-          examples/Connection/misc/test_upipe.cpp,
-          examples/Connection/non_blocking/test_*_connector.cpp: added
-          ACE_Map_Entry template specialization.  It's needed now that the
-          destructor is explicit.
+	* tests/Conn_Test.cpp,
+	  netsvcs/lib/{Client_Logging_Handler,TS_Clerk_Handler}.cpp,
+	  netsvcs/clients/Tokens/manual/manual.cpp,
+	  apps/Gateway/Gateway/Event_Channel.cpp,:
+	  apps/JAWS/client/Blob.cpp,
+	  examples/ASX/Event_Server/Event_Server/Peer_Router.cpp,
+	  examples/ASX/Event_Server/Transceiver/transceiver.cpp,
+	  examples/ASX/UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp,
+	  examples/Connection/misc/test_upipe.cpp,
+	  examples/Connection/non_blocking/test_*_connector.cpp: added
+	  ACE_Map_Entry template specialization.  It's needed now that the
+	  destructor is explicit.
 
 Fri May  2 14:57:56 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Map_Manager.cpp: Added a no-op destructor to ACE_Map_Entry
-          just to keep some compilers happy.  Thanks to Chuck Gehr for
-          reporting this.
+	* ace/Map_Manager.cpp: Added a no-op destructor to ACE_Map_Entry
+ 	  just to keep some compilers happy.  Thanks to Chuck Gehr for
+ 	  reporting this.
 
-        * ace/config-osf1-4.0.h: Added 
-        
-          #define ACE_LACKS_IOSTREAM_FX
-          #define ACE_LACKS_LINEBUFFERED_STREAMBUF
-          #define ACE_LACKS_SIGNED_CHAR
+	* ace/config-osf1-4.0.h: Added 
+	
+	  #define ACE_LACKS_IOSTREAM_FX
+	  #define ACE_LACKS_LINEBUFFERED_STREAMBUF
+	  #define ACE_LACKS_SIGNED_CHAR
 
-          Thanks to James CE Johnson <jjohnson@lads.com> for reporting
-          this.
+	  Thanks to James CE Johnson <jjohnson@lads.com> for reporting
+ 	  this.
 
-        * ace/Timer_{Wheel,Heap,List}_T.h: Fixed a typo in all these
-          classes that was failing to put the keyword "class" after
-          "friend."  Also, replaced the use of the typedef with the
-          expanded name of the class to work around problems with DEC
-          C++.  Thanks to James CE Johnson <jjohnson@lads.com> for
-          reporting this. 
+	* ace/Timer_{Wheel,Heap,List}_T.h: Fixed a typo in all these
+	  classes that was failing to put the keyword "class" after
+	  "friend."  Also, replaced the use of the typedef with the
+	  expanded name of the class to work around problems with DEC
+	  C++.  Thanks to James CE Johnson <jjohnson@lads.com> for
+	  reporting this. 
 
-        * ace/Set: Added a find() method that will return the "ith"
-          element in the set.
+	* ace/Set: Added a find() method that will return the "ith"
+ 	  element in the set.
 
-        * ace/Set: Added copy constructors and assignment operators to all
-          the ACE_*_Set classes.
+	* ace/Set: Added copy constructors and assignment operators to all
+ 	  the ACE_*_Set classes.
 
-        * ace/Set.cpp: Changed the implementation of ACE_Unbounded_Set to
-          use a dummy node and a circular list.  This improves performance
-          and also makes it possible to implement "queue" semantics for
-          inserting at the tail of the set.
+	* ace/Set.cpp: Changed the implementation of ACE_Unbounded_Set to
+ 	  use a dummy node and a circular list.  This improves performance
+ 	  and also makes it possible to implement "queue" semantics for
+ 	  inserting at the tail of the set.
 
-        * ace/config-osf1-4.0.h: Added the ACE_HAS_STRING_CLASS macro.
-          Thanks to James CE Johnson <jcej@lads.com> for this.
+	* ace/config-osf1-4.0.h: Added the ACE_HAS_STRING_CLASS macro.
+	  Thanks to James CE Johnson <jcej@lads.com> for this.
 
-        * ace/IOStream: Added the ACE_HAS_STRING_CLASS macro to
-          replace the nasty #ifdefs we had previously.  Thanks to
-          James CE Johnson <jcej@lads.com> for this.
+	* ace/IOStream: Added the ACE_HAS_STRING_CLASS macro to
+	  replace the nasty #ifdefs we had previously.  Thanks to
+	  James CE Johnson <jcej@lads.com> for this.
 
-        * ace/config*.g++: Added ACE_HAS_STRING_CLASS for all the GNU 
-          compilers and Win32.
+	* ace/config*.g++: Added ACE_HAS_STRING_CLASS for all the GNU 
+	  compilers and Win32.
 
-        * ace/config-mvs.h: Added a new version that contains support for
-          IBM OS/390 r2.  Thanks to Chuck Gehr for this.
+	* ace/config-mvs.h: Added a new version that contains support for
+ 	  IBM OS/390 r2.  Thanks to Chuck Gehr for this.
 
 Fri May 02 08:14:30 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp: removed
-          specializations of ACE Guards because they're in libGateway.
-          Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this problem.
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp: removed
+	  specializations of ACE Guards because they're in libGateway.
+	  Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this problem.
 
-        * examples/ASX/Event_Server/Transceiver/{Makefile,transceiver.cpp}:
-          added template specializations to transceiver.cpp so that it no
-          longer needs to be linked with libGateway.
+	* examples/ASX/Event_Server/Transceiver/{Makefile,transceiver.cpp}:
+	  added template specializations to transceiver.cpp so that it no
+	  longer needs to be linked with libGateway.
 
-        * examples/ASX/Event_Server/Event_Server/{Makefile,Peer_Router.cpp}:
-          added template specialization to Peer_Router.cpp so that event_server
-          no longer needs to be linked with libGateway.
+	* examples/ASX/Event_Server/Event_Server/{Makefile,Peer_Router.cpp}:
+	  added template specialization to Peer_Router.cpp so that event_server
+	  no longer needs to be linked with libGateway.
 
-        Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting the above
-        link problems.
+	Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting the above
+	link problems.
 
-        * apps/Gateway/Peer/{Makefile,Peer.cpp}: added template
-          specialization to Peer.cpp so that peerd no longer needs to
-          be linked with libGateway.
+	* apps/Gateway/Peer/{Makefile,Peer.cpp}: added template
+	  specialization to Peer.cpp so that peerd no longer needs to
+	  be linked with libGateway.
 
-        * Log_Msg.cpp (VxWorks only): fixed used of ::taskDeleteHookAdd (it
-          should only be called once for all Log_Msg instances) and added call
-          to ::taskDeleteHookDelete to clean up when the last task exits.
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          reporting this.
+	* Log_Msg.cpp (VxWorks only): fixed used of ::taskDeleteHookAdd (it
+	  should only be called once for all Log_Msg instances) and added call
+	  to ::taskDeleteHookDelete to clean up when the last task exits.
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  reporting this.
 
-        * tests/Conn_Test.cpp: changed some fprintf print specifiers to avoid
-          g++ warnings about printing pointer values.
+	* tests/Conn_Test.cpp: changed some fprintf print specifiers to avoid
+	  g++ warnings about printing pointer values.
 
 Thu May 01 00:05:59 1997    <irfan@TWOSTEP>
 
-        * tests/Time_Service_Test.cpp (main): Made sure that the backing
-          store is not there at the start of the program. We need to make
-          sure because this test kills the Time Clerk and on some
-          platforms the Clerk is not allowed to do a graceful shutdown. By
-          cleaning the backing store here, we are sure that we get a fresh
-          start and no garbage data from a possible aborted run. 
-
-          The old code deleting the backing store at the end of the test
-          is still there but does not work on Win32 as unlink fails with
-          ERROR_ACCESS_DENIED. I am not sure why this is happening!  For
-          now the unlink at the start of the program will do.
-
-          Also added a wait for the clerk before deleting the backing
-          store. This way we are sure that we do not delete the backing
-          store before the clerk is done with it.
-
-        * netsvcs/lib/TS_Clerk_Handler.cpp: Fixed an obscure bug with
-          ACE_TS_Clerk_Processor. ACE_TS_Clerk_Processor (which is an
-          ACE_Connector) and all its pending connection objects are still
-          registered with the Reactor when the process exits and the
-          Service_Object is deleted. After this the destructor of the
-          Reactor then calls handle_close on ACE_TS_Clerk_Processor
-          (which does not exist anymore), causing a seg fault. The
-          solution is to call ACE_Connector::fini from
-          ACE_TS_Clerk_Processor::fini. ACE_Connector::fini will
-          unregister ACE_TS_Clerk_Processor and all pending connects from
-          the Reactor.
+	* tests/Time_Service_Test.cpp (main): Made sure that the backing
+ 	  store is not there at the start of the program. We need to make
+ 	  sure because this test kills the Time Clerk and on some
+ 	  platforms the Clerk is not allowed to do a graceful shutdown. By
+ 	  cleaning the backing store here, we are sure that we get a fresh
+ 	  start and no garbage data from a possible aborted run. 
+
+	  The old code deleting the backing store at the end of the test
+ 	  is still there but does not work on Win32 as unlink fails with
+ 	  ERROR_ACCESS_DENIED. I am not sure why this is happening!  For
+ 	  now the unlink at the start of the program will do.
+
+	  Also added a wait for the clerk before deleting the backing
+ 	  store. This way we are sure that we do not delete the backing
+ 	  store before the clerk is done with it.
+
+	* netsvcs/lib/TS_Clerk_Handler.cpp: Fixed an obscure bug with
+ 	  ACE_TS_Clerk_Processor. ACE_TS_Clerk_Processor (which is an
+ 	  ACE_Connector) and all its pending connection objects are still
+ 	  registered with the Reactor when the process exits and the
+ 	  Service_Object is deleted. After this the destructor of the
+ 	  Reactor then calls handle_close on ACE_TS_Clerk_Processor
+	  (which does not exist anymore), causing a seg fault. The
+ 	  solution is to call ACE_Connector::fini from
+ 	  ACE_TS_Clerk_Processor::fini. ACE_Connector::fini will
+	  unregister ACE_TS_Clerk_Processor and all pending connects from
+	  the Reactor.
 
 Wed Apr 30 17:47:11 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i (getpwnam_r): Changed the expression to check if
-          getpwnam_r() returns -1 for AIX.  Thanks to Chris Lahey for
-          this.
+	* ace/OS.i (getpwnam_r): Changed the expression to check if
+ 	  getpwnam_r() returns -1 for AIX.  Thanks to Chris Lahey for
+ 	  this.
 
-        * ace/Timer_Wheel_T.h: changed
+	* ace/Timer_Wheel_T.h: changed
 
-          // = Don't allow these operations for now.
-          ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T &);
-          void operator= (const ACE_Timer_Wheel_T &);
+	  // = Don't allow these operations for now.
+	  ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T &);
+	  void operator= (const ACE_Timer_Wheel_T &);
  
           to:
  
           // = Don't allow these operations for now.
-          ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR> &);
-          void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR> &);
+	  ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T<TYPE, FUNCTOR> &);
+	  void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR> &);
 
-          Thanks to Chuck Gehr for reporting this.
+	  Thanks to Chuck Gehr for reporting this.
 
-        * ace/OS.cpp: Made mktime() thread-safe.  If any platforms support
-          multi-thread safe versions of mktime() please let me know so we
-          can set the ACE_HAS_MT_SAFE_MKTIME macro for that config file.
+	* ace/OS.cpp: Made mktime() thread-safe.  If any platforms support
+ 	  multi-thread safe versions of mktime() please let me know so we
+ 	  can set the ACE_HAS_MT_SAFE_MKTIME macro for that config file.
 
-        * ace/OS.i: Added a new special case for getpwnam_r() on AIX.
-          Thanks to Chris Lahey for reporting this.
+	* ace/OS.i: Added a new special case for getpwnam_r() on AIX.
+  	  Thanks to Chris Lahey for reporting this.
 
 Wed Apr 30 16:01:04 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/OS.i, ace/OS.h: added mktime().
+	* ace/OS.i, ace/OS.h: added mktime().
 
 Wed Apr 30 14:17:34 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-vxworks*.h: added ACE_LACKS_PWD_FUNCTIONS.  Thanks
-          to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting
-          this.
+	* ace/config-vxworks*.h: added ACE_LACKS_PWD_FUNCTIONS.  Thanks
+	  to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting
+	  this.
 
-        * ace/OS.i: cleaned up ACE_LACKS_PWD_FUNCTIONS comments a bit.
+	* ace/OS.i: cleaned up ACE_LACKS_PWD_FUNCTIONS comments a bit.
 
-        * ace/Array.{h,i}: added const operator [].
+	* ace/Array.{h,i}: added const operator [].
 
-        * ace/Array.cpp (ctors): reordered initializers to match declaration
-          order.
+	* ace/Array.cpp (ctors): reordered initializers to match declaration
+	  order.
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: protect against multiple
-          inclusion.  Thanks to Kevin Martindale
-          <kevin_martindale@stortek.com> for reporting this problem.
+	* netsvcs/lib/Server_Logging_Handler.cpp: protect against multiple
+ 	  inclusion.  Thanks to Kevin Martindale
+ 	  <kevin_martindale@stortek.com> for reporting this problem.
 
 Wed Apr 30 08:42:55 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace: Added a new generic Array class, which we'll use until
-          STL becomes more widely portable.
+	* ace: Added a new generic Array class, which we'll use until
+	  STL becomes more widely portable.
 
-        * ace: Added a new macro ACE_LACKS_GETPGID to clean up the code
-          in ACE_OS::getpgid().
+	* ace: Added a new macro ACE_LACKS_GETPGID to clean up the code
+	  in ACE_OS::getpgid().
 
-        * ace: Added new config*.h files and platform*.GNU files for
-          FreeBSD.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for these.
+	* ace: Added new config*.h files and platform*.GNU files for
+ 	  FreeBSD.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for these.
 
 Wed Apr 30 07:44:36 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-osf1-4.0*.h: removed ACE_HAS_SIGWAIT.
+	* ace/config-osf1-4.0*.h: removed ACE_HAS_SIGWAIT.
 
-        * ace/OS.{h,i}: applied Thilo's patch for sigwait on Digital
-          Unix 4.0, which defines sigwait as a macro.  Thanks to
-          Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          this and the above config file patches.
+	* ace/OS.{h,i}: applied Thilo's patch for sigwait on Digital
+	  Unix 4.0, which defines sigwait as a macro.  Thanks to
+	  Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  this and the above config file patches.
 
-        * ace/IOStream.{h,cpp}: James CE Johnson <jcej@lads.com> updated
-          the IOStream class; see comments in IOStream.h.
+	* ace/IOStream.{h,cpp}: James CE Johnson <jcej@lads.com> updated
+	  the IOStream class; see comments in IOStream.h.
 
-        * examples/Logger/client/logging_app.cpp (main),
-          performance-tests/Misc/test_naming.cpp (*): replaced sprintf
-          with ACE_OS::sprintf.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for reporting these.
+	* examples/Logger/client/logging_app.cpp (main),
+	  performance-tests/Misc/test_naming.cpp (*): replaced sprintf
+	  with ACE_OS::sprintf.  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for reporting these.
 
 Tue Apr 29 20:03:38 1997    <sumedh@cs.wustl.edu>
 
@@ -3254,386 +3254,386 @@ Tue Apr 29 20:03:38 1997    <sumedh@cs.wustl.edu>
 
 Tue Apr 29 19:57:52 1997    <irfan@TWOSTEP>
 
-        * config-win32-common.h (ACE_HAS_TEMPLATE_SPECIALIZATION): Win32
-          supports this option. Added to config file.
+	* config-win32-common.h (ACE_HAS_TEMPLATE_SPECIALIZATION): Win32
+	  supports this option. Added to config file.
 
-        * ace: Removed tracing for the following to make things work with
-          tracing on:
-          
-          ACE::timestamp
-          ACE_FIFO_Send_Msg::send
-          ACE_SPIPE_Stream::send
-          ACE_Sig_Guard::ACE_Sig_Guard
-          ACE_Sig_Guard::~ACE_Sig_Guard
+	* ace: Removed tracing for the following to make things work with
+ 	  tracing on:
+	  
+	  ACE::timestamp
+	  ACE_FIFO_Send_Msg::send
+	  ACE_SPIPE_Stream::send
+	  ACE_Sig_Guard::ACE_Sig_Guard
+	  ACE_Sig_Guard::~ACE_Sig_Guard
 
-        * netsvcs/servers/main.cpp (main): Added special code for Win32
-          such that only SIGINT is being registered with the Signal
-          Handler. SIGQUIT is not supported on Win32.
+	* netsvcs/servers/main.cpp (main): Added special code for Win32
+	  such that only SIGINT is being registered with the Signal
+	  Handler. SIGQUIT is not supported on Win32.
 
-        * netsvcs/lib/Token_Handler.cpp (init): Removed the registration
-          of the Acceptor for SIGINTs.
+	* netsvcs/lib/Token_Handler.cpp (init): Removed the registration
+	  of the Acceptor for SIGINTs.
 
-        * netsvcs/lib/TS_Server_Handler.cpp (init): Same as above.
+	* netsvcs/lib/TS_Server_Handler.cpp (init): Same as above.
 
-        * netsvcs/lib/Client_Logging_Handler.cpp (open): Removed the
-          registration of SIGPIPE for Win32. Win32 does not support
-          SIGPIPE.
+	* netsvcs/lib/Client_Logging_Handler.cpp (open): Removed the
+ 	  registration of SIGPIPE for Win32. Win32 does not support
+ 	  SIGPIPE.
 
-        * tests/Process_Strategy_Test.cpp (server): The new thread must
-          become owner before it can call Reactor::handle_events. Also
-          fixed #define typo.
+	* tests/Process_Strategy_Test.cpp (server): The new thread must
+ 	  become owner before it can call Reactor::handle_events. Also
+	  fixed #define typo.
 
-        * ace/OS.cpp (socket_fini): Remove the ACE error message as the IO
-          Stream objects are already gone by this point in the program.
+	* ace/OS.cpp (socket_fini): Remove the ACE error message as the IO
+ 	  Stream objects are already gone by this point in the program.
 
-        * examples/Registry/Registry.mak: Replaced the old makefiles with
-          this one. Also added _AFXDLL as a preprocessor define, forcing
-          the correct inclusion of header files that give a consistent
-          definition of HKEY. This is a hack till we have a better
-          solution.
+	* examples/Registry/Registry.mak: Replaced the old makefiles with
+ 	  this one. Also added _AFXDLL as a preprocessor define, forcing
+ 	  the correct inclusion of header files that give a consistent
+ 	  definition of HKEY. This is a hack till we have a better
+ 	  solution.
 
-        * ace/Event_Handler: Removed the old Proactor callback methods. 
+	* ace/Event_Handler: Removed the old Proactor callback methods. 
 
 Tue Apr 29 17:39:40 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/config-mvs.h: Added #define ACE_LACKS_LINEBUFFERED_STREAMBUF
-          for MVS.  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
-          reporting this.
-
-        * ace: Commented out ACE_TRACE calls in constructors in
-          several ACE classes in order to avoid problems with circular
-          initialization dependencies related to mutexes that are
-          breaking code on WinNT when ACE_NTRACE is set to 0.  Thanks
-          to Lothar Hermann <hermann@csaserv.med.siemens.de> for
-          reporting these. 
-
-        * ace/Reactor.cpp: It looks as if Windows NT isn't returning
-          the number of bytes requested by a WinSock recv() used in
-          the ACE_Reactor::notify() in some situations.  This is
-          causing problems for test programs under heavy load.  The
-          fix appears to be to add an additional ACE::recv() to obtain
-          the remaining bytes.  Thanks to Karlheinz for reporting this
-          and to Irfan for helping to fix it.
-
-        * ace/OS.i: Fixed a very subtle bug with ACE_OS::cond_wait() and
-          ACE_OS::cond_signal() that only manifests itself when
-          ACE_HAS_SIGNAL_OBJECT_AND_WAIT is enabled (which isn't the
-          default).  The problem stemmed from the fact that we were
-          assuming that if we used condition variables it implied that the
-          external mutex had USYNC_PROCESS scope.  In fact, the external
-          mutexes typically have USYNC_THREAD scope, so
-          SignalObjectAndWait() was hanging indefinitely.  Fortunately,
-          the fix was easy -- just add a run-time check for the type of
-          the external mutex and take the appropriate action.  Thanks to
-          Irfan for noticing this.
-
-        * tests/Reader_Writer_Test.cpp: Added a parse_args() function that
-          allows us to override the default number of reader/writer
-          threads + the number of iterations.
-
-        * ace/OS: Added patches for Digital UNIX to handle the
-          getpwnam_r() name.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for these patches.
+	* ace/config-mvs.h: Added #define ACE_LACKS_LINEBUFFERED_STREAMBUF
+	  for MVS.  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
+	  reporting this.
+
+	* ace: Commented out ACE_TRACE calls in constructors in
+	  several ACE classes in order to avoid problems with circular
+	  initialization dependencies related to mutexes that are
+	  breaking code on WinNT when ACE_NTRACE is set to 0.  Thanks
+	  to Lothar Hermann <hermann@csaserv.med.siemens.de> for
+	  reporting these. 
+
+	* ace/Reactor.cpp: It looks as if Windows NT isn't returning
+ 	  the number of bytes requested by a WinSock recv() used in
+	  the ACE_Reactor::notify() in some situations.  This is
+	  causing problems for test programs under heavy load.  The
+	  fix appears to be to add an additional ACE::recv() to obtain
+	  the remaining bytes.  Thanks to Karlheinz for reporting this
+	  and to Irfan for helping to fix it.
+
+	* ace/OS.i: Fixed a very subtle bug with ACE_OS::cond_wait() and
+ 	  ACE_OS::cond_signal() that only manifests itself when
+ 	  ACE_HAS_SIGNAL_OBJECT_AND_WAIT is enabled (which isn't the
+ 	  default).  The problem stemmed from the fact that we were
+ 	  assuming that if we used condition variables it implied that the
+ 	  external mutex had USYNC_PROCESS scope.  In fact, the external
+ 	  mutexes typically have USYNC_THREAD scope, so
+	  SignalObjectAndWait() was hanging indefinitely.  Fortunately,
+	  the fix was easy -- just add a run-time check for the type of
+	  the external mutex and take the appropriate action.  Thanks to
+	  Irfan for noticing this.
+
+	* tests/Reader_Writer_Test.cpp: Added a parse_args() function that
+ 	  allows us to override the default number of reader/writer
+ 	  threads + the number of iterations.
+
+	* ace/OS: Added patches for Digital UNIX to handle the
+ 	  getpwnam_r() name.  Thanks to Thilo Kielmann
+ 	  <kielmann@informatik.uni-siegen.de> for these patches.
 
 Tue Apr 29 14:27:19 1997    <harrison@samba.cs.wustl.edu>
 
-        * OS.h: Added ACE_HAS_SVC_DLL.  If you write a library and
-          want it to use ACE_Svc_Export, this will cause those macros
-          to build dlls.  If you want your ACE service to be a static
-          library, comment out this line.  As far as I know, the only
-          reason to have a library be an ACE "service" is to leverage
-          the ACE_Svc_Export macros.  It's just as easy to define your
-          own export macros.
+	* OS.h: Added ACE_HAS_SVC_DLL.  If you write a library and
+	  want it to use ACE_Svc_Export, this will cause those macros
+	  to build dlls.  If you want your ACE service to be a static
+	  library, comment out this line.  As far as I know, the only
+	  reason to have a library be an ACE "service" is to leverage
+	  the ACE_Svc_Export macros.  It's just as easy to define your
+	  own export macros.
 
 Tue Apr 29 07:25:25 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * apps/JAWS/server/HTTP_Request.h (HTTP_Request): added destructor
-          declaration.
+	* apps/JAWS/server/HTTP_Request.h (HTTP_Request): added destructor
+	  declaration.
 
-        * apps/JAWS/server/Parse_Headers.cpp (parse_header_line): assign local
-          "value" to value_ field of map_[header].
+	* apps/JAWS/server/Parse_Headers.cpp (parse_header_line): assign local
+	  "value" to value_ field of map_[header].
 
-        * apps/JAWS/server/HTTP_Request.cpp (HTTP_fix_path): commented this
-          static function out because it's not used, and g++ warns about that.
+	* apps/JAWS/server/HTTP_Request.cpp (HTTP_fix_path): commented this
+	  static function out because it's not used, and g++ warns about that.
 
-        * apps/JAWS: added CVS header to all .h, .i, and .cpp files.
+	* apps/JAWS: added CVS header to all .h, .i, and .cpp files.
 
 Tue Apr 29 00:33:46 1997    <irfan@TWOSTEP>
 
-        * examples/Reactor/Misc/notification.cpp: Add this test to the
-          Win32 makefile.
+	* examples/Reactor/Misc/notification.cpp: Add this test to the
+ 	  Win32 makefile.
 
-        * ace: Removed config-win32-msvc2.0.h,  config-win32-msvc4.0.h
-          config-win32-msvc4.x.h, and config-winnt-4.0-msvc.h from the
-          repository. These files have been replaced by config-win32.h
-          and config-win32-common.h.
+	* ace: Removed config-win32-msvc2.0.h,  config-win32-msvc4.0.h
+	  config-win32-msvc4.x.h, and config-winnt-4.0-msvc.h from the
+	  repository. These files have been replaced by config-win32.h
+	  and config-win32-common.h.
 
-        * IOStream_Test.cpp (main): Added return 0 at the end of main().
+	* IOStream_Test.cpp (main): Added return 0 at the end of main().
 
-        * examples/Reactor/Proactor/test_proactor.mak: Added wsock32.lib
-          to the link line. I am not sure why we have to do this again
-          since ace.lib already includes it. Without this library in the
-          link line, GetAcceptExSockaddr is not defined. Go figure!
+	* examples/Reactor/Proactor/test_proactor.mak: Added wsock32.lib
+	  to the link line. I am not sure why we have to do this again
+	  since ace.lib already includes it. Without this library in the
+	  link line, GetAcceptExSockaddr is not defined. Go figure!
 
-        * apps/JAWS/server/jaws.mak: Same as above.
+	* apps/JAWS/server/jaws.mak: Same as above.
 
-        * ace/ace.{mak,mdp}: Fixed the generation of the release version
-          of ace.dll such that wsock32.lib is automatically included.
+	* ace/ace.{mak,mdp}: Fixed the generation of the release version
+	  of ace.dll such that wsock32.lib is automatically included.
 
 Tue Apr 29 00:16:27 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * JAWS: Changes to support CGI scripts
+	* JAWS: Changes to support CGI scripts
 
-          Changed the following files --
-          HTTP_Handler.cpp HTTP_Handler.h HTTP_Helpers.cpp
-          HTTP_Helpers.h HTTP_Request.cpp HTTP_Request.h IO.cpp IO.h
+	  Changed the following files --
+	  HTTP_Handler.cpp HTTP_Handler.h HTTP_Helpers.cpp
+	  HTTP_Helpers.h HTTP_Request.cpp HTTP_Request.h IO.cpp IO.h
 
-          Added the following files --
-          HTTP_Response.cpp HTTP_Response.h Parse_Headers.cpp
-          Parse_Headers.h
+	  Added the following files --
+	  HTTP_Response.cpp HTTP_Response.h Parse_Headers.cpp
+	  Parse_Headers.h
 
-          Removed the file --
-          JXH_String.h
+	  Removed the file --
+	  JXH_String.h
 
-        * JAWS/stress_testing: Changed the Makefile to link in the math
-          library (-lm).
+	* JAWS/stress_testing: Changed the Makefile to link in the math
+	  library (-lm).
 
-        * ace/OS.h and ace/OS.i: Added support for memmove().
+	* ace/OS.h and ace/OS.i: Added support for memmove().
 
 Mon Apr 28 21:35:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/IOStream.h: Added a new macro called
-          ACE_LACKS_IOSTREAM_SETGET, which works around bugs with SGI C++
-          on IRIX 6.2.  Thanks to Torbjorn Lindgren <tl@funcom.com> for
-          reporting this.
+	* ace/IOStream.h: Added a new macro called
+ 	  ACE_LACKS_IOSTREAM_SETGET, which works around bugs with SGI C++
+ 	  on IRIX 6.2.  Thanks to Torbjorn Lindgren <tl@funcom.com> for
+ 	  reporting this.
 
-        * ace/Timer_List_T.h: Replaced the use of 
-          ITERATOR with ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR> to
-          work around problems with SGI C++.  Thanks to 
-          Torbjorn Lindgren <tl@funcom.com> for reporting this.
+	* ace/Timer_List_T.h: Replaced the use of 
+	  ITERATOR with ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR> to
+	  work around problems with SGI C++.  Thanks to 
+	  Torbjorn Lindgren <tl@funcom.com> for reporting this.
 
-        * ace/Timer_List_T.cpp: Removed the use of NODE * and replaced it
-          with ACE_Timer_Node_T<TYPE, FUNCTOR> in order to work around
-          bugs with certain C++ compilers (i.e., SGI).  Thanks to Torbjorn
-          Lindgren <tl@funcom.com> for reporting this.
+	* ace/Timer_List_T.cpp: Removed the use of NODE * and replaced it
+ 	  with ACE_Timer_Node_T<TYPE, FUNCTOR> in order to work around
+ 	  bugs with certain C++ compilers (i.e., SGI).  Thanks to Torbjorn
+ 	  Lindgren <tl@funcom.com> for reporting this.
 
-        * tests/Conn_Test.cpp: Removed some extraneous template
-          specializations.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for
-          reporting these.
+	* tests/Conn_Test.cpp: Removed some extraneous template
+ 	  specializations.  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for
+ 	  reporting these.
 
-        * apps/JAWS/client/Blob.cpp: Rearranged some of the template
-          specializations in the hope of fixing a linker problem with
-          SunC++ 4.2.
+	* apps/JAWS/client/Blob.cpp: Rearranged some of the template
+ 	  specializations in the hope of fixing a linker problem with
+ 	  SunC++ 4.2.
 
-        * ace/config-irix-6.2*.h.  It appears that SGI IRIX 6.2 supports
-          pread() and pwrite() so I enabled the ACE_HAS_P_READ_WRITE macro
-          in the IRIX 6.2 config file.
+	* ace/config-irix-6.2*.h.  It appears that SGI IRIX 6.2 supports
+ 	  pread() and pwrite() so I enabled the ACE_HAS_P_READ_WRITE macro
+ 	  in the IRIX 6.2 config file.
 
-        * ace/OS.cpp: Implemented ACE_OS::pread() and ACE_OS::pwrite() for
-          systems that lack this feature.  The implementation uses the new
-          ACE_Thread_Mutex monitor lock in order to ensure atomicity
-          between the lseek() and the read()/write().
+	* ace/OS.cpp: Implemented ACE_OS::pread() and ACE_OS::pwrite() for
+ 	  systems that lack this feature.  The implementation uses the new
+ 	  ACE_Thread_Mutex monitor lock in order to ensure atomicity
+ 	  between the lseek() and the read()/write().
 
-        * ace/OS.cpp: Finally broke down and added a ACE_Thread_Mutex
-          monitor lock to the ACE_OS implementation file.  This is useful
-          for situations where we need to serialize certain ACE_OS
-          emulation calls (e.g., ACE_OS::{pwrite,pread}).
+	* ace/OS.cpp: Finally broke down and added a ACE_Thread_Mutex
+ 	  monitor lock to the ACE_OS implementation file.  This is useful
+ 	  for situations where we need to serialize certain ACE_OS
+ 	  emulation calls (e.g., ACE_OS::{pwrite,pread}).
 
 Mon Apr 28 15:42:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * apps/JAWS/client/blobby.cpp: updated template specializations.
-
-        * apps/JAWS/stress_testing/global.h: removed #includes of system
-          headers because ace/OS.h takes care of them.  They were causing
-          warnings with g++ (because they were #included before OS.h).
-
-        * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed
-          typos in template specializations.
-
-        * tests/Conn_Test.cpp,Message_{Block,Queue}_Test.cpp,
-          Process_Strategy_Test.cpp: fixed template specializations
-          for platforms without threads.  Thanks to Nanbor Wang
-          <nw1@cs.wustl.edu> for pointing out this problem.
-
-        * ace/Connector.h: use ACE_SYNCH_RW_MUTEX in Map typedefs
-          instead of old ACE_RW_Mutex (which should have been
-          ACE_Thread_RW_Mutex) and ACE_Null_Mutex (depending on
-          whether the platform has threads). 
-
-        * ace/Service_Record.cpp: added ACE_NULL_SYNCH template
-          specializations with threads, because they're still needed even
-          with threads.  This way, individual programs don't have to
-          specialize these.
-
-        * ace/Task.cpp: added ACE_TSS<ACE_Task_Exit> and
-          ACE_TSS<ACE_Dynamic> template specializations, if the platform
-          has threads and TSS.  This way, individual programs don't have
-          to specialize them.
-
-        * apps/Gateway/Gateway/Event_Channel.cpp,
-          Proxy_Handler{,_Connector}.cpp,apps/JAWS/server/HTTP_Server.cpp,
-          examples/ASX/Event_Server/Transceiver/transceiver.cpp,
-          examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp,
-          examples/Connection/blocking/SPIPE-connector.cpp,
-          examples/Connection/misc/{Connection_Handler,test_upipe}.cpp,
-          examples/Connection/non_blocking/test_*.cpp,
-          examples/IOStream/server/iostream_server.cpp,
-          examples/Logger/Acceptor-server/server_loggerd.cpp,
-          examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp,
-          netsvcs/lib/Client_Logging_Handler.cpp,
-          netsvcs/lib/TS_{Clerk,Server}_Handler.cpp:
-          removed template instantiations that are now in
-          ace/Service_Record.cpp and ace/Task.cpp.  This should help
-          on platforms without threads.
-
-        * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed
-          typos in template specializations.
-
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: protected
-          the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS.
-
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp: protected
-          the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS.
-
-        * apps/JAWS/stress_testing/benchd.cpp (serve): added return -1 if
-          the strcmp () fails so that the function always returns a value.
+	* apps/JAWS/client/blobby.cpp: updated template specializations.
+
+	* apps/JAWS/stress_testing/global.h: removed #includes of system
+	  headers because ace/OS.h takes care of them.  They were causing
+	  warnings with g++ (because they were #included before OS.h).
+
+	* examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed
+	  typos in template specializations.
+
+	* tests/Conn_Test.cpp,Message_{Block,Queue}_Test.cpp,
+	  Process_Strategy_Test.cpp: fixed template specializations
+	  for platforms without threads.  Thanks to Nanbor Wang
+	  <nw1@cs.wustl.edu> for pointing out this problem.
+
+	* ace/Connector.h: use ACE_SYNCH_RW_MUTEX in Map typedefs
+	  instead of old ACE_RW_Mutex (which should have been
+	  ACE_Thread_RW_Mutex) and ACE_Null_Mutex (depending on
+	  whether the platform has threads). 
+
+	* ace/Service_Record.cpp: added ACE_NULL_SYNCH template
+	  specializations with threads, because they're still needed even
+	  with threads.	 This way, individual programs don't have to
+	  specialize these.
+
+	* ace/Task.cpp: added ACE_TSS<ACE_Task_Exit> and
+	  ACE_TSS<ACE_Dynamic> template specializations, if the platform
+	  has threads and TSS.  This way, individual programs don't have
+	  to specialize them.
+
+	* apps/Gateway/Gateway/Event_Channel.cpp,
+	  Proxy_Handler{,_Connector}.cpp,apps/JAWS/server/HTTP_Server.cpp,
+	  examples/ASX/Event_Server/Transceiver/transceiver.cpp,
+	  examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp,
+	  examples/Connection/blocking/SPIPE-connector.cpp,
+	  examples/Connection/misc/{Connection_Handler,test_upipe}.cpp,
+	  examples/Connection/non_blocking/test_*.cpp,
+	  examples/IOStream/server/iostream_server.cpp,
+	  examples/Logger/Acceptor-server/server_loggerd.cpp,
+	  examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp,
+	  netsvcs/lib/Client_Logging_Handler.cpp,
+	  netsvcs/lib/TS_{Clerk,Server}_Handler.cpp:
+	  removed template instantiations that are now in
+	  ace/Service_Record.cpp and ace/Task.cpp.  This should help
+	  on platforms without threads.
+
+	* examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed
+	  typos in template specializations.
+
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: protected
+	  the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS.
+
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp: protected
+	  the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS.
+
+	* apps/JAWS/stress_testing/benchd.cpp (serve): added return -1 if
+	  the strcmp () fails so that the function always returns a value.
 
 Mon Apr 28 18:53:58 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * ace/OS.h: Added ACE_DEFAULT_TIMER_WHEEL_SIZE and 
-          ACE_DEFAULT_TIMER_WHEEL_RESOLUTION constants.
-        
-        * ace/Timer_Wheel_T.h: switched to use these constants
-          
-        * tests/Timer_Queue_Test.cpp: switched to use these constants
-
-        * ace/Timer_Wheel: added a new strategy for Timer Queues, one 
-          based on a hash table of ordered lists.  
-                
-          These files were added:
-        
-          - ace/Timer_Wheel.h
-          - ace/Timer_Wheel_T.h
-          - ace/Timer_Wheel_T.cpp
-        
-          These files were also changed to accomodate Timer Wheel
-          
-          - ace/Timer_Queue.cpp 
-          - ace/Timer_Queue_T.h
-          - ace/Timer_Queue_T.cpp
-          - tests/Timer_Queue_Test.cpp 
+	* ace/OS.h: Added ACE_DEFAULT_TIMER_WHEEL_SIZE and 
+	  ACE_DEFAULT_TIMER_WHEEL_RESOLUTION constants.
+	
+	* ace/Timer_Wheel_T.h: switched to use these constants
+	  
+	* tests/Timer_Queue_Test.cpp: switched to use these constants
+
+	* ace/Timer_Wheel: added a new strategy for Timer Queues, one 
+	  based on a hash table of ordered lists.  
+		
+	  These files were added:
+	
+	  - ace/Timer_Wheel.h
+	  - ace/Timer_Wheel_T.h
+	  - ace/Timer_Wheel_T.cpp
+	
+	  These files were also changed to accomodate Timer Wheel
+	  
+	  - ace/Timer_Queue.cpp 
+	  - ace/Timer_Queue_T.h
+	  - ace/Timer_Queue_T.cpp
+	  - tests/Timer_Queue_Test.cpp 
 
 Mon Apr 28 17:32:04 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added
-          template specializations.
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added
+ 	  template specializations.
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added
-          template specializations.
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added
+ 	  template specializations.
 
-        * ace/OS.cpp (thr_create): Hopefully resolved tension
-          btw. priority determination algorithms for IRIX, LinuxThreads, and
-          DEC UNIX 4.0.  Thanks to Thilo for information that lead to this.
+	* ace/OS.cpp (thr_create): Hopefully resolved tension
+ 	  btw. priority determination algorithms for IRIX, LinuxThreads, and
+ 	  DEC UNIX 4.0.  Thanks to Thilo for information that lead to this.
 
 Mon Apr 28 00:25:17 1997    <irfan@TWOSTEP>
 
-        * apps/JAWS/client: Removed ACE_Export macro from class
-          declarations. Fixed buffer size bug in
-          ACE_Blob_Reader::receive_reply ().
+	* apps/JAWS/client: Removed ACE_Export macro from class
+ 	  declarations. Fixed buffer size bug in
+ 	  ACE_Blob_Reader::receive_reply ().
 
 Sun Apr 27 22:22:14 1997    <irfan@TWOSTEP>
 
-        * ace/Proactor: The Proactor can now be registered with ReactorEx
-          and both of them can be run from ReactorEx's event loop. Added a
-          flag to Proactor's constructor that indicates whether the
-          Proactor will be used in conjunction with ReactorEx event
-          loop. Only if this flag is set will the event in the Proactor be
-          used by the Asynch IO components. This will help with
-          performance.
-
-        * examples/Reactor/Proactor/test_multiple_loops.cpp: Added a new
-          test that shows the integration of the event loops of Proactor
-          and ReactorEx.
-
-        * ace/Asynch_IO: Added an ACE_EVENT parameter to the constructors
-          of classes that inherit from the OVERLAPPED structure. This way
-          the Proactor's event_ can be set in the OVERLAPPED structure.
-
-          Also changed the open methods on the Asynch IO classes to take a
-          Proactor as an extra parameter.
-        
-          Changed ACE_Handler's handle_timeout() to handle_time_out() in
-          ACE_Handler. This is temporary till we decide on the argument
-          about mixing the interface of ACE_Event_Handler and
-          ACE_Handler. This change allows user to inherit from ACE_Handler
-          and ACE_Event_Handler and use the different handle_timeout()
-          method, one of which returns void and the other return an int.
-
-        * examples/Reactor/Proactor/test_timeout.cpp: This file got
-          affected by the above change.
+	* ace/Proactor: The Proactor can now be registered with ReactorEx
+ 	  and both of them can be run from ReactorEx's event loop. Added a
+ 	  flag to Proactor's constructor that indicates whether the
+ 	  Proactor will be used in conjunction with ReactorEx event
+ 	  loop. Only if this flag is set will the event in the Proactor be
+ 	  used by the Asynch IO components. This will help with
+ 	  performance.
+
+	* examples/Reactor/Proactor/test_multiple_loops.cpp: Added a new
+ 	  test that shows the integration of the event loops of Proactor
+ 	  and ReactorEx.
+
+	* ace/Asynch_IO: Added an ACE_EVENT parameter to the constructors
+ 	  of classes that inherit from the OVERLAPPED structure. This way
+ 	  the Proactor's event_ can be set in the OVERLAPPED structure.
+
+	  Also changed the open methods on the Asynch IO classes to take a
+ 	  Proactor as an extra parameter.
+	
+	  Changed ACE_Handler's handle_timeout() to handle_time_out() in
+ 	  ACE_Handler. This is temporary till we decide on the argument
+ 	  about mixing the interface of ACE_Event_Handler and
+ 	  ACE_Handler. This change allows user to inherit from ACE_Handler
+ 	  and ACE_Event_Handler and use the different handle_timeout()
+ 	  method, one of which returns void and the other return an int.
+
+	* examples/Reactor/Proactor/test_timeout.cpp: This file got
+ 	  affected by the above change.
 
 Sun Apr 27 17:44:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.h: Added a new #define called ACE_DEFAULT_HTTP_SERVER_PORT.
-          Naturally, this defaults to 80...
-
-        * apps/JAWS/client/blobby.cpp: Cleaned up the blobby example so
-          that it conforms more closely to the ACE style guide.
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-in{server,client}.cpp: Took out
-          the VxWorks-specific #ifdefs.  I believe this is fixed in ACE_OS
-          now.  If not, the burden of proof is on the VxWorks testers to
-          prove me wrong ;-).
-
-        * ace/Synch_T.h: Added a new macro ACE_SYNCH_RW_MUTEX to
-          complement the existing ACE_SYNCH_MUTEX and ACE_SYNCH_CONDITION
-          macros.  This will clean up lots of code in various test
-          programs.
-
-        * ace/Synch_T.h: Added two new macros, ACE_SYNCH_MUTEX and
-          ACE_SYNCH_CONDITION.  These default to ACE_MT_SYNCH::MUTEX and
-          ACE_MT_SYNCH::MUTEX if template typedefs are supported and
-          ACE_HAS_THREADS is enabled.  If template typedefs *aren't*
-          supported but ACE_HAS_THREADS is enabled these macros turn into
-          ACE_Thread_Mutex and ACE_Thread_Condition.  Finally, if
-          ACE_HAS_THREADS is disabled these macros turn into
-          ACE_Null_Mutex and ACE_Null_Condition.  These macros make it
-          possible to write code that is more portable across platforms
-          and configurations.  Thanks to Carlos O'Ryan for this
-          suggestion.
-
-        * ace/OS.h: Replaced all uses of ACE_SYNCH_MUTEX and
-          ACE_SYNCH_CONDITION with ACE_SYNCH_MUTEX_T and
-          ACE_SYNCH_CONDITION_T since (1) this usage relates to templates
-          and (2) it frees up the namespace for the new ACE_SYNCH_MUTEX
-          and ACE_SYNCH_CONDITION macros.
-
-        * ace/Timer_Queue.cpp: Added yet more template specializations for
-          the benefit of GCC (ugh).
-
-        * ace/Timer_Wheel_T.cpp: Had to revise things just a bit to
-          compile with GCC and it's lame template mechanism.  This
-          required changing NODE * to ACE_Timer_Node_T<TYPE, FUNCTOR> * in
-          several method definitions.
-
-        * apps/JAWS/server/HTTP_Server.h: Changed the use of ACE_WIN32 to
-          ACE_HAS_THREAD_SAFE_ACCEPT since this is a more precise way to
-          determine if the platform allows multiple threads to call
-          accept() on the same port.  If other platforms support this
-          feature please make sure to add it to their config*.h files.
-
-        * ace/config-win32-common.h: Defined ACE_HAS_THREAD_SAFE_ACCEPT,
-          since Win32 allows multiple threads to call accept() on the same
-          port.
-
-        * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: The mutex
-          should be ACE_RW_Mutex, not ACE_Null_Mutex...
+	* ace/OS.h: Added a new #define called ACE_DEFAULT_HTTP_SERVER_PORT.
+	  Naturally, this defaults to 80...
+
+	* apps/JAWS/client/blobby.cpp: Cleaned up the blobby example so
+ 	  that it conforms more closely to the ACE style guide.
+
+	* examples/IPC_SAP/SOCK_SAP/CPP-in{server,client}.cpp: Took out
+ 	  the VxWorks-specific #ifdefs.  I believe this is fixed in ACE_OS
+ 	  now.  If not, the burden of proof is on the VxWorks testers to
+ 	  prove me wrong ;-).
+
+	* ace/Synch_T.h: Added a new macro ACE_SYNCH_RW_MUTEX to
+ 	  complement the existing ACE_SYNCH_MUTEX and ACE_SYNCH_CONDITION
+ 	  macros.  This will clean up lots of code in various test
+ 	  programs.
+
+	* ace/Synch_T.h: Added two new macros, ACE_SYNCH_MUTEX and
+ 	  ACE_SYNCH_CONDITION.  These default to ACE_MT_SYNCH::MUTEX and
+ 	  ACE_MT_SYNCH::MUTEX if template typedefs are supported and
+ 	  ACE_HAS_THREADS is enabled.  If template typedefs *aren't*
+ 	  supported but ACE_HAS_THREADS is enabled these macros turn into
+ 	  ACE_Thread_Mutex and ACE_Thread_Condition.  Finally, if
+ 	  ACE_HAS_THREADS is disabled these macros turn into
+ 	  ACE_Null_Mutex and ACE_Null_Condition.  These macros make it
+ 	  possible to write code that is more portable across platforms
+ 	  and configurations.  Thanks to Carlos O'Ryan for this
+ 	  suggestion.
+
+	* ace/OS.h: Replaced all uses of ACE_SYNCH_MUTEX and
+ 	  ACE_SYNCH_CONDITION with ACE_SYNCH_MUTEX_T and
+ 	  ACE_SYNCH_CONDITION_T since (1) this usage relates to templates
+ 	  and (2) it frees up the namespace for the new ACE_SYNCH_MUTEX
+ 	  and ACE_SYNCH_CONDITION macros.
+
+	* ace/Timer_Queue.cpp: Added yet more template specializations for
+ 	  the benefit of GCC (ugh).
+
+	* ace/Timer_Wheel_T.cpp: Had to revise things just a bit to
+ 	  compile with GCC and it's lame template mechanism.  This
+ 	  required changing NODE * to ACE_Timer_Node_T<TYPE, FUNCTOR> * in
+ 	  several method definitions.
+
+	* apps/JAWS/server/HTTP_Server.h: Changed the use of ACE_WIN32 to
+ 	  ACE_HAS_THREAD_SAFE_ACCEPT since this is a more precise way to
+ 	  determine if the platform allows multiple threads to call
+ 	  accept() on the same port.  If other platforms support this
+ 	  feature please make sure to add it to their config*.h files.
+
+	* ace/config-win32-common.h: Defined ACE_HAS_THREAD_SAFE_ACCEPT,
+ 	  since Win32 allows multiple threads to call accept() on the same
+ 	  port.
+
+	* examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: The mutex
+	  should be ACE_RW_Mutex, not ACE_Null_Mutex...
 
 Sun Apr 27 18:13:24 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Proactor.h: Added Timer_Wheel support.
+	* ace/Proactor.h: Added Timer_Wheel support.
 
-Sun Apr 27 18:13:24 1997  Sumedh Mungee <sumedh@cs.wustl.edu>
+Sun Apr 27 18:13:24 1997  Sumedh Mungee       <sumedh@cs.wustl.edu>
 
         * apps/JAWS/client: Removed blobby.h, and replaced it with
           blobby_options.{h,cpp}.
@@ -3643,242 +3643,242 @@ Sun Apr 27 18:13:24 1997  Sumedh Mungee <sumedh@cs.wustl.edu>
 
 Sun Apr 27 07:41:44 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Timer_Queue.cpp: added #includes for template specializations,
-          and removed some unused specializations.
+	* ace/Timer_Queue.cpp: added #includes for template specializations,
+	  and removed some unused specializations.
 
-        * ace/Timer_Wheel_T.cpp: added newline at end of file.
+	* ace/Timer_Wheel_T.cpp: added newline at end of file.
 
-        * ace/Timer_Wheel_T.cpp (ACE_Timer_Wheel_T ctor): reordered
-          initializers to match declaration order.
+	* ace/Timer_Wheel_T.cpp (ACE_Timer_Wheel_T ctor): reordered
+	  initializers to match declaration order.
 
-        * ace/Log_Msg.cpp (log): added support for indenting output according
-          to the current nesting level by adding a new format specifier, I,
-          which indents the output according to the current trace_depth_.
-          If a width is also specified it is taken as multiplier (so that
-          the indentation is n*trace_depth_).  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for providing the code for this feature!
+	* ace/Log_Msg.cpp (log): added support for indenting output according
+	  to the current nesting level by adding a new format specifier, I,
+	  which indents the output according to the current trace_depth_.
+	  If a width is also specified it is taken as multiplier (so that
+	  the indentation is n*trace_depth_).  Thanks to Matthias Kerkhoff
+	  <make@cs.tu-berlin.de> for providing the code for this feature!
 
-        * examples/Reactor/Misc/test_timer_queue.cpp: fixed typos in
-          #includes, and added #include of ace/Timer_Heap.h.
+	* examples/Reactor/Misc/test_timer_queue.cpp: fixed typos in
+	  #includes, and added #include of ace/Timer_Heap.h.
 
 Sat Apr 26 17:19:56 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Timer_Queue.cpp: The correct Timer_Queue.cpp file was not
-          checked in. Also the necessary #include was missing.
-        
-        * ace/Proactor.h: Proactor need all three Timer include files.
+	* ace/Timer_Queue.cpp: The correct Timer_Queue.cpp file was not
+ 	  checked in. Also the necessary #include was missing.
+	
+	* ace/Proactor.h: Proactor need all three Timer include files.
 
-        * ace/ace.{mdp,mak}: Updated for changes to Timer files.
+	* ace/ace.{mdp,mak}: Updated for changes to Timer files.
 
-        * ace: Updated the following files to include /**/ before an
-          include file directive: OS.h, config-win32-common.h,
-          bstring.h. Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de>
-          for reporting this.
+	* ace: Updated the following files to include /**/ before an
+ 	  include file directive: OS.h, config-win32-common.h,
+ 	  bstring.h. Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de>
+ 	  for reporting this.
 
 Sat Apr 26 13:41:15 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/config-sco-5.0.0-mit-pthread.h: Added
-          ACE_LACKS_PTHREAD_CANCEL.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
+	* ace/config-sco-5.0.0-mit-pthread.h: Added
+ 	  ACE_LACKS_PTHREAD_CANCEL.  Thanks to Arturo Montes
+ 	  <mitosys@colomsat.net.co> for reporting this.
 
-        * ace: Came up with a scheme that allowed us to remove the
-          ace/Timers.{h,i,cpp} files by adding
-          ACE_Timer_{Queue,Heap,List}_T.{h,i,cpp} files instead.  Thus, no
-          existing code should break.
+	* ace: Came up with a scheme that allowed us to remove the
+ 	  ace/Timers.{h,i,cpp} files by adding
+ 	  ACE_Timer_{Queue,Heap,List}_T.{h,i,cpp} files instead.  Thus, no
+ 	  existing code should break.
 
 Fri Apr 25 17:17:06 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.cpp (thr_create): Fixed the fix from Thilo so that it
-          compiled properly on Linux.  Hopefully I didn't break his, and I
-          should have detected the problem earlier.  Mea culpa.
+	* ace/OS.cpp (thr_create): Fixed the fix from Thilo so that it
+ 	  compiled properly on Linux.  Hopefully I didn't break his, and I
+ 	  should have detected the problem earlier.  Mea culpa.
 
 Fri Apr 25 12:45:23 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Added a new macro called ACE_HAS_SIG_MACROS for the
-          case where the frigging OS defines things like sigismember and
-          sigfillset as macros (ugh).
+	* ace/OS.h: Added a new macro called ACE_HAS_SIG_MACROS for the
+ 	  case where the frigging OS defines things like sigismember and
+ 	  sigfillset as macros (ugh).
 
-        * ace/FILE_IO.h: Removed a trailing default initializer from the
-          send() method since it was ambiguous.  Thanks to Carlos O'Ryan
-          for reporting this bug.
+	* ace/FILE_IO.h: Removed a trailing default initializer from the
+ 	  send() method since it was ambiguous.  Thanks to Carlos O'Ryan
+ 	  for reporting this bug.
 
-        * ace/OS.i (select): Unfortunately the (operator timeval*) defined
-          for ACE_Time_Value was not used in ACE_OS::select (int width,
-          fd_set *rfds, fd_set *wfds, fd_set *efds, const ACE_Time_Value
-          *timeout) because the operator cannot be applied for a
-          ACE_Time_Value*.  Therefore, I fixed this as follows:
+	* ace/OS.i (select): Unfortunately the (operator timeval*) defined
+ 	  for ACE_Time_Value was not used in ACE_OS::select (int width,
+ 	  fd_set *rfds, fd_set *wfds, fd_set *efds, const ACE_Time_Value
+ 	  *timeout) because the operator cannot be applied for a
+ 	  ACE_Time_Value*.  Therefore, I fixed this as follows:
 
-          ACE_SOCKCALL_RETURN (::select (width, 
-                                 (ACE_FD_SET_TYPE *) rfds, 
-                                 (ACE_FD_SET_TYPE *) wfds, 
-                                 (ACE_FD_SET_TYPE *) efds, 
-                                 timeout == 0 ? 0 : (timeval *) *timeout) , int, -1);
+	  ACE_SOCKCALL_RETURN (::select (width, 
+				 (ACE_FD_SET_TYPE *) rfds, 
+				 (ACE_FD_SET_TYPE *) wfds, 
+				 (ACE_FD_SET_TYPE *) efds, 
+				 timeout == 0 ? 0 : (timeval *) *timeout) , int, -1);
 
-          Thanks to Carlos O'Ryan for reporting this bug.
+	  Thanks to Carlos O'Ryan for reporting this bug.
 
-        * ace: Applied a slew of patches from Carlos O'Ryan in order to
-          get ACE to compile on HP/UX 10.x with the aCC compiler.
+	* ace: Applied a slew of patches from Carlos O'Ryan in order to
+ 	  get ACE to compile on HP/UX 10.x with the aCC compiler.
 
-        * ace/Shared_Memory_MM: Export the filename in
-          ACE_Shared_Memory_MM class in order to aid debugging.  Thanks to
-          Ashish Singhai <singhai@delirius.cs.uiuc.edu> for reporting
-          this.
+	* ace/Shared_Memory_MM: Export the filename in
+ 	  ACE_Shared_Memory_MM class in order to aid debugging.  Thanks to
+ 	  Ashish Singhai <singhai@delirius.cs.uiuc.edu> for reporting
+ 	  this.
 
 Fri Apr 25 14:58:38 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Timers: Updated the following files to make it compile on
-          g++. The following files were updated:
+	* ace/Timers: Updated the following files to make it compile on
+ 	  g++. The following files were updated:
 
-          Proactor.cpp Timer_Heap.cpp Timer_List.cpp Timer_Queue.cpp
-          Timers.cpp
+	  Proactor.cpp Timer_Heap.cpp Timer_List.cpp Timer_Queue.cpp
+ 	  Timers.cpp
 
 Thu Apr 24 21:13:51 1997    <irfan@TWOSTEP>
 
-        * ace/Timer_Queue: Decoupled the Timer Queue from
-          ACE_Event_Handler and the callback routines in the handler
-          (handle_timeout and handle_close). The new Timer Queue is
-          parameterized by the type of data to store and a FUNCTOR on
-          which methods are invoked by the Timer Queue when timeouts and
-          cancellations occur.
-
-          No changes occured to the algorithms of the different
-          implementations of the Timer Queues (Timer List and Timer
-          Heap). Timer Queues, Timer List, and Timer Heap were all renamed
-          as <class>_T. However, typedef were added such that there is now
-          an ACE_Timer_Queue, ACE_Timer_Heap, and ACE_Timer_List, each
-          being an instantiation of the respective template classes. The
-          instantiation is done with ACE_Event_Handler as the type of data
-          to be stored in Timer Queue and
-          ACE_Event_Handler_Handle_Timeout_Upcall as the FUNCTOR that does
-          the appropriate upcall to ACE_Event_Handler.
-
-          Due to these typedefs, 99.9% of existing code should not
-          break. However, the following two will cause problems:
-
-          (a) Forward declarations of Timer_Queue will not work! This is
-          because Timer_Queue is now a typedef and not a class.
-
-          (b) #include "ace/Timer_Queue.h" will not be enough to get the
-          ACE_Timer_Queue typedef. The new typedefs are in a new file
-          called Timers.h. This file also has typedefs for ACE_Timer_Heap
-          and ACE_Timer_List.
-
-          Currently Proactor is the only class that uses a different
-          instantiation of the Timer Queue class. Proactor's Timer Queue
-          class is instantiated with ACE_Handler as the type of data to be
-          stored in Timer Queue and ACE_Proactor_Handle_Timeout_Upcall as
-          the FUNCTOR that does the appropriate posting to the Proactor's
-          completion port.
-
-          The Upcall Strategy is not needed any more cause it is replaced
-          by the FUNCTORs. Thus this is removed.
-        
-          Small modifications were made to the following files
-          because of the changes to Timer_Queue.
-
-          - examples/Reactor/Misc/test_timer_queue.cpp
-          - examples/Reactor/Proactor/test_timeout.cpp
-          - tests/Timer_Queue_Test.cpp
-          - ace/Makefile (both UNIX and Win32)
-          - ace/Connector.h
-          - ace/Reactor.h
-          - ace/ReactorEx.h
-          - ace/Proactor.h
-
-        * ace/Proactor: Proactor now uses the new timer queues. Proactor's
-          Timer Queue class is instantiated with ACE_Handler as the type
-          of data to be stored in Timer Queue and
-          ACE_Proactor_Handle_Timeout_Upcall as the FUNCTOR that does the
-          appropriate posting to the Proactor's completion port. This will
-          help reduce the overhead of creating new act for each
-          timer. This also enables the cancellation of entire
-          ACE_Handlers.
-
-        * examples/Reactor/Misc: Added Win32 makefiles.
-
-        * ace/Shared_Memory_MM.i: Fixed typo.
-
-        * ace/SOCK_Connector.cpp: Fixed typo.
+	* ace/Timer_Queue: Decoupled the Timer Queue from
+ 	  ACE_Event_Handler and the callback routines in the handler
+	  (handle_timeout and handle_close). The new Timer Queue is
+ 	  parameterized by the type of data to store and a FUNCTOR on
+ 	  which methods are invoked by the Timer Queue when timeouts and
+ 	  cancellations occur.
+
+	  No changes occured to the algorithms of the different
+ 	  implementations of the Timer Queues (Timer List and Timer
+ 	  Heap). Timer Queues, Timer List, and Timer Heap were all renamed
+ 	  as <class>_T. However, typedef were added such that there is now
+ 	  an ACE_Timer_Queue, ACE_Timer_Heap, and ACE_Timer_List, each
+ 	  being an instantiation of the respective template classes. The
+ 	  instantiation is done with ACE_Event_Handler as the type of data
+ 	  to be stored in Timer Queue and
+ 	  ACE_Event_Handler_Handle_Timeout_Upcall as the FUNCTOR that does
+ 	  the appropriate upcall to ACE_Event_Handler.
+
+	  Due to these typedefs, 99.9% of existing code should not
+	  break. However, the following two will cause problems:
+
+	  (a) Forward declarations of Timer_Queue will not work! This is
+	  because Timer_Queue is now a typedef and not a class.
+
+	  (b) #include "ace/Timer_Queue.h" will not be enough to get the
+	  ACE_Timer_Queue typedef. The new typedefs are in a new file
+	  called Timers.h. This file also has typedefs for ACE_Timer_Heap
+	  and ACE_Timer_List.
+
+	  Currently Proactor is the only class that uses a different
+ 	  instantiation of the Timer Queue class. Proactor's Timer Queue
+ 	  class is instantiated with ACE_Handler as the type of data to be
+ 	  stored in Timer Queue and ACE_Proactor_Handle_Timeout_Upcall as
+ 	  the FUNCTOR that does the appropriate posting to the Proactor's
+	  completion port.
+
+	  The Upcall Strategy is not needed any more cause it is replaced
+	  by the FUNCTORs. Thus this is removed.
+	
+	  Small modifications were made to the following files
+ 	  because of the changes to Timer_Queue.
+
+	  - examples/Reactor/Misc/test_timer_queue.cpp
+	  - examples/Reactor/Proactor/test_timeout.cpp
+	  - tests/Timer_Queue_Test.cpp
+	  - ace/Makefile (both UNIX and Win32)
+	  - ace/Connector.h
+	  - ace/Reactor.h
+	  - ace/ReactorEx.h
+	  - ace/Proactor.h
+
+	* ace/Proactor: Proactor now uses the new timer queues. Proactor's
+ 	  Timer Queue class is instantiated with ACE_Handler as the type
+ 	  of data to be stored in Timer Queue and
+ 	  ACE_Proactor_Handle_Timeout_Upcall as the FUNCTOR that does the
+ 	  appropriate posting to the Proactor's completion port. This will
+ 	  help reduce the overhead of creating new act for each
+ 	  timer. This also enables the cancellation of entire
+ 	  ACE_Handlers.
+
+	* examples/Reactor/Misc: Added Win32 makefiles.
+
+	* ace/Shared_Memory_MM.i: Fixed typo.
+
+	* ace/SOCK_Connector.cpp: Fixed typo.
 
 Thu Apr 24 13:56:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/SOCK_Dgram.cpp: Added support for FreeBSD (i.e., BSD 4.4)
-          features for passing file descriptors between processes.  Thanks
-          to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* ace/SOCK_Dgram.cpp: Added support for FreeBSD (i.e., BSD 4.4)
+ 	  features for passing file descriptors between processes.  Thanks
+ 	  to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
-        * ace/LSOCK_Stream.cpp: Added support for FreeBSD (i.e., BSD 4.4)
-          features for passing file descriptors between processes.  Thanks
-          to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* ace/LSOCK_Stream.cpp: Added support for FreeBSD (i.e., BSD 4.4)
+ 	  features for passing file descriptors between processes.  Thanks
+ 	  to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
-        * ace/LSOCK.cpp: Added support for FreeBSD (i.e., BSD 4.4)
-          features for passing file descriptors between processes.  Thanks
-          to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* ace/LSOCK.cpp: Added support for FreeBSD (i.e., BSD 4.4)
+ 	  features for passing file descriptors between processes.  Thanks
+ 	  to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
-        * ace/SOCK_Connector.cpp (complete): There's a bug in WinNT that
-          causes non-blocking connects to fail.  The workaround is to
-          sleep for 1 millisecond.  Thanks to Steve Huston
-          <shuston@riverace.com> for reporting this.
+	* ace/SOCK_Connector.cpp (complete): There's a bug in WinNT that
+ 	  causes non-blocking connects to fail.  The workaround is to
+ 	  sleep for 1 millisecond.  Thanks to Steve Huston
+ 	  <shuston@riverace.com> for reporting this.
 
-        * ace/Connector.cpp (handle_output): There's a bug in WinNT that
-          causes non-blocking connects to fail.  The workaround is to
-          sleep for 1 millisecond.  Thanks to Steve Huston
-          <shuston@riverace.com> for reporting this.
+	* ace/Connector.cpp (handle_output): There's a bug in WinNT that
+ 	  causes non-blocking connects to fail.  The workaround is to
+ 	  sleep for 1 millisecond.  Thanks to Steve Huston
+ 	  <shuston@riverace.com> for reporting this.
 
-        * tests/Conn_Test.cpp: Changed from operator != to operator == to
-          be consistent with what is required by the ACE_Hash_Map_Manager.
+	* tests/Conn_Test.cpp: Changed from operator != to operator == to
+ 	  be consistent with what is required by the ACE_Hash_Map_Manager.
 
-        * ace/Hash_Map_Manager: Factored out the equality comparison into
-          an equal() method in order to facilitate template
-          specialization.  In addition, rather than using the != operator
-          we now default to using the operator== operator and negating the
-          result.  This is consistent with the behavior of the
-          ACE_Map_Manager.
+	* ace/Hash_Map_Manager: Factored out the equality comparison into
+ 	  an equal() method in order to facilitate template
+ 	  specialization.  In addition, rather than using the != operator
+ 	  we now default to using the operator== operator and negating the
+ 	  result.  This is consistent with the behavior of the
+ 	  ACE_Map_Manager.
 
-        * ace/Map_Manager: Factored out the equality comparison into an
-          equal() method in order to facilitate template specialization.
+	* ace/Map_Manager: Factored out the equality comparison into an
+ 	  equal() method in order to facilitate template specialization.
 
-        * ace/OS.i: Added a new #ifdef called ACE_LACKS_PTHREAD_CANCEL.
-          I'm not sure which platforms should set this, but it fixes
-          a bug with ACE_OS::thr_cancel().  Thanks to Eric Dean
-          Russell <edrusse@somnet.sandia.gov> for reporting this.
+	* ace/OS.i: Added a new #ifdef called ACE_LACKS_PTHREAD_CANCEL.
+	  I'm not sure which platforms should set this, but it fixes
+	  a bug with ACE_OS::thr_cancel().  Thanks to Eric Dean
+	  Russell <edrusse@somnet.sandia.gov> for reporting this.
 
-        * tests/Process_Strategy_Test.cpp (handle_input): We were
-          comparing EOF to a char, which gets complaints on platforms
-          where char is unsigned by default.  I added a cast of EOF to
-          char to fix this.  Thanks to Amos Shapira <amos@dsi.co.il> for
-          reporting this.
+	* tests/Process_Strategy_Test.cpp (handle_input): We were
+ 	  comparing EOF to a char, which gets complaints on platforms
+ 	  where char is unsigned by default.  I added a cast of EOF to
+ 	  char to fix this.  Thanks to Amos Shapira <amos@dsi.co.il> for
+ 	  reporting this.
 
-        * apps/JAWS/server/HTTP_Helpers.cpp (instance): Changed the
-          return type from const char * to const char **.  Thanks to
-          Amos Shapira <amos@dsi.co.il> for reporting this.
+	* apps/JAWS/server/HTTP_Helpers.cpp (instance): Changed the
+	  return type from const char * to const char **.  Thanks to
+	  Amos Shapira <amos@dsi.co.il> for reporting this.
 
-        * ace/OS.i (getpwnam_r): Added a missing #else.  Thanks to
-          Amos Shapira <amos@dsi.co.il> for reporting this.
+	* ace/OS.i (getpwnam_r): Added a missing #else.  Thanks to
+	  Amos Shapira <amos@dsi.co.il> for reporting this.
 
-        * ace/Timer_Heap: Made many minor enhancements to ACE_Timer_Heap
-          in an effort to figure out why we're getting memory leaks.
+	* ace/Timer_Heap: Made many minor enhancements to ACE_Timer_Heap
+ 	  in an effort to figure out why we're getting memory leaks.
 
 Thu Apr 24 09:33:53 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile: modified the TIMESTAMP macro to update the third
-          component, if there is one, of the version number in the VERSION
-          file.  This assumes that alpha/beta releases are numbered with
-          three components, and that final releases are not.  So, if the
-          version number is, e.g., 4.2, it will not be modified because it
-          is assumed to be for a final release.  Manual switching between
-          alpha/beta and final release "modes" is therefore still required.
+	* Makefile: modified the TIMESTAMP macro to update the third
+	  component, if there is one, of the version number in the VERSION
+	  file.  This assumes that alpha/beta releases are numbered with
+	  three components, and that final releases are not.  So, if the
+	  version number is, e.g., 4.2, it will not be modified because it
+	  is assumed to be for a final release.  Manual switching between
+	  alpha/beta and final release "modes" is therefore still required.
 
-        * ace/Timer_Heap.cpp (copy): added cast of max_size_ to int to avoid
-          signed/unsigned comparison.
+	* ace/Timer_Heap.cpp (copy): added cast of max_size_ to int to avoid
+	  signed/unsigned comparison.
 
-        * ace/config-sunos5.4-g++.h: removed
-          ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES because it caused compile
-          warnings about conversion from `(int)' to `(...)' at Signal.i:113.
-          (And the other sunos5.4 config files don't have it.)
-          Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this.
+	* ace/config-sunos5.4-g++.h: removed
+	  ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES because it caused compile
+	  warnings about conversion from `(int)' to `(...)' at Signal.i:113.
+	  (And the other sunos5.4 config files don't have it.)
+	  Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this.
 
-        * tests/Timer_Queue_Test.cpp (main): added delete of timer_ids array
-          to avoid memory leak.
+	* tests/Timer_Queue_Test.cpp (main): added delete of timer_ids array
+	  to avoid memory leak.
 
 Wed Apr 23 22:56:57 1997  Sumedh Mungee <sumedh@cs.wustl.edu>
 
@@ -3889,481 +3889,481 @@ Wed Apr 23 22:56:57 1997  Sumedh Mungee <sumedh@cs.wustl.edu>
 
 Wed Apr 23 20:57:35 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * ace/OS.i and ace/OS.h: added methods for getpwnam and
-          getpwnam_r, with hooks for NT.
+	* ace/OS.i and ace/OS.h: added methods for getpwnam and
+	  getpwnam_r, with hooks for NT.
 
-        * ace/config-irix6.2.*: added ACE_LACKS_PWD_REENTRANT_FUNCTIONS.
-        
+	* ace/config-irix6.2.*: added ACE_LACKS_PWD_REENTRANT_FUNCTIONS.
+	
 Wed Apr 23 14:27:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Timer_Queue.cpp (ACE_Timer_Queue ctor): reordered initializers
-          to match declaration order.
+	* ace/Timer_Queue.cpp (ACE_Timer_Queue ctor): reordered initializers
+	  to match declaration order.
 
-        * tests/Process_Strategy_Test.cpp: added ACE_Singleton template
-          specialization.  In function client (), null terminated "buf"
-          before call to ACE_OS::strrchr () to avoid uninitialized memory
-          read.  Also, fixed typo in test name (argument to ACE_START_TEST).
+	* tests/Process_Strategy_Test.cpp: added ACE_Singleton template
+	  specialization.  In function client (), null terminated "buf"
+	  before call to ACE_OS::strrchr () to avoid uninitialized memory
+	  read.  Also, fixed typo in test name (argument to ACE_START_TEST).
 
-        * examples/Service_Configurator/Misc/Timer_Service.cpp (init): changed
-          type of loop index to int to avoid signed/unsigned comparison, and
-          initialized "interval" so that it has a value even if one isn't
-          specified on the command line.
+	* examples/Service_Configurator/Misc/Timer_Service.cpp (init): changed
+	  type of loop index to int to avoid signed/unsigned comparison, and
+	  initialized "interval" so that it has a value even if one isn't
+	  specified on the command line.
 
 Wed Apr 23 10:52:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.cpp (thr_create): Removed errant preprocessor conditional
-          for determining the scheduling priority.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for reporting this.
+	* ace/OS.cpp (thr_create): Removed errant preprocessor conditional
+ 	  for determining the scheduling priority.  Thanks to Thilo Kielmann
+ 	  <kielmann@informatik.uni-siegen.de> for reporting this.
 
 Wed Apr 23 09:06:52 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/Process_Strategy_Test.cpp: Finished updating this program
-          so that it is an automated test.
+	* tests/Process_Strategy_Test.cpp: Finished updating this program
+	  so that it is an automated test.
 
-        * ace/Acceptor.h: Moved get_handle() into the public portion of
-          the Acceptor.
+	* ace/Acceptor.h: Moved get_handle() into the public portion of
+ 	  the Acceptor.
 
-        * include/makeinclude/platform_irix6.2_sgic++.GNU (SOBUILD): There
-          was an extra @ in $@@.  Thanks to Amos Shapira <amos@dsi.co.il>
-          for reporting this.
+	* include/makeinclude/platform_irix6.2_sgic++.GNU (SOBUILD): There
+ 	  was an extra @ in $@@.  Thanks to Amos Shapira <amos@dsi.co.il>
+ 	  for reporting this.
 
-        * apps/JAWS/client/Blob[_Handler].cpp: Added casts for free ((void
-          *) filename_);.  Thanks to Amos Shapira <amos@dsi.co.il> for
-          reporting this.
+	* apps/JAWS/client/Blob[_Handler].cpp: Added casts for free ((void
+ 	  *) filename_);.  Thanks to Amos Shapira <amos@dsi.co.il> for
+ 	  reporting this.
 
-        * apps/JAWS/server/HTTP_Helpers.h (class HTTP_Status_Code):
-          Removed an extraneous const * from the definition of instance().
-          Thanks to Amos Shapira <amos@dsi.co.il> for reporting this.
+	* apps/JAWS/server/HTTP_Helpers.h (class HTTP_Status_Code):
+ 	  Removed an extraneous const * from the definition of instance().
+  	  Thanks to Amos Shapira <amos@dsi.co.il> for reporting this.
 
 Wed Apr 23 03:15:11 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
-        * apps/JAWS/server/README: Updated to add some clarity and more
-          useful information.
+	* apps/JAWS/server/README: Updated to add some clarity and more
+	  useful information.
 
 Tue Apr 22 20:17:00 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Synch.cpp: Added a new method called open() to ACE_File_Lock
-          so that we don't have to initialize it solely in the
-          constructor.
-
-        * tests/Process_Strategy_Test.cpp: Added new test code that
-          exercises the ACE_Process_Strategy, ACE_Thread_Strategy, and
-          ACE_Reactive_Strategy classes.
-
-        * ace/Strategies_T: Added a new class called
-          ACE_Reactive_Strategy, which inherits from
-          ACE_Concurrency_Strategy and registers new Svc_Handlers with the
-          Reactor.
-
-        * ace/Strategies_T.cpp (ACE_Thread_Strategy): Added a check for
-          failed open() methods and call ACE_ERROR.
-
-        * tests/Map_Manager_Test.cpp: Added a template specialization for
-          the ACE_Hash_Map_Manager::hash() method, which is enabled if the
-          compiler supports template specializations.
-
-        * ace/Hash_Map_Manager.h (pool): Moved the ext_id.hash() call into
-          a separate method so that we can perform template specialization
-          of it more easily.
-
-        * ace/README: Added a new #define called
-          ACE_HAS_TEMPLATE_SPECIALIZATION so that we can work around funky
-          compilers that don't support this advanced template feature.
-
-        * ace: Added Nanbor Wang's port to FreeBSD.  The port is done
-          at FreeBSD 3.0-current as of 2/9/97, which is the
-          latest stable system before Lite2 merge.  Since the merge is
-          current under testing and changes are introduced in a daily
-          basis, I don't recommend using -current after the date.  You
-          can specified the date in your "supfile", run CVSup to get the entire 
-          source tree and do a 'make world' to update (or reverse) your
-          system.
+	* ace/Synch.cpp: Added a new method called open() to ACE_File_Lock
+ 	  so that we don't have to initialize it solely in the
+ 	  constructor.
+
+	* tests/Process_Strategy_Test.cpp: Added new test code that
+ 	  exercises the ACE_Process_Strategy, ACE_Thread_Strategy, and
+ 	  ACE_Reactive_Strategy classes.
+
+	* ace/Strategies_T: Added a new class called
+ 	  ACE_Reactive_Strategy, which inherits from
+ 	  ACE_Concurrency_Strategy and registers new Svc_Handlers with the
+ 	  Reactor.
+
+	* ace/Strategies_T.cpp (ACE_Thread_Strategy): Added a check for
+ 	  failed open() methods and call ACE_ERROR.
+
+	* tests/Map_Manager_Test.cpp: Added a template specialization for
+ 	  the ACE_Hash_Map_Manager::hash() method, which is enabled if the
+ 	  compiler supports template specializations.
+
+	* ace/Hash_Map_Manager.h (pool): Moved the ext_id.hash() call into
+ 	  a separate method so that we can perform template specialization
+ 	  of it more easily.
+
+	* ace/README: Added a new #define called
+ 	  ACE_HAS_TEMPLATE_SPECIALIZATION so that we can work around funky
+ 	  compilers that don't support this advanced template feature.
+
+	* ace: Added Nanbor Wang's port to FreeBSD.  The port is done
+	  at FreeBSD 3.0-current as of 2/9/97, which is the
+	  latest stable system before Lite2 merge.  Since the merge is
+	  current under testing and changes are introduced in a daily
+	  basis, I don't recommend using -current after the date.  You
+	  can specified the date in your "supfile", run CVSup to get the entire 
+	  source tree and do a 'make world' to update (or reverse) your
+	  system.
  
-          Pthread library is provided by John Birrell.  There is a
-          bug fix at mid April so you may want to CVSup the latest libc_r
-          library and re-make the pthreaded library.
+ 	  Pthread library is provided by John Birrell.  There is a
+	  bug fix at mid April so you may want to CVSup the latest libc_r
+	  library and re-make the pthreaded library.
  
-          A shared library must be name as lib<name>.so.<version
-          number> (e.g. libACE.4.1.0).  I would recommend adding a
-          post-compile hook in the Makefile so we FreeBSDers can
-          rename the shared library to it's proper name with correct
-          major and minor version number attached.  (which is a trick
-          BSD library makefiles use.) 
+	  A shared library must be name as lib<name>.so.<version
+	  number> (e.g. libACE.4.1.0).  I would recommend adding a
+	  post-compile hook in the Makefile so we FreeBSDers can
+	  rename the shared library to it's proper name with correct
+	  major and minor version number attached.  (which is a trick
+	  BSD library makefiles use.) 
 
-        * examples/OS/Process/process.cpp (main): Replaced the use of
-          "/bin/cat" with "cat" since we are now using execvp().  Thanks
-          to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* examples/OS/Process/process.cpp (main): Replaced the use of
+ 	  "/bin/cat" with "cat" since we are now using execvp().  Thanks
+ 	  to Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
-        * ace/Process.cpp (start): Changed the use of execv() to execvp()
-          in order to avoid having to pass in the full pathname.
+	* ace/Process.cpp (start): Changed the use of execv() to execvp()
+ 	  in order to avoid having to pass in the full pathname.
 
-        * ace/OS.i (sigwait): Added an #ifdef for FreeBSD so that we
-          return ACE_NOTSUP_RETURN(-1) for ACE_OS::sigwait().  Thanks to
-          Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
+	* ace/OS.i (sigwait): Added an #ifdef for FreeBSD so that we
+ 	  return ACE_NOTSUP_RETURN(-1) for ACE_OS::sigwait().  Thanks to
+ 	  Nanbor Wang <nw1@cs.wustl.edu> for reporting this.
 
 Tue Apr 22 17:46:30 1997    <harrison@samba.cs.wustl.edu>
 
-        * Process.cpp (start): We must pass in 0 instead of "" to
-          CreateProcess for the current working directory.
+	* Process.cpp (start): We must pass in 0 instead of "" to
+	  CreateProcess for the current working directory.
 
 Tue Apr 22 01:38:14 1997    <irfan@TWOSTEP>
 
-        * ace/Timer_Queue: Added ACE_Upcall_Strategy as a parameter to the
-          constructor.  <expire> will call <upcall_strategy->upcall> if
-          <upcall_strategy> is not 0. Else it will call <handle_timeout>
-          on the <Event_Handler>. Thus ACE_Upcall_Strategy becomes a
-          vehicle for extending the behavior of ACE_Timer_Queue wrt the
-          upcall (callback) *without subclassing*.  Hence, it's an example
-          of the Bridge/Strategy patterns.
+	* ace/Timer_Queue: Added ACE_Upcall_Strategy as a parameter to the
+ 	  constructor.  <expire> will call <upcall_strategy->upcall> if
+ 	  <upcall_strategy> is not 0. Else it will call <handle_timeout>
+ 	  on the <Event_Handler>. Thus ACE_Upcall_Strategy becomes a
+ 	  vehicle for extending the behavior of ACE_Timer_Queue wrt the
+ 	  upcall (callback) *without subclassing*.  Hence, it's an example
+ 	  of the Bridge/Strategy patterns.
 
-          This also affected ACE_Timer_List and ACE_Timer_Heap
+	  This also affected ACE_Timer_List and ACE_Timer_Heap
 
-        * ace/Strategies: Added ACE_Upcall_Strategy.
+	* ace/Strategies: Added ACE_Upcall_Strategy.
 
-        * ace/Proactor: Added timing support to the <handle_event> calls.
+	* ace/Proactor: Added timing support to the <handle_event> calls.
 
-        * ace/Asynch_IO: ACE_Handler now supports handle_timeout.
+	* ace/Asynch_IO: ACE_Handler now supports handle_timeout.
 
-        * ace/Proactor: Added timer support for the new Proactor.  This
-          new scheme allows any of the threads in the "thread pool"
-          waiting on the completion port of the Proactor to execute the
-          callback routine of the handler.
+	* ace/Proactor: Added timer support for the new Proactor.  This
+ 	  new scheme allows any of the threads in the "thread pool"
+ 	  waiting on the completion port of the Proactor to execute the
+ 	  callback routine of the handler.
 
-          The implementation included adding ACE_Proactor_Timer_Handler
-          class that has a thread that will wait on the earliest time in a
-          timer queue and an event. When a timer expires, the thread will
-          post a completion event on the port and go back to waiting on
-          the timer queue and event. If the event is signaled, the thread
-          will refresh the time it is currently waiting on (in case the
-          earliest time has changed).
+	  The implementation included adding ACE_Proactor_Timer_Handler
+ 	  class that has a thread that will wait on the earliest time in a
+ 	  timer queue and an event. When a timer expires, the thread will
+ 	  post a completion event on the port and go back to waiting on
+ 	  the timer queue and event. If the event is signaled, the thread
+ 	  will refresh the time it is currently waiting on (in case the
+ 	  earliest time has changed).
 
-          The ACE_Proactor::Asynch_Timer class is posted to the completion
-          port when a timer expires. When the <complete> method of this
-          object is called, the <handler>'s handle_timeout method will be
-          called.
-        
-        * examples/Reactor/Proactor/test_timeout: This example illustrates
-          the new timer features in the Proactor
+	  The ACE_Proactor::Asynch_Timer class is posted to the completion
+ 	  port when a timer expires. When the <complete> method of this
+ 	  object is called, the <handler>'s handle_timeout method will be
+ 	  called.
+	
+	* examples/Reactor/Proactor/test_timeout: This example illustrates
+ 	  the new timer features in the Proactor
 
-        * examples/Reactor/Proactor/test_proactor.{mdp,mak}: Added new
-          example.
+	* examples/Reactor/Proactor/test_proactor.{mdp,mak}: Added new
+ 	  example.
 
 Mon Apr 21 18:14:32 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/config-win32-common.h: Added checks around _AFXDLL before
-          defining it. Thanks to Bruce Meyer <bmeyer1@gte.net> for
-          pointing this out.
+	* ace/config-win32-common.h: Added checks around _AFXDLL before
+	  defining it. Thanks to Bruce Meyer <bmeyer1@gte.net> for
+	  pointing this out.
 
 Mon Apr 21 11:31:16 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-        Removed some unnecessary explicit template instantiations.
+	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
+ 	Removed some unnecessary explicit template instantiations.
 
-        * examples/Threads/barrier1.cpp (main): Explicitly converted
-        n_threads to int.
+	* examples/Threads/barrier1.cpp (main): Explicitly converted
+ 	n_threads to int.
 
 Sun Apr 20 23:08:37 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/{Local,Remote}_Tokens.h: Added a private declarations of the
-          copy constructor and assignment operator for classes that
-          inherit from ACE_TSS. This is necessary since the compiler will
-          auto generate these two operations that will end up using the
-          non-existent copy constructor and assignment operator from the
-          TSS class and cause linker errors.
+	* ace/{Local,Remote}_Tokens.h: Added a private declarations of the
+	  copy constructor and assignment operator for classes that
+	  inherit from ACE_TSS. This is necessary since the compiler will
+	  auto generate these two operations that will end up using the
+	  non-existent copy constructor and assignment operator from the
+	  TSS class and cause linker errors.
 
-Sun Apr 20 20:47:34 1997  Sumedh Mungee       <sumedh@cs.wustl.edu>
+Sun Apr 20 20:47:34 1997  Sumedh Mungee	      <sumedh@cs.wustl.edu>
 
-        * apps/JAWS/client: Reworked the ACE_Blob* classes to work
-          with the new Connector behavior. Added README for this 
-          directory. Added comments.
+	* apps/JAWS/client: Reworked the ACE_Blob* classes to work
+	  with the new Connector behavior. Added README for this 
+	  directory. Added comments.
 
-        * apps/JAWS/stress-testing: Added README file
-        
+	* apps/JAWS/stress-testing: Added README file
+	
 Sun Apr 20 13:11:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * apps/Makefile: By default, we now compile JAWS along with the
-          rest of ACE.  I've also added some README files that explain
-          what JAWS is all about.
+	* apps/Makefile: By default, we now compile JAWS along with the
+ 	  rest of ACE.  I've also added some README files that explain
+ 	  what JAWS is all about.
 
-        * examples/Service_Configurator/Misc/Timer_Service: Improved the
-          Timer_Service test so that it makes more sense and is better
-          documented.
+	* examples/Service_Configurator/Misc/Timer_Service: Improved the
+ 	  Timer_Service test so that it makes more sense and is better
+ 	  documented.
 
 Sat Apr 19 11:56:35 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * include/makeinclude: Removed the platform_irix6.2_sgiCC.GNU
-          from the release.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for these fixes.
+	* include/makeinclude: Removed the platform_irix6.2_sgiCC.GNU
+	  from the release.  Thanks to Torbjorn Lindgren
+ 	  <tl@funcom.no> for these fixes.
 
-        * include/makeinclude/platform_irix6.2_sgic++.GNU: Updated the SGI
-          C++ platform config file.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for these fixes.
+	* include/makeinclude/platform_irix6.2_sgic++.GNU: Updated the SGI
+ 	  C++ platform config file.  Thanks to Torbjorn Lindgren
+ 	  <tl@funcom.no> for these fixes.
 
-        * ace/Log_Msg.cpp (log_hexdump): The char * arguments should be
-          const char *'s.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for reporting this.
+	* ace/Log_Msg.cpp (log_hexdump): The char * arguments should be
+ 	  const char *'s.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for reporting this.
 
 Sat Apr 19 18:52:44 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * (format_hexdump): changed type of first arg to const char *
-          for compatibility with Log_Msg::log_hexdump ().
+	* (format_hexdump): changed type of first arg to const char *
+	  for compatibility with Log_Msg::log_hexdump ().
 
 Thu Apr 17 08:25:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Memory_Pool.h: Fixed a couple of typos in Memory_Pool
-          classes.  Thanks to Neil B. Cohen <nbc@metsci.com> for reporting
-          this.
+	* ace/Memory_Pool.h: Fixed a couple of typos in Memory_Pool
+ 	  classes.  Thanks to Neil B. Cohen <nbc@metsci.com> for reporting
+ 	  this.
 
-        * netsvcs/lib/Name_Handler.h: Arrgh, there was still one more
-          missing #include that I forgot to move into the *.h file.
-          Thanks to David Levine for noticing this.
+	* netsvcs/lib/Name_Handler.h: Arrgh, there was still one more
+ 	  missing #include that I forgot to move into the *.h file.
+  	  Thanks to David Levine for noticing this.
 
-        * ace/Synch.cpp (wait): There was a bug in
-          ACE_Condition::wait(MUTEX& mutex, const ACE_Time_Value
-          *abstime.)  Basically when abstime is zero, it ignores the
-          parameter "mutex" that has been passed to it and instead goes on
-          to call "ACE_Condition<MUTEX>::wait()" which uses "this->mutex_"
-          as the mutex to be released and not the mutex that the caller
-          has given.  The fix is to change the call "this->wait()" in the
-          if-clause to:  
+	* ace/Synch.cpp (wait): There was a bug in
+ 	  ACE_Condition::wait(MUTEX& mutex, const ACE_Time_Value
+ 	  *abstime.)  Basically when abstime is zero, it ignores the
+ 	  parameter "mutex" that has been passed to it and instead goes on
+ 	  to call "ACE_Condition<MUTEX>::wait()" which uses "this->mutex_"
+ 	  as the mutex to be released and not the mutex that the caller
+ 	  has given.  The fix is to change the call "this->wait()" in the
+	  if-clause to:  
 
-          return ACE_OS::cond_wait (&this->cond_, &mutex_.lock_);
+	  return ACE_OS::cond_wait (&this->cond_, &mutex_.lock_);
 
-          Thanks to Ashish Singhai <Ashish.Singhai@ACM.ORG> for reporting
-          this.
+	  Thanks to Ashish Singhai <Ashish.Singhai@ACM.ORG> for reporting
+ 	  this.
 
 Thu Apr 17 16:33:21 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Memory_Pool.cpp: fixed typos in ACE_MMAP_Memory_Pool_Options
-          constructor declaration and initializer list.  In init_acquire,
-          added cast of minimum_bytes_ to size_t to avoid signed/unsigned
-          comparison.
+	* ace/Memory_Pool.cpp: fixed typos in ACE_MMAP_Memory_Pool_Options
+	  constructor declaration and initializer list.  In init_acquire,
+	  added cast of minimum_bytes_ to size_t to avoid signed/unsigned
+	  comparison.
 
-        * include/makeinclude/{platform*,wrapper_macros}.GNU:
-          moved -g out of wrapper_macros.GNU and into each platform
-          file so that -gstabs can be used on SCO.  Thanks to
-          Ganesh Pai <gpai@voicetek.com> for reporting that problem.
+	* include/makeinclude/{platform*,wrapper_macros}.GNU:
+	  moved -g out of wrapper_macros.GNU and into each platform
+	  file so that -gstabs can be used on SCO.  Thanks to
+	  Ganesh Pai <gpai@voicetek.com> for reporting that problem.
 
-          (The real change was getting rid of the CFLAGS += DCFLAGS
-          default.  We could have left DCFLAGS=-g in wrapper_macros.GNU
-          and overridden for SCO.  But the way I changed things, the
-          C/CFLAGS pieces are together in each platform file, so they're
-          easier to find.)
+	  (The real change was getting rid of the CFLAGS += DCFLAGS
+	  default.  We could have left DCFLAGS=-g in wrapper_macros.GNU
+	  and overridden for SCO.  But the way I changed things, the
+	  C/CFLAGS pieces are together in each platform file, so they're
+	  easier to find.)
 
 Wed Apr 16 17:05:55 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Memory_Pool.cpp (acquire): Added code to enable a minimum
-          bytes field with the Shared_Memory_Pool.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for these enhancements.
+	* ace/Memory_Pool.cpp (acquire): Added code to enable a minimum
+ 	  bytes field with the Shared_Memory_Pool.  Thanks to Fred LaBar
+ 	  <flabar@fallschurch.esys.com> for these enhancements.
 
-        * tests/Process_Strategy_Test.cpp: Only compile this test if
-          ACE_LACKS_EXEC is *not* defined since ACE_Process_Strategy
-          requires fork().  Thanks to Irfan for pointing this out!
+	* tests/Process_Strategy_Test.cpp: Only compile this test if
+ 	  ACE_LACKS_EXEC is *not* defined since ACE_Process_Strategy
+ 	  requires fork().  Thanks to Irfan for pointing this out!
 
-        * netsvcs/lib: Fixed a couple o' typos that had escaped detection
-          last night.  Thanks to David Levine for reporting this.
+	* netsvcs/lib: Fixed a couple o' typos that had escaped detection
+ 	  last night.  Thanks to David Levine for reporting this.
 
-        * ace/Synch[_T].h: removed the use of {} rather than ; for
-          the private copy constructors and assignment operators.
-          Hopefully this won't break code on older C++ compilers.  Thanks
-          to Berni Merkle <merkle@io.freinet.de> for suggesting this.
+	* ace/Synch[_T].h: removed the use of {} rather than ; for
+	  the private copy constructors and assignment operators.
+	  Hopefully this won't break code on older C++ compilers.  Thanks
+	  to Berni Merkle <merkle@io.freinet.de> for suggesting this.
 
-        * Added a whole slew of minor fixes for unused variables in
-          the tests and examples.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for reporing these.
+	* Added a whole slew of minor fixes for unused variables in
+	  the tests and examples.  Thanks to Torbjorn Lindgren
+	  <tl@funcom.no> for reporing these.
 
-        * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): The order of 
-          the clause
+	* ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): The order of 
+	  the clause
 
-          this->handles_.mask_.fds_bits[this->index_] == 0
-          && this->num_ < ACE_Handle_Set::MAXSIZE
+	  this->handles_.mask_.fds_bits[this->index_] == 0
+	  && this->num_ < ACE_Handle_Set::MAXSIZE
 
-          was backwards.  It should be:
+	  was backwards.  It should be:
 
-          this->index_ < ACE_Handle_Set::NUM_WORDS
+	  this->index_ < ACE_Handle_Set::NUM_WORDS
           && this->handles_.mask_.fds_bits[this->index_] == 0
 
-          Thanks to Michael Newton <michaeln@in.ot.com.au> for
-          reporting this.
+	  Thanks to Michael Newton <michaeln@in.ot.com.au> for
+	  reporting this.
 
 Wed Apr 16 21:34:53 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Process_Strategy_Test.cpp: added template specializations.
+	* tests/Process_Strategy_Test.cpp: added template specializations.
 
 Wed Apr 16 15:46:58 1997    <irfan@TWOSTEP>
 
-        * tests/Process_Strategy_Test: Added test to batch files and
-          MSVC++ Makefiles.
+	* tests/Process_Strategy_Test: Added test to batch files and
+ 	  MSVC++ Makefiles.
 
-        * tests/Process_Strategy_Test.cpp (open): Added UNICODE support.
+	* tests/Process_Strategy_Test.cpp (open): Added UNICODE support.
 
-        * ace/OS.h: Added SIGCHLD to Win32 section.
+	* ace/OS.h: Added SIGCHLD to Win32 section.
 
-        * ace/config-win32-common.h: UNICODE should not be automatically
-          defined if ACE_HAS_UNICODE is defined. ACE_HAS_UNICODE signifies
-          that the OS has UNICODE support. It does not mean that your code
-          must be UNICODE. UNICODE must be defined at the project level.
+	* ace/config-win32-common.h: UNICODE should not be automatically
+ 	  defined if ACE_HAS_UNICODE is defined. ACE_HAS_UNICODE signifies
+ 	  that the OS has UNICODE support. It does not mean that your code
+ 	  must be UNICODE. UNICODE must be defined at the project level.
 
 Wed Apr 16 16:55:47 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/SString.{h,cpp}: Modified CString to not allocate 1 byte for
-          a 0 length string.  Instead, set the internal representation to
-          the address of static class character null_string_.
+	* ace/SString.{h,cpp}: Modified CString to not allocate 1 byte for
+	  a 0 length string.  Instead, set the internal representation to
+	  the address of static class character null_string_.
 
 Wed Apr 16 11:47:35 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/Map_Manager.cpp (free_search_structure): Added the loop
-          variable back in that must have been inadvertently deleted in the
-          previous entry.
+	* ace/Map_Manager.cpp (free_search_structure): Added the loop
+ 	  variable back in that must have been inadvertently deleted in the
+ 	  previous entry.
 
 Wed Apr 16 09:35:39 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Map_Manager.cpp (free_search_structure): changed type of
-          loop index to size_t to avoid signed/unsigned mismatch.
+	* ace/Map_Manager.cpp (free_search_structure): changed type of
+	  loop index to size_t to avoid signed/unsigned mismatch.
 
 Wed Apr 16 04:07:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Strategies_T: Widened the constructor interface for
-          ACE_Process_Strategy based on the feedback I got from
-          implementing the Process_Strategy_Test.cpp program.
+	* ace/Strategies_T: Widened the constructor interface for
+	  ACE_Process_Strategy based on the feedback I got from
+	  implementing the Process_Strategy_Test.cpp program.
 
-        * tests/Process_Strategy_Test.cpp: Added an interesting new test
-          that illustrates the use of the ACE_Process_Strategy and the
-          ACE_File_Lock.  To exercise this program, you can telnet to it
-          and type "read" and "inc" to query and change the count of
-          the numbers in the file, respectively.
+	* tests/Process_Strategy_Test.cpp: Added an interesting new test
+ 	  that illustrates the use of the ACE_Process_Strategy and the
+ 	  ACE_File_Lock.  To exercise this program, you can telnet to it
+ 	  and type "read" and "inc" to query and change the count of
+	  the numbers in the file, respectively.
 
-        * ace/Connector.cpp (create_AST):  I fixed a couple of things
-          in Connector.cpp: 
+	* ace/Connector.cpp (create_AST):  I fixed a couple of things
+	  in Connector.cpp: 
 
-          - In create_AST, it needs to save and restore errno, else it
-            gets wiped on Win32 and other platforms.
+	  - In create_AST, it needs to save and restore errno, else it
+	    gets wiped on Win32 and other platforms.
 
-          - On Win32 when a non-blocking connect completes and handle_output is
-            called, it tries to get the peer address.  If done too quickly, it
-            fails.  I put in a Sleep(0) call.  I think this is not a great
-            solution, but I don't have a better one yet.
-            
-          Thanks to Steve Huston <shuston@riverace.com> for fixing
-          these bugs. 
+	  - On Win32 when a non-blocking connect completes and handle_output is
+	    called, it tries to get the peer address.  If done too quickly, it
+	    fails.  I put in a Sleep(0) call.  I think this is not a great
+	    solution, but I don't have a better one yet.
+	    
+	  Thanks to Steve Huston <shuston@riverace.com> for fixing
+	  these bugs. 
 
 Tue Apr 15 17:09:33 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/SOCK_Stream.cpp (close): Removed the call to close_writer()
-          on UNIX since that doesn't do the correct thing in many
-          cases since it causes a protocol transmission which isn't
-          what we want if we're using fork().
-
-        * ace/Strategies_T.cpp (activate_svc_handler): Added a call to
-          svc_handler->destroy() in the parent since we don't need it and
-          we're leaking descriptors and memory otherwise...  Thanks to
-          Kevin Boyle <kboyle@sanwafp.com> for reporting this.
-
-        * ace/OS.i (thr_sigsetmask): Replaced the use of
-          PTHREADS_1003_DOT_1C with ACE_HAS_PTHREAD_SIGMASK.  Thanks to
-          Arturo Montes <mitosys@colomsat.net.co> for suggesting this.
-
-        * ace: Changed all uses of ACE_HAS_PTHREADS_XAVIER to
-          ACE_HAS_PTHREAD_SIGMASK, which is more descriptive.  Thanks to
-          Arturo Montes <mitosys@colomsat.net.co> for suggesting this.
-
-        * ace/config-aix-4.2.x.h: Added #define ACE_LACKS_RWLOCK_T to make
-          things compile with AIX 4.2.  Thanks to Jeremy Buch
-          <davinci@nortel.ca> for reporting this.
-
-        * ace/XtReactor.cpp (register_handler_i): Added "[]" to delete
-          this->ids_ since it is an array.  Thanks to Jean-Marc Strauss
-          <strauss@club-internet.fr> for reporting this.
-
-        * netsvcs/lib: Moved all the class definitions into the *.h files
-          to avoid complaints from the IBM C++ compiler.
-
-        * ace/OS.h: Added a #define for WNOHANG since this is missing on
-          NT.  Thanks to Brian Mendel <bmendel@mdc.com> for reporting
-          this.
-
-        * examples/Connection/non_blocking/test_sock_connector.cpp: Added
-          a typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * examples/Connection/non_blocking/test_tli_connector.cpp: Added a
-          typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * examples/Connection/misc/test_upipe.cpp: Added a typedef for
-          ACE_RW_Mutex so that the code compiles on non-MT platforms.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
-
-        * performance-tests/Synch-Benchmarks/Options.cpp: Added a #ifdef
-          for ACE_Thread_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added a
-          typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: Added a
-          typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * examples/ASX/Event_Server/Event_Server/Options.cpp
-          (print_results): Although rusage struct is defined on SCO, there
-          is no getrusage(), rusage is used only by wait()
-          etc. internally.  Therefore, we had to move some #ifdefs around.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
-
-        * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: Added a
-          typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
-
-        * tests/Conn_Test.cpp: Added a typedef for ACE_RW_Mutex so that
-          the code compiles on non-MT platforms.  Thanks to Ganesh Pai
-          <gpai@voicetek.com> for reporting this.
-
-        * tests/SPIPE_Test.cpp (main): Removed the VXWORKS arm of the
-          #ifdef, which is not correct since this stuff only works if
-          we're working with a version of VxWorks that has STREAM pipes.
-
-        * include/makeinclude/platform_sco5.0.0-nothread.GNU: Changed
-        
-          LIBS            = -lsocket -lnsl -ldl
+	* ace/SOCK_Stream.cpp (close): Removed the call to close_writer()
+	  on UNIX since that doesn't do the correct thing in many
+	  cases since it causes a protocol transmission which isn't
+	  what we want if we're using fork().
+
+	* ace/Strategies_T.cpp (activate_svc_handler): Added a call to
+ 	  svc_handler->destroy() in the parent since we don't need it and
+ 	  we're leaking descriptors and memory otherwise...  Thanks to
+ 	  Kevin Boyle <kboyle@sanwafp.com> for reporting this.
+
+	* ace/OS.i (thr_sigsetmask): Replaced the use of
+ 	  PTHREADS_1003_DOT_1C with ACE_HAS_PTHREAD_SIGMASK.  Thanks to
+ 	  Arturo Montes <mitosys@colomsat.net.co> for suggesting this.
+
+	* ace: Changed all uses of ACE_HAS_PTHREADS_XAVIER to
+ 	  ACE_HAS_PTHREAD_SIGMASK, which is more descriptive.  Thanks to
+ 	  Arturo Montes <mitosys@colomsat.net.co> for suggesting this.
+
+	* ace/config-aix-4.2.x.h: Added #define ACE_LACKS_RWLOCK_T to make
+ 	  things compile with AIX 4.2.  Thanks to Jeremy Buch
+ 	  <davinci@nortel.ca> for reporting this.
+
+	* ace/XtReactor.cpp (register_handler_i): Added "[]" to delete
+ 	  this->ids_ since it is an array.  Thanks to Jean-Marc Strauss
+ 	  <strauss@club-internet.fr> for reporting this.
+
+	* netsvcs/lib: Moved all the class definitions into the *.h files
+ 	  to avoid complaints from the IBM C++ compiler.
+
+	* ace/OS.h: Added a #define for WNOHANG since this is missing on
+	  NT.  Thanks to Brian Mendel <bmendel@mdc.com> for reporting
+	  this.
+
+	* examples/Connection/non_blocking/test_sock_connector.cpp: Added
+ 	  a typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
+
+	* examples/Connection/non_blocking/test_tli_connector.cpp: Added a
+ 	  typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
+
+	* examples/Connection/misc/test_upipe.cpp: Added a typedef for
+ 	  ACE_RW_Mutex so that the code compiles on non-MT platforms.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+
+	* performance-tests/Synch-Benchmarks/Options.cpp: Added a #ifdef
+ 	  for ACE_Thread_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
+
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added a
+ 	  typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
+
+	* examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: Added a
+ 	  typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
 
-          to
+	* examples/ASX/Event_Server/Event_Server/Options.cpp
+ 	  (print_results): Although rusage struct is defined on SCO, there
+ 	  is no getrusage(), rusage is used only by wait()
+ 	  etc. internally.  Therefore, we had to move some #ifdefs around.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
 
-          LIBS            += -lsocket -lnsl -ldl
+	* apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: Added a
+ 	  typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
 
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+	* tests/Conn_Test.cpp: Added a typedef for ACE_RW_Mutex so that
+ 	  the code compiles on non-MT platforms.  Thanks to Ganesh Pai
+ 	  <gpai@voicetek.com> for reporting this.
 
-        * netsvcs/lib/Client_Logging_Handler.cpp: Added a typedef for
-          ACE_RW_Mutex so that the code compiles on non-MT platforms.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+	* tests/SPIPE_Test.cpp (main): Removed the VXWORKS arm of the
+ 	  #ifdef, which is not correct since this stuff only works if
+ 	  we're working with a version of VxWorks that has STREAM pipes.
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp: Added a typedef for
-          ACE_RW_Mutex so that the code compiles on non-MT platforms.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+	* include/makeinclude/platform_sco5.0.0-nothread.GNU: Changed
+	
+	  LIBS            = -lsocket -lnsl -ldl
 
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added a
-          typedef for ACE_RW_Mutex so that the code compiles on non-MT
-          platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
+	  to
+
+	  LIBS            += -lsocket -lnsl -ldl
+
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+
+	* netsvcs/lib/Client_Logging_Handler.cpp: Added a typedef for
+ 	  ACE_RW_Mutex so that the code compiles on non-MT platforms.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+
+	* netsvcs/lib/TS_Clerk_Handler.cpp: Added a typedef for
+ 	  ACE_RW_Mutex so that the code compiles on non-MT platforms.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added a
+ 	  typedef for ACE_RW_Mutex so that the code compiles on non-MT
+ 	  platforms.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
 
 Tue Apr 15 23:16:43 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/[Hash_]Map_Manager.cpp: The [Hash_]Map_Manager now
-          explicitly calls the destructors of Map_Entry objects before
-          freeing up the space.  Not sure why we were not doing this
-          before...
+	* ace/[Hash_]Map_Manager.cpp: The [Hash_]Map_Manager now
+ 	  explicitly calls the destructors of Map_Entry objects before
+ 	  freeing up the space.  Not sure why we were not doing this
+ 	  before...
 
 Tue Apr 15 17:09:33 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * examples/Logger: Added MSVC++ makefile to Acceptor-server
-          and client.
+	* examples/Logger: Added MSVC++ makefile to Acceptor-server
+	  and client.
 
 Tue Apr 15 21:51:45 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
@@ -4386,1191 +4386,1191 @@ Tue Apr 15 21:51:45 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
         * apps/JAWS/server/HTTP_Server.cpp: Added template instances for
           LOCK_SOCK_Acceptor, ACE_Task, ACE_Thru_Task,
-          ACE_Message_Queue, ACE_Module so it would link using GCC.
-          Removed GCC warnings.  
+	  ACE_Message_Queue, ACE_Module so it would link using GCC.
+	  Removed GCC warnings.  
 
         * apps/JAWS/server/HTTP_Server_T.cpp: Removed template
-          instance of LOCK_SOCK_Acceptor, since it was not really
-          being compiled. 
+	  instance of LOCK_SOCK_Acceptor, since it was not really
+	  being compiled. 
 
         * apps/JAWS/server/HTTP_Handler.cpp: Removed GCC warnings.
 
 Tue Apr 15 13:01:13 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Token_Request_Reply.cpp (ctor): added initialization of
-          transfer_.data_ to avoid unitialized memory read.
+	* ace/Token_Request_Reply.cpp (ctor): added initialization of
+	  transfer_.data_ to avoid unitialized memory read.
 
-        * tests/test_config.h: removed "static" qualifier from
-          randomize () to avoid warning from g++ when it's not called
-          in a test.  
+	* tests/test_config.h: removed "static" qualifier from
+	  randomize () to avoid warning from g++ when it's not called
+	  in a test.  
 
-        * examples/IPC_SAP/SPIPE_SAP/server.cpp (main): moved
-          declaration of local variable "handle" up before its first
-          use. 
+	* examples/IPC_SAP/SPIPE_SAP/server.cpp (main): moved
+	  declaration of local variable "handle" up before its first
+	  use. 
 
 Tue Apr 15 17:09:33 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * examples/Connection/blocking/Makefile: Removed the Makefile
-          for this test. This example is only suppose to work on WIN32
-          and therefore the Makefile is not necessary. I have replace
-          this file with a MSVC++ make file.
+	* examples/Connection/blocking/Makefile: Removed the Makefile
+	  for this test. This example is only suppose to work on WIN32
+	  and therefore the Makefile is not necessary. I have replace
+	  this file with a MSVC++ make file.
 
 Mon Apr 14 23:08:27 1997    <irfan@TWOSTEP>
 
-        * INSTALL: Updated install files for Win32.
+	* INSTALL: Updated install files for Win32.
 
-        * ace/SPIPE_Stream: Changed the use of ACE::send_n to ACE::write_n
-          and ACE::recv_n to ACE::read_n.
+	* ace/SPIPE_Stream: Changed the use of ACE::send_n to ACE::write_n
+ 	  and ACE::recv_n to ACE::read_n.
 
-        * ace/OS.h (WNOHANG): Added WNOHANG to OS.h for Win32.
+	* ace/OS.h (WNOHANG): Added WNOHANG to OS.h for Win32.
 
-        * ace/OS.i (getpgid): Fixed extra return.
+	* ace/OS.i (getpgid): Fixed extra return.
 
-        * examples/Connection/blocking/SPIPE-acceptor: Updated the code to
-          use the new Proactor and the new asynchronous IO.     
+	* examples/Connection/blocking/SPIPE-acceptor: Updated the code to
+ 	  use the new Proactor and the new asynchronous IO.	
 
 Mon Apr 14 21:32:24 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client):
-          ACE_OS::sprintf instead of sprintf.
+	* examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client):
+	  ACE_OS::sprintf instead of sprintf.
 
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
-          (svc): declare "t" as time_t instead of long.
+	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+	  (svc): declare "t" as time_t instead of long.
 
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          reporting both of these.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  reporting both of these.
 
 Mon Apr 14 00:02:39 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.i (getpgid): Removed the extraneous return in front of
-          ACE_NOTSUP_RETURN.  Thanks to Mike Bernat <sagmb@sagus.com> for 
-          reporting this.
+	* ace/OS.i (getpgid): Removed the extraneous return in front of
+	  ACE_NOTSUP_RETURN.  Thanks to Mike Bernat <sagmb@sagus.com> for 
+	  reporting this.
 
-        * ace/Process.cpp: Replaced the use of ACE_OS::fork(void) with
-          ACE_OS::fork(const char *) so that we can pass in the name of
-          the process we're exec'ing.
+	* ace/Process.cpp: Replaced the use of ACE_OS::fork(void) with
+ 	  ACE_OS::fork(const char *) so that we can pass in the name of
+ 	  the process we're exec'ing.
 
-        * examples/Threads/process_manager.cpp: Added a test program that
-          exercises the features of the new ACE_Process_Manager.
+	* examples/Threads/process_manager.cpp: Added a test program that
+ 	  exercises the features of the new ACE_Process_Manager.
 
-        * ace/Process_Manager: Finished a rudimentary implementation of
-          ACE_Process_Manager.  There's still plenty of work to be done on
-          this, however...
+	* ace/Process_Manager: Finished a rudimentary implementation of
+ 	  ACE_Process_Manager.  There's still plenty of work to be done on
+ 	  this, however...
 
-        * ace/Thread_Manager.cpp (dump): Added dump() methods for
-          ACE_Thread_Descriptor and ACE_Thread_Manager.
+	* ace/Thread_Manager.cpp (dump): Added dump() methods for
+ 	  ACE_Thread_Descriptor and ACE_Thread_Manager.
 
 Sun Apr 13 11:40:26 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS: Added a getpgid() call to ACE_OS.
-
-        * ace/Thread_Manager: Changed the 'int n' of spawn_n() to size_t n
-          since this is more appropriate because we can't spawn a negative
-          number of threads...
-
-        * ace/Thread_Manager.cpp (close): Make sure to lock the calls to
-          close() in case things get amiss.
-
-        * ace/Process.cpp (start): Updated ACE_Process::start() to that it
-          doesn't try to exec() a program if argv == 0.  This allows us to
-          use ACE_Process to fork() a process without exec'ing.
-
-        * tests/Timer_Queue_Test.cpp (randomize_array): Added a new
-          "randomization" test that determines the performance of randomly
-          canceling items in the array.  Thanks to Darrell Brunsch
-          <brunsch@cs.wustl.edu> for this enhancement.
-
-        * tests/test_config.h: Moved the randomize() function from
-          Naming_Test.cpp to test_config.h so that we can use it in other
-          tests (e.g., the new Timer_Queue_Test.cpp that Darrell is
-          working on).
-
-        * ace/OS: Added a new #define called ACE_HAS_NONCONST_MSGSND which
-          can be used for platforms (e.g., SCO) that don't have a const
-          parameter for msgsend().  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/config-sco-5.0.0-mit-pthread.h: Added some fixes to make
-          this work on SCO.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/OS.i (cond_timedwait): There is a *small* chance for a
-          context switch before ACE_OS::cond_timedwait() is reached.  In
-          this case, the current time *may* advance by some milliseconds.
-          The code in ACE_OS::cond_timedwait() then converts the given
-          absolute time to a relative time.  In the described situation
-          this will be a very, very long t ime (0xfffffffn).  Therefore, I
-          added a check to avoid the "negative timespan" case.  Thanks to
-          Matthias Kerkhoff <make@cs.tu-berlin.de> for suggesting this.
-
-        * ace/Set: Moved all the size() methods out of the *.i file and
-          into the *.cpp file to avoid problems with quirky compilers
-          (e.g., SGI) that can't handle this.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for pointing this out.
-
-        * examples/Threads/process_semaphore.cpp (main): Removed a stray
-          ^M that was causing the SGI C++ compiler some grief.  Thanks to
-          Torbjorn Lindgren <tl@funcom.no> for pointing this out.
-
-        * ace/OS.i (gettimeofday): Rearranged the code a bit to return
-          errors correctly if they occur (which should be *very*
-          unlikely).  Thanks to Torbjorn Lindgren <tl@funcom.no> for
-          pointing this out.
-
-        * netsvcs/lib/Server_Logging_Handler.cpp: Replaced the use of
-          ACE_TLI* with LOGGING_PEER*.  Thanks to Tom Wright
-          <twright@gem-net.demon.co.uk> for reporting this.
-
-        * ace/Connector.cpp: Made sure to initialize all of the instance
-          variables for the ACE_Strategy_Connector and ACE_Connector.
-          Thanks to David Levine for pointing this out.
-
-        * ace/Synch.h: Changed protected: to private: so that we can
-          ensure that we never copy classes like ACE_File_Lock, etc.
-          Thanks to Berni Merkle <merkle@io.freinet.de> for reporting
-          this.
-
-        * examples/Shared_Malloc/test_malloc.cpp (malloc_recurse): Added
-          the print_stats() call back into the test since Sandro's fixes
-          should now support this.
-
-        * ace/Malloc[_T]: Added patches to enable ACE_Allocator's to print
-          malloc statistics.  Thanks to Sandro Doro
-          <alex@aureus.sublink.org> for these fixes.
+	* ace/OS: Added a getpgid() call to ACE_OS.
+
+	* ace/Thread_Manager: Changed the 'int n' of spawn_n() to size_t n
+ 	  since this is more appropriate because we can't spawn a negative
+ 	  number of threads...
+
+	* ace/Thread_Manager.cpp (close): Make sure to lock the calls to
+ 	  close() in case things get amiss.
+
+	* ace/Process.cpp (start): Updated ACE_Process::start() to that it
+ 	  doesn't try to exec() a program if argv == 0.  This allows us to
+ 	  use ACE_Process to fork() a process without exec'ing.
+
+	* tests/Timer_Queue_Test.cpp (randomize_array): Added a new
+ 	  "randomization" test that determines the performance of randomly
+ 	  canceling items in the array.  Thanks to Darrell Brunsch
+ 	  <brunsch@cs.wustl.edu> for this enhancement.
+
+	* tests/test_config.h: Moved the randomize() function from
+ 	  Naming_Test.cpp to test_config.h so that we can use it in other
+ 	  tests (e.g., the new Timer_Queue_Test.cpp that Darrell is
+ 	  working on).
+
+	* ace/OS: Added a new #define called ACE_HAS_NONCONST_MSGSND which
+ 	  can be used for platforms (e.g., SCO) that don't have a const
+ 	  parameter for msgsend().  Thanks to Arturo Montes
+ 	  <mitosys@colomsat.net.co> for reporting this.
+
+	* ace/config-sco-5.0.0-mit-pthread.h: Added some fixes to make
+ 	  this work on SCO.  Thanks to Arturo Montes
+ 	  <mitosys@colomsat.net.co> for reporting this.
+
+	* ace/OS.i (cond_timedwait): There is a *small* chance for a
+ 	  context switch before ACE_OS::cond_timedwait() is reached.  In
+ 	  this case, the current time *may* advance by some milliseconds.
+  	  The code in ACE_OS::cond_timedwait() then converts the given
+ 	  absolute time to a relative time.  In the described situation
+ 	  this will be a very, very long t ime (0xfffffffn).  Therefore, I
+ 	  added a check to avoid the "negative timespan" case.  Thanks to
+ 	  Matthias Kerkhoff <make@cs.tu-berlin.de> for suggesting this.
+
+	* ace/Set: Moved all the size() methods out of the *.i file and
+ 	  into the *.cpp file to avoid problems with quirky compilers
+	  (e.g., SGI) that can't handle this.  Thanks to Torbjorn Lindgren
+ 	  <tl@funcom.no> for pointing this out.
+
+	* examples/Threads/process_semaphore.cpp (main): Removed a stray
+ 	  ^M that was causing the SGI C++ compiler some grief.  Thanks to
+ 	  Torbjorn Lindgren <tl@funcom.no> for pointing this out.
+
+	* ace/OS.i (gettimeofday): Rearranged the code a bit to return
+ 	  errors correctly if they occur (which should be *very*
+ 	  unlikely).  Thanks to Torbjorn Lindgren <tl@funcom.no> for
+	  pointing this out.
+
+	* netsvcs/lib/Server_Logging_Handler.cpp: Replaced the use of
+ 	  ACE_TLI* with LOGGING_PEER*.  Thanks to Tom Wright
+ 	  <twright@gem-net.demon.co.uk> for reporting this.
+
+	* ace/Connector.cpp: Made sure to initialize all of the instance
+ 	  variables for the ACE_Strategy_Connector and ACE_Connector.
+  	  Thanks to David Levine for pointing this out.
+
+	* ace/Synch.h: Changed protected: to private: so that we can
+ 	  ensure that we never copy classes like ACE_File_Lock, etc.
+  	  Thanks to Berni Merkle <merkle@io.freinet.de> for reporting
+ 	  this.
+
+	* examples/Shared_Malloc/test_malloc.cpp (malloc_recurse): Added
+ 	  the print_stats() call back into the test since Sandro's fixes
+ 	  should now support this.
+
+	* ace/Malloc[_T]: Added patches to enable ACE_Allocator's to print
+ 	  malloc statistics.  Thanks to Sandro Doro
+ 	  <alex@aureus.sublink.org> for these fixes.
 
 Sat Apr 12 20:42:11 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Priority_Task_Test.cpp (open): only use THR_SCHED_FIFO
-          if it is defined.  (It isn't on Solaris without PTHREADS.)
+	* tests/Priority_Task_Test.cpp (open): only use THR_SCHED_FIFO
+	  if it is defined.  (It isn't on Solaris without PTHREADS.)
 
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
-          (make_svc_handler): added return statement.
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+	  (make_svc_handler): added return statement.
 
 Sat Apr 12 11:53:49 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/ASX/Event_Server/Transceiver/transceiver.cpp (main):
-          The first argument to connect () is now a SVC_HANDLER *&.
-          Therefore, we can no longer allows us to pass the address of a
-          SVC_HANDLER on the stack (or in the data segment).
-          Fortunately, the fix is easy, as shown below:
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp (main):
+ 	  The first argument to connect () is now a SVC_HANDLER *&.
+  	  Therefore, we can no longer allows us to pass the address of a
+ 	  SVC_HANDLER on the stack (or in the data segment).
+	  Fortunately, the fix is easy, as shown below:
 
-          Event_Transceiver transceiver, *tp = &transceiver;
+	  Event_Transceiver transceiver, *tp = &transceiver;
 
-          connector.connect (tp, ACE_INET_Addr (port_number, host_name));
+	  connector.connect (tp, ACE_INET_Addr (port_number, host_name));
 
-          Thanks to David Levine for reporting this problem.
+	  Thanks to David Levine for reporting this problem.
 
 Fri Apr 11 15:14:59 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Conn_Test.cpp: moved declaration of "result" out of
-          loop because it's used after the loop.  Thanks to
-          Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          reporting this.  Also, removed a few unnecessary template
-          specializations.
+	* tests/Conn_Test.cpp: moved declaration of "result" out of
+	  loop because it's used after the loop.  Thanks to
+	  Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  reporting this.  Also, removed a few unnecessary template
+	  specializations.
 
-        * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: fixed template
-          specializations for no-thread platforms.  Thanks to Ganesh Pai
-          <gpai@voicetek.com> for reporting this.
+	* apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: fixed template
+	  specializations for no-thread platforms.  Thanks to Ganesh Pai
+	  <gpai@voicetek.com> for reporting this.
 
-        * performance-tests/Misc/context_switch_time.cpp (main):
-          removed call to ACE_High_Res_Timer::supported ().
+	* performance-tests/Misc/context_switch_time.cpp (main):
+	  removed call to ACE_High_Res_Timer::supported ().
 
 Fri Apr 11 14:31:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * tests/Conn_Test.cpp: Added several explicit template
-          instantiations.
+	* tests/Conn_Test.cpp: Added several explicit template
+ 	  instantiations.
 
 Fri Apr 11 13:49:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: VxWorks changes only:  added taskHookLib.h.  Thanks
-          to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting
-          that.  Also rearranged the VxWorks #includes and such a bit.
+	* ace/OS.h: VxWorks changes only:  added taskHookLib.h.  Thanks
+	  to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting
+	  that.  Also rearranged the VxWorks #includes and such a bit.
 
-        * ace/Log_Msg.cpp (atexit): VxWorks changes only:  added cast
-          of spare1 to ACE_Log_Msg *.  Thanks to Dave Mayerhoefer
-          <mayerhoefer@svappl36.mdc.com> for reporting that.  Also,
-          in exists () and instance (), replaced double indirection
-          of the ACE_Log_Msg instance with indirection through a pointer
-          reference.
+	* ace/Log_Msg.cpp (atexit): VxWorks changes only:  added cast
+	  of spare1 to ACE_Log_Msg *.  Thanks to Dave Mayerhoefer
+	  <mayerhoefer@svappl36.mdc.com> for reporting that.  Also,
+	  in exists () and instance (), replaced double indirection
+	  of the ACE_Log_Msg instance with indirection through a pointer
+	  reference.
 
-        * ace/High_Res_Timer.{h,i}: removed supported () because
-          ACE_OS::gettimeofday () is used if a high-res timer isn't available.
+	* ace/High_Res_Timer.{h,i}: removed supported () because
+	  ACE_OS::gettimeofday () is used if a high-res timer isn't available.
 
-        * ace/OS.i (thr_sigsetmask),config-sunos5.4-*.h: swapped order of
-          #ifdefs to that ACE_LACKS_PTHREAD_THR_SIGSETMASK is checked before
-          ACE_HAS_STHREADS.  Added that #define to all SunOS 5.4 configs.
-          Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this.
+	* ace/OS.i (thr_sigsetmask),config-sunos5.4-*.h: swapped order of
+	  #ifdefs to that ACE_LACKS_PTHREAD_THR_SIGSETMASK is checked before
+	  ACE_HAS_STHREADS.  Added that #define to all SunOS 5.4 configs.
+	  Thanks to Joey Zhu <joey.zhu@wcom.com> for reporting this.
 
-        * ace/Token_Request_Reply.cpp (ctor): added a initializations to 0
-          of requeue_position_, notify_, and arg_.  With this change, all
-          of the ACE tests run without any Purify access anomalies!
-          (There are still some memory leaks, though.)
+	* ace/Token_Request_Reply.cpp (ctor): added a initializations to 0
+	  of requeue_position_, notify_, and arg_.  With this change, all
+	  of the ACE tests run without any Purify access anomalies!
+	  (There are still some memory leaks, though.)
 
-        * include/makeinclude/rules.local.GNU: added -DMAKEDEPEND to
-          invocation of g++dep.  This allows users to get proper
-          dependencies if they have conditional #includes in their code.
-          They can added #if defined (MAKEDEPEND) as necessary to make
-          sure that all headers are seen by g++dep.
+	* include/makeinclude/rules.local.GNU: added -DMAKEDEPEND to
+	  invocation of g++dep.  This allows users to get proper
+	  dependencies if they have conditional #includes in their code.
+	  They can added #if defined (MAKEDEPEND) as necessary to make
+	  sure that all headers are seen by g++dep.
 
 Fri Apr 11 10:46:56 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-        
-        * config-linux*.h: Added ACE_HAS_IP_MULTICAST as the default for
-          all Linux configurations.  If you're a 1.x user, or you didn't
-          config that into your 2.x kernel, you'll have to remove this from
-          your version of the file.
+	
+	* config-linux*.h: Added ACE_HAS_IP_MULTICAST as the default for
+ 	  all Linux configurations.  If you're a 1.x user, or you didn't
+ 	  config that into your 2.x kernel, you'll have to remove this from
+ 	  your version of the file.
 
 Thu Apr 10 00:34:10 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * examples/Logger/simple-server/Logging_Acceptor.cpp
-          (handle_input): We need to call svc_handler->close() if accept()
-          or open() fails.  Thanks to Ganesh Pai <gpai@voicetek.com> for
-          reporting this.
+	* examples/Logger/simple-server/Logging_Acceptor.cpp
+ 	  (handle_input): We need to call svc_handler->close() if accept()
+ 	  or open() fails.  Thanks to Ganesh Pai <gpai@voicetek.com> for
+ 	  reporting this.
 
-        * ace/Service_Config.cpp (close): Moved the call to
-          ACE_Service_Config::close_singletons() to outside the check for
-          ACE_Service_Config::svc_rep_ since the Singletons can be used
-          independently of the services.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for suggesting this.
+	* ace/Service_Config.cpp (close): Moved the call to
+ 	  ACE_Service_Config::close_singletons() to outside the check for
+ 	  ACE_Service_Config::svc_rep_ since the Singletons can be used
+ 	  independently of the services.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for suggesting this.
 
 Wed Apr  9 21:11:38 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Gateway.cpp (handle_signal): Evil demons
-          added bugs to my code that were causing segfaults when signals
-          shutdown the gateway.  This is now fixed.
+	* apps/Gateway/Gateway/Gateway.cpp (handle_signal): Evil demons
+ 	  added bugs to my code that were causing segfaults when signals
+ 	  shutdown the gateway.  This is now fixed.
 
-        * apps/Gateway/Gateway/Proxy_Handler.h: Changed ACE_Event_Channel
-          & to ACE_Event_Channel * to keep the compiler happy.
+	* apps/Gateway/Gateway/Proxy_Handler.h: Changed ACE_Event_Channel
+ 	  & to ACE_Event_Channel * to keep the compiler happy.
 
-        * examples/Connection/non_blocking/CPP-connector.h: Added a
-          do-nothing default constructor to keep ACE_Connector happy.
+	* examples/Connection/non_blocking/CPP-connector.h: Added a
+ 	  do-nothing default constructor to keep ACE_Connector happy.
 
-        * examples/Connection/misc/test_upipe.cpp: Added a do-nothing
-          default constructor to keep ACE_Connector happy.
+	* examples/Connection/misc/test_upipe.cpp: Added a do-nothing
+ 	  default constructor to keep ACE_Connector happy.
 
-        * examples/Connection/blocking/SPIPE-connector.h: Added a
-          do-nothing default constructor to keep ACE_Connector happy.
+	* examples/Connection/blocking/SPIPE-connector.h: Added a
+ 	  do-nothing default constructor to keep ACE_Connector happy.
 
-        * apps/Gateway/Gateway/Proxy_Handler: Added a do-nothing default
-          constructor to keep ACE_Connector happy.
+	* apps/Gateway/Gateway/Proxy_Handler: Added a do-nothing default
+ 	  constructor to keep ACE_Connector happy.
 
-        * netsvcs/lib: Added some default arguments to
-          TS_Clerk_Handler.cpp and Client_Logger_Handler.cpp to keep the
-          compiler from complaining about the new ACE_Connector features.
-          Thanks to David Levine for reporting this.
+	* netsvcs/lib: Added some default arguments to
+ 	  TS_Clerk_Handler.cpp and Client_Logger_Handler.cpp to keep the
+ 	  compiler from complaining about the new ACE_Connector features.
+  	  Thanks to David Levine for reporting this.
 
-        * ace/Timer_Heap.cpp (reheap_down): Fixed a *very* subtle bug in
-          reheap_down() where parent was starting off at 0 whereas it
-          should have been starting off at child_index / 2.
+	* ace/Timer_Heap.cpp (reheap_down): Fixed a *very* subtle bug in
+ 	  reheap_down() where parent was starting off at 0 whereas it
+ 	  should have been starting off at child_index / 2.
 
-        * examples/Logger/simple-server/Logging_Handler: Removed the use
-          of the operator ACE_SOCK_Stream &() and replaced it with the
-          more intuitive peer() approach used in ACE_Svc_Handler et al.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
+	* examples/Logger/simple-server/Logging_Handler: Removed the use
+ 	  of the operator ACE_SOCK_Stream &() and replaced it with the
+ 	  more intuitive peer() approach used in ACE_Svc_Handler et al.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
 
-        * ace: Added a bunch of changes to improve ACE support on SCO 5.0.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for these fixes.
+	* ace: Added a bunch of changes to improve ACE support on SCO 5.0.
+  	  Thanks to Ganesh Pai <gpai@voicetek.com> for these fixes.
 
-        * tests/Conn_Test.cpp: Completely reworked this test so that it
-          illustrates how to use the ACE_Strategy_Connector, which is
-          customized with a special Caching_Connect_Strategy that recycles
-          connections.
+	* tests/Conn_Test.cpp: Completely reworked this test so that it
+ 	  illustrates how to use the ACE_Strategy_Connector, which is
+ 	  customized with a special Caching_Connect_Strategy that recycles
+ 	  connections.
 
-        * ace/Connector: Finished implementing the new
-          ACE_Strategy_Connector.  This is similar in design to the
-          ACE_Strategy_Acceptor.
+	* ace/Connector: Finished implementing the new
+ 	  ACE_Strategy_Connector.  This is similar in design to the
+ 	  ACE_Strategy_Acceptor.
 
-        * ace: Changed the signature of all the make_svc_handler() methods
-          so that they return int (rather than SVC_HANDLER *) and they
-          pass back a SVC_HANDLER * by reference.  This makes it possible
-          to totally control the creation of svc handlers (which is useful
-          for the new ACE_Strategy_Connector).
+	* ace: Changed the signature of all the make_svc_handler() methods
+ 	  so that they return int (rather than SVC_HANDLER *) and they
+ 	  pass back a SVC_HANDLER * by reference.  This makes it possible
+ 	  to totally control the creation of svc handlers (which is useful
+ 	  for the new ACE_Strategy_Connector).
 
-        * ace/Connector.cpp: Factored out the active_svc_handler() call
-          from the connect_svc_handler() method into the connect() method
-          so that it would behave correctly as a Template Method and
-          Strategy.
+	* ace/Connector.cpp: Factored out the active_svc_handler() call
+ 	  from the connect_svc_handler() method into the connect() method
+ 	  so that it would behave correctly as a Template Method and
+ 	  Strategy.
 
-        * ace/Connector: Removed the explicit use of the Reactor data
-          member from the ACE_Connector since it's inherited from the
-          ACE_Service_Object.
+	* ace/Connector: Removed the explicit use of the Reactor data
+ 	  member from the ACE_Connector since it's inherited from the
+ 	  ACE_Service_Object.
 
-        * ace/Log_Msg.cpp: The MVS compiler doesn't like the call to
-          atexit() in ACE_Log_Msg::instance() because atexit() requires an
-          a function pointer of type extern "C" for its parameter.  I've
-          fixed this via an adapter.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for reporting this.
+	* ace/Log_Msg.cpp: The MVS compiler doesn't like the call to
+ 	  atexit() in ACE_Log_Msg::instance() because atexit() requires an
+ 	  a function pointer of type extern "C" for its parameter.  I've
+ 	  fixed this via an adapter.  Thanks to Chuck Gehr
+ 	  <gehr@sweng.stortek.com> for reporting this.
 
-        * ace/Strategies_T: Added a new ACE_Connect_Strategy that
-          complements the ACE_Strategy_Connector in the same manner that
-          the ACE_Accept_Strategy complements the ACE_Strategy_Acceptor.
+	* ace/Strategies_T: Added a new ACE_Connect_Strategy that
+ 	  complements the ACE_Strategy_Connector in the same manner that
+ 	  the ACE_Accept_Strategy complements the ACE_Strategy_Acceptor.
 
-        * ace/Connector.h: The destructor for ACE_Connector should have
-          been virtual.  Now it is.
+	* ace/Connector.h: The destructor for ACE_Connector should have
+ 	  been virtual.  Now it is.
 
-        * ace/Connector: Added a new factory method called
-          make_svc_handler().  This behaves similiarly to the
-          ACE_Acceptor::make_svc_handler().  However, for the
-          ACE_Connector we only use this when the SVC_HANDLER * is NULL.
+	* ace/Connector: Added a new factory method called
+ 	  make_svc_handler().  This behaves similiarly to the
+ 	  ACE_Acceptor::make_svc_handler().  However, for the
+ 	  ACE_Connector we only use this when the SVC_HANDLER * is NULL.
 
-        * ace/Connector: Changed the signature for connect() to take a &
-          to a SVC_HANDLER * in anticipation of our new
-          ACE_Strategy_Connector.  This new connector will make it easy to
-          implement cached connections.
+	* ace/Connector: Changed the signature for connect() to take a &
+ 	  to a SVC_HANDLER * in anticipation of our new
+ 	  ACE_Strategy_Connector.  This new connector will make it easy to
+ 	  implement cached connections.
 
-        * ace/config-win32-common.h: Added a new #include for <mswsock.h>,
-          which contains the declarations for TransmitFile() data
-          structures.  They are in WINSOCK.H if you do not use
-          ACE_HAS_WINSOCK2.  Thanks to Norbert Rapp
-          <norbert.rapp@nexus-informatics.de> for reporting this.
+	* ace/config-win32-common.h: Added a new #include for <mswsock.h>,
+ 	  which contains the declarations for TransmitFile() data
+ 	  structures.  They are in WINSOCK.H if you do not use
+ 	  ACE_HAS_WINSOCK2.  Thanks to Norbert Rapp
+ 	  <norbert.rapp@nexus-informatics.de> for reporting this.
 
-        * ace/OS.i: Fixed a typo in the new condition variable
-          implementation for Win32.  Thanks to Norbert Rapp
-          <norbert.rapp@nexus-informatics.de> for reporting this.
+	* ace/OS.i: Fixed a typo in the new condition variable
+ 	  implementation for Win32.  Thanks to Norbert Rapp
+ 	  <norbert.rapp@nexus-informatics.de> for reporting this.
 
 Wed Apr 09 22:06:23 1997    <harrison@samba.cs.wustl.edu>
 
-        * Memory_Pool.h: Modified ACE_MMAP_Memory_Pool and
-          ACE_MMAP_Memory_Pool_Options to include the new guess_on_fault
-          option.  This is only for platforms that can not report which
-          address caused a segmentation fault (via signal or exception).
-          When guess_on_fault is set (via ACE_MMAP_Memory_Pool_Options),
-          ACE_MMAP_Memory_Pool::handle_signal calls
-          ACE_MMAP_Memory_Pool::remap "guessing" that the segmentation
-          fault was caused by an access to memory not yet mapped.
+	* Memory_Pool.h: Modified ACE_MMAP_Memory_Pool and
+	  ACE_MMAP_Memory_Pool_Options to include the new guess_on_fault
+ 	  option.  This is only for platforms that can not report which
+ 	  address caused a segmentation fault (via signal or exception).
+  	  When guess_on_fault is set (via ACE_MMAP_Memory_Pool_Options),
+ 	  ACE_MMAP_Memory_Pool::handle_signal calls
+ 	  ACE_MMAP_Memory_Pool::remap "guessing" that the segmentation
+ 	  fault was caused by an access to memory not yet mapped.
 
 Wed Apr 09 16:46:16 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,i}: fixed readPPCTimeBase declaration and return
-          value (for now: it really needs to return a 64 bit quantity).
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          reporting these.
+	* ace/OS.{h,i}: fixed readPPCTimeBase declaration and return
+	  value (for now: it really needs to return a 64 bit quantity).
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  reporting these.
 
 Wed Apr  9 03:12:24 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/config-win32-common.h: Defining _WIN32_WINNT as 0x0400
-          implies ACE_HAS_WINSOCK2.
-        
-        * ace/Asynch_IO: The implementation of ACE_Asynch_Transmit_File
-          and ACE_Asynch_Accept are only supported if ACE_HAS_WINSOCK2 is
-          defined or you are on WinNT 4.0 or higher. Therefore, added
-          appropriate #defines.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for suggesting this.
+	* ace/config-win32-common.h: Defining _WIN32_WINNT as 0x0400
+ 	  implies ACE_HAS_WINSOCK2.
+	
+	* ace/Asynch_IO: The implementation of ACE_Asynch_Transmit_File
+ 	  and ACE_Asynch_Accept are only supported if ACE_HAS_WINSOCK2 is
+ 	  defined or you are on WinNT 4.0 or higher. Therefore, added
+ 	  appropriate #defines.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for suggesting this.
 
 Tue Apr  8 22:45:28 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
-        * java/src/SOCKStream.java (SOCKStream): Made two small changes to
-          the two send(). Instead of doing a println, I now do a
-          print. This was really a bug!
+	* java/src/SOCKStream.java (SOCKStream): Made two small changes to
+ 	  the two send(). Instead of doing a println, I now do a
+ 	  print. This was really a bug!
 
 Tue Apr 08 22:08:12 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed
-          "rm -f $@" from AR command so that archive won't be removed
-          during incremental updates.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for reporting this.
+	* include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed
+	  "rm -f $@" from AR command so that archive won't be removed
+	  during incremental updates.  Thanks to Chuck Gehr
+	  <gehr@sweng.stortek.com> for reporting this.
 
 Tue Apr  8 00:04:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Task_T.cpp: Added a hack to work around the new weird HP/UX
-          aCC template semantics.  Thanks to Neil B. Cohen
-          <nbc@metsci.com> for reporting this.
+	* ace/Task_T.cpp: Added a hack to work around the new weird HP/UX
+ 	  aCC template semantics.  Thanks to Neil B. Cohen
+ 	  <nbc@metsci.com> for reporting this.
  
-        * ace/config-hpux-10.x[-g++].h: Added #define
-          ACE_HAS_CLOCK_GETTIME.  Thanks to Neil B. Cohen <nbc@metsci.com>
-          for reporting this.
+	* ace/config-hpux-10.x[-g++].h: Added #define
+ 	  ACE_HAS_CLOCK_GETTIME.  Thanks to Neil B. Cohen <nbc@metsci.com>
+ 	  for reporting this.
 
-        * ace/config-hpux-10.x[-g++].h: Added ACE_HAS_IP_MULTICAST and removed
-          ACE_LACKS_STRRECVFD.  Thanks to Neil B. Cohen <nbc@metsci.com>
-          for reporting this.
+	* ace/config-hpux-10.x[-g++].h: Added ACE_HAS_IP_MULTICAST and removed
+ 	  ACE_LACKS_STRRECVFD.  Thanks to Neil B. Cohen <nbc@metsci.com>
+ 	  for reporting this.
 
-        * ace/config-hpux-10.x.h: Apparently some HP/UX 10.x C++ compilers
-          don't support volatile, so I #defined it away as a macro.
-          Thanks to Neil B. Cohen <nbc@metsci.com> for reporting this.
+	* ace/config-hpux-10.x.h: Apparently some HP/UX 10.x C++ compilers
+ 	  don't support volatile, so I #defined it away as a macro.
+  	  Thanks to Neil B. Cohen <nbc@metsci.com> for reporting this.
 
-        * ace/Log_Msg.cpp: Put a #if defined (ACE_MT_SAFE) around the
-          entire Log_Msg destructor.  Thanks to Neil B. Cohen
-          <nbc@metsci.com> for reporting this.
+	* ace/Log_Msg.cpp: Put a #if defined (ACE_MT_SAFE) around the
+ 	  entire Log_Msg destructor.  Thanks to Neil B. Cohen
+ 	  <nbc@metsci.com> for reporting this.
 
-        * ace/config-hpux-10.x[-g++].h: Added #define ACE_HAS_STREAMS on
-          the recommendation of Neil B. Cohen <nbc@metsci.com>.
+	* ace/config-hpux-10.x[-g++].h: Added #define ACE_HAS_STREAMS on
+ 	  the recommendation of Neil B. Cohen <nbc@metsci.com>.
 
 Mon Apr 07 12:08:21 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/Set.cpp: For some reason, VC++ 5.0 doesn't like to have the
-          constructors X::X(X&) and X::X(X*).  We can change the X::X(X*)
-          constructor to take in an extra argument with a default value.
-          This seems to have sufficiently satisfied the VC++ 5.0 for the
-          time being.  There were no changes necessary to other Set.cpp
-          code (as the extra argument has a default value).
+	* ace/Set.cpp: For some reason, VC++ 5.0 doesn't like to have the
+ 	  constructors X::X(X&) and X::X(X*).  We can change the X::X(X*)
+ 	  constructor to take in an extra argument with a default value.
+  	  This seems to have sufficiently satisfied the VC++ 5.0 for the
+ 	  time being.  There were no changes necessary to other Set.cpp
+ 	  code (as the extra argument has a default value).
 
 Mon Apr 07 08:05:03 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-win32.h: enabled ACE_HAS_UNICODE by default.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          suggesting this.
+	* ace/config-win32.h: enabled ACE_HAS_UNICODE by default.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
+	  suggesting this.
 
-        * ace/config-sunos5.4-g++.h: enabled ACE_HAS_BROKEN_RANDR and
-          disabled ACE_HAS_SVR4_SIGNAL_T.  Thanks to Joey Zhu
-          <joey.zhu@wcom.com> for reporting these problems and testing
-          the fix.
+	* ace/config-sunos5.4-g++.h: enabled ACE_HAS_BROKEN_RANDR and
+	  disabled ACE_HAS_SVR4_SIGNAL_T.  Thanks to Joey Zhu
+	  <joey.zhu@wcom.com> for reporting these problems and testing
+	  the fix.
 
-        * ace/Proactor.h (ACE_Proactor): commented out unused arguments
-          in non-WIN32 version.
+	* ace/Proactor.h (ACE_Proactor): commented out unused arguments
+	  in non-WIN32 version.
 
 Sun Apr 06 22:51:02 1997    <irfan@TWOSTEP>
 
-        * ace/Proactor: Complete rewrite of Proactor that pushes all the
-          differences in asynchronous I/O to the edges of the framework -
-          i.e., into the new Asynch_IO classes. This allows the Proactor
-          to easily support new asynchronous operations.
-
-          Currently, the new Proactor supports minimal functionality. In
-          the future, we will complete this.
-
-          The Proactor is used in conjunction with the new Asynch_IO
-          classes.  There is a different class for each operation. Please
-          see Asynch_IO.h for details.
-
-          There is also a new ACE_Asynch_Acceptor that uses AcceptEx.
-
-          Example is in:
-          ACE_wrappers/examples/Reactor/Proactor/test_proactor.cpp.  
-
-          This example illustrates how the ACE_Proactor can be used to
-          implement an application that does various asynchronous
-          operations.
-
-        * apps/JAWS/server: Complete rewrite of JAWS. The new JAWS has
-          support for Asynch-Thread-Pool (on WIN32), Synch-Thread-Pool,
-          and Thread-per-Request. Different models can be configured using
-          the svc.conf file.  The server now supports both GET and PUT
-          commands.
-          
-          The HTTP_Handler class is a state based implementation of the
-          HTTP protocol. Therefore, it can be used synchronously and
-          asynchronously. It uses an abstract IO class to move between
-          different HTTP protocol states. It is up to the IO class to
-          decide on synchronous or asynchronous I/O.
-
-        * apps/JAWS/client: This is an example of the implementation of
-          BlobStreaming in ACE. This version of BlobStreaming uses HTTP as
-          a transport protocol. 
-
-          Blobby :-) is a simple application written using the ACE_Blob
-          class, which is capable of doing both file uploads and
-          downloads.  If a file is downloaded, the downloaded data is sent
-          to standard output, so that it can be piped as necessary.
-
-        * ace/Mem_Map.cpp (map_it): This method now uses ACE_OS::pwrite
-          (if ACE_HAD_P_READ_WRITE is defined) instead of
-          ACE_OS::lseek/ACE_OS::write to write the end-of-file byte. The
-          old scheme does not work if the file is in OVERLAPPED mode.
-
-        * ace/OS: Added pread and pwrite to the OS class (if
-          ACE_HAD_P_READ_WRITE is defined). On Win32, these functions use
-          the OVERLAPPED structure to specify the offset. This
-          implementation will block until the write/read completes (even
-          if the file is in OVERLAPPED mode).
-
-        * ace/config: Added ACE_HAS_P_READ_WRITE to the following
-          platforms that support pread() and pwrite() calls:
-          config-sunos4-g++.h 
-          config-sunos4-lucid3.2.h
-          config-sunos4-sun3.x.h 
-          config-sunos4-sun4.1.4.h
-          config-sunos4-sun4.x-orbix.h 
-          config-sunos4-sun4.x.h
-          config-sunos5.4-centerline-2.x.h 
-          config-sunos5.4-g++.h
-          config-sunos5.4-sunc++-4.x-orbix.h
-          config-sunos5.4-sunc++-4.x.h 
-          config-sunos5.5-g++.h
-          config-sunos5.5-sunc++-4.1.h  
-          config-sunos5.5-sunc++-4.x-orbix.h
-          config-sunos5.5-sunc++-4.x.h 
-          config-sunx86-sunc++-4.x.h
-          config-win32-common.h
+	* ace/Proactor: Complete rewrite of Proactor that pushes all the
+ 	  differences in asynchronous I/O to the edges of the framework -
+ 	  i.e., into the new Asynch_IO classes. This allows the Proactor
+ 	  to easily support new asynchronous operations.
+
+	  Currently, the new Proactor supports minimal functionality. In
+ 	  the future, we will complete this.
+
+	  The Proactor is used in conjunction with the new Asynch_IO
+ 	  classes.  There is a different class for each operation. Please
+ 	  see Asynch_IO.h for details.
+
+	  There is also a new ACE_Asynch_Acceptor that uses AcceptEx.
+
+	  Example is in:
+ 	  ACE_wrappers/examples/Reactor/Proactor/test_proactor.cpp.  
+
+	  This example illustrates how the ACE_Proactor can be used to
+ 	  implement an application that does various asynchronous
+ 	  operations.
+
+	* apps/JAWS/server: Complete rewrite of JAWS. The new JAWS has
+ 	  support for Asynch-Thread-Pool (on WIN32), Synch-Thread-Pool,
+ 	  and Thread-per-Request. Different models can be configured using
+ 	  the svc.conf file.  The server now supports both GET and PUT
+ 	  commands.
+	  
+	  The HTTP_Handler class is a state based implementation of the
+ 	  HTTP protocol. Therefore, it can be used synchronously and
+ 	  asynchronously. It uses an abstract IO class to move between
+ 	  different HTTP protocol states. It is up to the IO class to
+ 	  decide on synchronous or asynchronous I/O.
+
+	* apps/JAWS/client: This is an example of the implementation of
+ 	  BlobStreaming in ACE. This version of BlobStreaming uses HTTP as
+ 	  a transport protocol. 
+
+	  Blobby :-) is a simple application written using the ACE_Blob
+ 	  class, which is capable of doing both file uploads and
+ 	  downloads.  If a file is downloaded, the downloaded data is sent
+ 	  to standard output, so that it can be piped as necessary.
+
+	* ace/Mem_Map.cpp (map_it): This method now uses ACE_OS::pwrite
+ 	  (if ACE_HAD_P_READ_WRITE is defined) instead of
+ 	  ACE_OS::lseek/ACE_OS::write to write the end-of-file byte. The
+ 	  old scheme does not work if the file is in OVERLAPPED mode.
+
+	* ace/OS: Added pread and pwrite to the OS class (if
+ 	  ACE_HAD_P_READ_WRITE is defined). On Win32, these functions use
+ 	  the OVERLAPPED structure to specify the offset. This
+ 	  implementation will block until the write/read completes (even
+ 	  if the file is in OVERLAPPED mode).
+
+	* ace/config: Added ACE_HAS_P_READ_WRITE to the following
+	  platforms that support pread() and pwrite() calls:
+	  config-sunos4-g++.h 
+	  config-sunos4-lucid3.2.h
+	  config-sunos4-sun3.x.h 
+	  config-sunos4-sun4.1.4.h
+	  config-sunos4-sun4.x-orbix.h 
+	  config-sunos4-sun4.x.h
+	  config-sunos5.4-centerline-2.x.h 
+	  config-sunos5.4-g++.h
+	  config-sunos5.4-sunc++-4.x-orbix.h
+	  config-sunos5.4-sunc++-4.x.h 
+	  config-sunos5.5-g++.h
+	  config-sunos5.5-sunc++-4.1.h	
+	  config-sunos5.5-sunc++-4.x-orbix.h
+	  config-sunos5.5-sunc++-4.x.h 
+	  config-sunx86-sunc++-4.x.h
+	  config-win32-common.h
 
 Sun Apr  6 14:16:18 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * tests/Timer_Queue_Test.cpp: Added tests to make sure that the
-          new ACE_Timer_Queue::cancel() logic is working correctly.  So
-          far, it seems to be fine.
+	* tests/Timer_Queue_Test.cpp: Added tests to make sure that the
+ 	  new ACE_Timer_Queue::cancel() logic is working correctly.  So
+ 	  far, it seems to be fine.
 
-        * ace/Timer_{Heap,List}.cpp (cancel): Changed the comparison for
-          dont_call_handle_close to be correct.
+	* ace/Timer_{Heap,List}.cpp (cancel): Changed the comparison for
+ 	  dont_call_handle_close to be correct.
 
-        * ace/OS.cpp: Deleted a useless return.  Thanks to Gonzalo
-          A. Diethelm <gonzo@ing.puc.cl> for reporting this.
+	* ace/OS.cpp: Deleted a useless return.  Thanks to Gonzalo
+ 	  A. Diethelm <gonzo@ing.puc.cl> for reporting this.
 
-        * ace/config-irix6.2-sgic++.h: Added the following definitions:
+	* ace/config-irix6.2-sgic++.h: Added the following definitions:
 
-          + ACE_LACKS_PTHREAD_THR_SIGSETMASK
-          + ACE_HAS_PTHREAD_EQUAL
-          + ACE_HAS_PTHREAD_T
-          + ACE_HAS_SYSENT_H
-          + ACE_HAS_SYSINFO
-          + ACE_HAS_TEMPLATE_TYPEDEFS
+	  + ACE_LACKS_PTHREAD_THR_SIGSETMASK
+	  + ACE_HAS_PTHREAD_EQUAL
+	  + ACE_HAS_PTHREAD_T
+	  + ACE_HAS_SYSENT_H
+	  + ACE_HAS_SYSINFO
+	  + ACE_HAS_TEMPLATE_TYPEDEFS
 
-          Deleted the following definitions:
+	  Deleted the following definitions:
 
-          + #define ACE_HAS_SYS_SIGLIST (Irix's compiler only has a
-            _sys_siglist array when compiling their own internal
-            functions).
+	  + #define ACE_HAS_SYS_SIGLIST (Irix's compiler only has a
+	    _sys_siglist array when compiling their own internal
+	    functions).
 
-          Thanks to Gonzalo A. Diethelm <gonzo@ing.puc.cl> for this.
+	  Thanks to Gonzalo A. Diethelm <gonzo@ing.puc.cl> for this.
 
-        * ace/Process: Added new support for setting the environment
-          variable and the current working directory.  Thanks to Gonzalo
-          A. Diethelm <gonzo@ing.puc.cl> for this enhancement.
+	* ace/Process: Added new support for setting the environment
+ 	  variable and the current working directory.  Thanks to Gonzalo
+ 	  A. Diethelm <gonzo@ing.puc.cl> for this enhancement.
 
-        * ace/OS.h: "sys/stat.h" was being included more than once, so I
-          fixed this.  Thanks to Gonzalo A. Diethelm <gonzo@ing.puc.cl>
-          for reporting this.
+	* ace/OS.h: "sys/stat.h" was being included more than once, so I
+ 	  fixed this.  Thanks to Gonzalo A. Diethelm <gonzo@ing.puc.cl>
+ 	  for reporting this.
 
-        * ace/XtReactor.cpp: Added the register_handler_i() method, which
-          just delegates to the one defined in the Reactor.  This is
-          necessary to adjust to the C++ type system rules.  Thanks to
-          Gonzalo A. Diethelm <gonzo@ing.puc.cl> for reporting this.
+	* ace/XtReactor.cpp: Added the register_handler_i() method, which
+ 	  just delegates to the one defined in the Reactor.  This is
+ 	  necessary to adjust to the C++ type system rules.  Thanks to
+ 	  Gonzalo A. Diethelm <gonzo@ing.puc.cl> for reporting this.
 
-        * ace/Service_Config.cpp: Added the Double-Checked Locking
-          Optimization pattern to all the ACE_Service_Config Singletons
-          (e.g., thr_mgr(), reactor(), etc.) so that they behave correctly
-          in multi-threaded programs.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for insisting on this.
+	* ace/Service_Config.cpp: Added the Double-Checked Locking
+ 	  Optimization pattern to all the ACE_Service_Config Singletons
+	  (e.g., thr_mgr(), reactor(), etc.) so that they behave correctly
+ 	  in multi-threaded programs.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for insisting on this.
 
-        * ace/OS.i (nanosleep): If the nanosleep() system call isn't
-          supported by the OS platform we'll just use ACE_OS::sleep(const
-          ACE_Time_Value &) instead.
+	* ace/OS.i (nanosleep): If the nanosleep() system call isn't
+ 	  supported by the OS platform we'll just use ACE_OS::sleep(const
+ 	  ACE_Time_Value &) instead.
 
-        * ace/Log_Msg.cpp: Changed the logic of
-          ACE_Log_Msg_Manager::remove() so that it returns the number of
-          remaining registered instances.  When this goes to 0 we'll
-          cleanup.
+	* ace/Log_Msg.cpp: Changed the logic of
+ 	  ACE_Log_Msg_Manager::remove() so that it returns the number of
+ 	  remaining registered instances.  When this goes to 0 we'll
+ 	  cleanup.
 
-        * ace/OS.i: Enhanced the ACE_OS::cond_[timed_]wait() methods so
-          that they use SignalObjectAndWait() whenever possible to avoid
-          potential problems with unfairness.  See
-          http://www.cs.wustl.edu/~schmidt/editorial-15.html for more
-          details.  Thanks to David Holmes <ltdholmes@mri.mq.edu.au> for
-          pointing out this subtlety.
+	* ace/OS.i: Enhanced the ACE_OS::cond_[timed_]wait() methods so
+ 	  that they use SignalObjectAndWait() whenever possible to avoid
+ 	  potential problems with unfairness.  See
+ 	  http://www.cs.wustl.edu/~schmidt/editorial-15.html for more
+ 	  details.  Thanks to David Holmes <ltdholmes@mri.mq.edu.au> for
+ 	  pointing out this subtlety.
 
 Sun Apr 06 20:01:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/wrapper_macros.GNU: added "purify" and
-          "quantify" make command options.  To build Purified versions
-          of all executables in the current direction, for example:
+	* include/makeinclude/wrapper_macros.GNU: added "purify" and
+	  "quantify" make command options.  To build Purified versions
+	  of all executables in the current direction, for example:
 
-                % make clean; make purify=1
+		% make clean; make purify=1
 
-          These options assume that purify or quantify are in your PATH.
+	  These options assume that purify or quantify are in your PATH.
 
-        * ace/Task.{h,cpp}: removed ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-          from ACE_Task_Exit declaration and ACE_Task_Exit::instance ().
-          ACE_Task_Exit is no longer a template class, so we don't need that.
+	* ace/Task.{h,cpp}: removed ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+	  from ACE_Task_Exit declaration and ACE_Task_Exit::instance ().
+	  ACE_Task_Exit is no longer a template class, so we don't need that.
 
-        * ace/Task_T.h: added missing "*/" at end of comment after #endif.
+	* ace/Task_T.h: added missing "*/" at end of comment after #endif.
 
-        * tests/IOStream.cpp (server): added check for 0 strlen of
-          "buf" to avoid out-of-bound array reference.
+	* tests/IOStream.cpp (server): added check for 0 strlen of
+	  "buf" to avoid out-of-bound array reference.
 
-        * ace/Svc_Conf_l.cpp, Makefile: added #define ACE_BUILD_DLL.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          reporting this.
+	* ace/Svc_Conf_l.cpp, Makefile: added #define ACE_BUILD_DLL.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
+	  reporting this.
 
-        * ace/Set.cpp(ACE_Set_Node ctor): commented out unused arg MS_SUCKS.
+	* ace/Set.cpp(ACE_Set_Node ctor): commented out unused arg MS_SUCKS.
 
 Sat Apr  5 14:21:29 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
-        * java/: Changed package name from ACE to JACE across all directories.
+	* java/: Changed package name from ACE to JACE across all directories.
 
 Sat Apr  5 13:12:37 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/MM_Shared_Memory_Test.cpp: Removed the use of dynamic
-          memory allocation to avoid memory leaks.
+	* tests/MM_Shared_Memory_Test.cpp: Removed the use of dynamic
+ 	  memory allocation to avoid memory leaks.
 
-        * ace/Service_Config: Changed _defaults to _static_svcs since this
-          more accurately reflects what they do.
+	* ace/Service_Config: Changed _defaults to _static_svcs since this
+ 	  more accurately reflects what they do.
 
-        * examples/Shared_Malloc/test_malloc.cpp: Removed the
-          print_stats() call since it doesn't work via this API.  Thanks
-          to Sandro Doro <alex@aureus.sublink.org> for reporting this.
+	* examples/Shared_Malloc/test_malloc.cpp: Removed the
+ 	  print_stats() call since it doesn't work via this API.  Thanks
+ 	  to Sandro Doro <alex@aureus.sublink.org> for reporting this.
 
-        * ACE-install.sh: Tweeked the install script by changing the
-          "gunzip; tar; gzip" sequence into "gunzip -c | tar xvf -" to
-          speed it up a little.  Thanks to Per Andersson
-          <Per.Andersson@hfera.ericsson.se> for this fix.
+	* ACE-install.sh: Tweeked the install script by changing the
+	  "gunzip; tar; gzip" sequence into "gunzip -c | tar xvf -" to
+	  speed it up a little.  Thanks to Per Andersson
+	  <Per.Andersson@hfera.ericsson.se> for this fix.
 
-        * examples/Threads/future1.cpp: Make sure to delete the char *name
-          that is retrieved from the future in order to avoid a memory
-          leak.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          figuring this out.
-        
-        * examples/Threads/future1.cpp: Make sure to delete this->name_ in
-          the Scheduler destructor to avoid a memory leak.
+	* examples/Threads/future1.cpp: Make sure to delete the char *name
+ 	  that is retrieved from the future in order to avoid a memory
+ 	  leak.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
+ 	  figuring this out.
+	
+	* examples/Threads/future1.cpp: Make sure to delete this->name_ in
+ 	  the Scheduler destructor to avoid a memory leak.
 
-        * examples/Threads/task_four.cpp (close): Enhanced the close()
-          method so that it will actually delete the memory for the
-          Worker_Task.
+	* examples/Threads/task_four.cpp (close): Enhanced the close()
+ 	  method so that it will actually delete the memory for the
+ 	  Worker_Task.
 
-        * ace/XtReactor.cpp (register_handler_i): Added the 
+	* ace/XtReactor.cpp (register_handler_i): Added the 
 
-          if (mask & ACE_Event_Handler::ACCEPT_MASK)
-            ACE_SET_BITS (condition, XtInputReadMask);
+	  if (mask & ACE_Event_Handler::ACCEPT_MASK)
+	    ACE_SET_BITS (condition, XtInputReadMask);
 
-          Thanks to Jean-Marc Strauss <strauss@club-internet.fr> for
-          reporting this.
+	  Thanks to Jean-Marc Strauss <strauss@club-internet.fr> for
+ 	  reporting this.
 
-        * ace/Timer_Queue.cpp (expire): This is the only method that calls
-          ACE_Timer_Queue::cancel() with dont_call_handle_close set to 0.
+	* ace/Timer_Queue.cpp (expire): This is the only method that calls
+ 	  ACE_Timer_Queue::cancel() with dont_call_handle_close set to 0.
 
-        * ace/Reactor: Modified the cancel_timer() methods so that they
-          also take a dont_call_handle_close parameter and pass it on to
-          the Timer_Queue::cancel() method.
+	* ace/Reactor: Modified the cancel_timer() methods so that they
+ 	  also take a dont_call_handle_close parameter and pass it on to
+ 	  the Timer_Queue::cancel() method.
 
-        * ace/Timer_{List,Heap}.cpp: Modified all the cancel() methods so
-          that they will not call handle_close() unless the new parameter
-          dont_call_handle_close is 0 (it is 1 by default).  This will
-          avoid nasty problems with recursion.  Thanks to Paul Han
-          <phan@CCGATE.HAC.COM> for suggesting this.
+	* ace/Timer_{List,Heap}.cpp: Modified all the cancel() methods so
+ 	  that they will not call handle_close() unless the new parameter
+ 	  dont_call_handle_close is 0 (it is 1 by default).  This will
+ 	  avoid nasty problems with recursion.  Thanks to Paul Han
+	  <phan@CCGATE.HAC.COM> for suggesting this.
 
-        * ace/Timer_{List,Heap}.cpp (schedule): If a user tried to
-          schedule a NULL ACE_Event_Handler then we return -1 with errno
-          set to EINVAL.
+	* ace/Timer_{List,Heap}.cpp (schedule): If a user tried to
+ 	  schedule a NULL ACE_Event_Handler then we return -1 with errno
+ 	  set to EINVAL.
 
-        * ace/Message_Block.cpp: Somehow the file got screwed up and was
-          reverted back to an earlier incarnation where we didn't use
-          ACE_Service_Config::alloc()...  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for figuring this out.
+	* ace/Message_Block.cpp: Somehow the file got screwed up and was
+ 	  reverted back to an earlier incarnation where we didn't use
+ 	  ACE_Service_Config::alloc()...  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for figuring this out.
 
 Sat Apr  5 19:11:46 1997  Tim H. Harrison  <harrison@waltz.cs.wustl.edu>
 
-        * ace/Signal.i (ACE_Sig_Guard): Changed the constructor of
-          ACE_Sig_Guard so that it doesn't call ACE_OS::sigprocmask for
-          Win32.  This keeps errno from being set to ENOSYS at random
-          times.
+	* ace/Signal.i (ACE_Sig_Guard): Changed the constructor of
+ 	  ACE_Sig_Guard so that it doesn't call ACE_OS::sigprocmask for
+ 	  Win32.  This keeps errno from being set to ENOSYS at random
+	  times.
 
 Sat Apr 05 17:27:02 1997    <irfan@TWOSTEP>
 
-        * Registry.cpp (resolve): Type and size of the object is only set
-          if RegQueryValueEx() returns success. Thanks to Alan
-          (Alan_Cabrera@fp.cibc.com) for reporting this.
+	* Registry.cpp (resolve): Type and size of the object is only set
+ 	  if RegQueryValueEx() returns success. Thanks to Alan
+	  (Alan_Cabrera@fp.cibc.com) for reporting this.
 
 Sat Apr 05 13:11:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Log_Msg.cpp (instance): Added another ACE_NO_HEAP_CHECK.
-          Matthias provided the fix.
-
-        * ace/config-win32.h: Disable ACE_HAS_STRICT by default, because
-          it will break existing application code.
-
-        * ace/OS.{h,cpp},Log_Msg.{h,cpp}: fixes from Matthias Kerkhoff
-          <make@cs.tu-berlin.de> to avoid memory-leak reports when MFC
-          or (the CrtHeapXXX()-functions of the Win32 runtime library)
-          are used.
-
-          The problem is, that MFC (and so may other Win32 applications
-          do) allocates a thread specific storage slot for each running
-          thread which contains various control and debug informations.
-          Part of this information is an object, which when constructed
-          makes a snapshop of the heap. When this object is destroyed,
-          the snapshot is compared to the actual heap. All object still
-          existing on the heap are reported as memory leaks (which
-          is in most situations correct).  Because the object is deleted
-          when the thread (or programs main) is left and this happens
-          before atexit is called, some leak reports are false (because,
-          e.g., all these ACE_Log_Msg's will be deleted in atexit).
-
-          The fix for ACE_Log_Msg consists of three changes (two only
-          relevant for Win32, one relevant for all platforms.)
-          Description of changes:
-
-          a) Introduced a new macro ACE_NO_HEAP_CHECK, which turns
-          off the built in heap checking until the current code block
-          is left. (defined for all platforms, but only does something
-          for Win32). This changes os.h and config-win32-common.h.
-
-          b) Added a static member function to ACE_Log_Msg. The function
-          (exists) returns 0 if the calling thread don't have an ACE_Log_Msg
-          and non-null if an ACE_Log_Msg exists. This changes Log_Msg.h
-          and Log_Msg.cpp.
-
-          c) Changed ACE_Thread_Adapter in a way that creating a new
-          thread does not automatically create an ACE_Log_Msg for the
-          calling thread. This happened until now, because the new
-          thread inherited the log settings of the calling thread.
-          This behaviour makes no sense, if the calling thread does
-          not have an ACE_Log_Msg, so i use ACE_Log_Msg::exists() (see
-          above) to prevent the implicit creation of an ACE_Log_Msg
-          for the calling thread.
-
-          Thanks, Matthias!
-
-        * ace/config-win32.h and config-win32-common.h: new, consolidated
-          Win32 config files.  Thanks, again, Matthias!
-
-        * ace/OS.h (ACE_UNUSED_ARG): determine whether we're building
-          on an Irix platform by looking for ACE_HAS_IRIX_GETTIMEOFDAY
-          instead of ACE_HAS_IRIX62_THREADS.
-
-        * ace/Log_Msg.cpp: VxWorks (only!) change: no longer strdups
-          program_name and local_host to avoid memory leaks.  Instead,
-          the addresses of these are copied by ACE_Log_Msg.  So, only
-          strings in the text segment should be passed to its functions!
-          Again, this change is for VxWorks only.
-
-        * ace/Sched_Params.cpp: moved memsets of pcinfo so that entire
-          pcinfo structure is zeroed out, to _really_ avoid Purify warnings.
+	* ace/Log_Msg.cpp (instance): Added another ACE_NO_HEAP_CHECK.
+	  Matthias provided the fix.
+
+	* ace/config-win32.h: Disable ACE_HAS_STRICT by default, because
+	  it will break existing application code.
+
+	* ace/OS.{h,cpp},Log_Msg.{h,cpp}: fixes from Matthias Kerkhoff
+	  <make@cs.tu-berlin.de> to avoid memory-leak reports when MFC
+	  or (the CrtHeapXXX()-functions of the Win32 runtime library)
+	  are used.
+
+	  The problem is, that MFC (and so may other Win32 applications
+	  do) allocates a thread specific storage slot for each running
+	  thread which contains various control and debug informations.
+	  Part of this information is an object, which when constructed
+	  makes a snapshop of the heap. When this object is destroyed,
+	  the snapshot is compared to the actual heap. All object still
+	  existing on the heap are reported as memory leaks (which
+	  is in most situations correct).  Because the object is deleted
+	  when the thread (or programs main) is left and this happens
+	  before atexit is called, some leak reports are false (because,
+	  e.g., all these ACE_Log_Msg's will be deleted in atexit).
+
+	  The fix for ACE_Log_Msg consists of three changes (two only
+	  relevant for Win32, one relevant for all platforms.)
+	  Description of changes:
+
+	  a) Introduced a new macro ACE_NO_HEAP_CHECK, which turns
+	  off the built in heap checking until the current code block
+	  is left. (defined for all platforms, but only does something
+	  for Win32). This changes os.h and config-win32-common.h.
+
+	  b) Added a static member function to ACE_Log_Msg. The function
+	  (exists) returns 0 if the calling thread don't have an ACE_Log_Msg
+	  and non-null if an ACE_Log_Msg exists. This changes Log_Msg.h
+	  and Log_Msg.cpp.
+
+	  c) Changed ACE_Thread_Adapter in a way that creating a new
+	  thread does not automatically create an ACE_Log_Msg for the
+	  calling thread. This happened until now, because the new
+	  thread inherited the log settings of the calling thread.
+	  This behaviour makes no sense, if the calling thread does
+	  not have an ACE_Log_Msg, so i use ACE_Log_Msg::exists() (see
+	  above) to prevent the implicit creation of an ACE_Log_Msg
+	  for the calling thread.
+
+	  Thanks, Matthias!
+
+	* ace/config-win32.h and config-win32-common.h: new, consolidated
+	  Win32 config files.  Thanks, again, Matthias!
+
+	* ace/OS.h (ACE_UNUSED_ARG): determine whether we're building
+	  on an Irix platform by looking for ACE_HAS_IRIX_GETTIMEOFDAY
+	  instead of ACE_HAS_IRIX62_THREADS.
+
+	* ace/Log_Msg.cpp: VxWorks (only!) change: no longer strdups
+	  program_name and local_host to avoid memory leaks.  Instead,
+	  the addresses of these are copied by ACE_Log_Msg.  So, only
+	  strings in the text segment should be passed to its functions!
+	  Again, this change is for VxWorks only.
+
+	* ace/Sched_Params.cpp: moved memsets of pcinfo so that entire
+	  pcinfo structure is zeroed out, to _really_ avoid Purify warnings.
 
 Fri Apr 04 12:28:40 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-mvs.h: removed ACE_HAS_IP_MULTICAST because MVS
-          doesn't define ip_mreq.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for reporting this.
-
-        * ace/OS.i (mutex_init): fixed the extra braces once and for all.
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting it.
-
-        * ace/OS.i, config-sco-5.0.0*.h: fixed for SCO so that it uses
-          single-argument gettimeofday () prototype, but calls two-arg
-          (SVR4) version in ACE_OS::gettimeofday ().  Thanks to Ganesh
-          Ganesh Pai <gpai@voicetek.com> for solving this problem.
-
-        * ace/Log_Msg.{h,cpp}: added ACE_Log_Msg destructor.  In
-          instance (), added call to ::atexit () (::taskDeleteHookAdd ()
-          on VxWorks) to register cleanup handler.  Each new instance
-          of an ACE_Log_Msg is inserted into an ACE_Unbounded_Set; the
-          cleanup handler iterates over the Set and deletes the
-          ACE_Log_Msgs at program exit.  
-
-          Also, the two strings that are allocated get cleaned up after
-          the last ACE_Log_Msg instance is deleted.  Many thanks to
-          Matthias Kerkhoff <make@cs.tu-berlin.de> for figuring this out
-          and cranking out the code.
-
-          It works differently on VxWorks, because it doesn't have
-          ::atexit ().  VxWorks has ::taskDeleteHookAdd (), which is
-          called when each task exits.  So, the Set isn't used.  Instead,
-          the cleanup hook is called for each task when it exits, passing
-          the task control block (TCB) of the exiting task.  A pointer to
-          the ACE_Log_Msg instance is contained in one of the spare fields
-          of the TCB, so the cleanup handler simply deletes it.
-
-        * ace/IOStream.h: specify template parameter (ACE_IOStream<STREAM>)
-          to ACE_OPERATOR{G,P}_SET macros.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for providing this fix.
+	* ace/config-mvs.h: removed ACE_HAS_IP_MULTICAST because MVS
+	  doesn't define ip_mreq.  Thanks to Chuck Gehr
+	  <gehr@sweng.stortek.com> for reporting this.
+
+	* ace/OS.i (mutex_init): fixed the extra braces once and for all.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting it.
+
+	* ace/OS.i, config-sco-5.0.0*.h: fixed for SCO so that it uses
+	  single-argument gettimeofday () prototype, but calls two-arg
+	  (SVR4) version in ACE_OS::gettimeofday ().  Thanks to Ganesh
+	  Ganesh Pai <gpai@voicetek.com> for solving this problem.
+
+	* ace/Log_Msg.{h,cpp}: added ACE_Log_Msg destructor.  In
+	  instance (), added call to ::atexit () (::taskDeleteHookAdd ()
+	  on VxWorks) to register cleanup handler.  Each new instance
+	  of an ACE_Log_Msg is inserted into an ACE_Unbounded_Set; the
+	  cleanup handler iterates over the Set and deletes the
+	  ACE_Log_Msgs at program exit.  
+
+	  Also, the two strings that are allocated get cleaned up after
+	  the last ACE_Log_Msg instance is deleted.  Many thanks to
+	  Matthias Kerkhoff <make@cs.tu-berlin.de> for figuring this out
+	  and cranking out the code.
+
+	  It works differently on VxWorks, because it doesn't have
+	  ::atexit ().  VxWorks has ::taskDeleteHookAdd (), which is
+	  called when each task exits.  So, the Set isn't used.  Instead,
+	  the cleanup hook is called for each task when it exits, passing
+	  the task control block (TCB) of the exiting task.  A pointer to
+	  the ACE_Log_Msg instance is contained in one of the spare fields
+	  of the TCB, so the cleanup handler simply deletes it.
+
+	* ace/IOStream.h: specify template parameter (ACE_IOStream<STREAM>)
+	  to ACE_OPERATOR{G,P}_SET macros.  Thanks to Chuck Gehr
+	  <gehr@sweng.stortek.com> for providing this fix.
 
 Thu Apr  3 22:17:53 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Registry.cpp: Changed STRING_SEPARATOR from Istring to
-          LPCTSTR.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          suggesting this.
+	* ace/Registry.cpp: Changed STRING_SEPARATOR from Istring to
+ 	  LPCTSTR.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
+ 	  suggesting this.
 
 Thu Apr  3 21:39:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.i (mutex_init): Removed errant open-brace ('{').  Thanks
-          to Chuck Gehr (gehr@sweng.stortek.com) for the fix!
+	* ace/OS.i (mutex_init): Removed errant open-brace ('{').  Thanks
+ 	  to Chuck Gehr (gehr@sweng.stortek.com) for the fix!
 
 Thu Apr 03 08:52:34 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h,OS.cpp,Sched_Params.cpp: added /**/ to some #include
-          directives.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de>
-          for reporting these.
+	* ace/OS.h,OS.cpp,Sched_Params.cpp: added /**/ to some #include
+	  directives.  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de>
+	  for reporting these.
 
-        * ace/OS.cpp (writev, readv): changed type of local variable "i"
-          from size_t to int to avoid signed/unsigned mismatch.  Thanks
-          to Matthias Kerkhoff <make@cs.tu-berlin.de> for reporting this.
+	* ace/OS.cpp (writev, readv): changed type of local variable "i"
+	  from size_t to int to avoid signed/unsigned mismatch.	 Thanks
+	  to Matthias Kerkhoff <make@cs.tu-berlin.de> for reporting this.
 
-        * ace/OS.cpp (readv), SOCK_Dgram.cpp (recv): added casts of
-          iov_len and copyn because iov_len is int on some platforms and
-          size_t on others.  This avoids compiler (MSVC 4.1) warnings.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for reporting
-          this.
+	* ace/OS.cpp (readv), SOCK_Dgram.cpp (recv): added casts of
+	  iov_len and copyn because iov_len is int on some platforms and
+	  size_t on others.  This avoids compiler (MSVC 4.1) warnings.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for reporting
+	  this.
 
-        * include/makeinclude/platform_sco5.0.0-nothread.GNU:
-          updated CCFLAGS and added LD=$(CXX).   Thanks to
-          Ganesh Pai <gpai@voicetek.com> for these fixes.
+	* include/makeinclude/platform_sco5.0.0-nothread.GNU:
+	  updated CCFLAGS and added LD=$(CXX).	 Thanks to
+	  Ganesh Pai <gpai@voicetek.com> for these fixes.
 
-        * ace/OS.h: added #include of <sys/regset.h> for SCO only.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for this fix.
+	* ace/OS.h: added #include of <sys/regset.h> for SCO only.
+	  Thanks to Ganesh Pai <gpai@voicetek.com> for this fix.
 
-        * ace/config-sco-5.0.0*.h: added #define ACE_HAS_IP_MULTICAST.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for this fix.
+	* ace/config-sco-5.0.0*.h: added #define ACE_HAS_IP_MULTICAST.
+	  Thanks to Ganesh Pai <gpai@voicetek.com> for this fix.
 
-        * ace/config-{chorus,linux*,sco*}.h: removed #define of
-          ACE_HAS_INLINED_OSCALLS because it's no longer needed in the
-          config files:  it's #defined in OS.h if needed.
+	* ace/config-{chorus,linux*,sco*}.h: removed #define of
+	  ACE_HAS_INLINED_OSCALLS because it's no longer needed in the
+	  config files:	 it's #defined in OS.h if needed.
 
 Thu Apr  3 01:48:01 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/Malloc.i (malloc): ACE_New_Allocator::malloc only calls new
-          if nbytes is > 0.  Purify was complaining that 0 bytes were
-          allocated but never deleted.  Go figure.
+	* ace/Malloc.i (malloc): ACE_New_Allocator::malloc only calls new
+	  if nbytes is > 0.  Purify was complaining that 0 bytes were
+ 	  allocated but never deleted.  Go figure.
 
 Wed Apr  2 22:24:48 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.cpp: Moved the ACE_OS::inet_aton() method into the *.cpp
-          file and made it non-inline to work around a bug with HP/UX C++.
-          Thanks to Neil Cohen for this fix.
+	* ace/OS.cpp: Moved the ACE_OS::inet_aton() method into the *.cpp
+	  file and made it non-inline to work around a bug with HP/UX C++.
+	  Thanks to Neil Cohen for this fix.
 
 Wed Apr 02 10:09:37 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos5.5-sunc++-4.1.h: added template specialization
-          with Sun C++ 4.2.
+	* ace/config-sunos5.5-sunc++-4.1.h: added template specialization
+	  with Sun C++ 4.2.
 
-        * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed +w
-          and added comments about Sun C++ 4.2 support.
+	* include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed +w
+	  and added comments about Sun C++ 4.2 support.
 
-        * include/makeinclude/platform_chorus.GNU, platform_hpux_gcc.GNU,
-          platform_irix5.{2,3_g++}.GNU, platform_linux{_,pthread}.GNU,
-          platform_m88k.GNU,platform_osf1_4.0_g++.GNU,
-          platform_sco-nothread.GNU,platform_sco5.0.0-*.GNU,
-          platform_sunos{4,5}_g++.GNU, platform_sunos5_x86_g++.GNU,
-          platform_unixware_g++.GNU, platform_vxworks5.2_g++.GNU:
-          added -fno-implicit-templates to CCFLAGS.  See INSTALL file
-          for discussion of the g++ option.  Also, added -O2 because
-          it dramatically reduces object file sizes.
+	* include/makeinclude/platform_chorus.GNU, platform_hpux_gcc.GNU,
+	  platform_irix5.{2,3_g++}.GNU, platform_linux{_,pthread}.GNU,
+	  platform_m88k.GNU,platform_osf1_4.0_g++.GNU,
+	  platform_sco-nothread.GNU,platform_sco5.0.0-*.GNU,
+	  platform_sunos{4,5}_g++.GNU, platform_sunos5_x86_g++.GNU,
+	  platform_unixware_g++.GNU, platform_vxworks5.2_g++.GNU:
+	  added -fno-implicit-templates to CCFLAGS.  See INSTALL file
+	  for discussion of the g++ option.  Also, added -O2 because
+	  it dramatically reduces object file sizes.
 
-        * netsvcs/clients/Tokens/manual/manual.cpp: made
-          STDIN_Token::TID typedef public so that template
-          specialization (w/ Sun C++ 4.2) can access it.
+	* netsvcs/clients/Tokens/manual/manual.cpp: made
+	  STDIN_Token::TID typedef public so that template
+	  specialization (w/ Sun C++ 4.2) can access it.
 
 Wed Apr  2 10:02:47 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.h: Added definitions for THREAD- and PROCESS-LEVEL
-          priorities because some implementations define these while
-          others don't.  These are now
-          ACE_{THR,PROC}_{FIFO,RR,OTHER}_{MIN,MAX,DEF}.  The only really
-          NEW concept is the *_DEF, which is a default value assigned by
-          ACE_OS::thr_create() if one isn't given.  Of special note is that
-          we don't redefine a default values if it's already been
-          defined, which allows individual programs to have their
-          own ACE-wide "default".
-
-        * ace/OS.cpp (thr_create): Uses ACE_{THR,PROC}_* macros
-          rather than the PRI_* macros.
-
-        * ace/Sched_Params.cpp (priority_min,priority_max): These now
-          use ACE_{THR,PROC}_* macros to ignore OS-specific priority
-          assignments.
-
-        * ace/config-linux-lxpthreads.h: Removed definitions of
-          PRI_{FIFO,RR,OTHER}_{MIN,MAX}.
-
-        * include/makeinclude/platform_linux*.GNU (CCFLAGS): Added
-          -fno-implicit-templates now that it's supported.  This
-          eliminates messages of the sort 'ld: Warning size of
-          <mangled template specialization name> change from xx to yy'
-          when linking libACE.so.  Thanks to David Levine for making
-          this possible!
-        
+	* ace/OS.h: Added definitions for THREAD- and PROCESS-LEVEL
+ 	  priorities because some implementations define these while
+ 	  others don't.  These are now
+ 	  ACE_{THR,PROC}_{FIFO,RR,OTHER}_{MIN,MAX,DEF}.  The only really
+	  NEW concept is the *_DEF, which is a default value assigned by
+	  ACE_OS::thr_create() if one isn't given.  Of special note is that
+ 	  we don't redefine a default values if it's already been
+ 	  defined, which allows individual programs to have their
+ 	  own ACE-wide "default".
+
+	* ace/OS.cpp (thr_create): Uses ACE_{THR,PROC}_* macros
+	  rather than the PRI_* macros.
+
+	* ace/Sched_Params.cpp (priority_min,priority_max): These now
+	  use ACE_{THR,PROC}_* macros to ignore OS-specific priority
+	  assignments.
+
+	* ace/config-linux-lxpthreads.h: Removed definitions of
+ 	  PRI_{FIFO,RR,OTHER}_{MIN,MAX}.
+
+	* include/makeinclude/platform_linux*.GNU (CCFLAGS): Added
+ 	  -fno-implicit-templates now that it's supported.  This
+ 	  eliminates messages of the sort 'ld: Warning size of
+ 	  <mangled template specialization name> change from xx to yy'
+ 	  when linking libACE.so.  Thanks to David Levine for making
+ 	  this possible!
+	
 Tue Apr  1 15:27:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * bin/g++dep: Removed the "/bin" prefix so that this won't fail on
-          platforms that don't have sed in /bin.  Thanks to Sandro Doro
-          <alex@aureus.sublink.org> for this fix.
+	* bin/g++dep: Removed the "/bin" prefix so that this won't fail on
+ 	  platforms that don't have sed in /bin.  Thanks to Sandro Doro
+ 	  <alex@aureus.sublink.org> for this fix.
 
 Tue Apr 01 09:55:07 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: protected definition of struct flock on VxWorks,
-          because it defines that type in sys/fcntlcom.h.  (It doesn't
-          appear to support flock (), though.)  Thanks to Dave
-          Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting this.
+	* ace/OS.h: protected definition of struct flock on VxWorks,
+	  because it defines that type in sys/fcntlcom.h.  (It doesn't
+	  appear to support flock (), though.)  Thanks to Dave
+	  Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting this.
 
-        * ace/OS.h: define ACE_hrtime_t as u_longlong_t gcc, because
-          its long long types are only 4 bytes long.  Its longlong_t
-          types are 8 bytes.  Also made ACE_hrtime_t unsigned for
-          other than gcc on Unix platforms.
+	* ace/OS.h: define ACE_hrtime_t as u_longlong_t gcc, because
+	  its long long types are only 4 bytes long.  Its longlong_t
+	  types are 8 bytes.  Also made ACE_hrtime_t unsigned for
+	  other than gcc on Unix platforms.
 
-        * ace/OS.* (gethrtime), config-vxworks-ghs-1.8.h: added support
-          for PowerPC with Green Hills compiler.  Thanks to Dave
-          Mayerhoefer <mayerhoefer@svappl36.mdc.com> for providing the
-          readPPCTimeBase assembler routine.
+	* ace/OS.* (gethrtime), config-vxworks-ghs-1.8.h: added support
+	  for PowerPC with Green Hills compiler.  Thanks to Dave
+	  Mayerhoefer <mayerhoefer@svappl36.mdc.com> for providing the
+	  readPPCTimeBase assembler routine.
 
-        * ace/config-vxworks*.h: removed #include of vxWorks.h because
-          its no longer necessary with the TimeValue.h merged into OS.h.
+	* ace/config-vxworks*.h: removed #include of vxWorks.h because
+	  its no longer necessary with the TimeValue.h merged into OS.h.
 
-        * ace/High_Res_Timer.cpp (elapsed_time): added cast to
-          initialization of nseconds to avoid compiler warning from
-          MSVC 4.1 about narrowing from unsigned __int64.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          reporting this.
+	* ace/High_Res_Timer.cpp (elapsed_time): added cast to
+	  initialization of nseconds to avoid compiler warning from
+	  MSVC 4.1 about narrowing from unsigned __int64.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
+	  reporting this.
 
 Mon Mar 31 18:18:35 1997  Carlos O'Ryan  <coryan@charlie>
 
-        * ace/config-hpux-10.x-g++.h: 
-        It was tuned to HP-UX 10.10 (and further) using g++ 2.7.2 without
-        DCE/Threads.
-
-        * ace/Task_T.cpp: 
-        Another iteration on the Module.h file, this time it is not
-        included *only* under HPUX and when using HP/aCC. Still IMHO
-        problems will arise as template sintax checking becomes more
-        popular.
-
-        * ace/Local_Name_Space_T.h: 
-        * ace/Local_Name_Space_T.cpp: 
-        Replaced MAXNAMELEN with MAXPATHLEN since some platforms
-        (e.g., HP/UX) have a very low value (e.g., 14 bytes) for
-        MAXNAMELEN.
-
-        * ace/config-hpux-10.x-aCC.h: 
-        The comment did not make clear what was compiler/platform
-        target. It also included some remarks that only applied to
-        HP/C++.
-
-        * tests/Future_Test.cpp: 
-        * tests/Message_Block_Test.cpp: 
-        * tests/Thread_Pool_Test.cpp: 
-        Will not compile if ACE_HAS_THREADS was not defined and
-        ACE_TEMPLATES_REQUIRE_SPECIALIZATION was: they tried to
-        instantiate templates that were only defined when ACE_HAS_THREADS.
-
-        * ace/config-hpux-10.x-aCC.h: 
-        More fine tuning: ACE_HAS_EXCEPTIONS,
-        ACE_LACKS_LINEBUFFERED_STREAMBUF,
-        ACE_HAS_STREAM_PIPES.
-
-        * ace/TLI_Stream.h: 
-        * ace/TLI_Acceptor.h: 
-        No "Meta-type info" was defined (the PEER_ADDR and PEER_STREAM
-        typedefs).
-
-        * ace/Signal.h: 
-        * ace/Signal.cpp: 
-        With HP/aCC we can enable ACE_Sig_Handlers.
+	* ace/config-hpux-10.x-g++.h: 
+	It was tuned to HP-UX 10.10 (and further) using g++ 2.7.2 without
+	DCE/Threads.
+
+	* ace/Task_T.cpp: 
+	Another iteration on the Module.h file, this time it is not
+	included *only* under HPUX and when using HP/aCC. Still IMHO
+	problems will arise as template sintax checking becomes more
+	popular.
+
+	* ace/Local_Name_Space_T.h: 
+	* ace/Local_Name_Space_T.cpp: 
+	Replaced MAXNAMELEN with MAXPATHLEN since some platforms
+	(e.g., HP/UX) have a very low value (e.g., 14 bytes) for
+	MAXNAMELEN.
+
+	* ace/config-hpux-10.x-aCC.h: 
+	The comment did not make clear what was compiler/platform
+	target. It also included some remarks that only applied to
+	HP/C++.
+
+	* tests/Future_Test.cpp: 
+	* tests/Message_Block_Test.cpp: 
+	* tests/Thread_Pool_Test.cpp: 
+	Will not compile if ACE_HAS_THREADS was not defined and
+	ACE_TEMPLATES_REQUIRE_SPECIALIZATION was: they tried to
+	instantiate templates that were only defined when ACE_HAS_THREADS.
+
+	* ace/config-hpux-10.x-aCC.h: 
+	More fine tuning: ACE_HAS_EXCEPTIONS,
+	ACE_LACKS_LINEBUFFERED_STREAMBUF,
+	ACE_HAS_STREAM_PIPES.
+
+	* ace/TLI_Stream.h: 
+	* ace/TLI_Acceptor.h: 
+	No "Meta-type info" was defined (the PEER_ADDR and PEER_STREAM
+	typedefs).
+
+	* ace/Signal.h: 
+	* ace/Signal.cpp: 
+	With HP/aCC we can enable ACE_Sig_Handlers.
 
 Mon Mar 31 22:36:55 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Service_Config.cpp (process_directives): Return -1 if
-          ace_yyerrno > 0.  Thanks to Alan Cabrera
-          <Alan_Cabrera@fp.cibc.com> for reporting this.
+	* ace/Service_Config.cpp (process_directives): Return -1 if
+ 	  ace_yyerrno > 0.  Thanks to Alan Cabrera
+ 	  <Alan_Cabrera@fp.cibc.com> for reporting this.
 
 Mon Mar 31 17:38:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.cpp (thr_create): Moved priority determination after
-          policy determination because it's possible for setting of the
-          priority to fail if it's not a valid priority for the [default]
-          policy.
+	* ace/OS.cpp (thr_create): Moved priority determination after
+ 	  policy determination because it's possible for setting of the
+ 	  priority to fail if it's not a valid priority for the [default]
+ 	  policy.
 
 Mon Mar 31 09:00:54 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * performance-tests/Misc/context_switch_time.cpp: this test no
-          longer worked.  So, reverted to revision 4.5, plus minimum
-          changes necessary to support build on platforms without threads.
+	* performance-tests/Misc/context_switch_time.cpp: this test no
+	  longer worked.  So, reverted to revision 4.5, plus minimum
+	  changes necessary to support build on platforms without threads.
 
-        * examples/Threads/Makefile, performance-tests/Misc/Makefile:
-          moved context_switch_time.cpp from examples/Threads to
-          performance-tests/Misc.
+	* examples/Threads/Makefile, performance-tests/Misc/Makefile:
+	  moved context_switch_time.cpp from examples/Threads to
+	  performance-tests/Misc.
 
-        * examples/Logger/Acceptor-server/server_loggerd.cpp,
-          examples/Reactor/Misc/pingpong.cpp,
-          examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp,
-          examples/Shared_Malloc/Malloc.cpp:
-          added template specializations.
+	* examples/Logger/Acceptor-server/server_loggerd.cpp,
+	  examples/Reactor/Misc/pingpong.cpp,
+	  examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp,
+	  examples/Shared_Malloc/Malloc.cpp:
+	  added template specializations.
 
-        * include/makeinclude/platform_sunos5_g++.GNU: removed dependency
-          of CCFLAGS on CFLAGS to avoid duplicate -g in build command.
-          Also, added -fno-implicit-templates in comment.
+	* include/makeinclude/platform_sunos5_g++.GNU: removed dependency
+	  of CCFLAGS on CFLAGS to avoid duplicate -g in build command.
+	  Also, added -fno-implicit-templates in comment.
 
 Sun Mar 30 12:52:58 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Malloc.h: The block begining with:
-          #if defined (ACE_MALLOC_STATS)
-          and ending with end of struct ACE_Malloc_Stats
-          must be moved (up) after line 107
+	* ace/Malloc.h: The block begining with:
+	  #if defined (ACE_MALLOC_STATS)
+	  and ending with end of struct ACE_Malloc_Stats
+	  must be moved (up) after line 107
 
-          Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
-          this out.
+	  Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
+ 	  this out.
 
-        * ace/Malloc_T.cpp: The line
-          this->malloc_stats_.dump ();
-          must be changed in:
-          this->cb_ptr_->malloc_stats_.dump ();
+	* ace/Malloc_T.cpp: The line
+	  this->malloc_stats_.dump ();
+	  must be changed in:
+	  this->cb_ptr_->malloc_stats_.dump ();
 
-          Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
-          this out.
+	  Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
+ 	  this out.
 
-        * ace/Malloc_T.cpp: the line
-          this->cb_ptr_->malloc_stats_.print ();    // print not exists
-          may be changed in:
-          this->cb_ptr_->malloc_stats_.dump ();
+	* ace/Malloc_T.cpp: the line
+	  this->cb_ptr_->malloc_stats_.print ();    // print not exists
+	  may be changed in:
+	  this->cb_ptr_->malloc_stats_.dump ();
 
-          Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
-          this out.
+	  Thanks to Sandro Doro <alex@aureus.sublink.org> for pointing
+ 	  this out.
 
-        * ace/Malloc_T.h: Added "virtual" to the ACE_New_Allocator methods
-          to reinforce the fact that they are indeed virtual.  Thanks to
-          Sandro Doro <alex@aureus.sublink.org> for pointing this out.
+	* ace/Malloc_T.h: Added "virtual" to the ACE_New_Allocator methods
+ 	  to reinforce the fact that they are indeed virtual.  Thanks to
+ 	  Sandro Doro <alex@aureus.sublink.org> for pointing this out.
 
-        * ace/Malloc.h: Added "virtual" to the ACE_New_Allocator methods
-          to reinforce the fact that they are indeed virtual.
+	* ace/Malloc.h: Added "virtual" to the ACE_New_Allocator methods
+ 	  to reinforce the fact that they are indeed virtual.
 
 Sat Mar 29 20:26:54 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: moved #defin of RTLD_LAZY after #include of dlfcn.h.
-          Thanks to Chris Lahey <CLahey@cccis.com> for this fix.
+	* ace/OS.h: moved #defin of RTLD_LAZY after #include of dlfcn.h.
+	  Thanks to Chris Lahey <CLahey@cccis.com> for this fix.
 
-        * ace/Task_T.h: replaced #include of "ace/Module.h" because some
-          Task_T methods use ACE_Module methods.
+	* ace/Task_T.h: replaced #include of "ace/Module.h" because some
+	  Task_T methods use ACE_Module methods.
 
-        * examples/Connection/non_blocking/test_{sock,spipe,tli}_{acceptor,
-          connector}.cpp,
-          examples/System_V_IPC/SV_Semaphores/Semaphores_{1,2}.cpp:
-          added template specializations.
+	* examples/Connection/non_blocking/test_{sock,spipe,tli}_{acceptor,
+	  connector}.cpp,
+	  examples/System_V_IPC/SV_Semaphores/Semaphores_{1,2}.cpp:
+	  added template specializations.
 
 Sat Mar 29 17:08:33 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.cpp: Added many new ACE_UNUSED_ARGS macros to eliminate
-          warnings when we are compiling without threads.
+	* ace/OS.cpp: Added many new ACE_UNUSED_ARGS macros to eliminate
+	  warnings when we are compiling without threads.
 
 Fri Mar 28 11:34:38 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Task.{h,cpp},Thread_Manager.h: changed remaining
-          priority types to long and defaults to -1.
+	* ace/Task.{h,cpp},Thread_Manager.h: changed remaining
+	  priority types to long and defaults to -1.
 
-        * ace/Thread_Manager.cpp (spawn_i): don't clobber errno!
-          ACE_OS::thr_create () sets errno and returns -1.  So,
-          its return value should not be used to set errno.
+	* ace/Thread_Manager.cpp (spawn_i): don't clobber errno!
+	  ACE_OS::thr_create () sets errno and returns -1.  So,
+	  its return value should not be used to set errno.
 
-        * ace/OS.cpp (thr_create): fixed PTHREADS_1003_DOT_1C thread
-          priority logic.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for the patch.
+	* ace/OS.cpp (thr_create): fixed PTHREADS_1003_DOT_1C thread
+	  priority logic.  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for the patch.
 
-        * ace/config-sunos5.5*.h,README,OS.cpp (thr_create): added
-          ACE_HAS_ONLY_SCHED_OTHER to indicate that platform (Solaris 2.5)
-          only supports POSIX SCHED_OTHER scheduling policy.
+	* ace/config-sunos5.5*.h,README,OS.cpp (thr_create): added
+	  ACE_HAS_ONLY_SCHED_OTHER to indicate that platform (Solaris 2.5)
+	  only supports POSIX SCHED_OTHER scheduling policy.
 
-        * tests/Priority_Task_Test.cpp (open): added THR_SCHED_FIFO flag.
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          for this suggestion.
+	* tests/Priority_Task_Test.cpp (open): added THR_SCHED_FIFO flag.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  for this suggestion.
 
-        * examples/ASX/Event_Server/Event_Server/Makefile,
-                                    Transceiver/Makefile:
-          added -lGateway to LIBS to pick up its template
-          instantiations during links.
+	* examples/ASX/Event_Server/Event_Server/Makefile,
+	                            Transceiver/Makefile:
+	  added -lGateway to LIBS to pick up its template
+	  instantiations during links.
 
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp,
-                                    Transceiver/transceiver.cpp,
-                   Connection/blocking/SPIPE-{acceptor,connector}.cpp,
-                              misc/Connection_Handler.cpp,test_upipe.cpp,
-                   Logger/simple-server/server_loggerd.cpp,
-                   UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp,
-                   performance-tests/Synch-Benchmarks/Options.cpp:
-          added template specializations.
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp,
+	                            Transceiver/transceiver.cpp,
+	           Connection/blocking/SPIPE-{acceptor,connector}.cpp,
+	                      misc/Connection_Handler.cpp,test_upipe.cpp,
+	           Logger/simple-server/server_loggerd.cpp,
+	           UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp,
+		   performance-tests/Synch-Benchmarks/Options.cpp:
+	  added template specializations.
 
 Thu Mar 27 21:10:59 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/IOStream.h: only use built-in ipfx{0,1} () with __GNUC__,
-          because that's the only compiler we know of that has them.
-          Thanks to Carlos O'Ryan <coryan@mat.puc.cl> for pointing this
-          out, and to James CE Johnson <jcej@lads.com> for providing the fix.
+	* ace/IOStream.h: only use built-in ipfx{0,1} () with __GNUC__,
+	  because that's the only compiler we know of that has them.
+	  Thanks to Carlos O'Ryan <coryan@mat.puc.cl> for pointing this
+	  out, and to James CE Johnson <jcej@lads.com> for providing the fix.
 
-        * ace/OS.i: rearranged order of ACE_Time_Value functions (moved
-          set ()'s up, moved arithmetic operators down) so that they are
-          defined before use.
+	* ace/OS.i: rearranged order of ACE_Time_Value functions (moved
+	  set ()'s up, moved arithmetic operators down) so that they are
+	  defined before use.
 
-        * ace/Task_T.cpp: removed ACE_TEMPLATES_REQUIRE_SOURCE around
-          #include of "ace/Module.h" so that it will build with Sun C++ 4.1.
+	* ace/Task_T.cpp: removed ACE_TEMPLATES_REQUIRE_SOURCE around
+	  #include of "ace/Module.h" so that it will build with Sun C++ 4.1.
 
-        * apps/Gateway/Peer/Makefile: added -lGateway to LIBS to
-          pick up its template instantiations during links.
+	* apps/Gateway/Peer/Makefile: added -lGateway to LIBS to
+	  pick up its template instantiations during links.
 
-        * apps/Gateway/Peer/Peer.cpp: added template instantations.
+	* apps/Gateway/Peer/Peer.cpp: added template instantations.
 
 Thu Mar 27 14:10:39 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.h: Added two new accessors to ACE_Time_Value:
+	* ace/OS.h: Added two new accessors to ACE_Time_Value:
 
-          operator timeval *() const;
-          // Returns a pointer to the object as a timeval.
+	  operator timeval *() const;
+	  // Returns a pointer to the object as a timeval.
 
-          const operator timeval *() const;
-          // Returns a pointer to the object as a timeval.
+	  const operator timeval *() const;
+	  // Returns a pointer to the object as a timeval.
 
-          Thanks to Carlos O'Ryan <coryan@mat.puc.cl> for this suggestion.
+	  Thanks to Carlos O'Ryan <coryan@mat.puc.cl> for this suggestion.
 
-        * ace/OS.i (ACE_Time_Value): Inlined many of the ACE_Time_Value
-          accessors.
+	* ace/OS.i (ACE_Time_Value): Inlined many of the ACE_Time_Value
+ 	  accessors.
 
-        * ace/OS.h: Reimplemented ACE_Str_Buf at 
+	* ace/OS.h: Reimplemented ACE_Str_Buf at 
 
-          struct ACE_Export ACE_Str_Buf : public strbuf
-          {
-            // = Initialization method
-            ACE_Str_Buf(void* b = 0, int l = 0, int max = 0);
-            // Constructor.
-          };
+	  struct ACE_Export ACE_Str_Buf : public strbuf
+	  {
+	    // = Initialization method
+	    ACE_Str_Buf(void* b = 0, int l = 0, int max = 0);
+	    // Constructor.
+	  };
  
           this makes the casting from ACE_Str_Buf* to strbuf* a "safe"
-          cast and makes it more portable (say on platforms where the
-          fields in strbuf are not in the right order).  Thanks to Carlos
-          O'Ryan <coryan@mat.puc.cl> for this fix.
+ 	  cast and makes it more portable (say on platforms where the
+ 	  fields in strbuf are not in the right order).  Thanks to Carlos
+ 	  O'Ryan <coryan@mat.puc.cl> for this fix.
 
-        * ace/OS.h: Moved the definition of imr_multiaddr to just before
-          class ACE_OS so that it picks everything up appropriately.
-          Thanks to Hakan Kallberg <hk@simulina.se> for reporting this.
+	* ace/OS.h: Moved the definition of imr_multiaddr to just before
+ 	  class ACE_OS so that it picks everything up appropriately.
+  	  Thanks to Hakan Kallberg <hk@simulina.se> for reporting this.
 
-        * ace/config-aix-4.[12].x.h and config-mvs.h: Fixed the
-          ACE_HAS_MULTICAST macros, which should have said
-          ACE_HAS_IP_MULTICAST.  Thanks to Daniel Montalibet
-          <daniel_montalibet@stortek.com> for reporting this.
+	* ace/config-aix-4.[12].x.h and config-mvs.h: Fixed the
+ 	  ACE_HAS_MULTICAST macros, which should have said
+ 	  ACE_HAS_IP_MULTICAST.  Thanks to Daniel Montalibet
+ 	  <daniel_montalibet@stortek.com> for reporting this.
 
 Thu Mar 27 15:54:10 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/{Thread,Thread_Manager}.{h,i,cpp} (ACE_Thread): Changed
-          type for priority arg to spawn*() from u_int to long to
-          support changes in thr_create indicated below.  Thanks to
-          Thilo Kielmann <kielmann@informatik.uni-siegen.de> for these
-          changes.
+	* ace/{Thread,Thread_Manager}.{h,i,cpp} (ACE_Thread): Changed
+	  type for priority arg to spawn*() from u_int to long to
+	  support changes in thr_create indicated below.  Thanks to
+	  Thilo Kielmann <kielmann@informatik.uni-siegen.de> for these
+	  changes.
 
-        * ace/OS.cpp: Ensure that whenever either a priority of a
-          scheduling policy is set explicitly, with POSIX threads, the
-          other argument and the flag THR_EXPLICIT_SCHED is set
-          automatically.  A range check for priority values for POSIX
-          1003.1c is also included.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for these changes.
+	* ace/OS.cpp: Ensure that whenever either a priority of a
+	  scheduling policy is set explicitly, with POSIX threads, the
+	  other argument and the flag THR_EXPLICIT_SCHED is set
+	  automatically.  A range check for priority values for POSIX
+	  1003.1c is also included.  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for these changes.
 
-        * ace/OS.h: Changed type and default value of priority arg to 
-          thr_create from u_int to long and 0 to -1.  Thanks to Thilo 
-          Kielmann <kielmann@informatik.uni-siegen.de> for these
-          changes.  Also added ACE_MAX and ACE_MIN macros.
+	* ace/OS.h: Changed type and default value of priority arg to 
+	  thr_create from u_int to long and 0 to -1.  Thanks to Thilo 
+	  Kielmann <kielmann@informatik.uni-siegen.de> for these
+	  changes.  Also added ACE_MAX and ACE_MIN macros.
 
 Thu Mar 27 11:25:38 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * netsvcs/servers/Makefile: removed SHOBJ so that main.so is not
-          built, because it wasn't needed.  Thanks to Sandro Doro
-          <alex@aureus.sublink.org> for this fix.
-
-        * ace/config-aix-4.[12].x.h,config-mvs.h: changed
-          ACE_HAS_MULTICAST to ACE_HAS_IP_MULTICAST.  Thanks to Daniel
-          Montalibet <daniel_montalibet@stortek.com> for reporting
-          this. 
-
-        * include/makeinclude/platform_sunos5_g++.GNU,
-                              platform_sunos5_x86_g++.GNU,
-                              platform_unixware_g++.GNU:
-          removed "-L$(WRAPPER_ROOT)/ace -L./" from LDFLAGS because it
-          is added to LDFLAGS in include/makeinclude/wrapper_macros.GNU.
-
-        * apps/Gateway/Gateway/{Event_Channel.cpp,Gateway.cpp,
-                                Proxy_Handler.cpp,Proxy_Handler_Acceptor.cpp,
-                                Proxy_Handler_Connector.cpp,
-          examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp,
-          netsvcs/clients/Naming/Client/Client_Test.cpp,
-          netsvcs/clients/Tokens/manual/manual.cpp:
-          added template specializations.
+	* netsvcs/servers/Makefile: removed SHOBJ so that main.so is not
+	  built, because it wasn't needed.  Thanks to Sandro Doro
+	  <alex@aureus.sublink.org> for this fix.
+
+	* ace/config-aix-4.[12].x.h,config-mvs.h: changed
+	  ACE_HAS_MULTICAST to ACE_HAS_IP_MULTICAST.  Thanks to Daniel
+	  Montalibet <daniel_montalibet@stortek.com> for reporting
+	  this. 
+
+	* include/makeinclude/platform_sunos5_g++.GNU,
+	                      platform_sunos5_x86_g++.GNU,
+	                      platform_unixware_g++.GNU:
+	  removed "-L$(WRAPPER_ROOT)/ace -L./" from LDFLAGS because it
+	  is added to LDFLAGS in include/makeinclude/wrapper_macros.GNU.
+
+	* apps/Gateway/Gateway/{Event_Channel.cpp,Gateway.cpp,
+	                        Proxy_Handler.cpp,Proxy_Handler_Acceptor.cpp,
+	                        Proxy_Handler_Connector.cpp,
+	  examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp,
+	  netsvcs/clients/Naming/Client/Client_Test.cpp,
+	  netsvcs/clients/Tokens/manual/manual.cpp:
+	  added template specializations.
 
 Thu Mar 27 10:05:59 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp: Fixed two things:
-          1) In TS_Clerk_Processor::parse_args() changed
-          "%n:\n[-p hostname:port] [-t timeout] [-p poolname]\n%a", 1),
-          to
-          "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1),
+	* netsvcs/lib/TS_Clerk_Handler.cpp: Fixed two things:
+	  1) In TS_Clerk_Processor::parse_args() changed
+	  "%n:\n[-p hostname:port] [-t timeout] [-p poolname]\n%a", 1),
+	  to
+	  "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1),
 
-          2) In TS_Clerk_Processor::alloc() changed
-          void *temp = 0;
+	  2) In TS_Clerk_Processor::alloc() changed
+	  void *temp = 0;
           // Only create the state if it doesn't already exist.
           if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) ==  -1)
           {
@@ -5589,1478 +5589,1478 @@ Thu Mar 27 10:05:59 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
 Thu Mar 27 01:00:18 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * include/makeinclude/platform_irix6.2_sgiCC.GNU: Added a new
-          platform config file for SGI Irix 6.2 using the CC compiler (not
-          NCC nor the MipsProcompiler).  Thanks to Eric Dean Russell
-          <edrusse@somnet.sandia.gov> for these changes.
+	* include/makeinclude/platform_irix6.2_sgiCC.GNU: Added a new
+ 	  platform config file for SGI Irix 6.2 using the CC compiler (not
+ 	  NCC nor the MipsProcompiler).  Thanks to Eric Dean Russell
+ 	  <edrusse@somnet.sandia.gov> for these changes.
 
-        * ace/OS.h: Moved the ACE_LACKS_UTSNAME_T block into the right
-          part of the code.  Thanks to Jonathan Biggar <jon@sems.com> for
-          this fix.
+	* ace/OS.h: Moved the ACE_LACKS_UTSNAME_T block into the right
+ 	  part of the code.  Thanks to Jonathan Biggar <jon@sems.com> for
+ 	  this fix.
 
-        * ace/Malloc.h: Added an enhancement so that the new alignment
-          features will work regardless of the size of ACE_MALLOC_ALIGN.
-          Thanks to Fred LaBar <flabar@fallschurch.esys.com> for this fix.
+	* ace/Malloc.h: Added an enhancement so that the new alignment
+ 	  features will work regardless of the size of ACE_MALLOC_ALIGN.
+  	  Thanks to Fred LaBar <flabar@fallschurch.esys.com> for this fix.
 
-        * ace/Synch_Options.cpp: We now automatically set the USE_TIMEOUT
-          flag if a non-0 timeout value is supplied.  Thanks to Tim
-          Liddelow <tim@cst.com.au> for this suggestion.
+	* ace/Synch_Options.cpp: We now automatically set the USE_TIMEOUT
+ 	  flag if a non-0 timeout value is supplied.  Thanks to Tim
+ 	  Liddelow <tim@cst.com.au> for this suggestion.
 
 Wed Mar 26 08:47:24 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/{ACE.cpp,Log_Msg.cppOS.cpp},
-          tests/{Message_Queue_Test.cpp,Naming_Test.cpp}:
-          Changed ::sprintf calls to ACE_OS::sprintf.  Thanks to
-          Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          reporting this.
+	* ace/{ACE.cpp,Log_Msg.cppOS.cpp},
+	  tests/{Message_Queue_Test.cpp,Naming_Test.cpp}:
+	  Changed ::sprintf calls to ACE_OS::sprintf.  Thanks to
+	  Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  reporting this.
 
-        * netsvcs/lib/{Client_Logging_Handler.cpp,Name_Handler.cpp,
-                       Server_Logging_Handler.cpp,TS_Service_Handler.cpp,
-                       Token_Handler.cpp}: added template specializations.
+	* netsvcs/lib/{Client_Logging_Handler.cpp,Name_Handler.cpp,
+	               Server_Logging_Handler.cpp,TS_Service_Handler.cpp,
+	               Token_Handler.cpp}: added template specializations.
 
 Tue Mar 25 06:47:14 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Moved config.h to the top of OS.h so that we don't
-          have to worry about not defining things in the right place.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
-          this out.
+	* ace/OS.h: Moved config.h to the top of OS.h so that we don't
+ 	  have to worry about not defining things in the right place.
+  	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
+ 	  this out.
 
 Tue Mar 25 22:54:49 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/OS.i: Added UNICODE support for ACE_OS::chdir().  Thanks to
-          Ivan Murphy <Ivan.Murphy@med.siemens.de> for the code.
+	* ace/OS.i: Added UNICODE support for ACE_OS::chdir().  Thanks to
+	  Ivan Murphy <Ivan.Murphy@med.siemens.de> for the code.
 
 Tue Mar 25 21:26:10 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/TTY_IO.{h,cpp},README, and these config files:
-          config-aix-*.h, config-hpux-*.h, config-irix5.*.h,
-          config-mvs.h, config-osf1-*.h, config-sun*.h (except for g++
-          and config-sunos5.5-sunc++-4.1.h), config-win*.h:
-          Added ACE_NEEDS_DEV_IO_CONVERSION to conditionally compile the
-          ACE_DEV_IO & conversion operator for ACE_TTY_IO, which is a
-          subclass of ACE_DEV_IO.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> and Gonzalo Diethelm
-          <gonzo@ing.puc.cl> for reporting warnings without this on
-          Irix 6.2 with the mipsPro compiler.
-
-        * ace/OS.cpp (thr_create): on VxWorks, always pass 0 as first arg to
-          ::taskSpawn () so that VxWorks will generate the task ID.
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com>
-          for providing this fix, without which random task names would
-          be assigned.
-
-        * ace/ACE.cpp (get_bcast_addr): added return 0 at end of non-WIN32
-          code to avoid compile warning from g++.
-
-        * tests/IOStream_Test.cpp: removed extra "(%P|%t)" from output.
-          I couldn't get ACE_ERROR_RETURN to work on g++:  it complained
-          about mismatched return types when returning an int from a
-          function that returns a void *, and about mismatched arguments
-          to an ACE_Log_Msg function if I cast the int to a void *.  So,
-          I used ACE_ERROR instead.
-          Added ACE_UNUNSED_ARG (arg).  Removed unused variables
-          error_at_server and error_at_client.
-
-        * netsvcs/lib/TS_Clerk_Handler.cpp: added another template
-          specialization.
-
-        * examples/Reactor/Multicast/client.cpp: Log_Wrapper::LOG_DEBUG
-          instead of LM_DEBUG.
-
-        * examples/Threads/context_switch_time.cpp: use ACE_Sched_Params
-          to get platform-dependent thread priorities.  Also, moved #includes
-          so that config.h is read before testing for ACE_HAS_THREADS.
-
-        * examples/Threads/{auto_event.cpp,barrier2.cpp,future1.cpp,
-                            future2.cpp,reader_writer.cpp,tss1.cpp,tss2.cpp}:
-          added template specializations.
+	* ace/TTY_IO.{h,cpp},README, and these config files:
+	  config-aix-*.h, config-hpux-*.h, config-irix5.*.h,
+	  config-mvs.h, config-osf1-*.h, config-sun*.h (except for g++
+	  and config-sunos5.5-sunc++-4.1.h), config-win*.h:
+	  Added ACE_NEEDS_DEV_IO_CONVERSION to conditionally compile the
+	  ACE_DEV_IO & conversion operator for ACE_TTY_IO, which is a
+	  subclass of ACE_DEV_IO.  Thanks to Fred LaBar
+	  <flabar@fallschurch.esys.com> and Gonzalo Diethelm
+	  <gonzo@ing.puc.cl> for reporting warnings without this on
+	  Irix 6.2 with the mipsPro compiler.
+
+	* ace/OS.cpp (thr_create): on VxWorks, always pass 0 as first arg to
+	  ::taskSpawn () so that VxWorks will generate the task ID.
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com>
+	  for providing this fix, without which random task names would
+	  be assigned.
+
+	* ace/ACE.cpp (get_bcast_addr): added return 0 at end of non-WIN32
+	  code to avoid compile warning from g++.
+
+	* tests/IOStream_Test.cpp: removed extra "(%P|%t)" from output.
+	  I couldn't get ACE_ERROR_RETURN to work on g++:  it complained
+	  about mismatched return types when returning an int from a
+	  function that returns a void *, and about mismatched arguments
+	  to an ACE_Log_Msg function if I cast the int to a void *.  So,
+	  I used ACE_ERROR instead.
+	  Added ACE_UNUNSED_ARG (arg).	Removed unused variables
+	  error_at_server and error_at_client.
+
+	* netsvcs/lib/TS_Clerk_Handler.cpp: added another template
+	  specialization.
+
+	* examples/Reactor/Multicast/client.cpp: Log_Wrapper::LOG_DEBUG
+	  instead of LM_DEBUG.
+
+	* examples/Threads/context_switch_time.cpp: use ACE_Sched_Params
+	  to get platform-dependent thread priorities.	Also, moved #includes
+	  so that config.h is read before testing for ACE_HAS_THREADS.
+
+	* examples/Threads/{auto_event.cpp,barrier2.cpp,future1.cpp,
+			    future2.cpp,reader_writer.cpp,tss1.cpp,tss2.cpp}:
+	  added template specializations.
 
 Tue Mar 25 10:01:05 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * config-linux.h: Added
-        ACE_HAS_{SVR4_DYNAMIC_LINKING,AUTOMATIC_INIT_FINI}.  Thanks to
-        alex@aureus.sublink.org (Sandro Doro) for the change.
+	* config-linux.h: Added
+ 	ACE_HAS_{SVR4_DYNAMIC_LINKING,AUTOMATIC_INIT_FINI}.  Thanks to
+ 	alex@aureus.sublink.org (Sandro Doro) for the change.
 
-        * platform_linux.GNU: Added -ldl to LIBS.  Thanks to
-        alex@aureus.sublink.org (Sandro Doro) for the change.
+	* platform_linux.GNU: Added -ldl to LIBS.  Thanks to
+ 	alex@aureus.sublink.org (Sandro Doro) for the change.
 
 Tue Mar 25 16:01:34 1997  Carlos O'Ryan  <coryan@charlie>
 
-        * ace/Svc_Handler.cpp: 
-        I forgot to comment this: "operator delete" used to call ::delete
-        on a void*, on ANSI/C++ this is not allowed. Since "operator new"
-        calls ::new for a char[] I do a casting to char* and call
-        ::delete[] on the char pointer.
-
-        * ace/config-hpux-10.x-aCC.h: 
-        HP-UX 10.10 supports CLOCK_GETTIME, my guess is that it should
-        work with g++ and HP/C++, but I won't mess with those files yet.
-
-        * ace/Connector.h: 
-        The default address parameter for "connect" is a bit tricky, from
-        the comments in the file:
-          //
-          // If the compiler supports 'typename' we cannot use
-          // 
-          // PEER_CONNECTOR::PEER_ADDR::sap_any
-          // 
-          // because PEER_CONNECTOR::PEER_ADDR is not considered a
-          // type. But: 
-          //
-          // typename PEER_CONNECTOR::PEER_ADDR::sap_any
-          // 
-          // will not work either, because now we are declaring sap_any a
-          // type, further:
-          // 
-          // (typename PEER_CONNECTOR::PEER_ADDR)::sap_any
-          //
-          // is considered a casting expression. All I can think of is
-          // using a typedef, I tried PEER_ADDR but that was a source of
-          // trouble on some platforms. I will try:
-          //
-          typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF;
-
-        * ace/OS.h: 
-        The stock HP C++ compiler (cfront based) gives lots of warnings in
-        <net/if.h>. I used to define volatile to avoid this warnings. Now
-        I think I'll rather like to see them.
-
-        * ace/SPIPE_Stream.h: 
-        * ace/SPIPE_Connector.h: 
-        There was no meta-type info (PEER_ADDR) for SPIPE_Stream and
-        SPIPE_Connector.
-
-        * ace/Stream_Modules.h: 
-        * ace/Stream_Modules.cpp: 
-        Fixed a "bug" introduced in my last change: a couple of
-        ACE_ALLOC_HOOK_* were commented but shouldn't.
-
-        * examples/Connection/non-blocking/CPP-acceptor.cpp (open): 
-        PR_AD cannot be used in this context, it expands to
-        _ACE_PEER_ACCEPTOR::PEER_ADDR (via ACE_PEER_ACCEPTOR_ADDR), but
-        the template parameter is _ACE_PEER_STREAM (aka PR_ST_1, aka
-        ACE_PEER_STREAM_1).
-        The right macro was ACE_PEER_STREAM_ADDR.
-
-        * ace/Connector.h: 
-        * ace/Connector.cpp: 
-        The typedef trick I used (PEER_ADDR) did not work on every
-        platform.
-        I also broke some examples since ACE_PEER_CONNECTOR_ADDR did not
-        include ACE_TYPENAME on its definition. Hopefully this new trick
-        will work everywhere.
-
-        * I finally sorted out the mistery of including "ace/Module.h"
-        into "ace/Task_T.cpp": when compiling "ace/Stream_Modules.cpp" you
-        get the following include sequence:
-        Stream_Modules.cpp
-          Stream_Modules.h
-            Task.h
-              Task.i
-              Task_T.h
-                Message_Queue.h (descendants removed)
-                Synch_T.h (descendants removed)
-                Task.h (already included).
-                Task_T.i
-                Task_T.cpp
-                  Module.h
-                    ACE.h (descendants removed)
-                    Task.h (already included).
-                    Module.i
-                    Module.cpp
-
-        At this point Module.cpp uses ACE_Thru_Task declared on
-        Stream_Modules.h, but after the #include "ace/Task.h";
-        in fact Module.cpp tries to #include "ace/Stream_Modules.cpp" but
-        that second #include expands to nothing due to the canonical
-        protection on Stream_Modules.h.
-        That explains the removal of Module.h in Task_T.cpp.
-        If you are wondering why so long an explanation for this change
-        the answer is simple: just because I was curious on now it worked.
+	* ace/Svc_Handler.cpp: 
+	I forgot to comment this: "operator delete" used to call ::delete
+	on a void*, on ANSI/C++ this is not allowed. Since "operator new"
+	calls ::new for a char[] I do a casting to char* and call
+	::delete[] on the char pointer.
+
+	* ace/config-hpux-10.x-aCC.h: 
+	HP-UX 10.10 supports CLOCK_GETTIME, my guess is that it should
+	work with g++ and HP/C++, but I won't mess with those files yet.
+
+	* ace/Connector.h: 
+	The default address parameter for "connect" is a bit tricky, from
+	the comments in the file:
+	  //
+	  // If the compiler supports 'typename' we cannot use
+	  // 
+	  // PEER_CONNECTOR::PEER_ADDR::sap_any
+	  // 
+	  // because PEER_CONNECTOR::PEER_ADDR is not considered a
+	  // type. But: 
+	  //
+	  // typename PEER_CONNECTOR::PEER_ADDR::sap_any
+	  // 
+	  // will not work either, because now we are declaring sap_any a
+	  // type, further:
+	  // 
+	  // (typename PEER_CONNECTOR::PEER_ADDR)::sap_any
+	  //
+	  // is considered a casting expression. All I can think of is
+	  // using a typedef, I tried PEER_ADDR but that was a source of
+	  // trouble on some platforms. I will try:
+	  //
+	  typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF;
+
+	* ace/OS.h: 
+	The stock HP C++ compiler (cfront based) gives lots of warnings in
+	<net/if.h>. I used to define volatile to avoid this warnings. Now
+	I think I'll rather like to see them.
+
+	* ace/SPIPE_Stream.h: 
+	* ace/SPIPE_Connector.h: 
+	There was no meta-type info (PEER_ADDR) for SPIPE_Stream and
+	SPIPE_Connector.
+
+	* ace/Stream_Modules.h: 
+	* ace/Stream_Modules.cpp: 
+	Fixed a "bug" introduced in my last change: a couple of
+	ACE_ALLOC_HOOK_* were commented but shouldn't.
+
+	* examples/Connection/non-blocking/CPP-acceptor.cpp (open): 
+	PR_AD cannot be used in this context, it expands to
+	_ACE_PEER_ACCEPTOR::PEER_ADDR (via ACE_PEER_ACCEPTOR_ADDR), but
+	the template parameter is _ACE_PEER_STREAM (aka PR_ST_1, aka
+	ACE_PEER_STREAM_1).
+	The right macro was ACE_PEER_STREAM_ADDR.
+
+	* ace/Connector.h: 
+	* ace/Connector.cpp: 
+	The typedef trick I used (PEER_ADDR) did not work on every
+	platform.
+	I also broke some examples since ACE_PEER_CONNECTOR_ADDR did not
+	include ACE_TYPENAME on its definition. Hopefully this new trick
+	will work everywhere.
+
+	* I finally sorted out the mistery of including "ace/Module.h"
+	into "ace/Task_T.cpp": when compiling "ace/Stream_Modules.cpp" you
+	get the following include sequence:
+	Stream_Modules.cpp
+	  Stream_Modules.h
+	    Task.h
+	      Task.i
+	      Task_T.h
+	        Message_Queue.h (descendants removed)
+		Synch_T.h (descendants removed)
+		Task.h (already included).
+		Task_T.i
+		Task_T.cpp
+		  Module.h
+		    ACE.h (descendants removed)
+		    Task.h (already included).
+		    Module.i
+		    Module.cpp
+
+	At this point Module.cpp uses ACE_Thru_Task declared on
+	Stream_Modules.h, but after the #include "ace/Task.h";
+	in fact Module.cpp tries to #include "ace/Stream_Modules.cpp" but
+	that second #include expands to nothing due to the canonical
+	protection on Stream_Modules.h.
+	That explains the removal of Module.h in Task_T.cpp.
+	If you are wondering why so long an explanation for this change
+	the answer is simple: just because I was curious on now it worked.
 
 Mon Mar 24 14:08:48 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Cleaned up the code a
-          bit.
+	* ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Cleaned up the code a
+ 	  bit.
 
-        * ace/ACE: Added a new method called get_bcast_addr() which will
-          get the broadcast address for a host.  Thanks to Paul Han
-          <phan@CCGATE.HAC.COM> for suggesting this.
+	* ace/ACE: Added a new method called get_bcast_addr() which will
+ 	  get the broadcast address for a host.  Thanks to Paul Han
+ 	  <phan@CCGATE.HAC.COM> for suggesting this.
 
-        * ace/UNIX_Addr: Added another set method in UNIX_Addr class:
+	* ace/UNIX_Addr: Added another set method in UNIX_Addr class:
 
-          void set (const ACE_UNIX_Addr &sa);
-          // Creates an ACE_UNIX_Addr from another <ACE_UNIX_Addr>.
+	  void set (const ACE_UNIX_Addr &sa);
+	  // Creates an ACE_UNIX_Addr from another <ACE_UNIX_Addr>.
 
-          Thanks to Paul Han <phan@CCGATE.HAC.COM> for this.
-          
-        * ace/SOCK_Dgram: Removed the #if defined (ACE_HAS_IP_MULTICAST) 
-          since this is now handled at the ACE_OS level.
+	  Thanks to Paul Han <phan@CCGATE.HAC.COM> for this.
+	  
+	* ace/SOCK_Dgram: Removed the #if defined (ACE_HAS_IP_MULTICAST) 
+	  since this is now handled at the ACE_OS level.
 
-        * ace/OS.h: Added support for IP multicast macros and structs even
-          on platforms that don't support it so that the tests will
-          compile without having lots of #ifdefs.
+	* ace/OS.h: Added support for IP multicast macros and structs even
+ 	  on platforms that don't support it so that the tests will
+ 	  compile without having lots of #ifdefs.
 
-        * tests/Future_Test.cpp: Added a check for platforms that lack
-          threads.  Thanks to Hakan Kallberg <hk@simulina.se>
-          for reporting this.
+	* tests/Future_Test.cpp: Added a check for platforms that lack
+ 	  threads.  Thanks to Hakan Kallberg <hk@simulina.se>
+	  for reporting this.
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: Added a check for
-          platforms that lack threads.  Thanks to Hakan Kallberg
-          <hk@simulina.se> for reporting this.
+	* netsvcs/lib/Server_Logging_Handler.cpp: Added a check for
+	  platforms that lack threads.  Thanks to Hakan Kallberg
+	  <hk@simulina.se> for reporting this.
 
-        * examples/Threads/context_switch_time.cpp: Added an #ifdef for
-          ACE_HAS_THREADS to this test so that it will compile on
-          platforms that don't have threading.  Thanks to Scott Halstead
-          <scott.halstead@gs.com> for reporting this.
+	* examples/Threads/context_switch_time.cpp: Added an #ifdef for
+ 	  ACE_HAS_THREADS to this test so that it will compile on
+ 	  platforms that don't have threading.  Thanks to Scott Halstead
+ 	  <scott.halstead@gs.com> for reporting this.
 
-        * tests/IOStream_Test.cpp: Fixed up this test so that it works
-          correctly on platforms that lack multi-threading.  Thanks to
-          Scott Halstead <scott.halstead@gs.com> for reporting this.
+	* tests/IOStream_Test.cpp: Fixed up this test so that it works
+ 	  correctly on platforms that lack multi-threading.  Thanks to
+ 	  Scott Halstead <scott.halstead@gs.com> for reporting this.
 
-        * netsvcs/lib/Makefile: Reincluded the LIB target so that we'll
-          build a static library.  Thanks to Scott Halstead
-          <scott.halstead@gs.com> for reporting this.
+	* netsvcs/lib/Makefile: Reincluded the LIB target so that we'll
+ 	  build a static library.  Thanks to Scott Halstead
+ 	  <scott.halstead@gs.com> for reporting this.
 
-        * ace/SOCK_Dgram.cpp (recv): Added a check to make sure that we
-          don't try to copy more into the recv buffer than we've really
-          got.  Thanks to Alan_Cabrera@fp.cibc.com for this fix.
+	* ace/SOCK_Dgram.cpp (recv): Added a check to make sure that we
+ 	  don't try to copy more into the recv buffer than we've really
+ 	  got.  Thanks to Alan_Cabrera@fp.cibc.com for this fix.
 
-        * ace/OS.cpp (readv): Added a check to make sure that we don't try
-          to copy more into the recv buffer than we've really got.  Thanks
-          to Alan_Cabrera@fp.cibc.com for this fix.
+	* ace/OS.cpp (readv): Added a check to make sure that we don't try
+ 	  to copy more into the recv buffer than we've really got.  Thanks
+ 	  to Alan_Cabrera@fp.cibc.com for this fix.
 
-        * ace/Malloc.h: Modified the alignment strategy to define
-          ACE_MALLOC_ALIGN to a number of bytes. (it gets rounded to a
-          number of long's).  This makes it easier to work with more
-          complex buffer alignment strategies (e.g., DMA).  Thanks to Fred
-          LaBar <flabar@fallschurch.esys.com> for this.
+	* ace/Malloc.h: Modified the alignment strategy to define
+ 	  ACE_MALLOC_ALIGN to a number of bytes. (it gets rounded to a
+ 	  number of long's).  This makes it easier to work with more
+ 	  complex buffer alignment strategies (e.g., DMA).  Thanks to Fred
+ 	  LaBar <flabar@fallschurch.esys.com> for this.
 
-        * ace/OS.cpp (readv): Added several more changes for the readv()
-          emulation.  Thanks to Alan Cabrera <Alan_Cabrera@fp.cibc.com>
-          and Adam Porter <aporter@cs.umd.edu> for these fixes.
+	* ace/OS.cpp (readv): Added several more changes for the readv()
+ 	  emulation.  Thanks to Alan Cabrera <Alan_Cabrera@fp.cibc.com>
+ 	  and Adam Porter <aporter@cs.umd.edu> for these fixes.
 
 Mon Mar 24 14:22:17 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.cpp (thr_create): For VxWorks, fixed call to ::taskSpawn ().
-          ACE's arguments are in an array, not individual arguments.
-          Also, set flags to VX_FP_TASK if it's 0, to match behavior
-          of ::sp ().  Thanks to Dave Mayerhoefer
-          <mayerhoefer@svappl36.mdc.com> for reporting these and providing
-          the fix.
+	* ace/OS.cpp (thr_create): For VxWorks, fixed call to ::taskSpawn ().
+	  ACE's arguments are in an array, not individual arguments.
+	  Also, set flags to VX_FP_TASK if it's 0, to match behavior
+	  of ::sp ().  Thanks to Dave Mayerhoefer
+	  <mayerhoefer@svappl36.mdc.com> for reporting these and providing
+	  the fix.
 
-        * ace/High_Res_Timer.cpp (elapsed_time (struct timespec &):
-          fixed, using same approach as in elapsed_time
-          (ACE_hrtime_t &nanoseconds), to get nanosecond resolution.
+	* ace/High_Res_Timer.cpp (elapsed_time (struct timespec &):
+	  fixed, using same approach as in elapsed_time
+	  (ACE_hrtime_t &nanoseconds), to get nanosecond resolution.
 
-        * netsvcs/lib/TS_Clerk_Handler.cpp (handle_close): added
-          ACE_UNUSED_ARG (mask).  Also, added template specializations.
+	* netsvcs/lib/TS_Clerk_Handler.cpp (handle_close): added
+	  ACE_UNUSED_ARG (mask).  Also, added template specializations.
 
-        * examples/Reactor/Multicast/server.cpp (Server_Events ctor):
-          rearranged initializers to match declaration order.
+	* examples/Reactor/Multicast/server.cpp (Server_Events ctor):
+	  rearranged initializers to match declaration order.
 
-        * examples/IOStream/server/iostream_server.cpp,
-                            client/iostream_client.cpp:
-          added template specializations.
+	* examples/IOStream/server/iostream_server.cpp,
+	                    client/iostream_client.cpp:
+	  added template specializations.
 
 Mon Mar 24 13:21:31 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/High_Res_Timer.cpp (elapsed_time): Added an
-          ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanosecond)
-          method that returns the number of elapsed nanoseconds.  This is
-          accomplished even with the scale factors converting to
-          microseconds.  It also does not use floating point
-          calculations.
+	* ace/High_Res_Timer.cpp (elapsed_time): Added an
+	  ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanosecond)
+	  method that returns the number of elapsed nanoseconds.  This is
+	  accomplished even with the scale factors converting to
+	  microseconds.  It also does not use floating point
+	  calculations.
 
 Sun Mar 23 13:25:39 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/High_Res_Timer.h: Removed <scale_factor> from the
-          constructor of High_Res_Timer.  All High_Res_Timers now use
-          global_scale_factor_ directly.  Hopefully, this will not break
-          any existing code!
+	* ace/High_Res_Timer.h: Removed <scale_factor> from the
+	  constructor of High_Res_Timer.  All High_Res_Timers now use
+	  global_scale_factor_ directly.  Hopefully, this will not break
+	  any existing code!
 
 Sat Mar 22 12:06:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.h: The include statement for config.h was too low.  Some
-          defines for key_t, needed for NT, didn't work.  Thanks to Alan
-          Cabrera <Alan_Cabrera@fp.cibc.com> for these fixes.
-
-        * examples/Reactor/Multicast: Improved the multicast client and
-          server programs to work better.
-
-        * ace/Connector.cpp: Modified the ACE_Connector::handle_close()
-          method to prevent recursive calls to itself.  Thanks to Paul Han
-          <phan@CCGATE.HAC.COM> for reporting this.
-
-        * ace/Svc_Handler.cpp: Put the check (closing_ == 0) in the
-          destructor as well as in the destroy() method.  This prevents a
-          possible core dump when the timer exists.  The instruction
-          reactor::remove_handler in the shutdown method currently will be
-          called twice when ACE_Svc_Handler object is being deleted.  Core
-          dump occurs when it tries to execute ACE_Reactor::remove_handler
-          method the second time because the ACE_Svc_Handler object
-          pointer has already been deleted by the previous instruction
-          ACE_Reactor::cancel_timer.  Thanks to Paul Han
-          <phan@CCGATE.HAC.COM> for reporting this.
-
-        * ace/OS.cpp: Added new thread-safe implementations of writev()
-          and readv() for platforms that lack these functions.
-
-        * ace/SOCK_Dgram.cpp: Added new implementations of
-          ACE_SOCK_Dgram::{send,recv} that define methods for
-          send(iovec[], ...)  and recv(iovec[], ...) for systems that
-          don't have sendmsg() and recvmsg().  Thanks to Alan Cabrera
-          <Alan_Cabrera@fp.cibc.com> for these fixes.
-
-        * apps/jaws/HTTP_Handler.cpp: Removed some problematic template
-          specializations that were left over from an earlier version of
-          JAWS.  Thanks to Adam Porter <aporter@cs.umd.edu> for reporting
-          this.
-
-        * examples/Logger/Acceptor-server/server_loggerd.cpp: Revised the
-          code to use the new ACE_Svc_Handler logic that checks to ensure
-          that we don't recurse infinitely in handle_close().
-          Thanks to Jean-Marc Strauss <strauss@club-internet.fr> for
-          reporting this problem.
-
-        * examples/Logger/simple-server/Logging_Handler.cpp
-          (handle_close): Added a check to make sure we don't end up
-          recursively calling handle_close().  This will prevent
-          a segfault.
+	* ace/OS.h: The include statement for config.h was too low.  Some
+ 	  defines for key_t, needed for NT, didn't work.  Thanks to Alan
+ 	  Cabrera <Alan_Cabrera@fp.cibc.com> for these fixes.
+
+	* examples/Reactor/Multicast: Improved the multicast client and
+ 	  server programs to work better.
+
+	* ace/Connector.cpp: Modified the ACE_Connector::handle_close()
+ 	  method to prevent recursive calls to itself.  Thanks to Paul Han
+ 	  <phan@CCGATE.HAC.COM> for reporting this.
+
+	* ace/Svc_Handler.cpp: Put the check (closing_ == 0) in the
+ 	  destructor as well as in the destroy() method.  This prevents a
+ 	  possible core dump when the timer exists.  The instruction
+ 	  reactor::remove_handler in the shutdown method currently will be
+ 	  called twice when ACE_Svc_Handler object is being deleted.  Core
+ 	  dump occurs when it tries to execute ACE_Reactor::remove_handler
+ 	  method the second time because the ACE_Svc_Handler object
+ 	  pointer has already been deleted by the previous instruction
+ 	  ACE_Reactor::cancel_timer.  Thanks to Paul Han
+ 	  <phan@CCGATE.HAC.COM> for reporting this.
+
+	* ace/OS.cpp: Added new thread-safe implementations of writev()
+ 	  and readv() for platforms that lack these functions.
+
+	* ace/SOCK_Dgram.cpp: Added new implementations of
+ 	  ACE_SOCK_Dgram::{send,recv} that define methods for
+ 	  send(iovec[], ...)  and recv(iovec[], ...) for systems that
+ 	  don't have sendmsg() and recvmsg().  Thanks to Alan Cabrera
+ 	  <Alan_Cabrera@fp.cibc.com> for these fixes.
+
+	* apps/jaws/HTTP_Handler.cpp: Removed some problematic template
+ 	  specializations that were left over from an earlier version of
+ 	  JAWS.  Thanks to Adam Porter <aporter@cs.umd.edu> for reporting
+ 	  this.
+
+	* examples/Logger/Acceptor-server/server_loggerd.cpp: Revised the
+ 	  code to use the new ACE_Svc_Handler logic that checks to ensure
+ 	  that we don't recurse infinitely in handle_close().
+	  Thanks to Jean-Marc Strauss <strauss@club-internet.fr> for
+	  reporting this problem.
+
+	* examples/Logger/simple-server/Logging_Handler.cpp
+ 	  (handle_close): Added a check to make sure we don't end up
+ 	  recursively calling handle_close().  This will prevent
+	  a segfault.
 
 Sat Mar 22 07:30:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/High_Res_Timer.*: Changed scale factor to convert
-          platform-dependent clock units to microseconds instead of
-          nanoseconds.  That way, it should be greater than 1 for
-          all supported platforms.  So, it's now an unsigned long
-          instead of a double.
+	* ace/High_Res_Timer.*: Changed scale factor to convert
+	  platform-dependent clock units to microseconds instead of
+	  nanoseconds.  That way, it should be greater than 1 for
+	  all supported platforms.  So, it's now an unsigned long
+	  instead of a double.
 
-        * ace/OS.h: Changed ACE_hrtime_t to unsigned __int64 with
-          _MSC_VER.  Also, fixed typo: "uint64" instead of "unit64"
-          without _MSC_VER.
+	* ace/OS.h: Changed ACE_hrtime_t to unsigned __int64 with
+	  _MSC_VER.  Also, fixed typo: "uint64" instead of "unit64"
+	  without _MSC_VER.
 
 Fri Mar 21 08:37:34 1997  Carlos O'Ryan  <coryan@charlie>
 
-        * makeinclude/rules.lib.GNU:
-        I use the macro SOEXT to support HP non-standard extension for
-        shared library names (.sl instead of .so).
-        I also changed the rule to build shared libraries: under HP-UX you
-        cannot pass extra libraries (-lXXX options) when building a shared
-        lib. Before HP-UX 10.10 it wasn't a problem because no library was
-        needed with ACE, but to support XLI the '-lxti' flag must be used
-        on binaries (but not on shared libs).
-
-        * include/makeinclude/platform_hpux.GNU: 
-        The PIC option (+Z) was used always, clearly not intended.
-
-        * include/makeinclude/platform_hpux_gcc.GNU: 
-        Added a config file for g++ under HP-UX.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: 
-        Added a config file for HP/aCC compiler under HP-UX.
-
-        * ace/Makefile: 
-        * netsvcs/lib/Makefile: 
-        Changed to support the SOEXT macro.
-
-        * config-hpux-10.x.h: 
-        * config-hpux-10.x-aCC.h: 
-        * config-hpux-10.x-g++.h: 
-        I updated the files to HP-UX 10.10, AFAIK since that version HP-UX
-        uses fd_set instead of int in select(2) (so ACE_SELECT_USES_INT is
-        not needed) and the OS supports siginfo_t and ucontext_t so
-        ACE_HAS_SIGINFO_T and ACE_HAS_UCONTEXT_T are defined.
-        I *do not* have threads at my site nor the infamous PHSS_6246
-        patch so I couldn't test the threaded version nor the HP cfront
-        based one.
-        ACE compiled fine with g++ and HP/aCC though.
-
-        * ace/OS.h: 
-        * ace/Malloc_T.h: 
-        HP/aCC supports the typename keyword. I added a new config macro
-        'ACE_HAS_TYPENAME_KEYWORD', when it is defined ACE_TYPENAME
-        expands to 'typename' when not it expands to nothing.
-        On the cases where HP/aCC requires the usage of 'typename' I added
-        a 'ACE_TYPENAME'.
-
-        * ace/OS.i: 
-        * ace/OS.cpp: 
-        ACE_OS::inet_aton cannot be inlined under HP-UX.
-
-        * ace/Connector.h: 
-        * ace/Connector.cpp: 
-        I have decided to use a typedef (PEER_ADDR) instead of
-        ACE_PEER_CONNECTOR_ADDR, mainly because the second form
-        requires a ACE_TYPENAME before each usage.
-
-        * ace/Event_Handler_T.i: 
-        Much to my surprize ACE_TYPENAME is required when using a template
-        typedef as a return value.
-
-        * ace/Local_Name_Space_T.h: 
-        HP/aCC does not like the usage of a private typedef from another
-        class.
-
-        * ace/Strategies_T.h: 
-        * ace/Strategies_T.cpp: 
-        ACE_Process_Strategy declared two defaults constructors:
-        ACE_Process_Strategy(void) and ACE_Process_Strategy(int = 1).
-        The constructor code was wrong, it called open() with parameters:
-        open(thr_mgr, thr_flags, n_threads)
-        none of which were defined, worse, open() receives just one
-        parameter (the number of processes) just as the constructor, I
-        believe that C-w programming is lurking here.
-
-        * ace/Signal.cpp: 
-        Though the header file does not declare ACE_Sig_Handlers under
-        HP-UX (and the code is not defined too) some auxiliary functions
-        that use ACE_Sig_Handlers were defined. I removed their
-        definition.
-        Some day I'll try to take a look at the code, trying to find out
-        was wrong with them.
-
-        * ace/Stream_Modules.h: 
-        * ace/Stream_Modules.cpp: 
-        By mistake I commented out the ACE_ALLOC_HOOK_* macros; have to
-        fix it *real soon*.
-
-        * ace/Task_T.cpp: 
-        No need to include "ace/Module.h" since only the template
-        declaration is used. When ACE_TEMPLATES_REQUIRE_SOURCE is defined
-        you end up using ACE_Thru_Task before it gets defined.
-        This is no problem unless your compiler checks template sintax
-        before instantiation as the HP/aCC compiler do.
-
-        * examples/Reactor/Misc/test_demuxing.cpp: 
-        ACE_MT_SYNCH was used, but it is only defined if ACE_HAS_THREADS,
-        I used ACE_SYNCH instead, which is defined as ACE_MT_SYNCH if
-        ACE_HAS_THREADS and as ACE_NULL_SYNCH if not.
-        Maybe the semantics are wrong, but the thing compiles.
+	* makeinclude/rules.lib.GNU:
+	I use the macro SOEXT to support HP non-standard extension for
+	shared library names (.sl instead of .so).
+	I also changed the rule to build shared libraries: under HP-UX you
+	cannot pass extra libraries (-lXXX options) when building a shared
+	lib. Before HP-UX 10.10 it wasn't a problem because no library was
+	needed with ACE, but to support XLI the '-lxti' flag must be used
+	on binaries (but not on shared libs).
+
+	* include/makeinclude/platform_hpux.GNU: 
+	The PIC option (+Z) was used always, clearly not intended.
+
+	* include/makeinclude/platform_hpux_gcc.GNU: 
+	Added a config file for g++ under HP-UX.
+
+	* include/makeinclude/platform_hpux_aCC.GNU: 
+	Added a config file for HP/aCC compiler under HP-UX.
+
+	* ace/Makefile: 
+	* netsvcs/lib/Makefile: 
+	Changed to support the SOEXT macro.
+
+	* config-hpux-10.x.h: 
+	* config-hpux-10.x-aCC.h: 
+	* config-hpux-10.x-g++.h: 
+	I updated the files to HP-UX 10.10, AFAIK since that version HP-UX
+	uses fd_set instead of int in select(2) (so ACE_SELECT_USES_INT is
+	not needed) and the OS supports siginfo_t and ucontext_t so
+	ACE_HAS_SIGINFO_T and ACE_HAS_UCONTEXT_T are defined.
+	I *do not* have threads at my site nor the infamous PHSS_6246
+	patch so I couldn't test the threaded version nor the HP cfront
+	based one.
+	ACE compiled fine with g++ and HP/aCC though.
+
+	* ace/OS.h: 
+	* ace/Malloc_T.h: 
+	HP/aCC supports the typename keyword. I added a new config macro
+	'ACE_HAS_TYPENAME_KEYWORD', when it is defined ACE_TYPENAME
+	expands to 'typename' when not it expands to nothing.
+	On the cases where HP/aCC requires the usage of 'typename' I added
+	a 'ACE_TYPENAME'.
+
+	* ace/OS.i: 
+	* ace/OS.cpp: 
+	ACE_OS::inet_aton cannot be inlined under HP-UX.
+
+	* ace/Connector.h: 
+	* ace/Connector.cpp: 
+	I have decided to use a typedef (PEER_ADDR) instead of
+	ACE_PEER_CONNECTOR_ADDR, mainly because the second form
+	requires a ACE_TYPENAME before each usage.
+
+	* ace/Event_Handler_T.i: 
+	Much to my surprize ACE_TYPENAME is required when using a template
+	typedef as a return value.
+
+	* ace/Local_Name_Space_T.h: 
+	HP/aCC does not like the usage of a private typedef from another
+	class.
+
+	* ace/Strategies_T.h: 
+	* ace/Strategies_T.cpp: 
+	ACE_Process_Strategy declared two defaults constructors:
+	ACE_Process_Strategy(void) and ACE_Process_Strategy(int = 1).
+	The constructor code was wrong, it called open() with parameters:
+	open(thr_mgr, thr_flags, n_threads)
+	none of which were defined, worse, open() receives just one
+	parameter (the number of processes) just as the constructor, I
+	believe that C-w programming is lurking here.
+
+	* ace/Signal.cpp: 
+	Though the header file does not declare ACE_Sig_Handlers under
+	HP-UX (and the code is not defined too) some auxiliary functions
+	that use ACE_Sig_Handlers were defined. I removed their
+	definition.
+	Some day I'll try to take a look at the code, trying to find out
+	was wrong with them.
+
+	* ace/Stream_Modules.h: 
+	* ace/Stream_Modules.cpp: 
+	By mistake I commented out the ACE_ALLOC_HOOK_* macros; have to
+	fix it *real soon*.
+
+	* ace/Task_T.cpp: 
+	No need to include "ace/Module.h" since only the template
+	declaration is used. When ACE_TEMPLATES_REQUIRE_SOURCE is defined
+	you end up using ACE_Thru_Task before it gets defined.
+	This is no problem unless your compiler checks template	sintax
+	before instantiation as the HP/aCC compiler do.
+
+	* examples/Reactor/Misc/test_demuxing.cpp: 
+	ACE_MT_SYNCH was used, but it is only defined if ACE_HAS_THREADS,
+	I used ACE_SYNCH instead, which is defined as ACE_MT_SYNCH if
+	ACE_HAS_THREADS and as ACE_NULL_SYNCH if not.
+	Maybe the semantics are wrong, but the thing compiles.
 
 Fri Mar 21 15:10:59 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Makefile (FILES): Moved Log_Msg to the beginning of the
-          source list in the ace Makefile.  This is nice because it forces
-          the compilation of OS.i and that, obviously, is where you get
-          the complaints for the port.  It's nice to have it at the
-          beginning so you catch the errors very early on before you've
-          compiled 30 or 40 files.  Thanks to Scott Halstead
-          <scott.halstead@gs.com> for this suggestion.
+	* ace/Makefile (FILES): Moved Log_Msg to the beginning of the
+ 	  source list in the ace Makefile.  This is nice because it forces
+ 	  the compilation of OS.i and that, obviously, is where you get
+ 	  the complaints for the port.  It's nice to have it at the
+ 	  beginning so you catch the errors very early on before you've
+ 	  compiled 30 or 40 files.  Thanks to Scott Halstead
+ 	  <scott.halstead@gs.com> for this suggestion.
 
-        * ace/Memory_Pool.cpp: Added #if !defined
-          (ACE_LACKS_SYSV_SHMEM) to handle systems like Chorus that
-          lack this feature.  
+	* ace/Memory_Pool.cpp: Added #if !defined
+	  (ACE_LACKS_SYSV_SHMEM) to handle systems like Chorus that
+	  lack this feature.  
 
 Thu Mar 20 18:58:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Svc_Handler.cpp (destroy): Added a state variable to keep
-          track of when we are closing down the Svc_Handler.  This is
-          necessary to prevent endless recursive calls to handle_close()
-          due to the recent enhancements to ACE_Timer_{List,Heap}.  Thanks
-          to Bert Craytor <Bert_Craytor@peoplesoft.com> for reporting
-          this.
+	* ace/Svc_Handler.cpp (destroy): Added a state variable to keep
+ 	  track of when we are closing down the Svc_Handler.  This is
+ 	  necessary to prevent endless recursive calls to handle_close()
+ 	  due to the recent enhancements to ACE_Timer_{List,Heap}.  Thanks
+ 	  to Bert Craytor <Bert_Craytor@peoplesoft.com> for reporting
+ 	  this.
 
-        * tests/Conn_Test.cpp: Added a new test that makes sure the
-          Acceptor, Connector, and Svc_Handler are working correctly.
+	* tests/Conn_Test.cpp: Added a new test that makes sure the
+ 	  Acceptor, Connector, and Svc_Handler are working correctly.
 
-        * ace: Added some more changes for Chorus.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for these changes.
+	* ace: Added some more changes for Chorus.  Thanks to Wei Chiang
+ 	  <chiang@tele.nokia.fi> for these changes.
 
-        * ace/OS.h: Added #define for SIGSEGV for platforms that lack it
-          (e.g., Chorus).
+	* ace/OS.h: Added #define for SIGSEGV for platforms that lack it
+ 	  (e.g., Chorus).
 
-        * ace: Made a bunch of minor changes to support SunOS 4.x better.
-          Thanks to Scott Halstead <scott.halstead@gs.com> for reporting
-          these problems.
+	* ace: Made a bunch of minor changes to support SunOS 4.x better.
+	  Thanks to Scott Halstead <scott.halstead@gs.com> for reporting
+	  these problems.
 
-        * tests/Conn_Test.cpp: Added ACE_TEMPLATES_REQUIRE_SPECIALIZATION
-          for the various templates used in this test.  Thanks to Thilo
-          Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
+	* tests/Conn_Test.cpp: Added ACE_TEMPLATES_REQUIRE_SPECIALIZATION
+ 	  for the various templates used in this test.  Thanks to Thilo
+ 	  Kielmann <kielmann@informatik.uni-siegen.de> for reporting this.
 
-        * ace/Connector.cpp (connector): Fixed some minor bugs that
-          prevented the ACE_Connector from compiling.  Thanks to David
-          Levine for noticing this.
+	* ace/Connector.cpp (connector): Fixed some minor bugs that
+ 	  prevented the ACE_Connector from compiling.  Thanks to David
+ 	  Levine for noticing this.
 
-        * ace/OS.h: Moved the ACE_LACKS_SIGACTION block so that it will
-          work on Win32.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for pointing this out.
+	* ace/OS.h: Moved the ACE_LACKS_SIGACTION block so that it will
+ 	  work on Win32.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for pointing this out.
 
 Thu Mar 20 22:38:27 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Timer_Heap.cpp: added template specializations.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp,
-                      Name_Handler.cpp
-                      Server_Logging_Handler.cpp
-                      TS_Clerk_Handler.cpp
-                      TS_Server_Handler.cpp
-                      Token_Handler.cpp: added template specializations.
-          There are still many missing from libnetsvcs.
-
-        * tests/Conn_Test.cpp,
-                Future_Test.cpp
-                IOStream_Test.cpp
-                Map_Manager_Test.cpp
-                Message_Block_Test.cpp
-                Message_Queue_Test.cpp
-                Reader_Writer_Test.cpp
-                SV_Shared_Memory_Test.cpp
-                Thread_Pool_Test.cpp}: added template specializations.
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
-          for providing these.
-
-        * ace/Log_Msg.cpp: removed commented-out template specialization.
-
-        * include/makeinclude/platform_{chorus,hpux,hpux_gcc}.GNU:
-          split out CFLAGS and CCFLAGS from CC and CXX.
-
-        * ace/config-aix-4.[12].x.h: added back ACE_HAS_THREAD_SELF and
-          and ACE_HAS_SVR4_DYNAMIC_LINKING; removed ACE_HAS_PTHREAD_T.
-          Thanks to Chris Lahey <CLahey@cccis.com> for figuring these out.
+	* ace/Timer_Heap.cpp: added template specializations.
+
+	* netsvcs/lib/Client_Logging_Handler.cpp,
+	              Name_Handler.cpp
+	              Server_Logging_Handler.cpp
+	              TS_Clerk_Handler.cpp
+	              TS_Server_Handler.cpp
+	              Token_Handler.cpp: added template specializations.
+	  There are still many missing from libnetsvcs.
+
+	* tests/Conn_Test.cpp,
+	        Future_Test.cpp
+	        IOStream_Test.cpp
+	        Map_Manager_Test.cpp
+	        Message_Block_Test.cpp
+	        Message_Queue_Test.cpp
+	        Reader_Writer_Test.cpp
+	        SV_Shared_Memory_Test.cpp
+	        Thread_Pool_Test.cpp}: added template specializations.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
+	  for providing these.
+
+	* ace/Log_Msg.cpp: removed commented-out template specialization.
+
+	* include/makeinclude/platform_{chorus,hpux,hpux_gcc}.GNU:
+	  split out CFLAGS and CCFLAGS from CC and CXX.
+
+	* ace/config-aix-4.[12].x.h: added back ACE_HAS_THREAD_SELF and
+	  and ACE_HAS_SVR4_DYNAMIC_LINKING; removed ACE_HAS_PTHREAD_T.
+	  Thanks to Chris Lahey <CLahey@cccis.com> for figuring these out.
 
 Thu Mar 20 12:25:30 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/ace.{mak,mdp}: Build->Settings->Code Generation->Processor is
-          now set to "Pentium" instead of "Blend*" for Debug and Release
-          builds.
+	* ace/ace.{mak,mdp}: Build->Settings->Code Generation->Processor is
+	  now set to "Pentium" instead of "Blend*" for Debug and Release
+ 	  builds.
 
-        * ace/config-win32-msvc4.x.h:
-        * ace/config-win32-msvc2.0.h:
-        * ace/config-winnt-4.0-msvc4.x.h: Only define ACE_HAS_PENTIUM when
-          _M_IX86 == 500.  Projects must specify Pentium in
-          Build->Settings->Code Generation->Processor to use the RDTSC
-          instruction in ACE_OS::gethrtime.
+	* ace/config-win32-msvc4.x.h:
+	* ace/config-win32-msvc2.0.h:
+	* ace/config-winnt-4.0-msvc4.x.h: Only define ACE_HAS_PENTIUM when
+	  _M_IX86 == 500.  Projects must specify Pentium in
+	  Build->Settings->Code Generation->Processor to use the RDTSC
+	  instruction in ACE_OS::gethrtime.
 
-        * ace/High_Res_Timer.{cpp,i}: By default, High_Res_Timer is
-          constructed with a scale_factor == 1.  This allowed me to remove
-          all the checks for scale_factor == 0 in the code.
+	* ace/High_Res_Timer.{cpp,i}: By default, High_Res_Timer is
+	  constructed with a scale_factor == 1.  This allowed me to remove
+	  all the checks for scale_factor == 0 in the code.
 
-        * ace/High_Res_Timer.h (static gettimeofday): If
-          global_scale_factor_ is not set, and we're on a platform that
-          requires global_scale_factor_ (e.g., Win32),
-          ACE_OS::gettimeofday will be used instead of ACE_OS::gethrtime.
-          This allows the scale_factor of 1 to still result in correct
-          values.
+	* ace/High_Res_Timer.h (static gettimeofday): If
+	  global_scale_factor_ is not set, and we're on a platform that
+ 	  requires global_scale_factor_ (e.g., Win32),
+ 	  ACE_OS::gettimeofday will be used instead of ACE_OS::gethrtime.
+  	  This allows the scale_factor of 1 to still result in correct
+ 	  values.
 
 Wed Mar 19 15:02:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace: Added zillions of minor changes so that ACE will compile on
-          the new aCC compiler for HPUX.  Thanks to Gonzalo A. Diethelm
-          <gonzo@ing.puc.cl> and Carlos O'Ryan <coryan@mat.puc.cl> for
-          help with this.
+	* ace: Added zillions of minor changes so that ACE will compile on
+ 	  the new aCC compiler for HPUX.  Thanks to Gonzalo A. Diethelm
+ 	  <gonzo@ing.puc.cl> and Carlos O'Ryan <coryan@mat.puc.cl> for
+	  help with this.
 
-        * ace/SOCK_Dgram_Mcast.cpp (subscribe): In addition to the
-          SO_REUSEADDR option, Irix has a SO_REUSEPORT option that must
-          also be set to allow multiple sockets to bind to the same
-          multicast address.  Thanks to Robert V. Head <rhead@vtcs20a> for
-          reporting this.
+	* ace/SOCK_Dgram_Mcast.cpp (subscribe): In addition to the
+ 	  SO_REUSEADDR option, Irix has a SO_REUSEPORT option that must
+ 	  also be set to allow multiple sockets to bind to the same
+ 	  multicast address.  Thanks to Robert V. Head <rhead@vtcs20a> for
+ 	  reporting this.
 
-        * ace: Added a slew of changes to support CHORUS.  Thanks to
-          Wei Chiang <chiang@tele.nokia.fi> for these changes.
+	* ace: Added a slew of changes to support CHORUS.  Thanks to
+	  Wei Chiang <chiang@tele.nokia.fi> for these changes.
 
-        * ace/config-sunos4.*.h: Added #define ACE_HAS_UNION_WAIT based
-          on the recommendation of Kumar Neelakantan
-          <kneelaka@painewebber.com>.
+	* ace/config-sunos4.*.h: Added #define ACE_HAS_UNION_WAIT based
+	  on the recommendation of Kumar Neelakantan
+	  <kneelaka@painewebber.com>.
 
-        * ace/Log_Msg.cpp (log_hexdump): Replaced the use of ::sprintf()
-          with ACE_OS::sprintf() so that the return value would be correct
-          on SunOS 4.x!
+	* ace/Log_Msg.cpp (log_hexdump): Replaced the use of ::sprintf()
+	  with ACE_OS::sprintf() so that the return value would be correct
+	  on SunOS 4.x!
 
-        * ace/OS: Added ACE_HAS_CHARPTR_SPRINTF and ACE_SPRINTF_ADAPTER
-          to ACE_OS::sprintf() for SunOS 4.x platforms.  Thanks to Kumar
-          Neelakantan <kneelaka@painewebber.com> for reporting this.
+	* ace/OS: Added ACE_HAS_CHARPTR_SPRINTF and ACE_SPRINTF_ADAPTER
+ 	  to ACE_OS::sprintf() for SunOS 4.x platforms.  Thanks to Kumar
+ 	  Neelakantan <kneelaka@painewebber.com> for reporting this.
 
-        * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): If the bound was
-          reached in the following loop, we should set this->num_ =
-          this->handles_.max_handle_ + 1 rather than go into the 2nd loop.
-          Thanks to Michael Newton <michaeln@in.ot.com.au> for reporting
-          this.
+	* ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): If the bound was
+ 	  reached in the following loop, we should set this->num_ =
+ 	  this->handles_.max_handle_ + 1 rather than go into the 2nd loop.
+  	  Thanks to Michael Newton <michaeln@in.ot.com.au> for reporting
+ 	  this.
 
-        * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator):
-          ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator did not work
-          properly if called with a zero handleset, as there was no bounds
-          check on the first loop therein.  Thanks to Michael Newton
-          <michaeln@in.ot.com.au> for reporting this.
+	* ace/Handle_Set.cpp (ACE_Handle_Set_Iterator):
+ 	  ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator did not work
+ 	  properly if called with a zero handleset, as there was no bounds
+ 	  check on the first loop therein.  Thanks to Michael Newton
+ 	  <michaeln@in.ot.com.au> for reporting this.
 
 Wed Mar 19 16:06:32 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h,README: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER to wrap
-          #include of sys/socket.h with #undef/#define of __cplusplus.
+	* ace/OS.h,README: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER to wrap
+	  #include of sys/socket.h with #undef/#define of __cplusplus.
 
-        * ace/config-aix-4.[12].x.h: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER,
-          ACE_HAS_PTHREAD_T, ACE_LACKS_TCP_H, and ACE_LACKS_SETSCHED.
-          Removed ACE_HAS_SVR4_DYNAMIC_LINKING and ACE_HAS_THREAD_SELF.
+	* ace/config-aix-4.[12].x.h: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER,
+	  ACE_HAS_PTHREAD_T, ACE_LACKS_TCP_H, and ACE_LACKS_SETSCHED.
+	  Removed ACE_HAS_SVR4_DYNAMIC_LINKING and ACE_HAS_THREAD_SELF.
 
-        Thanks to Daniel Montalibet <daniel_montalibet@stortek.com> for
-        both of the above modifications.
+	Thanks to Daniel Montalibet <daniel_montalibet@stortek.com> for
+	both of the above modifications.
 
-        * platform_{dgux4_epc,irix5.3_g++,linux*,m88k,osf1_3.2,sco*,
-          sunos4_g++,sunos5_centerline*,sunos5_g++,sunos5_sunc++*,
-          unixware_g++,vxworks5.2_g++}.GNU: split out CFLAGS and CCFLAGS.
-          Also, removed -lstdc++/-lm from g++ versions, because we now set
-          CXX to g++ instead of gcc, so those libraries are picked up.
+	* platform_{dgux4_epc,irix5.3_g++,linux*,m88k,osf1_3.2,sco*,
+	  sunos4_g++,sunos5_centerline*,sunos5_g++,sunos5_sunc++*,
+	  unixware_g++,vxworks5.2_g++}.GNU: split out CFLAGS and CCFLAGS.
+	  Also, removed -lstdc++/-lm from g++ versions, because we now set
+	  CXX to g++ instead of gcc, so those libraries are picked up.
 
-        * include/makeinclude/platform_osf1_4.0{,_g++}.GNU:
-          added -lrt to support ACE_Sched_Params.  Thanks to
-          Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
-          suggesting this.  Also, split out CFLAGS and CCFLAGS.
+	* include/makeinclude/platform_osf1_4.0{,_g++}.GNU:
+	  added -lrt to support ACE_Sched_Params.  Thanks to
+	  Thilo Kielmann <kielmann@informatik.uni-siegen.de> for
+	  suggesting this.  Also, split out CFLAGS and CCFLAGS.
 
-        * ace/OS.h: removed SVR4_DYNAMIC_LINKING protection around
-          #define of RTLD_LAZY because it's used in ace/Parse_Node.cpp.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
-          this out.
+	* ace/OS.h: removed SVR4_DYNAMIC_LINKING protection around
+	  #define of RTLD_LAZY because it's used in ace/Parse_Node.cpp.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
+	  this out.
 
-        * ace/OS.i (thr_setcanceltype): added ACE_UNUSED_ARGS for STHREADS
-          case.  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
-          providing this fix.
+	* ace/OS.i (thr_setcanceltype): added ACE_UNUSED_ARGS for STHREADS
+	  case.  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
+	  providing this fix.
 
 Tue Mar 18 21:53:03 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Modified the
-          SOCK_Dgram_Bcast class by adding a const char *host_name to the
-          contructor, and open, and mk_broadcast methods.  If the user
-          passes in the host_name, then only the broadcast address of an
-          interface that has a matching ip address with the host will be
-          added to the if_list_.  Otherwise, nothing changes.  Thanks to
-          Paul <phan@CCGATE.HAC.COM> for this feature.
+	* ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Modified the
+ 	  SOCK_Dgram_Bcast class by adding a const char *host_name to the
+ 	  contructor, and open, and mk_broadcast methods.  If the user
+ 	  passes in the host_name, then only the broadcast address of an
+ 	  interface that has a matching ip address with the host will be
+ 	  added to the if_list_.  Otherwise, nothing changes.  Thanks to
+ 	  Paul <phan@CCGATE.HAC.COM> for this feature.
 
 Tue Mar 18 13:20:59 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
         * ace/ace.mdp: Reverted the change for DllMain as the entry point
-          to ace.dll.  This is causing problems in multi-threaded
-          applications. 
+ 	  to ace.dll.  This is causing problems in multi-threaded
+	  applications. 
 
-        * netsvcs/lib/Client_Logging_Handler.cpp: Added a check in fini()
-          to make sure we have a valid handler.  If the connect attempt
-          failed, this->handler_ will be set to 0.
+	* netsvcs/lib/Client_Logging_Handler.cpp: Added a check in fini()
+ 	  to make sure we have a valid handler.  If the connect attempt
+ 	  failed, this->handler_ will be set to 0.
 
-        * tests/Mem_Map_Test.cpp: Added code that removes all temporary
-          files created by the test.
+	* tests/Mem_Map_Test.cpp: Added code that removes all temporary
+ 	  files created by the test.
 
-        * tests/Time_Service_Test.cpp: Made sure we remove the backing
-          store file left behind by a aborted clerk process.
+	* tests/Time_Service_Test.cpp: Made sure we remove the backing
+ 	  store file left behind by a aborted clerk process.
 
-        * examples/Reactor/Ntalker/ntalker.cpp: The ntalker now uses
-          ACE::register_stdin_handler to register the STDIN. This function
-          allows for portability.
+	* examples/Reactor/Ntalker/ntalker.cpp: The ntalker now uses
+ 	  ACE::register_stdin_handler to register the STDIN. This function
+ 	  allows for portability.
 
 Tue Mar 18 08:12:22 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Svc_Conf_y.cpp,Makefile: replaced "y.tab.c" string with
-          "Svc_Conf_y.cpp" to ease debugging.  Thanks to Luca Priorelli
-          <lucapri@mbox.vol.it> for suggesting this.
+	* ace/Svc_Conf_y.cpp,Makefile: replaced "y.tab.c" string with
+	  "Svc_Conf_y.cpp" to ease debugging.  Thanks to Luca Priorelli
+	  <lucapri@mbox.vol.it> for suggesting this.
 
-        * ace/IOStream.cpp (close): replaced call to
-          ACE_SOCK_Stream::close () with one to generic STREAM::close ().
-          Thanks to Kumar Neelakantan <kneelaka@painewebber.com> for
-          reporting this problem.
+	* ace/IOStream.cpp (close): replaced call to
+	  ACE_SOCK_Stream::close () with one to generic STREAM::close ().
+	  Thanks to Kumar Neelakantan <kneelaka@painewebber.com> for
+	  reporting this problem.
 
-        * ace/OS.h,README,config-*.h: removed ACE_HAS_RTLD_LAZY_V, and
-          replaced with #define of RTLD_LAZY macro only if it's not
-          already defined (and if ACE_HAS_SVR4_DYNAMIC_LINKING is defined).
-          Thanks to Chris Lahey <CLahey@cccis.com> for providing this fix.
+	* ace/OS.h,README,config-*.h: removed ACE_HAS_RTLD_LAZY_V, and
+	  replaced with #define of RTLD_LAZY macro only if it's not
+	  already defined (and if ACE_HAS_SVR4_DYNAMIC_LINKING is defined).
+	  Thanks to Chris Lahey <CLahey@cccis.com> for providing this fix.
 
-        * ace/OS.i (thr_setcancelstate, thr_setcanceltype, thr_cancel):
-          added ACE_UNUSED_ARG calls to avoid compiler warnings.  Thanks
-          to Chuck Gehr <gehr@sweng.stortek.com> for suggesting them.
+	* ace/OS.i (thr_setcancelstate, thr_setcanceltype, thr_cancel):
+	  added ACE_UNUSED_ARG calls to avoid compiler warnings.  Thanks
+	  to Chuck Gehr <gehr@sweng.stortek.com> for suggesting them.
 
-        * ace/Local_Name_Space_T.h: moved #include of Local_Name_Space.h up
-          because this file needs declaration of ACE_NS_String.  There
-          _shouldn't_ be a circular include problem because the #includes are
-          protected.  Thanks to Daniel Montalibet
-          <daniel_montalibet@stortek.com> for reporting this problem and
-          providing the fix.
+	* ace/Local_Name_Space_T.h: moved #include of Local_Name_Space.h up
+	  because this file needs declaration of ACE_NS_String.	 There
+	  _shouldn't_ be a circular include problem because the #includes are
+	  protected.  Thanks to Daniel Montalibet
+	  <daniel_montalibet@stortek.com> for reporting this problem and
+	  providing the fix.
 
-        * ace/Local_Name_Space.h: removed #include of ace/Service_Config.h.
+	* ace/Local_Name_Space.h: removed #include of ace/Service_Config.h.
 
-        * include/makeinclude/wrapper_macros.GNU: put -I. before
-          -I$(WRAPPER_ROOT) instead of after.
+	* include/makeinclude/wrapper_macros.GNU: put -I. before
+	  -I$(WRAPPER_ROOT) instead of after.
 
-        * tests/IOStream_test.cpp: added checks for receipt of proper values.
+	* tests/IOStream_test.cpp: added checks for receipt of proper values.
 
 Tue Mar 18 01:38:14 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
         * ace/ace.mdp: Add DllMain as the entry point of ace.dll.  This
-          allows us to call WSAStartup when ace.dll is loaded in and
-          WSACleanup when ace.dll is unloaded.  People using ace as a
-          static library are still out in the cold with respect of getting
-          WSACleanup called before the process exits. 
-        
-          I am not sure of two cases: (1) What happens when an application
-          crashes and was not able to call WSACleanup and (2) if the
-          application wants to continue using sockets when ace.dll is
-          unloaded.  I hope this solves more problems than it creates ;-)
+	  allows us to call WSAStartup when ace.dll is loaded in and
+	  WSACleanup when ace.dll is unloaded.  People using ace as a
+	  static library are still out in the cold with respect of getting
+	  WSACleanup called before the process exits. 
+ 	
+	  I am not sure of two cases: (1) What happens when an application
+ 	  crashes and was not able to call WSACleanup and (2) if the
+	  application wants to continue using sockets when ace.dll is
+	  unloaded.  I hope this solves more problems than it creates ;-)
 
 Tue Mar 18 01:38:14 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Parse_Node.cpp: Added END_OF_LINE characters to some
-          ACE_ERRORs.
+	* ace/Parse_Node.cpp: Added END_OF_LINE characters to some
+ 	  ACE_ERRORs.
 
-        * netsvcs/{lib,servers}: Fixed the project files to produce and
-          use the dll in the correct place (which is netsvcs/lib).
+	* netsvcs/{lib,servers}: Fixed the project files to produce and
+	  use the dll in the correct place (which is netsvcs/lib).
 
-        * ace/Log_Record.cpp: Corrected format string for fprintf().
+	* ace/Log_Record.cpp: Corrected format string for fprintf().
 
-        * examples/Threads/test.mdp: Added context_switch_time.cpp to the
-          project.
+	* examples/Threads/test.mdp: Added context_switch_time.cpp to the
+	  project.
 
-          All of the above bugs were reported by Luca Priorelli
-          <lucapri@mbox.vol.it>.  Thanks for the contribution.
+	  All of the above bugs were reported by Luca Priorelli
+	  <lucapri@mbox.vol.it>.  Thanks for the contribution.
 
 Mon Mar 17 12:59:56 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,i}: added nanosleep (), currently supported only
-          on POSIX platforms (if ACE_HAS_CLOCK_GETTIME is defined).
+	* ace/OS.{h,i}: added nanosleep (), currently supported only
+	  on POSIX platforms (if ACE_HAS_CLOCK_GETTIME is defined).
 
-        * examples/Mem_Map/IO-tests/{IO_Test.cpp,test_io.cpp):
-          LM_ERROR instead of ACE_ERROR, and fixed call to ACE::basename ().
+	* examples/Mem_Map/IO-tests/{IO_Test.cpp,test_io.cpp):
+	  LM_ERROR instead of ACE_ERROR, and fixed call to ACE::basename ().
 
-        * ace/OS.cpp (sched_params): return -1 if not supported,
-          instead of ENOTSUP.
+	* ace/OS.cpp (sched_params): return -1 if not supported,
+	  instead of ENOTSUP.
 
-        * ace/OS.cpp (fork): added ACE_UNUSED_ARG (program_name) for WIN32
-          and VxWorks.
+	* ace/OS.cpp (fork): added ACE_UNUSED_ARG (program_name) for WIN32
+	  and VxWorks.
 
-        * ace/Sched_Params.cpp (priority_min, priority_max, next_priority,
-          previous_priority): not supported on MVS, via ACE_LACKS_SETSCHED.
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for figuring this
-          out and providing the fix.
+	* ace/Sched_Params.cpp (priority_min, priority_max, next_priority,
+	  previous_priority): not supported on MVS, via ACE_LACKS_SETSCHED.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for figuring this
+	  out and providing the fix.
 
-        * tests/Timer_Queue_Test.cpp (test_performance): changed type of
-          local variable "i" to (signed) int to avoid signed/unsigned
-          comparison, and eventual seg fault because a loop would never
-          terminate.
+	* tests/Timer_Queue_Test.cpp (test_performance): changed type of
+	  local variable "i" to (signed) int to avoid signed/unsigned
+	  comparison, and eventual seg fault because a loop would never
+	  terminate.
 
 Sun Mar 16 11:31:46 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Timer_{List,Queue,Heap}.h: Defined copy constructors and
-          assignment operators in the private part of the class so that
-          users won't accidentally make mistakes.
+	* ace/Timer_{List,Queue,Heap}.h: Defined copy constructors and
+ 	  assignment operators in the private part of the class so that
+ 	  users won't accidentally make mistakes.
 
 Sat Mar 15 21:44:45 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Timer_{Queue,List}.cpp (cancel): handle_close() should be
-          called only once (especially when handle_close() implements
-          "delete this;" ).  Since it is possible that the EH will be
-          registered more than once, I changed the code to do the
-          following:
+	* ace/Timer_{Queue,List}.cpp (cancel): handle_close() should be
+ 	  called only once (especially when handle_close() implements
+ 	  "delete this;" ).  Since it is possible that the EH will be
+ 	  registered more than once, I changed the code to do the
+ 	  following:
 
           if (number_of_cancellations == 1)
-            // Call the close hook.
+	    // Call the close hook.
             curr->handler_->handle_close (ACE_INVALID_HANDLE, 
                                           ACE_Event_Handler::TIMER_MASK);
 
           Thanks to Hamutal Yanay <Hamutal_Yanay@mail.icomverse.com> for
-          suggesting this.
+ 	  suggesting this.
 
-        * examples/Mem_Map/IO-tests/test_io.cpp (run_tests): Removed all
-          uses of ::perror and replaced them with calls to ACE_ERROR
-          macros.
+	* examples/Mem_Map/IO-tests/test_io.cpp (run_tests): Removed all
+ 	  uses of ::perror and replaced them with calls to ACE_ERROR
+ 	  macros.
 
-        * ace/Mem_Map.i (unmap): The ACE_Mem_Map::close method does not
-          work properly if the value of file_mapping_ is equal to
-          ACE_INVALID_HANDLE.  In this case the method calls a useless
-          close (-1).  Therefore, I changed:
+	* ace/Mem_Map.i (unmap): The ACE_Mem_Map::close method does not
+	  work properly if the value of file_mapping_ is equal to
+	  ACE_INVALID_HANDLE.  In this case the method calls a useless
+	  close (-1).  Therefore, I changed:
 
-          if (this->file_mapping_ != this->handle_)
-            ACE_OS::close (this->file_mapping_);
+	  if (this->file_mapping_ != this->handle_)
+	    ACE_OS::close (this->file_mapping_);
  
           in:
  
           if (this->file_mapping_ != this->handle_ &&
-              this->file_mapping_ != ACE_INVALID_HANDLE)
-            ACE_OS::close (this->file_mapping_);
+	      this->file_mapping_ != ACE_INVALID_HANDLE)
+	    ACE_OS::close (this->file_mapping_);
 
-          Thanks to Sandro Doro <alex@aureus.sublink.org> for reporting
-          this.
+	  Thanks to Sandro Doro <alex@aureus.sublink.org> for reporting
+ 	  this.
 
 Thu Mar 13 18:21:15 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/ReactorEx.h: Change protection of methods/variables of
-          ReactorEx from private to protected. Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for suggesting this.
+	* ace/ReactorEx.h: Change protection of methods/variables of
+	  ReactorEx from private to protected. Thanks to Matthias Kerkhoff
+	  <make@cs.tu-berlin.de> for suggesting this.
 
 Thu Mar 13 16:31:54 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.i (thr_getprio): Added missing ACE_NOTSUP_RETURN
-          for the case of pthreads && !defined (ACE_LACKS_SETSCHED).
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
-          reporting this.
+	* ace/OS.i (thr_getprio): Added missing ACE_NOTSUP_RETURN
+	  for the case of pthreads && !defined (ACE_LACKS_SETSCHED).
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for
+	  reporting this.
 
 Thu Mar 13 00:12:15 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/Local_Name_Space_T.cpp (dump): Added ACE_UNUSED_ARG around
-          fake_this to stop the compiler from complaining about unused
-          variables.
+	* ace/Local_Name_Space_T.cpp (dump): Added ACE_UNUSED_ARG around
+ 	  fake_this to stop the compiler from complaining about unused
+ 	  variables.
 
-        * ace/Message_Block.cpp (ACE_Data_Block::size): Moved the copying
-          of the old base before freeing it up. Thanks to Dieter Quehl
-          (dietrich.quehl@med.siemens.de) for pointing this out.
+	* ace/Message_Block.cpp (ACE_Data_Block::size): Moved the copying
+ 	  of the old base before freeing it up. Thanks to Dieter Quehl
+	  (dietrich.quehl@med.siemens.de) for pointing this out.
 
-        * ace/Local_Name_Space_T.cpp: Added code to the list methods such
-          that structured exceptions are handled correctly.  Thanks to
-          Karlheinz Dorn (karlheinz.dorn@med.siemens.de) for reporting
-          this.
+	* ace/Local_Name_Space_T.cpp: Added code to the list methods such
+ 	  that structured exceptions are handled correctly.  Thanks to
+ 	  Karlheinz Dorn (karlheinz.dorn@med.siemens.de) for reporting
+ 	  this.
 
 Wed Mar 12 21:31:51 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * examples/Reactor/Ntalker/ntalker.cpp: Made changes to the
-          program which allows it to run under Win32. 
+	* examples/Reactor/Ntalker/ntalker.cpp: Made changes to the
+	  program which allows it to run under Win32. 
 
-        * ace/SOCK_Dgram_Mcast.cpp: Made changes to the setting of the
-          interface address so that it works correctly under Win32. 
-          Thanks to Todd L. Montgomery (tmont@cs.wvu.edu), Anton van
-          Straaten (anton@appsolutions.com), Ole O. Johnsen
-          (Ole.Johnsen@gpi.telemax.no), Mike Flinn
-          (mike.flinn@smtpgate.aws.waii.com), Steve Weismuller
-          (spweismu@rsoc.rockwell.com) and others who helped out.
+	* ace/SOCK_Dgram_Mcast.cpp: Made changes to the setting of the
+ 	  interface address so that it works correctly under Win32. 
+	  Thanks to Todd L. Montgomery (tmont@cs.wvu.edu), Anton van
+ 	  Straaten (anton@appsolutions.com), Ole O. Johnsen
+	  (Ole.Johnsen@gpi.telemax.no), Mike Flinn
+	  (mike.flinn@smtpgate.aws.waii.com), Steve Weismuller
+ 	  (spweismu@rsoc.rockwell.com) and others who helped out.
 
 Wed Mar 12 17:05:52 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/config-linux-lxpthreads.h: Added ACE_HAS_IP_MULTICAST.
+	* ace/config-linux-lxpthreads.h: Added ACE_HAS_IP_MULTICAST.
 
 Wed Mar 12 16:07:07 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.i (gethrtime): Added support for VxWorks and
-          other platforms that support ACE_HAS_CLOCK_GETTIME.
+	* ace/OS.i (gethrtime): Added support for VxWorks and
+	  other platforms that support ACE_HAS_CLOCK_GETTIME.
 
 Tue Mar 11 21:38:42 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/OS.i (open): Improved support for passing flags through to
-          CreateFile ().
+	* ace/OS.i (open): Improved support for passing flags through to
+	  CreateFile ().
 
 Tue Mar 11 14:30:12 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SYS_NERR.
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          reporting this.
-
-        * ace/OS.{i,cpp} (uname, hostname): added VxWorks support.
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          providing this.  (Also, uninlined ACE_OS::uname on WIN32
-          and VxWorks because it contains string literals.)
-
-        * ace/High_Res_Timer.{i,cpp}: fixed interpretation of units:
-          ACE_hrtime_t is in nanoseconds, so it should be divided by
-          1000000000 to get seconds.  Fixed divs/mods to first divide
-          by 1000, then div/mod.  Thanks to Luca Priorelli
-          <lucapri@mbox.vol.it> for identifying this problem.
-
-          Also, removed some casts that are no longer necessary, and
-          added some casts of ACE_hrtime_t values to longs to avoid
-          compiler warnings.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for pointing this out.
-
-        * ace/Reactor.cpp (unbind): cast "index" to int to avoid
-          signed/unsigned comparison.  Thanks to Matthias Kerkhoff
-          <make@cs.tu-berlin.de> for pointing this out.
-
-        * ace/ReactorEx.cpp (bind): changed type of "current_size" to
-          size_t to avoid signed/unsigned comparison.  Thanks to Matthias
-          Kerkhoff <make@cs.tu-berlin.de> for pointing this out.
-
-        * ace/Timer_Heap.cpp (ctor, grow_heap): cast unsigned value
-          (i + 1) to int before negating to avoid compiler warning.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
-          this out.
-
-        * examples/Threads/context_switch_time.cpp (main): added
-          ACE_SCOPE_PROCESS param to ACE_Sched_Params instances so
-          that the test works on WIN32.  Thanks to Luca Priorelli
-          <lucapri@mbox.vol.it> for identifying this problem.
-
-        * ace/Registry.{h,cpp},Registry_Name_Space.{h,cpp},Svc_Conf_Tokens.h,
-          Svc_Conf_{l,y}.cpp,Timer_{Heap,List}.cpp,config-aix-4.2.x.h,
-          config-dgux-4.11-epc.h,config-mvs.h,config-sco-5.0.0-fsu-pthread.h,
-          config-sco-5.0.0-mit-pthread.h,config-sco-5.0.0-nothread.h:
-          added CVS header (Id wrapped in $).
-
-        * netsvcs/clients/Logger/indirect_logging.cpp (main): declare loop
-          index as signed int to avoid signed/unsigned comparison.
+	* ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SYS_NERR.
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  reporting this.
+
+	* ace/OS.{i,cpp} (uname, hostname): added VxWorks support.
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  providing this.  (Also, uninlined ACE_OS::uname on WIN32
+	  and VxWorks because it contains string literals.)
+
+	* ace/High_Res_Timer.{i,cpp}: fixed interpretation of units:
+	  ACE_hrtime_t is in nanoseconds, so it should be divided by
+	  1000000000 to get seconds.  Fixed divs/mods to first divide
+	  by 1000, then div/mod.  Thanks to Luca Priorelli
+	  <lucapri@mbox.vol.it> for identifying this problem.
+
+	  Also, removed some casts that are no longer necessary, and
+	  added some casts of ACE_hrtime_t values to longs to avoid
+	  compiler warnings.  Thanks to Matthias Kerkhoff
+	  <make@cs.tu-berlin.de> for pointing this out.
+
+	* ace/Reactor.cpp (unbind): cast "index" to int to avoid
+	  signed/unsigned comparison.  Thanks to Matthias Kerkhoff
+	  <make@cs.tu-berlin.de> for pointing this out.
+
+	* ace/ReactorEx.cpp (bind): changed type of "current_size" to
+	  size_t to avoid signed/unsigned comparison.  Thanks to Matthias
+	  Kerkhoff <make@cs.tu-berlin.de> for pointing this out.
+
+	* ace/Timer_Heap.cpp (ctor, grow_heap): cast unsigned value
+	  (i + 1) to int before negating to avoid compiler warning.
+	  Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing
+	  this out.
+
+	* examples/Threads/context_switch_time.cpp (main): added
+	  ACE_SCOPE_PROCESS param to ACE_Sched_Params instances so
+	  that the test works on WIN32.  Thanks to Luca Priorelli
+	  <lucapri@mbox.vol.it> for identifying this problem.
+
+	* ace/Registry.{h,cpp},Registry_Name_Space.{h,cpp},Svc_Conf_Tokens.h,
+	  Svc_Conf_{l,y}.cpp,Timer_{Heap,List}.cpp,config-aix-4.2.x.h,
+	  config-dgux-4.11-epc.h,config-mvs.h,config-sco-5.0.0-fsu-pthread.h,
+	  config-sco-5.0.0-mit-pthread.h,config-sco-5.0.0-nothread.h:
+	  added CVS header (Id wrapped in $).
+
+	* netsvcs/clients/Logger/indirect_logging.cpp (main): declare loop
+	  index as signed int to avoid signed/unsigned comparison.
 
 Tue Mar 11 07:34:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/Timer_Queue_Test.cpp: Added some code to illustrate how
-          the new handle_close() hook for ACE_Timer_{Heap,List} work.
+	* tests/Timer_Queue_Test.cpp: Added some code to illustrate how
+ 	  the new handle_close() hook for ACE_Timer_{Heap,List} work.
 
-        * ace/Timer_Heap.cpp (cancel): Modified the Timer_Heap and
-          Timer_Queue so that it will call the handle_close() hook when
-          Event_Handler's are cancelled.  This is necessary to reclaim
-          resources.  Thanks to Hamutal Yanay
-          <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
+	* ace/Timer_Heap.cpp (cancel): Modified the Timer_Heap and
+ 	  Timer_Queue so that it will call the handle_close() hook when
+ 	  Event_Handler's are cancelled.  This is necessary to reclaim
+ 	  resources.  Thanks to Hamutal Yanay
+ 	  <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
 
-        * ace/Event_Handler.h (signal): Added a TIMER_MASK, which is
-          passed to handle_close() when a timer is cancelled.
+	* ace/Event_Handler.h (signal): Added a TIMER_MASK, which is
+ 	  passed to handle_close() when a timer is cancelled.
 
-        * ace/Log_Msg.cpp (log): Fixed a bug by setting LPTSTR lpMsgBuf =
-          0 on line 524.  Thanks to Mark Wright <markw@odi.com.au> for
-          reporting this.
+	* ace/Log_Msg.cpp (log): Fixed a bug by setting LPTSTR lpMsgBuf =
+ 	  0 on line 524.  Thanks to Mark Wright <markw@odi.com.au> for
+ 	  reporting this.
 
 Sun Mar  10 13:06:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * examples/Mem_Map/IO-tests: Fixed a small bug in "IO_Test.cpp"
-          file.  In the "int Mmap1_Test::run_test" method I inserted an
-          lseek to rewind the output file.  With this correction the speed
-          go up due to IO cache.  Thanks to Sandro Doro
-          <alex@aureus.sublink.org> for reporting this.
+ 	  file.  In the "int Mmap1_Test::run_test" method I inserted an
+ 	  lseek to rewind the output file.  With this correction the speed
+ 	  go up due to IO cache.  Thanks to Sandro Doro
+ 	  <alex@aureus.sublink.org> for reporting this.
 
 Sun Mar  9 18:24:37 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
-        * java/src/IOCntlMsg.java (IOCntlMsg): Added two new
-          classes/files, namely IOCntlCmds and IOCntlMsg.
+	* java/src/IOCntlMsg.java (IOCntlMsg): Added two new
+	  classes/files, namely IOCntlCmds and IOCntlMsg.
 
-        * java/src/Task.java: Added accessors to get/set the flags of the
-          Task. 
+	* java/src/Task.java: Added accessors to get/set the flags of the
+	  Task. 
 
 Sun Mar  9 13:06:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Reactor: Fixed an evil bug where the expression
-        
-          if (handle >= 0 || handle < this->max_handlep1_)
-          
-          should be
-          
-          if (handle >= 0 && handle < this->max_handlep1_)
+	* ace/Reactor: Fixed an evil bug where the expression
+	
+	  if (handle >= 0 || handle < this->max_handlep1_)
+	  
+	  should be
+	  
+	  if (handle >= 0 && handle < this->max_handlep1_)
 
-          Thanks to Mark Wright <markw@odi.com.au> for reporting this.
+	  Thanks to Mark Wright <markw@odi.com.au> for reporting this.
 
 Sun Mar  9 13:06:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * apps/Gateway: Updated the Peer and Gateway applications so that
-          they don't try to register ACE_STDIN with the Reactor on Win32.
+	* apps/Gateway: Updated the Peer and Gateway applications so that
+ 	  they don't try to register ACE_STDIN with the Reactor on Win32.
 
-        * apps/Gateway: Changed a bunch of calls to
-          ACE_Reactor::remove_handler() so that it no longer tries to
-          remove descriptor 0, but instead uses ACE_STDIN.  Naturally,
-          this doesn't work due to the way that Win32 implements select()
-          but at least it compiles...  Thanks to Elliot Lau
-          <eeklau@post1.com> for reporting this.
+	* apps/Gateway: Changed a bunch of calls to
+ 	  ACE_Reactor::remove_handler() so that it no longer tries to
+ 	  remove descriptor 0, but instead uses ACE_STDIN.  Naturally,
+ 	  this doesn't work due to the way that Win32 implements select()
+ 	  but at least it compiles...  Thanks to Elliot Lau
+ 	  <eeklau@post1.com> for reporting this.
 
-        * apps/Gateway/Gateway/File_Parser: Changed the enumerated type
-          ERROR to PARSE_ERROR to avoid a name clash with a symbol
-          reserved by Win32 (barf).  Thanks to Elliot Lau
-          <eeklau@post1.com> for reporting this.
+	* apps/Gateway/Gateway/File_Parser: Changed the enumerated type
+ 	  ERROR to PARSE_ERROR to avoid a name clash with a symbol
+ 	  reserved by Win32 (barf).  Thanks to Elliot Lau
+ 	  <eeklau@post1.com> for reporting this.
 
 Sat Mar  8 12:37:44 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Log_Msg.cpp: Changed the implementation of ACE_Log_Msg so
-          that all accesses to the lock_ are now through a Singleton.
-          This makes it possible to define multiple instances of
-          ACE_Log_Msg within the same thread.  Thanks to Jeff Morgan
-          <jeff@audioactive.com> for helping track this down.
+	* ace/Log_Msg.cpp: Changed the implementation of ACE_Log_Msg so
+ 	  that all accesses to the lock_ are now through a Singleton.
+  	  This makes it possible to define multiple instances of
+ 	  ACE_Log_Msg within the same thread.  Thanks to Jeff Morgan
+ 	  <jeff@audioactive.com> for helping track this down.
 
-        * Added support for SCO 5.0.  Thanks to Auturo
-          <mitosys@colomsat.net.co> for these patches.
+	* Added support for SCO 5.0.  Thanks to Auturo
+ 	  <mitosys@colomsat.net.co> for these patches.
 
 Thu Mar 06 13:24:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.i (gettimeofday): moved declaration of "result" so
-          that it's not declared on VxWorks, where it's not needed;
-          (stat): added cast of file arg to char * for VxWorks;
-          (thr_getprio): added missing "#else" before ACE_NOTSUP_RETURN (-1).
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          reporting these.
+	* ace/OS.i (gettimeofday): moved declaration of "result" so
+	  that it's not declared on VxWorks, where it's not needed;
+	  (stat): added cast of file arg to char * for VxWorks;
+	  (thr_getprio): added missing "#else" before ACE_NOTSUP_RETURN (-1).
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  reporting these.
 
-        * ace/OS.cpp (sched_param): with STHREADS, map ACE_SCOPE_THREAD
-          to ACE_SCOPE_PROCESS'.
+	* ace/OS.cpp (sched_param): with STHREADS, map ACE_SCOPE_THREAD
+	  to ACE_SCOPE_PROCESS'.
 
-        * ace/Svc_Conf_l.cpp: commented out YY_BREAK after ace_yyterminate ()
-          to avoid GHS compiler warning about unreachable statement.
-          Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
-          reporting this.
+	* ace/Svc_Conf_l.cpp: commented out YY_BREAK after ace_yyterminate ()
+	  to avoid GHS compiler warning about unreachable statement.
+	  Thanks to Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for
+	  reporting this.
 
-        * ace/ace.mak: removed Thread_Priority and renamed Scheduling_Params
-          to Sched_Param.
+	* ace/ace.mak: removed Thread_Priority and renamed Scheduling_Params
+	  to Sched_Param.
 
-        * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client):
-          added "l" qualifier for sprintf of ACE_OS::getpid ().
+	* examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client):
+	  added "l" qualifier for sprintf of ACE_OS::getpid ().
 
-        * tests/Priority_Task_Test.cpp,
-          examples/Threads/{context_switch_time.cpp,Makefile}:
-          adapted to new thread priority/ACE_Sched_Params.
+	* tests/Priority_Task_Test.cpp,
+	  examples/Threads/{context_switch_time.cpp,Makefile}:
+	  adapted to new thread priority/ACE_Sched_Params.
 
 Wed Mar  5 14:33:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/UNIX_Addr.cpp: Enhanced the implementation of set() so
-          that it works correctly on MVS, which has a different definition
-          of struct sockaddr_un:
-          
-          struct sockaddr_un {                                               
-                unsigned char  sun_len;                                         
-                unsigned char  sun_family;                                      
-                char  sun_path[108];                                   
-          };
+	* ace/UNIX_Addr.cpp: Enhanced the implementation of set() so
+	  that it works correctly on MVS, which has a different definition
+	  of struct sockaddr_un:
+	  
+	  struct sockaddr_un {                                               
+	        unsigned char  sun_len;                                         
+		unsigned char  sun_family;                                      
+		char  sun_path[108];                                   
+	  };
 
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
+ 	  this.
 
 Wed Mar 05 14:47:14 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,cpp},Makefile; also, renamed Scheduling_Params.* to
-          Sched_Params.* and removed Thread_Priority.*:
-
-          Major change in scheduling parameters interface:
-          The key change is that there is no longer a special thread priority
-          enum.  Thread_Priority was changed to int, so applications can do
-          whatever they want.  The ACE_Sched_Params class has some static
-          functions to help do this portably.
-
-          Here  are the changes from the ACE 4.1.3:
-
-          1) ACE_Thread_Priority:  removed this class.
-
-            It contained "priority class" and "thread priority".
-            "Priority class" is platform-specific and doesn't
-            need to be visible in ACE; it is subsumed by scheduling policy,
-            see below.  "Thread priority" is replaced by the global
-            ACE_Sched_Priority typedef in ace/OS.h, see next change.
-
-          2) ace/OS.h:  added ACE_Sched_Priority typedef (to int)
-             and ACE_SCOPE_THREAD.
-
-          3) ace/OS.h:  added scheduling policy #defines:  ACE_SCHED_OTHER,
-             ACE_SCHED_FIFO, and ACE_SCHED_RR.  There's an ACE_Sched_Params::
-             Policy typedef that can take one of these values.
-
-          4) ACE_Sched_Params:  added priority_min (), priority_max (),
-             next_priority (), and previous_priority () functions.  All
-             require an ACE_Sched_Params::Policy argument and take an
-             optional scope argument (to support the distinct thread
-             and process priorities on DEC UNIX).
-
-             min_priority () and max_priority () have platform-specific
-             and policy-specific values, and direction (the min value may
-             be higher than the max value).  The increment and decrement
-             operations allow applications to iterate over them, etc.,
-             without explicitly specifying the direction of the priority
-             (0 for high or low priority).
-
-          5) The only way to apply ACE_Sched_Params is through
-             ACE_OS::sched_params (const ACE_Sched_Params &).
-             (This is not really a change, except for the name change from
-             ACE_OS::set_sched_params ().
-
-             It sets both policy and priority of current thread or
-             process (depending on the scope in ACE_Sched_Params).
-             Not all combinations of policy, priority, and scope are
-             legal on all platforms.  Unfortunately, I see no way around
-             this, because the intersection of legal ranges
-             on our supported platforms is empty.  If an illegal request
-             is made, ACE_OS::sched_params () sets errno to EINVAL and
-             returns -1.
-
-          6) added ACE_OS::thr_setprio (const ACE_Sched_Priority prio)
-             to set the current thread's priority, only.
-
-          Many thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
-          for his careful review of this class design, thoughtful comments,
-          and assistance with implementation, especially for PTHREADS
-          platforms.
+	* ace/OS.{h,cpp},Makefile; also, renamed Scheduling_Params.* to
+	  Sched_Params.* and removed Thread_Priority.*:
+
+	  Major change in scheduling parameters interface:
+	  The key change is that there is no longer a special thread priority
+	  enum.	 Thread_Priority was changed to int, so applications can do
+	  whatever they want.  The ACE_Sched_Params class has some static
+	  functions to help do this portably.
+
+	  Here	are the changes from the ACE 4.1.3:
+
+	  1) ACE_Thread_Priority:  removed this class.
+
+	    It contained "priority class" and "thread priority".
+	    "Priority class" is platform-specific and doesn't
+	    need to be visible in ACE; it is subsumed by scheduling policy,
+	    see below.	"Thread priority" is replaced by the global
+	    ACE_Sched_Priority typedef in ace/OS.h, see next change.
+
+	  2) ace/OS.h:	added ACE_Sched_Priority typedef (to int)
+	     and ACE_SCOPE_THREAD.
+
+	  3) ace/OS.h:	added scheduling policy #defines:  ACE_SCHED_OTHER,
+	     ACE_SCHED_FIFO, and ACE_SCHED_RR.	There's an ACE_Sched_Params::
+	     Policy typedef that can take one of these values.
+
+	  4) ACE_Sched_Params:	added priority_min (), priority_max (),
+	     next_priority (), and previous_priority () functions.  All
+	     require an ACE_Sched_Params::Policy argument and take an
+	     optional scope argument (to support the distinct thread
+	     and process priorities on DEC UNIX).
+
+	     min_priority () and max_priority () have platform-specific
+	     and policy-specific values, and direction (the min value may
+	     be higher than the max value).  The increment and decrement
+	     operations allow applications to iterate over them, etc.,
+	     without explicitly specifying the direction of the priority
+	     (0 for high or low priority).
+
+	  5) The only way to apply ACE_Sched_Params is through
+	     ACE_OS::sched_params (const ACE_Sched_Params &).
+	     (This is not really a change, except for the name change from
+	     ACE_OS::set_sched_params ().
+
+	     It sets both policy and priority of current thread or
+	     process (depending on the scope in ACE_Sched_Params).
+	     Not all combinations of policy, priority, and scope are
+	     legal on all platforms.  Unfortunately, I see no way around
+	     this, because the intersection of legal ranges
+	     on our supported platforms is empty.  If an illegal request
+	     is made, ACE_OS::sched_params () sets errno to EINVAL and
+	     returns -1.
+
+	  6) added ACE_OS::thr_setprio (const ACE_Sched_Priority prio)
+	     to set the current thread's priority, only.
+
+	  Many thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
+	  for his careful review of this class design, thoughtful comments,
+	  and assistance with implementation, especially for PTHREADS
+	  platforms.
 
 Wed Mar  5 14:36:59 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * SString.cpp: Fixed ACE*String initialization bugs. Thanks to
-          jmorey@tbi.com (John Morey) for reporting this.
+	* SString.cpp: Fixed ACE*String initialization bugs. Thanks to
+	  jmorey@tbi.com (John Morey) for reporting this.
 
 Wed Mar  5 14:33:04 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i: Fixed a bug in gethrtime
+	* ace/OS.i: Fixed a bug in gethrtime
 
-          const ACE_Time_Value now = ACE_OS::gettimeofday (void);
+	  const ACE_Time_Value now = ACE_OS::gettimeofday (void);
 
-          which should be
+	  which should be
 
-          const ACE_Time_Value now = ACE_OS::gettimeofday ();
+	  const ACE_Time_Value now = ACE_OS::gettimeofday ();
 
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
+ 	  this.
 
 Tue Mar  4 16:37:26 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp (main): Make life
-          easier by doing an unlink(rendezvous) before reopening the
-          UNIX-domain socket.  Thanks to Jeff Morgan
-          <jeff@audioactive.com> for suggesting this.
+	* examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp (main): Make life
+ 	  easier by doing an unlink(rendezvous) before reopening the
+ 	  UNIX-domain socket.  Thanks to Jeff Morgan
+ 	  <jeff@audioactive.com> for suggesting this.
 
 Sun Mar 02 19:58:00 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config*.h: removed #define of ACE_HAS_INLINED_OSCALLS
-          because it's no longer needed in the config files:  it's
-          #defined in OS.h if needed.
+	* ace/config*.h: removed #define of ACE_HAS_INLINED_OSCALLS
+	  because it's no longer needed in the config files:  it's
+	  #defined in OS.h if needed.
 
 Sun Mar  2 17:14:29 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * include/makeinclude: Updated all the platform-*g++.GNU files so
-          that they no longer -D__ACE_INLINE__ (since this is handled in
-          the the config-*g++.h files).
+	* include/makeinclude: Updated all the platform-*g++.GNU files so
+ 	  that they no longer -D__ACE_INLINE__ (since this is handled in
+ 	  the the config-*g++.h files).
 
-        * ace: Updated all the config-*g++.h files so that they now
-          #define __ACE_INLINE__ rather than having this set in the
-          platform_*.GNU file.  This makes ACE easier to build and
-          integrate with other software packages.
+	* ace: Updated all the config-*g++.h files so that they now
+ 	  #define __ACE_INLINE__ rather than having this set in the
+ 	  platform_*.GNU file.  This makes ACE easier to build and
+ 	  integrate with other software packages.
 
 Fri Feb 28 02:22:33 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/SOCK_*: There were problems starting UDP broadcast servers
-          (all using the same well known port number) multiple times on
-          one machine (this is very useful test distributed applications
-          on one single machine).  Setting the SO_REUSEADDR option for the
-          broadcast socket allows binding of a socket that is already in
-          use and thus allows us to start more than one broadcast servers
-          in parallel on one machine.  Thanks to Dieter Quehl
-          <dietrich.quehl@med.siemens.de> for this fix.
+	* ace/SOCK_*: There were problems starting UDP broadcast servers
+	  (all using the same well known port number) multiple times on
+ 	  one machine (this is very useful test distributed applications
+ 	  on one single machine).  Setting the SO_REUSEADDR option for the
+ 	  broadcast socket allows binding of a socket that is already in
+ 	  use and thus allows us to start more than one broadcast servers
+ 	  in parallel on one machine.  Thanks to Dieter Quehl
+ 	  <dietrich.quehl@med.siemens.de> for this fix.
 
-          Therefore, I patched ACE_SOCK_Dgram_Bcast, ACE_SOCK_Dgram and
-          ACE_SOCK to include this feature.  In addition, I also changed
-          ACE_SOCK_Connector/ACE_SOCK_Acceptor to use this feature instead
-          of calling setsockopt() there explicitly.
+	  Therefore, I patched ACE_SOCK_Dgram_Bcast, ACE_SOCK_Dgram and
+ 	  ACE_SOCK to include this feature.  In addition, I also changed
+ 	  ACE_SOCK_Connector/ACE_SOCK_Acceptor to use this feature instead
+ 	  of calling setsockopt() there explicitly.
 
-        * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (main): Fixed up the
-          use of ACE_OS::fork() here to use the new "named" version.
+	* examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (main): Fixed up the
+ 	  use of ACE_OS::fork() here to use the new "named" version.
 
-        * ace/OS.h: Added a clever new wrapper function called fork (const
-          char *program_name), which calls fork() and then automatically
-          calls ACE_LOG_MSG->sync (program_name) to sync up the program
-          name.  This eliminates a common source of error when forking
-          children and using ACE_Log_Msg::log().
+	* ace/OS.h: Added a clever new wrapper function called fork (const
+ 	  char *program_name), which calls fork() and then automatically
+ 	  calls ACE_LOG_MSG->sync (program_name) to sync up the program
+ 	  name.  This eliminates a common source of error when forking
+ 	  children and using ACE_Log_Msg::log().
 
-        * examples/IPC_SAP/SOCK_SAP/FD-un{client,server}.cpp: Updated the
-          FD client and FD server programs so that it is now a concurrent
-          server.
+	* examples/IPC_SAP/SOCK_SAP/FD-un{client,server}.cpp: Updated the
+ 	  FD client and FD server programs so that it is now a concurrent
+ 	  server.
 
-        * ace/config-mvs.h: Added #define ACE_LACKS_TCP_H for MVS.  Thanks
-          to Chuck Gehr for pointing this out.
+	* ace/config-mvs.h: Added #define ACE_LACKS_TCP_H for MVS.  Thanks
+ 	  to Chuck Gehr for pointing this out.
 
-        * ace/OS.h: Added a new #define ACE_LACKS_TCP_H that skips the
-          inclusion of the netinet/tcp.h file if it isn't on the platform.
+	* ace/OS.h: Added a new #define ACE_LACKS_TCP_H that skips the
+ 	  inclusion of the netinet/tcp.h file if it isn't on the platform.
 
-        * ace/OS.i (thr_cancel): Changed the line
+	* ace/OS.i (thr_cancel): Changed the line
 
-          ACE_UNUSED_ARG (t_id);
+	  ACE_UNUSED_ARG (t_id);
 
-          to
+	  to
 
-          ACE_UNUSED_ARG (thr_id);
+	  ACE_UNUSED_ARG (thr_id);
 
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
+ 	  this.
 
-        * ace/SString.cpp: Fixed up all the ACE_[CSW]String code so that
-          always allocates a rep_ even in the null constructor.  This
-          saves us from having to handle odd special cases later on...
-          Thanks to John Morey <JMOREY@tbi.com> for reporting this.
+	* ace/SString.cpp: Fixed up all the ACE_[CSW]String code so that
+ 	  always allocates a rep_ even in the null constructor.  This
+ 	  saves us from having to handle odd special cases later on...
+  	  Thanks to John Morey <JMOREY@tbi.com> for reporting this.
 
-        * ace/Service_Repository.cpp (close): Changed the order in which
-          services are destroyed when the Service Configurator is closed.
-          Currently, services are destroyed in the order in which they are
-          created according to the svc.conf file.  Now, we shut them down
-          in reverse order.  This makes more sense when services are
-          related, i.e., one service has to be started before another.
-          Thanks to Karlheinz for this suggestion.
+	* ace/Service_Repository.cpp (close): Changed the order in which
+ 	  services are destroyed when the Service Configurator is closed.
+  	  Currently, services are destroyed in the order in which they are
+ 	  created according to the svc.conf file.  Now, we shut them down
+ 	  in reverse order.  This makes more sense when services are
+ 	  related, i.e., one service has to be started before another.
+  	  Thanks to Karlheinz for this suggestion.
 
 
 Fri Feb 28 12:13:09 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: fixed definition of ACE_TIMER_SKEW.  Thanks
-          to Chuck Gehr <gehr@sweng.stortek.com> for pointing this out.
+	* ace/OS.h: fixed definition of ACE_TIMER_SKEW.  Thanks
+	  to Chuck Gehr <gehr@sweng.stortek.com> for pointing this out.
 
 Thu Feb 27 21:36:28 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{i,cpp} (gethrtime):  support on all platforms by
-          using ACE_OS::gettimeofday () if there is no native high
-          resolution timer. Moved ACE_OS::getimeofday () definition
-          toward top of OS.i so that it is always defined before
-          being called.  Finally, expanded gethrtime () support from
-          linux to __GNUC__ with ACE_HAS_PENTIUM; it should work on
-          platforms such as VxWorks with gcc on Pentiums.
+	* ace/OS.{i,cpp} (gethrtime):  support on all platforms by
+	  using ACE_OS::gettimeofday () if there is no native high
+	  resolution timer. Moved ACE_OS::getimeofday () definition
+	  toward top of OS.i so that it is always defined before
+	  being called.  Finally, expanded gethrtime () support from
+	  linux to __GNUC__ with ACE_HAS_PENTIUM; it should work on
+	  platforms such as VxWorks with gcc on Pentiums.
 
-        * ace/config-osf1-4.0-{,g++}.h:  added ACE_HAS_CLOCK_GETTIME.
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
-          for pointing this out.
+	* ace/config-osf1-4.0-{,g++}.h:  added ACE_HAS_CLOCK_GETTIME.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
+	  for pointing this out.
 
 Thu Feb 27 17:06:12 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/High_Res_Timer.h (get_env_global_scale_factor):  This static
-          method will set the global_scale_factor to the value in an
-          environment variable (ACE_SCALE_FACTOR by default).
+	* ace/High_Res_Timer.h (get_env_global_scale_factor):  This static
+	  method will set the global_scale_factor to the value in an
+ 	  environment variable (ACE_SCALE_FACTOR by default).
 
-        * ace/High_Res_Timer.*: Changed all calculations to divide by
-          scale_factor before doing / and %.  This must be done before the
-          mod for correctness.
+	* ace/High_Res_Timer.*: Changed all calculations to divide by
+	  scale_factor before doing / and %.  This must be done before the
+	  mod for correctness.
 
-        * ace/Profile_Timer.i (start): Changed start and stop methods to
-          call ACE_High_Res_Timer::gettimeofday.  This should allow
-          greater timing accurracy.
+	* ace/Profile_Timer.i (start): Changed start and stop methods to
+	  call ACE_High_Res_Timer::gettimeofday.  This should allow
+	  greater timing accurracy.
 
-        * ace/High_Res_Timer.h (global_scale_factor): Added a static
-          global_scale_factor that allows applications to set one scale
-          factor for all high res timers.  This is important for platforms
-          like intel where the scale factor will vary based on the
-          processor clock speed.
+	* ace/High_Res_Timer.h (global_scale_factor): Added a static
+	  global_scale_factor that allows applications to set one scale
+	  factor for all high res timers.  This is important for platforms
+	  like intel where the scale factor will vary based on the
+	  processor clock speed.
 
-        * ace/High_Res_Timer.i (gettimeofday): This static method calls
-          ACE_OS::gethrtime and converts to an ACE_Time_Value based on the
-          global_static_factor.
+	* ace/High_Res_Timer.i (gettimeofday): This static method calls
+	  ACE_OS::gethrtime and converts to an ACE_Time_Value based on the
+	  global_static_factor.
 
 Wed Feb 26 18:28:35 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ACE-install.sh: Added some fixes for the ACE-install.sh script.
-          Thanks to Eugene R. Somdahl <gene@endo.com> for reporting these.
+	* ACE-install.sh: Added some fixes for the ACE-install.sh script.
+  	  Thanks to Eugene R. Somdahl <gene@endo.com> for reporting these.
 
-        * ace/Connector.cpp (handle_close): Added a test to see if the
-          reactor_ is NULL and if it is, don't bother trying to use it to
-          clean up.  Thanks to Paul Han <phan@CCGATE.HAC.COM> for this
-          suggestion.
+	* ace/Connector.cpp (handle_close): Added a test to see if the
+ 	  reactor_ is NULL and if it is, don't bother trying to use it to
+ 	  clean up.  Thanks to Paul Han <phan@CCGATE.HAC.COM> for this
+ 	  suggestion.
 
 Tue Feb 25 21:19:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h,config-sunos*.h: default ACE_TIMER_SKEW to 0,
-          and override to 10 ms in all Solaris config files.
+	* ace/OS.h,config-sunos*.h: default ACE_TIMER_SKEW to 0,
+	  and override to 10 ms in all Solaris config files.
 
-        * ace/Svc_Conf_l.cpp,Makefile: #undef ACE_HAS_TERM_IOCTLS
-          so that /usr/include/sys/termios.h won't be included; it
-          #defines ECHO, and Svc_Conf_l.cpp has an ECHO symbol.
+	* ace/Svc_Conf_l.cpp,Makefile: #undef ACE_HAS_TERM_IOCTLS
+	  so that /usr/include/sys/termios.h won't be included; it
+	  #defines ECHO, and Svc_Conf_l.cpp has an ECHO symbol.
 
-        * ace/ACE.cpp (sock_error): added ACE_UNUSED_ARG (error);.
+	* ace/ACE.cpp (sock_error): added ACE_UNUSED_ARG (error);.
 
-        * ace/Timer_Queue.cpp (ctor): rearranged initializers to
-          match declaration order.
+	* ace/Timer_Queue.cpp (ctor): rearranged initializers to
+	  match declaration order.
 
 Tue Feb 25 19:57:54 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/Timer_Queue.cpp (gettimeofday): Added gettimeofday accessors
-          on the Timer_Queue.  The default implementation calls
-          ACE_OS::gettimeofday.  Applications can specify, via pointers to
-          functions, that a timer queue use an alternate gettimeofday
-          implementation (e.g., a high resolution timer).
+	* ace/Timer_Queue.cpp (gettimeofday): Added gettimeofday accessors
+	  on the Timer_Queue.  The default implementation calls
+	  ACE_OS::gettimeofday.  Applications can specify, via pointers to
+	  functions, that a timer queue use an alternate gettimeofday
+	  implementation (e.g., a high resolution timer).
 
-        * ace/Reactor.cpp (schedule_timer): The Reactor no longer calls
-          ACE_OS::gettimeofday.  Instead, it calls
-          Timer_Queue::gettimeofday.
+	* ace/Reactor.cpp (schedule_timer): The Reactor no longer calls
+	  ACE_OS::gettimeofday.  Instead, it calls
+	  Timer_Queue::gettimeofday.
 
-        * ace/ReactorEx.cpp (schedule_timer): The ReactorEx no longer calls
-          ACE_OS::gettimeofday.  Instead, it calls
-          Timer_Queue::gettimeofday.
+	* ace/ReactorEx.cpp (schedule_timer): The ReactorEx no longer calls
+	  ACE_OS::gettimeofday.  Instead, it calls
+	  Timer_Queue::gettimeofday.
 
 Tue Feb 25 17:40:57 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Log_Msg.cpp: Updated the 'p' option of the log() method to
-          use the new ACE::sock_error() method for cases where
-          FormatMessage() fails.
+	* ace/Log_Msg.cpp: Updated the 'p' option of the log() method to
+ 	  use the new ACE::sock_error() method for cases where
+ 	  FormatMessage() fails.
 
-        * ace/ACE: Added a new sock_error() method to class ACE which
-          returns the appropriate message for each WinSock error code.
-          This makes up for an apparent oversight in Win32.  Thanks to
-          Michael R. MacFaden" <mrm@cisco.com> for this.
+	* ace/ACE: Added a new sock_error() method to class ACE which
+ 	  returns the appropriate message for each WinSock error code.
+  	  This makes up for an apparent oversight in Win32.  Thanks to
+ 	  Michael R. MacFaden" <mrm@cisco.com> for this.
 
 Tue Feb 25 01:33:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Moved <netinet/tcp.h> outside of the VXWORKS #ifdef
-          since it seems to be available on other platforms (e.g.,
-          Solaris).  If people find this not to be the case on all
-          platforms please let me know and I'll #ifdef it.  Thanks to
-          Sumedh Mungee <sumedh@cs.wustl.edu> for reporting this.
+	* ace/OS.h: Moved <netinet/tcp.h> outside of the VXWORKS #ifdef
+ 	  since it seems to be available on other platforms (e.g.,
+ 	  Solaris).  If people find this not to be the case on all
+ 	  platforms please let me know and I'll #ifdef it.  Thanks to
+ 	  Sumedh Mungee <sumedh@cs.wustl.edu> for reporting this.
 
 Tue Feb 25 16:20:29 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * examples/Connection/non_blocking/CPP-acceptor.cpp: Added a
-          specific checl for timeouts. Also, changed
-          ACE_PEER_ACCEPTOR_ADDR to ACE_PEER_STREAM_ADDR
+	* examples/Connection/non_blocking/CPP-acceptor.cpp: Added a
+ 	  specific checl for timeouts. Also, changed
+ 	  ACE_PEER_ACCEPTOR_ADDR to ACE_PEER_STREAM_ADDR
 
-        * examples/Connection/non_blocking/non-blocking.{mak,mdp}: New
-          project files for Win32.
+	* examples/Connection/non_blocking/non-blocking.{mak,mdp}: New
+	  project files for Win32.
 
-        * ace/Log_Msg.cpp: Minor changes.
+	* ace/Log_Msg.cpp: Minor changes.
 
 Mon Feb 24 17:16:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Log_Msg.cpp (ACE_Log_Msg): Enable the thread-specific
-          tracing flag by default.  This ensures that tracing will work
-          "out of the box."
+	* ace/Log_Msg.cpp (ACE_Log_Msg): Enable the thread-specific
+ 	  tracing flag by default.  This ensures that tracing will work
+ 	  "out of the box."
 
-        * ace/config-sunos5.[45]-g++.h: Added a #define for
-          ACE_HAS_TERM_IOCTLS.  Thanks to Joey Zhu <joey.zhu@wcom.com> for
-          reporting this.
+	* ace/config-sunos5.[45]-g++.h: Added a #define for
+ 	  ACE_HAS_TERM_IOCTLS.  Thanks to Joey Zhu <joey.zhu@wcom.com> for
+ 	  reporting this.
 
-        * ace/Synch.cpp (acquire): Simplified the recursive mutex logic
-          for acquire().  Thanks to Arthur J. Lewis" <hfdh99a@prodigy.com>
-          for reporting this.
+	* ace/Synch.cpp (acquire): Simplified the recursive mutex logic
+ 	  for acquire().  Thanks to Arthur J. Lewis" <hfdh99a@prodigy.com>
+ 	  for reporting this.
 
-        * examples/Connection/non_blocking/CPP-acceptor.cpp (init): Added
-          a #ifdef for ACE_WIN32 so that we don't register the signal
-          handler for SIGPIPE since it's not supported on Win32.  Thanks
-          to Ivan Murphy <Ivan.Murphy@med.siemens.de> for reporting this
-          problem.
+	* examples/Connection/non_blocking/CPP-acceptor.cpp (init): Added
+ 	  a #ifdef for ACE_WIN32 so that we don't register the signal
+ 	  handler for SIGPIPE since it's not supported on Win32.  Thanks
+ 	  to Ivan Murphy <Ivan.Murphy@med.siemens.de> for reporting this
+ 	  problem.
 
-        * examples/Connection/non_blocking: The SPIPE examples in
-          (test_spipe_{acceptor,connector}.cpp) aren't ported to Win32
-          yet.  They currently don't work because ACE_SPIPE*'s can't be
-          registered with the ACE_Reactor (which only works with sockets).
-          I've #ifdef'd these examples so that they don't get compiled on
-          Win32.  Thanks to Ivan Murphy <Ivan.Murphy@med.siemens.de> for
-          reporting this problem.
+	* examples/Connection/non_blocking: The SPIPE examples in
+	  (test_spipe_{acceptor,connector}.cpp) aren't ported to Win32
+ 	  yet.  They currently don't work because ACE_SPIPE*'s can't be
+ 	  registered with the ACE_Reactor (which only works with sockets).
+  	  I've #ifdef'd these examples so that they don't get compiled on
+ 	  Win32.  Thanks to Ivan Murphy <Ivan.Murphy@med.siemens.de> for
+ 	  reporting this problem.
 
 Mon Feb 24 20:28:10 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: use signed __int64 for ACE_hrtime_t because VC++
-          won't convert unsigned __int64 to double.  Thanks to Irfan
-          <irfan@cs.wustl.edu> for reporting this.
+	* ace/OS.h: use signed __int64 for ACE_hrtime_t because VC++
+	  won't convert unsigned __int64 to double.  Thanks to Irfan
+	  <irfan@cs.wustl.edu> for reporting this.
 
-        * include/makeinclude/platform_{irix5.3_g++,linux*,m88k,
-          osf1_4.0_g++,sco-nothread,sunos*g++,unixware_g++}.GNU:
-          changed C++ compiler (CXX) from gcc to g++ so that libg++
-          will be linked in.  Thanks to James CE Johnson <jcej@lads.com>
-          for suggesting this.
+	* include/makeinclude/platform_{irix5.3_g++,linux*,m88k,
+	  osf1_4.0_g++,sco-nothread,sunos*g++,unixware_g++}.GNU:
+	  changed C++ compiler (CXX) from gcc to g++ so that libg++
+	  will be linked in.  Thanks to James CE Johnson <jcej@lads.com>
+	  for suggesting this.
 
-        * examples/IOStream/{client,server}/Makefile,tests/Makefile:
-          removed -lg++, when gcc is the compiler, because it's no
-          longer needed with g++ as the compiler.
+	* examples/IOStream/{client,server}/Makefile,tests/Makefile:
+	  removed -lg++, when gcc is the compiler, because it's no
+	  longer needed with g++ as the compiler.
 
 Sat Feb 22 23:03:45 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.i: restored version 4.89 and 4.90 changes that
-          were lost in version 4.91.
+	* ace/OS.i: restored version 4.89 and 4.90 changes that
+	  were lost in version 4.91.
 
-        * ace/OS.{i,cpp},config-linux*.h: added ACE_OS::gethrtime ()
-          support for Linux on Pentiums.
+	* ace/OS.{i,cpp},config-linux*.h: added ACE_OS::gethrtime ()
+	  support for Linux on Pentiums.
 
-        * ace/High_Res_Timer.*: changed scale_factor type from
-          u_long to double so that it can be less than 1.
+	* ace/High_Res_Timer.*: changed scale_factor type from
+	  u_long to double so that it can be less than 1.
 
-        * ace/Thread_Priority.cpp: "linux" instead of "LINUX".
+	* ace/Thread_Priority.cpp: "linux" instead of "LINUX".
 
-        * tests/Priority_Task_Test.cpp (open): set this->priority_ because
-          an assertion uses it.  Also, use ACE_NORMAL_PRIORITY_CLASS so that
-          root doesn't have to run the test on Solaris.
+	* tests/Priority_Task_Test.cpp (open): set this->priority_ because
+	  an assertion uses it.  Also, use ACE_NORMAL_PRIORITY_CLASS so that
+	  root doesn't have to run the test on Solaris.
 
 Sat Feb 22 22:07:35 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * tests/Priority_Task_Test.cpp (open): Now use
-          ACE_Thread_Priority while setting the priority of the new
-          thread.
+	* tests/Priority_Task_Test.cpp (open): Now use
+	  ACE_Thread_Priority while setting the priority of the new
+	  thread.
 
-        * ace/Thread_Priority.cpp (convert_to_os_priority): Changed
-          return type for this to 'int' from 'long' on Linux.  Thanks
-          to James CE Johnson <jjohnson@lads.com> for pointing this
-          out!
+	* ace/Thread_Priority.cpp (convert_to_os_priority): Changed
+	  return type for this to 'int' from 'long' on Linux.  Thanks
+	  to James CE Johnson <jjohnson@lads.com> for pointing this
+	  out!
 
-        * ace/OS.i (thr_cancel): Corrected erroneous macro argument.
-          Thanks to James CE Johnson <jjohnson@lads.com> for pointing
-          this out!
+	* ace/OS.i (thr_cancel): Corrected erroneous macro argument.
+	  Thanks to James CE Johnson <jjohnson@lads.com> for pointing
+	  this out!
 
 Sat Feb 22 17:00:59 1997    <harrison@samba.cs.wustl.edu>
 
-        * ace/OS.i (gethrtime): Added support for intel's RDTSC
-          instruction for pentium architectures.
+	* ace/OS.i (gethrtime): Added support for intel's RDTSC
+	  instruction for pentium architectures.
 
 Sat Feb 22 10:57:47 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Stream.cpp (open): Make sure that if we allocate the Tasks
-          in the Stream head and the Stream tail that we set the M_DELETE
-          flag so that the close() method will clean up the memory.
-          Thanks to David Levine and Purify for noticing this problem.
+	* ace/Stream.cpp (open): Make sure that if we allocate the Tasks
+ 	  in the Stream head and the Stream tail that we set the M_DELETE
+ 	  flag so that the close() method will clean up the memory.
+  	  Thanks to David Levine and Purify for noticing this problem.
 
 Fri Feb 21 08:06:41 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i: Yikes, it looks like the Solaris and the POSIX version
-          of sigwait() are different!  The Solaris version returns the
-          signal number, whereas the POSIX version returns 0 on success,
-          errno on failure, and sets a parameter with the signal on
-          success.  I've fixed the ACE_OS C++ wrapper so that the right
-          thing happens, i.e., errno is always set to the error (if
-          sigwait() returns -1) and the signum is always returned as the
-          argument and the return value on success ...  Thanks to Harry
-          Gunnarsson <hg@carmenta.se> for reporting this.
+	* ace/OS.i: Yikes, it looks like the Solaris and the POSIX version
+ 	  of sigwait() are different!  The Solaris version returns the
+ 	  signal number, whereas the POSIX version returns 0 on success,
+ 	  errno on failure, and sets a parameter with the signal on
+ 	  success.  I've fixed the ACE_OS C++ wrapper so that the right
+ 	  thing happens, i.e., errno is always set to the error (if
+ 	  sigwait() returns -1) and the signum is always returned as the
+ 	  argument and the return value on success ...  Thanks to Harry
+ 	  Gunnarsson <hg@carmenta.se> for reporting this.
 
 Fri Feb 21 11:01:22 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Thread_Priority.cpp: fixed return type of
-          convert_to_os_priority () for Linux.  Thanks to
-          James CE Johnson <jcej@lads.com> for pointing this out.
+	* ace/Thread_Priority.cpp: fixed return type of
+	  convert_to_os_priority () for Linux.  Thanks to
+	  James CE Johnson <jcej@lads.com> for pointing this out.
 
-        * examples/Shared_Malloc/test_malloc.cpp,
-          examples/System_V_IPC/SV_Message_Queues/{T,}MQ_Server.cpp (main):
-          added ACE_UNUSED_ARG (sa);.
+	* examples/Shared_Malloc/test_malloc.cpp,
+	  examples/System_V_IPC/SV_Message_Queues/{T,}MQ_Server.cpp (main):
+	  added ACE_UNUSED_ARG (sa);.
 
 Fri Feb 21 04:12:31 1997    <irfan@TWOSTEP>
 
-        * ace/OS.h: Added ACE_SEH_FINALLY.
+	* ace/OS.h: Added ACE_SEH_FINALLY.
 
-        * ace/ReactorEx.h: Added ACE_ReactorEx_Test as a friend class. I
-          think we should have one such friend class for all classes in
-          ACE.
+	* ace/ReactorEx.h: Added ACE_ReactorEx_Test as a friend class. I
+ 	  think we should have one such friend class for all classes in
+ 	  ACE.
 
-        * examples/Reactor/ReactorEx/test_exceptions.cpp: New test which
-          checks how ReactorEx deals with structured exceptions thrown by
-          user code
+	* examples/Reactor/ReactorEx/test_exceptions.cpp: New test which
+ 	  checks how ReactorEx deals with structured exceptions thrown by
+ 	  user code
 
-        * ace/ReactorEx.cpp (safe_dispatch): Added protection against
-          structured exceptions caused by user code when dispatching
-          handles
+	* ace/ReactorEx.cpp (safe_dispatch): Added protection against
+ 	  structured exceptions caused by user code when dispatching
+ 	  handles
 
 Thu Feb 20 17:32:54 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * apps/Gateway: Added a new -v flag to the peerd and gatewayd
-          applications so that they will print out the strings that are
-          passed to them.  This makes it easier to debug and see what's
-          happening.
+	* apps/Gateway: Added a new -v flag to the peerd and gatewayd
+ 	  applications so that they will print out the strings that are
+ 	  passed to them.  This makes it easier to debug and see what's
+ 	  happening.
 
 Wed Feb 19 19:39:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp (recv): Removed
-          the VERBOSE #ifdefs since they weren't used and were causing
-          compile errors.  Thanks to Bert Craytor
-          <Bert_Craytor@peoplesoft.com> for reporting this.
+	* apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp (recv): Removed
+ 	  the VERBOSE #ifdefs since they weren't used and were causing
+ 	  compile errors.  Thanks to Bert Craytor
+ 	  <Bert_Craytor@peoplesoft.com> for reporting this.
 
 Wed Feb 19 00:39:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * examples/ASX/Event_Server: Updated the README file a bit to
-          clarify some loose ends.  The documentation now explains
-          precisely how to start up the transceivers correctly.  Thanks to
-          Patty Genuald <genualdp@agcs.com> for suggesting this.
+	* examples/ASX/Event_Server: Updated the README file a bit to
+ 	  clarify some loose ends.  The documentation now explains
+ 	  precisely how to start up the transceivers correctly.  Thanks to
+ 	  Patty Genuald <genualdp@agcs.com> for suggesting this.
 
-        * include/makeinclude: Removed the default symlink for
-          platform_macros.GNU since it is "Solaris-biased" ;-).  Thanks to
-          Amos Shapira <amos@dsi.co.il> for reporting this.
+	* include/makeinclude: Removed the default symlink for
+ 	  platform_macros.GNU since it is "Solaris-biased" ;-).  Thanks to
+ 	  Amos Shapira <amos@dsi.co.il> for reporting this.
 
 Wed Feb 19 14:41:18 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/Reactor.cpp: Modified to use timer_queue_->gettimeofday().
+	* ace/Reactor.cpp: Modified to use timer_queue_->gettimeofday().
 
-        * ace/Proactor.cpp: Modified to use timer_queue_->gettimeofday().
+	* ace/Proactor.cpp: Modified to use timer_queue_->gettimeofday().
 
-        * ace/ReactorEx.cpp: Modified to use
-          timer_queue_->gettimeofday().  Also had to modify the
-          ReactorEx_Notify mechanism to use the ReactorEx's timer queue to
-          call gettimeofday.
+	* ace/ReactorEx.cpp: Modified to use
+	  timer_queue_->gettimeofday().  Also had to modify the
+	  ReactorEx_Notify mechanism to use the ReactorEx's timer queue to
+	  call gettimeofday.
 
-        * ace/Timer_Queue.h: Added a gettimeofday method.  This allows
-          applications to replace the timer mechanism used by the
-          Reactors.  The default implementation returns
-          ACE_OS::gettimeofday.  However, a real-time application can
-          inherit from Timer_Queue and override gettimeofday to return a
-          value from a high resolution timer.
+	* ace/Timer_Queue.h: Added a gettimeofday method.  This allows
+	  applications to replace the timer mechanism used by the
+ 	  Reactors.  The default implementation returns
+ 	  ACE_OS::gettimeofday.  However, a real-time application can
+ 	  inherit from Timer_Queue and override gettimeofday to return a
+ 	  value from a high resolution timer.
 
-        * STL/bool.h: Changed the defines for type bool.  First, bool is no
-          longer defined for WIN32 since yvals.h typedefs it already.
-          Also, I moved the defines out the namespace.  I'm not sure if
-          that's the right thing to do.
+	* STL/bool.h: Changed the defines for type bool.  First, bool is no
+	  longer defined for WIN32 since yvals.h typedefs it already.
+  	  Also, I moved the defines out the namespace.  I'm not sure if
+ 	  that's the right thing to do.
 
 Tue Feb 18 16:41:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * include/makeinclude: Added minor enhancements to rules.local.GNU
-          and wrapper_macros.GNU so that it works with MVS.  Thanks to
-          Chuck Gehr <gehr@sweng.stortek.com> for this.
+	* include/makeinclude: Added minor enhancements to rules.local.GNU
+ 	  and wrapper_macros.GNU so that it works with MVS.  Thanks to
+ 	  Chuck Gehr <gehr@sweng.stortek.com> for this.
 
-        * include/makeinclude: Added a new platform_mvs.GNU file that
-          supports builds on MVS!  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for this.
+	* include/makeinclude: Added a new platform_mvs.GNU file that
+ 	  supports builds on MVS!  Thanks to Chuck Gehr
+ 	  <gehr@sweng.stortek.com> for this.
 
-        * tests/TSS_Test.cpp (worker): To get TSS_Test.cpp to compile on
-          MVS we changed line 69 from:
+	* tests/TSS_Test.cpp (worker): To get TSS_Test.cpp to compile on
+	  MVS we changed line 69 from:
 
-          ACE_thread_key_t key = 0;
+	  ACE_thread_key_t key = 0;
  
           to:
  
@@ -7074,1695 +7074,1695 @@ Tue Feb 18 16:41:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
  
           key = ACE_OS::NULL_key;
 
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
+ 	  this.
 
-        * ace/Reactor.cpp (dispatch): Fixed the dispatching logic so that
-          we bail out as soon as we discover that our state has changed.
-          Thus, we'll recompute the fd_sets used for select().
+	* ace/Reactor.cpp (dispatch): Fixed the dispatching logic so that
+ 	  we bail out as soon as we discover that our state has changed.
+  	  Thus, we'll recompute the fd_sets used for select().
 
 Tue Feb 18 19:02:53 1997    <irfan@cha-cha.cs.wustl.edu>
 
-        * ace/ReactorEx: 
+	* ace/ReactorEx: 
 
-        (a) Made wakeup_all_threads() public. Thanks to Hamutal Yanay
-            <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
+	(a) Made wakeup_all_threads() public. Thanks to Hamutal Yanay
+ 	    <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
 
-        (b) Change closed_for_business_ to open_for_business_. Also made
-            sure that open and close can potentially be called multiple
-            times from multiple threads.
+	(b) Change closed_for_business_ to open_for_business_. Also made
+ 	    sure that open and close can potentially be called multiple
+ 	    times from multiple threads.
 
-        (c) Changed unbind and unbind_all such that they iterate through
-            all the handles.
+	(c) Changed unbind and unbind_all such that they iterate through
+ 	    all the handles.
 
-        (d) Added a check to see if the handle has been scheduled for
-            deletion before dispatching it.
+	(d) Added a check to see if the handle has been scheduled for
+ 	    deletion before dispatching it.
 
 Tue Feb 18 21:24:57 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/IOStream.h,README: replaced ACE_WIN32 conditional with
-          ACE_LACKS_IOSTREAM_FX.
+	* ace/IOStream.h,README: replaced ACE_WIN32 conditional with
+	  ACE_LACKS_IOSTREAM_FX.
 
-        * ace/config-{mvs,win*}.h: added #define ACE_LACKS_IOSTREAM_FX.
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for pointing
-          out the need for this support for MVS.
+	* ace/config-{mvs,win*}.h: added #define ACE_LACKS_IOSTREAM_FX.
+	  Thanks to Chuck Gehr <gehr@sweng.stortek.com> for pointing
+	  out the need for this support for MVS.
 
-        * examples/Reactor/Misc/test_demuxing.cpp: removed unused
-          variable "done".
+	* examples/Reactor/Misc/test_demuxing.cpp: removed unused
+	  variable "done".
 
-        * examples/Reactor/Misc/test_signals_1.cpp (main),
-          examples/Reactor/Ntalker/ntalker.cpp (main):
-          added ACE_UNUSED_ARG (sig);.
+	* examples/Reactor/Misc/test_signals_1.cpp (main),
+	  examples/Reactor/Ntalker/ntalker.cpp (main):
+	  added ACE_UNUSED_ARG (sig);.
 
 Tue Feb 18 17:15:24 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/ace.mdp, ace/mak: Modified release configuration to build
-          acer.dll.
+	* ace/ace.mdp, ace/mak: Modified release configuration to build
+	  acer.dll.
 
 Tue Feb 18 11:43:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Log_Msg.cpp: removed destructor because it's not declared
-          and it's empty.
+	* ace/Log_Msg.cpp: removed destructor because it's not declared
+	  and it's empty.
 
-        * ace/OS.i (thr_setprio): added another case (that is NOTSUP)
-          for platforms with Pthreads and with LACK_SETSCHED.  Thanks to
-          Chuck Gehr <gehr@sweng.stortek.com> for pointing this out.
+	* ace/OS.i (thr_setprio): added another case (that is NOTSUP)
+	  for platforms with Pthreads and with LACK_SETSCHED.  Thanks to
+	  Chuck Gehr <gehr@sweng.stortek.com> for pointing this out.
 
-        * tests/Reactor_Notify_Test.cpp (main): added shutdown flag so
-          that normal termination reaches ACE_END_TEST.
+	* tests/Reactor_Notify_Test.cpp (main): added shutdown flag so
+	  that normal termination reaches ACE_END_TEST.
 
-        * tests/Reactors_Test.cpp (worker): changed "timeout" message to
-          "Reactor shutdown" because that indicates normal termination,
-           and won't fool the one-button test.
+	* tests/Reactors_Test.cpp (worker): changed "timeout" message to
+	  "Reactor shutdown" because that indicates normal termination,
+	   and won't fool the one-button test.
 
-        * examples/Mem_Map/IO-tests/test_io.cpp (main): added
+	* examples/Mem_Map/IO-tests/test_io.cpp (main): added
           ACE_UNUSED_ARG (sa);.
 
-        * examples/Misc/test_trace.cpp (main): added ACE_UNUSED_ARG
+	* examples/Misc/test_trace.cpp (main): added ACE_UNUSED_ARG
           for sig1 and sig2.
 
 Tue Feb 18 03:50:10 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/ReactorEx: 
+	* ace/ReactorEx: 
 
-          (a) Added a closed_for_business_ flag so that handle_events()
-              cannot be called after the ReactorEx has been closed down.
+	  (a) Added a closed_for_business_ flag so that handle_events()
+ 	      cannot be called after the ReactorEx has been closed down.
 
-          (b) Transfer of ownership of the ReactorEx to a new owner has
-              changed. The transfer will not complete until all threads
-              are ready for it (just like the handle set).
-              ReactorEx->update_state() now looks out for changes in
-              ownership.
+	  (b) Transfer of ownership of the ReactorEx to a new owner has
+ 	      changed. The transfer will not complete until all threads
+ 	      are ready for it (just like the handle set).
+  	      ReactorEx->update_state() now looks out for changes in
+ 	      ownership.
 
-        * examples/Reactor/ReactorEx/test_MT.cpp:
-          
-          (a) The test now terminates and number of iterations can be
-              specified on the command line.
-              
-          (b) Graceful shutdown of ReactorEx is now exercised in the
-              test. This is a change for the earlier infinite loop. This
-              also shows how to gracefully close ReactorEx which is being
-              shared by multiple threads.
+	* examples/Reactor/ReactorEx/test_MT.cpp:
+	  
+	  (a) The test now terminates and number of iterations can be
+	      specified on the command line.
+	      
+	  (b) Graceful shutdown of ReactorEx is now exercised in the
+ 	      test. This is a change for the earlier infinite loop. This
+ 	      also shows how to gracefully close ReactorEx which is being
+	      shared by multiple threads.
 
-          (c) Timers were added to the test.
+	  (c) Timers were added to the test.
 
-        * ace/config{win32}: Added flag ACE_LACKS_LINEBUFFERED_STREAMBUF.
+	* ace/config{win32}: Added flag ACE_LACKS_LINEBUFFERED_STREAMBUF.
 
 Mon Feb 17 22:37:35 1997  Tim H. Harrison  <harrison@lambada.cs.wustl.edu>
 
-        * ace/Log_Msg.h (ACE_RETURN): Modified all ACE_RETURN macros to
-          use ACE_OS::last_error instead of errno.  This makes these more
-          portable to Win32.
+	* ace/Log_Msg.h (ACE_RETURN): Modified all ACE_RETURN macros to
+	  use ACE_OS::last_error instead of errno.  This makes these more
+	  portable to Win32.
 
-        * ace/Log_Msg.cpp (log): Modified Win32 version to use
-          FormatMessage if errnum is greater than sys_nerr.
+	* ace/Log_Msg.cpp (log): Modified Win32 version to use
+	  FormatMessage if errnum is greater than sys_nerr.
 
-        * ace/OS.i (last_error): Modified Win32 version to return
-          GetLastError if errno == 0.
+	* ace/OS.i (last_error): Modified Win32 version to return
+	  GetLastError if errno == 0.
 
 Mon Feb 17 18:32:29 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it
-          won't conflict with an existing macro in AIX.  Thanks to Chris
-          Lahey <CLahey@cccis.com> for this.
+	* ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it
+ 	  won't conflict with an existing macro in AIX.  Thanks to Chris
+ 	  Lahey <CLahey@cccis.com> for this.
 
-        * ace/Local_Name_Space_T.h: Added Local_Name_Space.h to
-          Local_Name_Space_T.h so that templates will work correctly on
-          AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for this.
+	* ace/Local_Name_Space_T.h: Added Local_Name_Space.h to
+ 	  Local_Name_Space_T.h so that templates will work correctly on
+ 	  AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for this.
 
-        * tests: Added a new test, Reactor_Notify_Test.cpp, which tests
-          out the new max_notify_iterations() method on the Reactor.
+	* tests: Added a new test, Reactor_Notify_Test.cpp, which tests
+ 	  out the new max_notify_iterations() method on the Reactor.
 
-        * ace/Reactor: Finished rewriting and testing the new dispatching
-          logic of the Reactor.  The new implementation guards against
-          pathological cases where ACE_Event_Handler::handle_*() methods
-          remove registered ACE_Event_Handler objects whose handles are
-          pending in the dispatch_set.  Previously there was no good way
-          to guard against this.  Now, it should be handled automatically.
+	* ace/Reactor: Finished rewriting and testing the new dispatching
+ 	  logic of the Reactor.  The new implementation guards against
+ 	  pathological cases where ACE_Event_Handler::handle_*() methods
+ 	  remove registered ACE_Event_Handler objects whose handles are
+ 	  pending in the dispatch_set.  Previously there was no good way
+ 	  to guard against this.  Now, it should be handled automatically.
 
-        * ace: Added many minor fixes to remove warnings with the SGI C++
-          compiler.  Thanks to Gonzalo Diethelm <gonzo@ing.puc.cl> for
-          suggesting this.
+	* ace: Added many minor fixes to remove warnings with the SGI C++
+ 	  compiler.  Thanks to Gonzalo Diethelm <gonzo@ing.puc.cl> for
+ 	  suggesting this.
 
-        * include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on all
-          the warnings for the SGI C++ compiler.  Thanks to Gonzalo
-          Diethelm <gonzo@ing.puc.cl> for suggesting this.
+	* include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on all
+ 	  the warnings for the SGI C++ compiler.  Thanks to Gonzalo
+ 	  Diethelm <gonzo@ing.puc.cl> for suggesting this.
 
 Mon Feb 17 20:59:47 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/IOStream.h: added null ipfx (), etc., methods for ACE_WIN32
-          because its iostream class doesn't have them.
+	* ace/IOStream.h: added null ipfx (), etc., methods for ACE_WIN32
+	  because its iostream class doesn't have them.
 
-        * ace/OS.h: added #include of <netinet/tcp.h> on VxWorks.
+ 	* ace/OS.h: added #include of <netinet/tcp.h> on VxWorks.
 
-        * ace/Pipe.cpp (open): enabled TCP_NODELAY on VxWorks now that
-          OS.h #includes <netinet/tcp.h>.
+	* ace/Pipe.cpp (open): enabled TCP_NODELAY on VxWorks now that
+	  OS.h #includes <netinet/tcp.h>.
 
-        * ace/ReactorEx.h: made ACE_ReactorEx_Handler_Repository destructor
-          virtual because the class has other virtual functions.
+	* ace/ReactorEx.h: made ACE_ReactorEx_Handler_Repository destructor
+	  virtual because the class has other virtual functions.
 
-        * tests/IOStream_Test.cpp: removed ACE_WIN32 #ifndef, and
-          removed q_char bool conversion operator because it shouldn't
-          be needed.
+	* tests/IOStream_Test.cpp: removed ACE_WIN32 #ifndef, and
+	  removed q_char bool conversion operator because it shouldn't
+	  be needed.
 
-        * examples/Reactor/Misc/pingpong.cpp (handle_input): cast buf_len
-          to ssize_t to avoid signed/unsigned comparison.
+	* examples/Reactor/Misc/pingpong.cpp (handle_input): cast buf_len
+	  to ssize_t to avoid signed/unsigned comparison.
 
-        * examples/Service_Configurator/IPC-tests/client/\
-          remote_dgram_client_test.cpp (main): cast mmap.size () to
-          ssize_t to avoid signed/unsigned comparison.
+	* examples/Service_Configurator/IPC-tests/client/\
+	  remote_dgram_client_test.cpp (main): cast mmap.size () to
+	  ssize_t to avoid signed/unsigned comparison.
 
 Mon Feb 17 09:25:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/config-linux-lxpthreads.h: Bumped the Linux kernel version
-        number assigned to the symbol LINUX.  Also added conditional
-        defines for PTHREAD_{MAX,MIN}_PRIORITY when using Xavier Leroy's
-        LinuxThreads.
+	* ace/config-linux-lxpthreads.h: Bumped the Linux kernel version
+ 	number assigned to the symbol LINUX.  Also added conditional
+ 	defines for PTHREAD_{MAX,MIN}_PRIORITY when using Xavier Leroy's
+ 	LinuxThreads.
 
-        * ace/Thread_Priority.cpp: Added convert_to_os_priority() for Linux.
-        
+	* ace/Thread_Priority.cpp: Added convert_to_os_priority() for Linux.
+	
 Mon Feb 17 03:15:48 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * tests/SOCK_Test.cpp (server): Changed recv_n() to recv().
+	* tests/SOCK_Test.cpp (server): Changed recv_n() to recv().
 
-        * tests/tests.{mak,mdp}: Added two new tests: IOStream and
-          Reactor_Notify.
+	* tests/tests.{mak,mdp}: Added two new tests: IOStream and
+	  Reactor_Notify.
 
-        * ace/Reactor: Removed all special checks for setting
-          ACE_Reactor::max_notify_iterations_ on WIN32 to be 1.  This was
-          made possible after we figured out that the errno was being
-          reset after the recv() call in handle_input().  This allows
-          ACE_Reactor_Notify::handle_input() to serve upto
-          ACE_Reactor::max_notify_iterations_ notifications in one shot
-          rather than just 1 on WIN32. This should speed up the Reactor on
-          WIN32 platforms.
-        
+	* ace/Reactor: Removed all special checks for setting
+ 	  ACE_Reactor::max_notify_iterations_ on WIN32 to be 1.  This was
+ 	  made possible after we figured out that the errno was being
+ 	  reset after the recv() call in handle_input().  This allows
+ 	  ACE_Reactor_Notify::handle_input() to serve upto
+ 	  ACE_Reactor::max_notify_iterations_ notifications in one shot
+ 	  rather than just 1 on WIN32. This should speed up the Reactor on
+ 	  WIN32 platforms.
+	
 Sun Feb 16 12:23:23 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Reactor.cpp: Totally rewrote the ACE_Reactor's dispatching
-          mechanism so that it now keeps track of whether the state of the
-          wait_set_ has changed during a dispatch (i.e., whenever
-          register_handler_i() or remove_handler_i() is called).  If the
-          wait_set_ state *has* changed, then we bail out and rerun
-          select() in order to get the latest changes.
-
-        * ace/Reactor.cpp: Changed the implementation of the
-          ACE_Reactor_Notify class so that (1) it short-circuits a trip
-          through the ACE_Reactor::notify_handle() method (after all, it's
-          just going to call its own handle_input() method back) and (2)
-          the ACE_Reactor_Notify::handle_input() method now returns a
-          count of the number of handlers that it dispatched.
-
-        * ace/Log_Msg.h: Added a (%P|%t) so that we now print out the
-          process id and thread number for failed ACE_ASSERT() calls.
-
-        * tests: Removed the unnecessary template specializations of
-          ACE_Atomic_Op<ACE_Thread_Mutex, int> since this is already done
-          in libACE.
-
-        * ace/Reactor.cpp: Removed the #ifdef preventing the enabling of
-          non-blocking mode for the recv() side of the Reactor's
-          notification pipe (socket) for Win32.  I believe that with the
-          new max_notify_iterations scheme we should be all set.
-
-        * ace/ReactorEx.cpp: Added an identical API for bounding the
-          max_notify_iterations() for ReactorEx.
-
-        * ace/Reactor.cpp: Enhanced the Reactor's notify() mechanism so
-          that it is now possible to set the max_notify_iterations(),
-          which limits the number of times that the
-          ACE_Reactor_Notify::handle_input() method will iterate and
-          dispatch the ACE_Event_Handlers that are passed in via the
-          notify pipe before breaking out of its recv() loop.  This is
-          necessary to keep from starving out other Event_Handlers.
-          Thanks to Rod Skinner <rods@in.ot.com.au> for pointing out the
-          need for this.
-
-        * ace/Reactor.cpp: Fixed a bug in the WIN32
-          ACE_Reactor_Notify::handle_input() logic.  We were calling
-          requeue_position(0) when we should have been calling renew().
+	* ace/Reactor.cpp: Totally rewrote the ACE_Reactor's dispatching
+ 	  mechanism so that it now keeps track of whether the state of the
+ 	  wait_set_ has changed during a dispatch (i.e., whenever
+ 	  register_handler_i() or remove_handler_i() is called).  If the
+ 	  wait_set_ state *has* changed, then we bail out and rerun
+ 	  select() in order to get the latest changes.
+
+	* ace/Reactor.cpp: Changed the implementation of the
+ 	  ACE_Reactor_Notify class so that (1) it short-circuits a trip
+ 	  through the ACE_Reactor::notify_handle() method (after all, it's
+ 	  just going to call its own handle_input() method back) and (2)
+ 	  the ACE_Reactor_Notify::handle_input() method now returns a
+ 	  count of the number of handlers that it dispatched.
+
+	* ace/Log_Msg.h: Added a (%P|%t) so that we now print out the
+ 	  process id and thread number for failed ACE_ASSERT() calls.
+
+	* tests: Removed the unnecessary template specializations of
+ 	  ACE_Atomic_Op<ACE_Thread_Mutex, int> since this is already done
+ 	  in libACE.
+
+	* ace/Reactor.cpp: Removed the #ifdef preventing the enabling of
+ 	  non-blocking mode for the recv() side of the Reactor's
+ 	  notification pipe (socket) for Win32.  I believe that with the
+ 	  new max_notify_iterations scheme we should be all set.
+
+	* ace/ReactorEx.cpp: Added an identical API for bounding the
+ 	  max_notify_iterations() for ReactorEx.
+
+	* ace/Reactor.cpp: Enhanced the Reactor's notify() mechanism so
+ 	  that it is now possible to set the max_notify_iterations(),
+ 	  which limits the number of times that the
+ 	  ACE_Reactor_Notify::handle_input() method will iterate and
+ 	  dispatch the ACE_Event_Handlers that are passed in via the
+ 	  notify pipe before breaking out of its recv() loop.  This is
+ 	  necessary to keep from starving out other Event_Handlers.
+  	  Thanks to Rod Skinner <rods@in.ot.com.au> for pointing out the
+ 	  need for this.
+
+	* ace/Reactor.cpp: Fixed a bug in the WIN32
+ 	  ACE_Reactor_Notify::handle_input() logic.  We were calling
+ 	  requeue_position(0) when we should have been calling renew().
 
 Sat Feb 15 11:46:39 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/ACE.cpp: It appears that VxWorks doesn't support fcntl().
-          However, it does seem to support ioctl().  Therefore, that's how
-          we'll set the descriptors into non-blocking mode.  Thanks to
-          Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting this.
+	* ace/ACE.cpp: It appears that VxWorks doesn't support fcntl().
+  	  However, it does seem to support ioctl().  Therefore, that's how
+ 	  we'll set the descriptors into non-blocking mode.  Thanks to
+ 	  Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> for reporting this.
 
-        * ace/SOCK_Stream.h: Corrected the documentation for
-          ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags, const
-          ACE_Time_Value *timeout).  Thanks to Paul Roman
-          <proman@npac.syr.edu> for reporting this.
+	* ace/SOCK_Stream.h: Corrected the documentation for
+ 	  ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags, const
+ 	  ACE_Time_Value *timeout).  Thanks to Paul Roman
+ 	  <proman@npac.syr.edu> for reporting this.
 
-        * ace/SOCK_Stream.i (recv_n): Fixed a minor bug in the
-          SOCK_Stream.i line 38: 
+	* ace/SOCK_Stream.i (recv_n): Fixed a minor bug in the
+	  SOCK_Stream.i line 38: 
 
-          ACE_TRACE ("ACE_SOCK_Stream::send_n");
+	  ACE_TRACE ("ACE_SOCK_Stream::send_n");
 
-          should be
+	  should be
 
-          ACE_TRACE ("ACE_SOCK_Stream::recv_n");
+	  ACE_TRACE ("ACE_SOCK_Stream::recv_n");
 
-          Thanks to Paul Roman <proman@npac.syr.edu> for reporting this.
+	  Thanks to Paul Roman <proman@npac.syr.edu> for reporting this.
 
 Fri Feb 14 00:40:14 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/TTY_IO.cpp (control): Moved the drop out timer value from
-          the ACE struct to the WinNT struct.  Thanks to Brad Flood
-          <BFLOOD@tcs.lmco.com> for this fix.
+	* ace/TTY_IO.cpp (control): Moved the drop out timer value from
+ 	  the ACE struct to the WinNT struct.  Thanks to Brad Flood
+ 	  <BFLOOD@tcs.lmco.com> for this fix.
 
 Thu Feb 13 21:24:17 1997    <irfan@cha-cha.cs.wustl.edu>
 
-        * ace/OS.i (event_wait): Fixed the missing check for success.
+	* ace/OS.i (event_wait): Fixed the missing check for success.
 
-        * ace/Synch: Fixed problems with multiple removal of
-          resources. Thanks to Bert (Bcraytor@aol.com) for pointing this
-          out.
+	* ace/Synch: Fixed problems with multiple removal of
+ 	  resources. Thanks to Bert (Bcraytor@aol.com) for pointing this
+ 	  out.
 
-        * examples/Threads/test.{mdp,mak}: Reorganized project so that it
-          is easier to use. 
+	* examples/Threads/test.{mdp,mak}: Reorganized project so that it
+	  is easier to use. 
 
-        * examples/Threads: Small changes to make tests run faster.     
+	* examples/Threads: Small changes to make tests run faster.	
 
 Thu Feb 13 01:49:38 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/OS.i (stat): Added stat() to ACE_OS.
+	* ace/OS.i (stat): Added stat() to ACE_OS.
 
-        * apps/jaws: The ACE web server has now been ported to Win32. 
+	* apps/jaws: The ACE web server has now been ported to Win32. 
 
-        * ace/ReactorEx: Add a new version of remove_handler().
+	* ace/ReactorEx: Add a new version of remove_handler().
 
-        * examples/Reactor/ReactorEx/test_MT.cpp: Fixed stuff so that only
-          <concurrent_threads> are activated.
+	* examples/Reactor/ReactorEx/test_MT.cpp: Fixed stuff so that only
+ 	  <concurrent_threads> are activated.
 
 Wed Feb 12 22:58:15 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/ReactorEx: Made minor changes to the ReactorEx.
+	* ace/ReactorEx: Made minor changes to the ReactorEx.
 
-        * examples/Reactor/ReactorEx/test_MT.cpp: Updated Irfan's new
-          ReactorEx test to use ACE_Tasks.
+	* examples/Reactor/ReactorEx/test_MT.cpp: Updated Irfan's new
+ 	  ReactorEx test to use ACE_Tasks.
 
 Wed Feb 12 00:08:42 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/ReactorEx: Finished a complete rewrite of
-          ReactorEx.  The new version allows multiple threads of
-          control to wait simultaneously in
-          ::WaitForMultipleObjects(). This was difficult because the 
-          set of ACE_HANDLEs used in ReactorEx->handle_events() is 
-          shared between all threads.  We devised a clever protocol
-          that ensures all changes to the handle set are
-          serialized. This serialization was achieved by using
-          multiple (auto and manual) events and mutexes and by taking
-          advantage of the "waitAll" semantics of
-          WaitForMultipleObjects().
-
-          Concept of "owner" thread is introduced in ReactorEx.  We
-          need to keep track of the "owner" because we don't want
-          multiple threads to try to expire timers. Therefore the
-          "owner" thread is the only one allowed to expire
-          timers. Also, the owner thread is the only thread which
-          waits on the internal notify handle (which is used to
-          dispatch explicit calls to
-          ACE_ReactorEx::notify(). Initially, the creator thread of
-          ReactorEx becomes the "owner" thread. Ownership can later be
-          transferred among threads, just as with the standard
-          ACE_Reactor.
-
-          We also updated the Handler Repository since it now
-          keeps track of <handle, event_handler> tuples to be added
-          and deleted from the current handle set at the appropriate
-          time (i.e., when all threads are out of
-          WaitForMultipleObjects() and have completed all necessary
-          dispatching).  The Handler_Repository implements the update
-          protocol that is used to serialize changes to its internal
-          state.
-        
-          Two slots were added to the <size> parameter in the
-          constructor and open methods of ReactorEx that will store
-          handles used for internal management. Therefore, users can add
-          upto MAXIMUM_WAIT_OBJECTS - 2 handles into ReactorEx.  On
-          current WinNT platforms (e.g., 3.51 and 4.0)
-          MAXIMUM_WAIT_OBJECTS is 64.
-
-          Note that the interface to ReactorEx did not change in this
-          process. Your existing code should work without changes.
-          Moreover, we've optimized the implementation so that if only
-          1 thread calls ACE_ReactorEx::handle_events() the code is
-          very efficient.  Moreover, you can dynamically add or remove
-          threads without having to register them with the ReactorEx.
-
-        * examples/Reactor/ReactorEx/test_MT.cpp: This application tests
-          multiple threads simultaneously calling
-          ReactorEx->handle_events(). It also shows how different threads
-          can update the state of ReactorEx.
+	* ace/ReactorEx: Finished a complete rewrite of
+	  ReactorEx.  The new version allows multiple threads of
+	  control to wait simultaneously in
+	  ::WaitForMultipleObjects(). This was difficult because the 
+ 	  set of ACE_HANDLEs used in ReactorEx->handle_events() is 
+	  shared between all threads.  We devised a clever protocol
+	  that ensures all changes to the handle set are
+	  serialized. This serialization was achieved by using
+	  multiple (auto and manual) events and mutexes and by taking
+	  advantage of the "waitAll" semantics of
+	  WaitForMultipleObjects().
+
+	  Concept of "owner" thread is introduced in ReactorEx.  We
+	  need to keep track of the "owner" because we don't want
+	  multiple threads to try to expire timers. Therefore the
+	  "owner" thread is the only one allowed to expire
+	  timers. Also, the owner thread is the only thread which
+	  waits on the internal notify handle (which is used to
+	  dispatch explicit calls to
+	  ACE_ReactorEx::notify(). Initially, the creator thread of
+	  ReactorEx becomes the "owner" thread. Ownership can later be
+	  transferred among threads, just as with the standard
+	  ACE_Reactor.
+
+	  We also updated the Handler Repository since it now
+ 	  keeps track of <handle, event_handler> tuples to be added
+	  and deleted from the current handle set at the appropriate
+	  time (i.e., when all threads are out of
+	  WaitForMultipleObjects() and have completed all necessary
+	  dispatching).  The Handler_Repository implements the update
+	  protocol that is used to serialize changes to its internal
+	  state.
+	
+	  Two slots were added to the <size> parameter in the
+ 	  constructor and open methods of ReactorEx that will store
+ 	  handles used for internal management. Therefore, users can add
+ 	  upto MAXIMUM_WAIT_OBJECTS - 2 handles into ReactorEx.  On
+	  current WinNT platforms (e.g., 3.51 and 4.0)
+	  MAXIMUM_WAIT_OBJECTS is 64.
+
+	  Note that the interface to ReactorEx did not change in this
+ 	  process. Your existing code should work without changes.
+	  Moreover, we've optimized the implementation so that if only
+	  1 thread calls ACE_ReactorEx::handle_events() the code is
+	  very efficient.  Moreover, you can dynamically add or remove
+	  threads without having to register them with the ReactorEx.
+
+	* examples/Reactor/ReactorEx/test_MT.cpp: This application tests
+ 	  multiple threads simultaneously calling
+ 	  ReactorEx->handle_events(). It also shows how different threads
+ 	  can update the state of ReactorEx.
 
 Wed Feb 12 00:08:42 1997  Douglas C. Schmidt  <schmidt@polka.cs.wustl.edu>
 
-        * ace/Synch: Added a remove() call to ~ACE_Thread_Mutex so that it
-          will be removed (and resources cleaned up) automatically when an
-          ACE_Thread_Mutex object goes out of scope.  Thanks to Jay
-          Denkberg <jay_denkberg@mail.icomverse.com> for reporting this.
+	* ace/Synch: Added a remove() call to ~ACE_Thread_Mutex so that it
+ 	  will be removed (and resources cleaned up) automatically when an
+ 	  ACE_Thread_Mutex object goes out of scope.  Thanks to Jay
+ 	  Denkberg <jay_denkberg@mail.icomverse.com> for reporting this.
 
-        * ace: Added a new config file (config-irix6.2-sgic++-nothreads.h)
-          that works for non-Pthread versions of SGI 6.2.  Thanks to Fred
-          LaBar <flabar@fallschurch.esys.com> for this.
+	* ace: Added a new config file (config-irix6.2-sgic++-nothreads.h)
+ 	  that works for non-Pthread versions of SGI 6.2.  Thanks to Fred
+ 	  LaBar <flabar@fallschurch.esys.com> for this.
 
-        * ace/XtReactor: Fixed a bunch of minor bugs that crept into the
-          ACE_XtReactor.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for reporting this.
+	* ace/XtReactor: Fixed a bunch of minor bugs that crept into the
+ 	  ACE_XtReactor.  Thanks to Fred LaBar
+ 	  <flabar@fallschurch.esys.com> for reporting this.
 
-        * ace/OS.i (thr_getprio): Fixed a typo in the #ifdefs so that we
-          return ACE_NOTSUP_RETURN(-1) if threading isn't enabled.  Thanks
-          to Fred LaBar <flabar@fallschurch.esys.com> for reporting this.
+	* ace/OS.i (thr_getprio): Fixed a typo in the #ifdefs so that we
+ 	  return ACE_NOTSUP_RETURN(-1) if threading isn't enabled.  Thanks
+ 	  to Fred LaBar <flabar@fallschurch.esys.com> for reporting this.
 
 Tue Feb 11 11:26:03 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,i},config-vxworks*.h,README: added ACE_HAS_CLOCK_GETTIME,
-          and only support ACE_OS::clock_gettime if that's defined.
-          It can be supported on Solaris 2.5, but -lposix4 is then required.
+	* ace/OS.{h,i},config-vxworks*.h,README: added ACE_HAS_CLOCK_GETTIME,
+	  and only support ACE_OS::clock_gettime if that's defined.
+	  It can be supported on Solaris 2.5, but -lposix4 is then required.
 
-        * ace/Thread_Priority.*: added increment () and decrement ()
-          operations.
+	* ace/Thread_Priority.*: added increment () and decrement ()
+	  operations.
 
-        * include/makeinclude/platform_sunos5_sunc++_4.1.GNU:
-          added -pta back to avoid link problems with template classes
-          that have virtual functions that are all inline, if inlining
-          is disabled.  Though we don't see the problem, other 4.1 users do.
-          Thanks to mscallinan@CCGATE.HAC.COM for reporting this.
+	* include/makeinclude/platform_sunos5_sunc++_4.1.GNU:
+	  added -pta back to avoid link problems with template classes
+	  that have virtual functions that are all inline, if inlining
+	  is disabled.  Though we don't see the problem, other 4.1 users do.
+	  Thanks to mscallinan@CCGATE.HAC.COM for reporting this.
 
-        * examples/Logger/simple-server/Logging_Handler.cpp (handle_input):
-          cast "len" to ssize_t to prevent mixed signed/unsigned comparison.
+	* examples/Logger/simple-server/Logging_Handler.cpp (handle_input):
+	  cast "len" to ssize_t to prevent mixed signed/unsigned comparison.
 
-        * examples/Logger/simple-server/server_loggerd.cpp (main):
-          added ACE_UNUSED_ARG (sa);.
+	* examples/Logger/simple-server/server_loggerd.cpp (main):
+	  added ACE_UNUSED_ARG (sa);.
 
-        * examples/Reactor/Misc/notification.cpp (Thread_Handler ctor):
-          changed type of n_threads argument from int to size_t to avoid
-          signed/unsigned comparison.
+	* examples/Reactor/Misc/notification.cpp (Thread_Handler ctor):
+	  changed type of n_threads argument from int to size_t to avoid
+	  signed/unsigned comparison.
 
 Mon Feb 10 15:27:02 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Timer_Queue: Added a virtual destructor so that subclasses
-          deleted via ACE_Timer_Queue *'s will call the right destructor.
-          Thanks to Stuart Powell <stuartp@in.ot.com.au> for reporting
-          this.
+	* ace/Timer_Queue: Added a virtual destructor so that subclasses
+ 	  deleted via ACE_Timer_Queue *'s will call the right destructor.
+  	  Thanks to Stuart Powell <stuartp@in.ot.com.au> for reporting
+ 	  this.
 
-        * ace/Timer_Heap.cpp: Added support for automatically growing
-          ACE_Timer_Heaps.  This allows heaps to grow automatically as new
-          ACE_Event_Handlers are added dynamically.  Thanks to Stuart
-          Powell <stuartp@in.ot.com.au> for this enhancement.
+	* ace/Timer_Heap.cpp: Added support for automatically growing
+ 	  ACE_Timer_Heaps.  This allows heaps to grow automatically as new
+ 	  ACE_Event_Handlers are added dynamically.  Thanks to Stuart
+ 	  Powell <stuartp@in.ot.com.au> for this enhancement.
 
-        * ace/Memory_Pool: Added support that allows flags to be passed in
-          to the MMAP_Memory_Pool.  This can be used to set the
-          appropriate type of backing store semantics (e.g., MAP_PRIVATE
-          and MAP_SHARED).  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for providing this.
+	* ace/Memory_Pool: Added support that allows flags to be passed in
+ 	  to the MMAP_Memory_Pool.  This can be used to set the
+ 	  appropriate type of backing store semantics (e.g., MAP_PRIVATE
+ 	  and MAP_SHARED).  Thanks to Fred LaBar
+ 	  <flabar@fallschurch.esys.com> for providing this.
 
 Sun Feb  9 11:56:37 1997  Douglas C. Schmidt  <schmidt@polka.cs.wustl.edu>
 
-        * ace/Map_Manager.cpp (bind_i): A recent change to Map_Manager
-          broke the Connector since errno was getting set to ENOENT rather
-          than EWOULDBLOCK.  Thanks to Mark Rabotnikov
-          <mark@usp.elscintcorp.co.il> for finding this.
+	* ace/Map_Manager.cpp (bind_i): A recent change to Map_Manager
+ 	  broke the Connector since errno was getting set to ENOENT rather
+ 	  than EWOULDBLOCK.  Thanks to Mark Rabotnikov
+ 	  <mark@usp.elscintcorp.co.il> for finding this.
 
 Sun Feb 09 21:44:34 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/ACE.{h,cpp}: added static u_long is_prime ().
+	* ace/ACE.{h,cpp}: added static u_long is_prime ().
 
-        * ace/{OS.cpp,Thread_Priority.cpp}: added comment about thread
-          priorities only being tested for 1003.1C version of Pthreads.
-          Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
-          for suggesting this.
+	* ace/{OS.cpp,Thread_Priority.cpp}: added comment about thread
+	  priorities only being tested for 1003.1C version of Pthreads.
+	  Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de>
+	  for suggesting this.
 
-        * ace/OS.{h,i}: added ACE_OS::clock_gettime ().  It allows
-          applications to get high-resolution time on POSIX systems.
+	* ace/OS.{h,i}: added ACE_OS::clock_gettime ().  It allows
+	  applications to get high-resolution time on POSIX systems.
 
-        * ace/Future.cpp (dump): cast ref_count_ to an int because
-          g++ doesn't figure it out (it's an ACE_Atomic_Op<ACE_Thread_Mutex,
-          int>, which does have an int conversion operator).
+	* ace/Future.cpp (dump): cast ref_count_ to an int because
+	  g++ doesn't figure it out (it's an ACE_Atomic_Op<ACE_Thread_Mutex,
+	  int>, which does have an int conversion operator).
 
-        * ace/Timer_List.cpp (constructor): added initializer for
-          timer_id_ to prevent unitialized memory read report from Purify.
+	* ace/Timer_List.cpp (constructor): added initializer for
+	  timer_id_ to prevent unitialized memory read report from Purify.
 
-        * tests/IOStream_Test.cpp,Makefile: added IOStream_Test,
-          complements of James CE Johnson <jcej@lads.com>.  Very cool!
+	* tests/IOStream_Test.cpp,Makefile: added IOStream_Test,
+	  complements of James CE Johnson <jcej@lads.com>.  Very cool!
 
-        * tests/Future_Test.cpp: replaced call to ::sin ()
-          with one to ACE::is_prime () to remove dependency on libm.
+	* tests/Future_Test.cpp: replaced call to ::sin ()
+	  with one to ACE::is_prime () to remove dependency on libm.
 
-        * examples/IPC_SAP/UPIPE_SAP/ex1.cpp (peer1, peer2): removed
-          unused variables c_addr and serv_addr: they were replaced by
-          a global.
+	* examples/IPC_SAP/UPIPE_SAP/ex1.cpp (peer1, peer2): removed
+	  unused variables c_addr and serv_addr: they were replaced by
+	  a global.
 
-        * examples/Threads/future{1,2}.cpp: replaced call to ::sin ()
-          with one to ACE::is_prime () to remove dependency on libm.
+	* examples/Threads/future{1,2}.cpp: replaced call to ::sin ()
+	  with one to ACE::is_prime () to remove dependency on libm.
 
-        * netsvcs/clients/Naming/Dump_Restore/createfile.cpp: removed
-          #include of math.h, it wasn't needed.
+	* netsvcs/clients/Naming/Dump_Restore/createfile.cpp: removed
+	  #include of math.h, it wasn't needed.
 
 Sat Feb 08 15:19:50 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/ReactorEx.h: commented out ACE_ReactorEx_Notify::message_queue_
-          declaration if not ACE_WIN32 because Sun C++ chokes on it.
+	* ace/ReactorEx.h: commented out ACE_ReactorEx_Notify::message_queue_
+	  declaration if not ACE_WIN32 because Sun C++ chokes on it.
 
-        * examples/IPC_SAP/{FILE,SPIPE}_SAP/client.cpp: declare "len" as
-          ssize_t to avoid signed/unsigned comparison.
+	* examples/IPC_SAP/{FILE,SPIPE}_SAP/client.cpp: declare "len" as
+	  ssize_t to avoid signed/unsigned comparison.
 
 Fri Feb  7 01:13:05 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i (select): Simplified Chris' fixes for the weird
-          Linux select() semantics.
+	* ace/OS.i (select): Simplified Chris' fixes for the weird
+	  Linux select() semantics.
 
-        * ace/OS: Added a new accessor method called waiters() in
-          ACE_cond_t that returns the number of waiters on the condition
-          variable.  Thanks to Karlheinz for suggesting this.
+	* ace/OS: Added a new accessor method called waiters() in
+ 	  ACE_cond_t that returns the number of waiters on the condition
+ 	  variable.  Thanks to Karlheinz for suggesting this.
 
-        * ace/OS: Changed all the ACE_cont_t, ACE_rwlock_t, etc. so that
-          their fields are private, but made class ACE_OS a friend.
-          Applications should not be mucking with these fields since they
-          may change.
+	* ace/OS: Changed all the ACE_cont_t, ACE_rwlock_t, etc. so that
+ 	  their fields are private, but made class ACE_OS a friend.
+  	  Applications should not be mucking with these fields since they
+ 	  may change.
 
-        * ace/OS.h: Fixed a minor typo where friend class ACE_rwlock_t
-          should be friend class ACE_OS.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for reporting this.
+	* ace/OS.h: Fixed a minor typo where friend class ACE_rwlock_t
+ 	  should be friend class ACE_OS.  Thanks to Thilo Kielmann
+ 	  <kielmann@informatik.uni-siegen.de> for reporting this.
 
-        * ace/Log_Msg.cpp: Added a destructor to ACE_Log_Msg and changed
-          ACE_TSS_cleanup so that it calls delete (ACE_Log_Msg *) ptr.
-          Thanks to Per Anderson <Per.Andersson@hfera.ericsson.se> for
-          reporting this.
+	* ace/Log_Msg.cpp: Added a destructor to ACE_Log_Msg and changed
+ 	  ACE_TSS_cleanup so that it calls delete (ACE_Log_Msg *) ptr.
+  	  Thanks to Per Anderson <Per.Andersson@hfera.ericsson.se> for
+ 	  reporting this.
 
-        * tests/Map_Manager_Test.cpp: Create a file Map_Manager_Test_Key.h
-          and move the class Key into the include file.  Include this *.h
-          file in Map_Manager_Test.cpp.  This is needed for template
-          generation on AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for
-          pointing this out.
+	* tests/Map_Manager_Test.cpp: Create a file Map_Manager_Test_Key.h
+ 	  and move the class Key into the include file.  Include this *.h
+ 	  file in Map_Manager_Test.cpp.  This is needed for template
+ 	  generation on AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for
+ 	  pointing this out.
 
 Fri Feb  7 17:29:40 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.cpp (set_sched_params): added support for POSIX
-          threads.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for figuring it out and
-          for providing the code.
+	* ace/OS.cpp (set_sched_params): added support for POSIX
+	  threads.  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for figuring it out and
+	  for providing the code.
 
-        * tests/Naming_Test.cpp (test_find): Changed final delete[] to
-          not try to delete a static buffer. :-(
+	* tests/Naming_Test.cpp (test_find): Changed final delete[] to
+	  not try to delete a static buffer. :-(
 
-        * tests/SOCK_Test.cpp (server): Added assertion test for
-          modified select timeval.
+	* tests/SOCK_Test.cpp (server): Added assertion test for
+	  modified select timeval.
 
 Fri Feb 07 13:56:24 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/{OS.cpp,Thread_Priority.cpp}: added ACE_Thread_Priority
-          support for Digital Unix.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for figuring the priorities
-          and priority classes out and for providing the code.
+	* ace/{OS.cpp,Thread_Priority.cpp}: added ACE_Thread_Priority
+	  support for Digital Unix.  Thanks to Thilo Kielmann
+	  <kielmann@informatik.uni-siegen.de> for figuring the priorities
+	  and priority classes out and for providing the code.
 
-        * ace/High_Res_Timer.{h,cpp},config-linux*.h,README:
-          use struct timespec instead of timespec_t, because not all
-          platforms have the timespec_t typedef.  Thanks to
-          Marius Kjeldahl <marius@funcom.com> for reporting this on Linux
-          and Chris Lahey <CLahey@cccis.com> for reporting it on AIX.
+	* ace/High_Res_Timer.{h,cpp},config-linux*.h,README:
+	  use struct timespec instead of timespec_t, because not all
+	  platforms have the timespec_t typedef.  Thanks to
+	  Marius Kjeldahl <marius@funcom.com> for reporting this on Linux
+	  and Chris Lahey <CLahey@cccis.com> for reporting it on AIX.
 
-        * ace/IOStream.h: use "ssize_t send (...)", etc., instead of exact
-          function prototypes.
+	* ace/IOStream.h: use "ssize_t send (...)", etc., instead of exact
+	  function prototypes.
 
-        * examples/IPC_SAP/TLI_SAP/db-server.cpp: declare struct member as
-          const char * instead of const char [] because it's not static and
-          the struct doesn't have constructors.
+	* examples/IPC_SAP/TLI_SAP/db-server.cpp: declare struct member as
+	  const char * instead of const char [] because it's not static and
+	  the struct doesn't have constructors.
 
-        * examples/Reactor/Multicast/server.cpp (Server_Events ctor):
-          reordered initializers to match declaration order.
+	* examples/Reactor/Multicast/server.cpp (Server_Events ctor):
+	  reordered initializers to match declaration order.
 
 Fri Feb 07 05:08:51 1997    <irfan@cha-cha.cs.wustl.edu>
 
-        * ace/Synch.cpp (dump): Fixed access error.
+	* ace/Synch.cpp (dump): Fixed access error.
 
-        * ace/OS.h: Fixed ACE_rwlock_t friend declaration.
+	* ace/OS.h: Fixed ACE_rwlock_t friend declaration.
 
-        * ace/OS.i: Moved ACE_cond_t::waiters() such that it is now
-          visiable to NT. Also fixed ACE_OS::cond_timed_wait by returning
-          the correct return value on a TIMEOUT. Also fixed typo in
-          ACE_OS::sema_wait.    
+	* ace/OS.i: Moved ACE_cond_t::waiters() such that it is now
+ 	  visiable to NT. Also fixed ACE_OS::cond_timed_wait by returning
+ 	  the correct return value on a TIMEOUT. Also fixed typo in
+ 	  ACE_OS::sema_wait.	
 
 Thu Feb  6 20:25:13 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ace/OS.i (select): Adapted ACE_OS::select methods for use on
-          platforms (such as Linux) that allow select(2) to modify its
-          struct timeval arg.  New behavior is triggered by the define
-          ACE_HAS_NONCONST_SELECT_TIMEVAL.  Thanks to Jorn Jensen
-          <jornj@funcom.com> for reporting this!
+	* ace/OS.i (select): Adapted ACE_OS::select methods for use on
+	  platforms (such as Linux) that allow select(2) to modify its
+	  struct timeval arg.  New behavior is triggered by the define
+	  ACE_HAS_NONCONST_SELECT_TIMEVAL.  Thanks to Jorn Jensen
+	  <jornj@funcom.com> for reporting this!
 
 Thu Feb 06 09:48:43 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos-sun*.h,README: added
-          ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR.
+	* ace/config-sunos-sun*.h,README: added
+	  ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR.
 
-        * ace/IOStream.{h,cpp}: support
-          ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR
-          so that this builds with SunC++.
+	* ace/IOStream.{h,cpp}: support
+	  ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR
+	  so that this builds with SunC++.
 
-        * examples/IOStream/client/iostream_client.cpp:
-          reordered args and fixed argv indexes.
+	* examples/IOStream/client/iostream_client.cpp:
+	  reordered args and fixed argv indexes.
 
-        * examples/IOStream/server/iostream_server.cpp:
-          use ACE_DEFAULT_SERVER_PORT for default port.
+	* examples/IOStream/server/iostream_server.cpp:
+	  use ACE_DEFAULT_SERVER_PORT for default port.
 
-        * tests/Naming_Test.cpp (randomize): changed type of "size" arg to
-          size_t to avoid compiler warnings about signed/unsigned comparison.
+	* tests/Naming_Test.cpp (randomize): changed type of "size" arg to
+	  size_t to avoid compiler warnings about signed/unsigned comparison.
 
 Thu Feb 06 09:40:47 1997  Chris Cleeland <cleeland@cs.wustl.edu>
 
-        * ace/config-linux*.h: added typedef of timespec_t.
+	* ace/config-linux*.h: added typedef of timespec_t.
 
 Wed Feb  5 01:45:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i: Changed the Win32 implementation of all methods that call
-          WaitForMultipleObjects() so that errno is set to
-          WAIT_ABANDONED if the mutex is abandoned.  This makes it
-          possible for users to understand why ACE_OS methods that use
-          synchronization operations fail.  Thanks to Ivan Murphy
-          <Ivan.Murphy@med.siemens.de> for reporting this problem.
+	* ace/OS.i: Changed the Win32 implementation of all methods that call
+	  WaitForMultipleObjects() so that errno is set to
+	  WAIT_ABANDONED if the mutex is abandoned.  This makes it
+	  possible for users to understand why ACE_OS methods that use
+	  synchronization operations fail.  Thanks to Ivan Murphy
+	  <Ivan.Murphy@med.siemens.de> for reporting this problem.
 
-        * ace/IOStream.cpp (ACE_Streambuf): Moved the const initialization
-          from the header file to the constructor since this is the only
-          portable way to do this.  Thanks to Michael Maxie
-          <maxie@acm.org> for reporting this.
+	* ace/IOStream.cpp (ACE_Streambuf): Moved the const initialization
+ 	  from the header file to the constructor since this is the only
+ 	  portable way to do this.  Thanks to Michael Maxie
+ 	  <maxie@acm.org> for reporting this.
 
-        * ace/OS.i: Updated the call to thr_setprio() for pthreads so that
-          it first determines the existing scheduling parameters and then
-          updates the priority.  Thanks to Thilo Kielmann
-          <kielmann@informatik.uni-siegen.de> for help with this.
+	* ace/OS.i: Updated the call to thr_setprio() for pthreads so that
+ 	  it first determines the existing scheduling parameters and then
+ 	  updates the priority.  Thanks to Thilo Kielmann
+ 	  <kielmann@informatik.uni-siegen.de> for help with this.
 
-        * ace/config-osf1-4.0*.h: Updated ACE_NEEDS_HUGE_THREAD_STACKSIZE
-          to be 1 mega to minimize porting surprises.  Thanks to Thilo
-          Kielmann <kielmann@informatik.uni-siegen.de> for help with this.
+	* ace/config-osf1-4.0*.h: Updated ACE_NEEDS_HUGE_THREAD_STACKSIZE
+ 	  to be 1 mega to minimize porting surprises.  Thanks to Thilo
+ 	  Kielmann <kielmann@informatik.uni-siegen.de> for help with this.
 
-        * tests/Naming_Test.cpp: Cleaned up a few minor things related to
-          int i = 0 vs. size_t i = 0.
+	* tests/Naming_Test.cpp: Cleaned up a few minor things related to
+ 	  int i = 0 vs. size_t i = 0.
 
-        * ace/SOCK_Dgram.cpp: Added a new macro called
-          ACE_HAS_SOCKADDR_MSG_NAME, which is used on platforms (e.g.,
-          DG/UX) that require a cast to (struct sockaddr *) for the
-          msg_name field of struct msghdr.
+	* ace/SOCK_Dgram.cpp: Added a new macro called
+ 	  ACE_HAS_SOCKADDR_MSG_NAME, which is used on platforms (e.g.,
+ 	  DG/UX) that require a cast to (struct sockaddr *) for the
+ 	  msg_name field of struct msghdr.
 
 Wed Feb 05 10:45:41 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/IOStream.h: replaced __*manip with expanded types, because
-          Sun C++ doesn't have those typedefs; and added complete prototypes
-          for send, recv, send_n, and recv_n.
+	* ace/IOStream.h: replaced __*manip with expanded types, because
+	  Sun C++ doesn't have those typedefs; and added complete prototypes
+	  for send, recv, send_n, and recv_n.
 
-        * ace/IOStream.cpp: fixed "#define ACE_IOSTREAM_C" to keep g++ sane.
+	* ace/IOStream.cpp: fixed "#define ACE_IOSTREAM_C" to keep g++ sane.
 
-        * ace/Hash_Map_Manager.{h,cpp},Map_Manager.{h,cpp}: replaced
-          DEFAULT_SIZE with ACE_DEFAULT_MAP_SIZE so that Naming_Test runs
-          on SunC++ 4.1.
+	* ace/Hash_Map_Manager.{h,cpp},Map_Manager.{h,cpp}: replaced
+	  DEFAULT_SIZE with ACE_DEFAULT_MAP_SIZE so that Naming_Test runs
+	  on SunC++ 4.1.
 
-        * ace/High_Res_Timer.*: added optional scale factor.
+	* ace/High_Res_Timer.*: added optional scale factor.
 
-        * examples/IOStream/{client,server}/Makefile:  addd -g++ if building
-          with gcc.
+	* examples/IOStream/{client,server}/Makefile:  addd -g++ if building
+	  with gcc.
 
-        * tests/Naming_Test.cpp: moved declaration of "i" out of for loop
-          because it is used after the loop.
+	* tests/Naming_Test.cpp: moved declaration of "i" out of for loop
+	  because it is used after the loop.
 
-        * examples/ASX/UPIPE_Event_server/{Consumer,Supplier}_Router.cpp
-          (open): return 1 if init () succeeds.  There's a commented-out
-          call to activate the objects that would (should?) return a value.
+	* examples/ASX/UPIPE_Event_server/{Consumer,Supplier}_Router.cpp
+	  (open): return 1 if init () succeeds.  There's a commented-out
+	  call to activate the objects that would (should?) return a value.
 
-        * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp (main): declare n
-          as ssize_t instead of size_t to avoid compiler warning about
-          signed/unsigned comparison.
+	* examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp (main): declare n
+	  as ssize_t instead of size_t to avoid compiler warning about
+	  signed/unsigned comparison.
 
 Tue Feb  4 19:06:52 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Signal.cpp: Fixed all the ACE_Sig_Handler[s] methods so that
-          they now use ACE_Guard, rather than ACE_TSS_Guard, *unless* they
-          are actually performing callbacks to user-code.  Not only is
-          this faster, but it also avoids thread-specific storage key
-          leaks on platforms like Solaris!
+	* ace/Signal.cpp: Fixed all the ACE_Sig_Handler[s] methods so that
+ 	  they now use ACE_Guard, rather than ACE_TSS_Guard, *unless* they
+ 	  are actually performing callbacks to user-code.  Not only is
+ 	  this faster, but it also avoids thread-specific storage key
+ 	  leaks on platforms like Solaris!
 
-        * ace/OS.cpp (thr_keyfree): Added a new #ifdef for
-          ACE_HAS_THR_KEYDELETE, which is defined for UNIXWARE.  This
-          fixes a nasty problem with leaking thread-specific keys.  Thanks
-          to Nigel Owen <Nigel@voicelink.co.nz> for reporting this.
+	* ace/OS.cpp (thr_keyfree): Added a new #ifdef for
+ 	  ACE_HAS_THR_KEYDELETE, which is defined for UNIXWARE.  This
+ 	  fixes a nasty problem with leaking thread-specific keys.  Thanks
+ 	  to Nigel Owen <Nigel@voicelink.co.nz> for reporting this.
 
-        * ace/Message_Block.cpp: Added a #include for
-          "ace/Service_Config.h".
+	* ace/Message_Block.cpp: Added a #include for
+	  "ace/Service_Config.h".
 
-        * ace/Malloc.i: Fixed a few warnings by removing the names of
-          unused parameters.
+	* ace/Malloc.i: Fixed a few warnings by removing the names of
+ 	  unused parameters.
 
-        * ace: Added many minor changes to ACE so that it will work on
-          DG/UX.  Thanks to Michael Maxie <maxie@acm.org> for all these.
+	* ace: Added many minor changes to ACE so that it will work on
+ 	  DG/UX.  Thanks to Michael Maxie <maxie@acm.org> for all these.
 
-        * ace/LSOCK_Stream.cpp: Applied the same fix as to LSOCK.cpp.
+	* ace/LSOCK_Stream.cpp: Applied the same fix as to LSOCK.cpp.
 
-        * ace/LSOCK.cpp: Removed the cast of 0 to (char *) for msg_name
-          since some platforms use (struct sockaddr *).  By omitting the
-          cast the compiler will figure it out correctly.  Thanks to
-          Michael Maxie <maxie@acm.org> for this.
+	* ace/LSOCK.cpp: Removed the cast of 0 to (char *) for msg_name
+ 	  since some platforms use (struct sockaddr *).  By omitting the
+ 	  cast the compiler will figure it out correctly.  Thanks to
+ 	  Michael Maxie <maxie@acm.org> for this.
 
-        * ace/IOStream: Added a new template adapter for creating an
-          iostream-like object using an ACE IPC Stream for the actual I/O.
-          Thanks to James CE Johnson <jcej@lads.com> for this.
+	* ace/IOStream: Added a new template adapter for creating an
+ 	  iostream-like object using an ACE IPC Stream for the actual I/O.
+  	  Thanks to James CE Johnson <jcej@lads.com> for this.
 
-        * examples/Misc/test_iostreams.cpp: Added a test that illustrates
-          how the new ACE_iostreams mechanism works.  Thanks to James CE
-          Johnson <jcej@lads.com> for this.
+	* examples/Misc/test_iostreams.cpp: Added a test that illustrates
+ 	  how the new ACE_iostreams mechanism works.  Thanks to James CE
+ 	  Johnson <jcej@lads.com> for this.
 
-        * ace/Message_Block: Updated the ACE_Message_Block implementation
-          to use ACE_Service_Config::alloc() if the user doesn't supply a
-          customize version.  This also means that we never delete the
-          allocator_strategy_, so we can remove this flag and reduce the
-          amount of storage by 4 bytes.  Thanks to Irfan for noticing that
-          we can do this.
+	* ace/Message_Block: Updated the ACE_Message_Block implementation
+ 	  to use ACE_Service_Config::alloc() if the user doesn't supply a
+ 	  customize version.  This also means that we never delete the
+ 	  allocator_strategy_, so we can remove this flag and reduce the
+ 	  amount of storage by 4 bytes.  Thanks to Irfan for noticing that
+ 	  we can do this.
 
-        * ace/platform_dgux4_epc.h: Added a new platform config file
-          for DG/UX.  Thanks to Michael Maxie <maxie@acm.org> for
-          this.
+	* ace/platform_dgux4_epc.h: Added a new platform config file
+	  for DG/UX.  Thanks to Michael Maxie <maxie@acm.org> for
+	  this.
 
-        * ace/config-dgux-4.11-epc.h: Added a new config file for DG/UX.
-          Thanks to Michael Maxie <maxie@acm.org> for this.
+	* ace/config-dgux-4.11-epc.h: Added a new config file for DG/UX.
+  	  Thanks to Michael Maxie <maxie@acm.org> for this.
 
 Tue Feb 04 18:26:01 1997    <irfan@cha-cha.cs.wustl.edu>
 
-        * ace/Service_Config.cpp (alloc): The implementation now creates a
-          ACE_New_Allocator rather than a ACE_Allocator_Adaptor.  If
-          you still want the old behavior, simply provide your own
-          custom allocator singleton for ACE_Service_Config.
+	* ace/Service_Config.cpp (alloc): The implementation now creates a
+ 	  ACE_New_Allocator rather than a ACE_Allocator_Adaptor.  If
+	  you still want the old behavior, simply provide your own
+	  custom allocator singleton for ACE_Service_Config.
 
-        * ace/OS.i (mktemp): Added the missing ACE_INLINE directive.
+	* ace/OS.i (mktemp): Added the missing ACE_INLINE directive.
 
-        * ace/OS.h: ACE_HAS_INLINED_OSCALLS is now automatically defined
-          when __ACE_INLINE__ is defined.  This avoids mysterious linking
-          problems that occur otherwise.
+	* ace/OS.h: ACE_HAS_INLINED_OSCALLS is now automatically defined
+	  when __ACE_INLINE__ is defined.  This avoids mysterious linking
+	  problems that occur otherwise.
 
-        * ace/Malloc: Added a virtual destructor to ACE_Allocator.  Also
-          added a new class ACE_New_Allocator which is a sub-class of
-          ACE_Allocator. This class uses the new/delete operators to
-          allocate and free up memory.  Please note that the only methods
-          that are supported are malloc() and free(). All other
-          methods are no-ops.  If you require more functionality, please use:
-          ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL,
-          MUTEX>> This will allow you to use the added functionality of
-          bind/find/etc. while using the new/delete operators.
+	* ace/Malloc: Added a virtual destructor to ACE_Allocator.  Also
+ 	  added a new class ACE_New_Allocator which is a sub-class of
+ 	  ACE_Allocator. This class uses the new/delete operators to
+ 	  allocate and free up memory.  Please note that the only methods
+ 	  that are supported are malloc() and free(). All other
+	  methods are no-ops.  If you require more functionality, please use:
+ 	  ACE_Allocator_Adapter <ACE_Malloc <ACE_LOCAL_MEMORY_POOL,
+ 	  MUTEX>> This will allow you to use the added functionality of
+ 	  bind/find/etc. while using the new/delete operators.
 
 Mon Feb  3 15:35:24 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/config-aix-*.h: Added a (char *) cast to
-          ACE_DEFAULT_BASE_ADDR.  Thanks to John Cosby
-          <John.D.Cosby@cpmx.saic.com> for reporting this.
+	* ace/config-aix-*.h: Added a (char *) cast to
+ 	  ACE_DEFAULT_BASE_ADDR.  Thanks to John Cosby
+ 	  <John.D.Cosby@cpmx.saic.com> for reporting this.
 
-        * ace/OS.cpp: Added a new set() method that sets the Time_Value
-          from a double.  Thanks to Brad Flood for this suggestion.
+	* ace/OS.cpp: Added a new set() method that sets the Time_Value
+ 	  from a double.  Thanks to Brad Flood for this suggestion.
 
-        * ace/OS: Changed ACE_OS::flock_t to ACE_OS::ace_flock_t to avoid
-          a name clash on DG/UX.  Thanks to Michael Maxie <maxie@acm.org>
-          for reporting this.
+	* ace/OS: Changed ACE_OS::flock_t to ACE_OS::ace_flock_t to avoid
+ 	  a name clash on DG/UX.  Thanks to Michael Maxie <maxie@acm.org>
+ 	  for reporting this.
 
 Tue Feb  4 03:02:52 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * tests/Naming_Test.cpp: Added timing and made debug print outs
-          optional. Also added randomization of the test data.
+	* tests/Naming_Test.cpp: Added timing and made debug print outs
+ 	  optional. Also added randomization of the test data.
 
-        * ace/OS.h: Fixed prototype for gethrtime ()
+	* ace/OS.h: Fixed prototype for gethrtime ()
 
 Mon Feb 03 21:00:56 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: define ACE_SCOPE_PROCESS and ACE_SCOPE_THREAD
-          even if ACE_HAS_THREADS is not defined.  Thanks to
-          Michael Maxie <maxie@acm.org> for pointing this out.
+	* ace/OS.h: define ACE_SCOPE_PROCESS and ACE_SCOPE_THREAD
+	  even if ACE_HAS_THREADS is not defined.  Thanks to
+	  Michael Maxie <maxie@acm.org> for pointing this out.
 
-        * examples/Threads/{process_mutex.cpp,process_semaphore.cpp,
-          task_three.cpp,thread_manager.cpp,thread_specific.cpp} (main):
-          added ACE_UNUSED_ARG (sa);.
+	* examples/Threads/{process_mutex.cpp,process_semaphore.cpp,
+	  task_three.cpp,thread_manager.cpp,thread_specific.cpp} (main):
+	  added ACE_UNUSED_ARG (sa);.
 
-        * examples/Threads/reader_writer.cpp: fixed declaration of
-          "shared_data" to be "static volatile" instead of "volatile
-          static", and removed unused variable "n".
+	* examples/Threads/reader_writer.cpp: fixed declaration of
+	  "shared_data" to be "static volatile" instead of "volatile
+	  static", and removed unused variable "n".
 
-        * examples/Threads/thread_pool.cpp: removed unused variable "result".
+	* examples/Threads/thread_pool.cpp: removed unused variable "result".
 
 Sun Feb 02 21:24:02 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: changed hrtime_t to ACE_hrtime_t.
+	* ace/OS.h: changed hrtime_t to ACE_hrtime_t.
 
-        * ace/{config-win*.h,README}: added #define ACE_HAS_PENTIUM to
-          enable gethrtime () support.
+	* ace/{config-win*.h,README}: added #define ACE_HAS_PENTIUM to
+	  enable gethrtime () support.
 
-        * ace/High_Res_Time.{h,i,cpp}: removed platform-specific #ifdef's,
-          instead added "unsupported ()" static member function; changed
-          changed signature of elapsed_time to take time reference as
-          argument instead of return value; added elapsed_time
-          (ACE_Time_Value &) and elapsed_time_incr (ACE_Time_Value &).
+	* ace/High_Res_Time.{h,i,cpp}: removed platform-specific #ifdef's,
+	  instead added "unsupported ()" static member function; changed
+	  changed signature of elapsed_time to take time reference as
+	  argument instead of return value; added elapsed_time
+	  (ACE_Time_Value &) and elapsed_time_incr (ACE_Time_Value &).
 
-        * examples/Thread/context_switch.cpp: use ACE_High_Res_Timer
-          instead of the old Timer adapter.
+	* examples/Thread/context_switch.cpp: use ACE_High_Res_Timer
+	  instead of the old Timer adapter.
 
-        * ace/config-aix-4.1.x.h: fixed typo: #defind ACE_HAS_LONGLONG_T.
+	* ace/config-aix-4.1.x.h: fixed typo: #defind ACE_HAS_LONGLONG_T.
 
-        * ace/config-aix-4.2.x.h: added #define ACE_HAS_LONGLONG_T.
+	* ace/config-aix-4.2.x.h: added #define ACE_HAS_LONGLONG_T.
 
-        * ace/Thread_Priority.{h,cpp}: moved #include of OS.h from .cpp
-          to .h file.
+	* ace/Thread_Priority.{h,cpp}: moved #include of OS.h from .cpp
+	  to .h file.
 
 Sun Feb 02 10:30:29 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Local_Name_Space.cpp: removed ACE_Map_Manager, ACE_Map_Iterator,
-          and ACE_Map_Entry: they don't appear to be used and, without
-          including their headers, this file won't compile.
+	* ace/Local_Name_Space.cpp: removed ACE_Map_Manager, ACE_Map_Iterator,
+	  and ACE_Map_Entry: they don't appear to be used and, without
+	  including their headers, this file won't compile.
 
-        * ace/Hash_Map_Manager.cpp (Hash_Map_Manager (ACE_Allocator *)):
-          reordered initializers to match declaration order.
+	* ace/Hash_Map_Manager.cpp (Hash_Map_Manager (ACE_Allocator *)):
+	  reordered initializers to match declaration order.
 
 Sat Feb  1 15:11:28 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * include/makeinclude/platform_aix4.2.GNU (LD): Removed the -qnoro
-          flag since it is no longer needed.  Thanks to Rob Jordan
-          <jordan@hursley.ibm.com> for reporting this.
+	* include/makeinclude/platform_aix4.2.GNU (LD): Removed the -qnoro
+ 	  flag since it is no longer needed.  Thanks to Rob Jordan
+ 	  <jordan@hursley.ibm.com> for reporting this.
 
 Sat Feb  1 03:25:21 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/SString.cpp: Added two methods to the wide string
-          implementation for high-performance. Even though these methods
-          are somewhat ugly and not the "OO" way of doing things,
-          performance was at stake here.
+	* ace/SString.cpp: Added two methods to the wide string
+ 	  implementation for high-performance. Even though these methods
+ 	  are somewhat ugly and not the "OO" way of doing things,
+ 	  performance was at stake here.
 
-        * ace/Registry_Name_Space.cpp (resolve): Fixed the implementation
-          by correctly figuring out the size of the value in the
-          Registry. This allows us to dynamically allocated the correct
-          amount of memory.
+	* ace/Registry_Name_Space.cpp (resolve): Fixed the implementation
+	  by correctly figuring out the size of the value in the
+	  Registry. This allows us to dynamically allocated the correct
+	  amount of memory.
 
-        * ace/Registry: Fixed the constant MAX_CONTEXT_NAME_SIZE to be the
-          maximum path length.
+	* ace/Registry: Fixed the constant MAX_CONTEXT_NAME_SIZE to be the
+	  maximum path length.
 
-        * ace/Naming_Context.cpp: Fixed various memory leaks.
+	* ace/Naming_Context.cpp: Fixed various memory leaks.
 
-        * ace/Local_Name_Space_T.h: Replaced the simple-minded Map_Manager
-          with the new (improved) Hash_Map_Manager.     
+	* ace/Local_Name_Space_T.h: Replaced the simple-minded Map_Manager
+	  with the new (improved) Hash_Map_Manager.	
 
-        * ace/Local_Name_Space.cpp: Added new methods operator!= and hash
-          required by the map.
+	* ace/Local_Name_Space.cpp: Added new methods operator!= and hash
+ 	  required by the map.
 
-        * ace/Hash_Map_Manager.cpp (ACE_Hash_Map_Manager): Added an extra
-          constructor.
+	* ace/Hash_Map_Manager.cpp (ACE_Hash_Map_Manager): Added an extra
+	  constructor.
 
-        * tests/Naming_Test.cpp: Removed memory leaks.
+	* tests/Naming_Test.cpp: Removed memory leaks.
 
 Fri Jan 31 19:39:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Hash_Map_Manager.cpp (ctor): reordered initializers
-          to match declaration order.
+	* ace/Hash_Map_Manager.cpp (ctor): reordered initializers
+	  to match declaration order.
 
-        * tests/Time_Value_Test.cpp: cast double argument to long
-          because there no longer is a constructor that takes a double.
+	* tests/Time_Value_Test.cpp: cast double argument to long
+	  because there no longer is a constructor that takes a double.
 
-        * ace/Hash_Map_Manager.{h,cpp}: removed #include of
-          ace/Hash_Map_Manager.i because it doesn't exist.
-          Protected .cpp file against multiple includes.  Moved
-          #include of "ace/Malloc.h" from .h to .cpp file.
+	* ace/Hash_Map_Manager.{h,cpp}: removed #include of
+	  ace/Hash_Map_Manager.i because it doesn't exist.
+	  Protected .cpp file against multiple includes.  Moved
+	  #include of "ace/Malloc.h" from .h to .cpp file.
 
-        * ace/Map_Manager.cpp (current_size, total_size): cast -1 to
-          size_t to avoid warning about signed-to-unsigned conversion.
+	* ace/Map_Manager.cpp (current_size, total_size): cast -1 to
+	  size_t to avoid warning about signed-to-unsigned conversion.
 
-        * ace/OS.h: moved hrtime_t typedef for ACE_WIN32 so it doesn't
-          get defined twice.
+	* ace/OS.h: moved hrtime_t typedef for ACE_WIN32 so it doesn't
+	  get defined twice.
 
-        * ace/OS.i (getservbyname): one last ACE_HAS_NONCONST_GETBY change:
-          missed "lproto" to "proto".
+	* ace/OS.i (getservbyname): one last ACE_HAS_NONCONST_GETBY change:
+	  missed "lproto" to "proto".
 
-        * bin/create_ace_build: added checks for existing symlinks, so
-          now the script can be re-run safely at any time on a build
-          tree to update it.
+	* bin/create_ace_build: added checks for existing symlinks, so
+	  now the script can be re-run safely at any time on a build
+	  tree to update it.
 
 Fri Jan 31 02:16:30 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/config-aix-*.h: Made the default value for
-          ACE_DEFAULT_BASE_ADDR 0x80000000 to work around restrictions
-          with AIX.  Thanks to Rob Jordan <jordan@hursley.ibm.com> for
-          this.
+	* ace/config-aix-*.h: Made the default value for
+ 	  ACE_DEFAULT_BASE_ADDR 0x80000000 to work around restrictions
+ 	  with AIX.  Thanks to Rob Jordan <jordan@hursley.ibm.com> for
+ 	  this.
 
-        * examples/Map_Manager: Added a new example of the
-          Hash_Map_Manager.
+	* examples/Map_Manager: Added a new example of the
+	  Hash_Map_Manager.
 
-        * tests/Map_Manager: Integrated the Hash_Map_Manager into the
-          Map_Manager test and greatly improved the test (e.g., by adding
-          timing).
+	* tests/Map_Manager: Integrated the Hash_Map_Manager into the
+ 	  Map_Manager test and greatly improved the test (e.g., by adding
+ 	  timing).
 
-        * ace: Added a new implementation of the Map_Manager called
-          Hash_Map_Manager.  This, of course, uses hashing rather than
-          linear search.  The result should be a much faster
-          implementation for many types of applications. 
+	* ace: Added a new implementation of the Map_Manager called
+ 	  Hash_Map_Manager.  This, of course, uses hashing rather than
+ 	  linear search.  The result should be a much faster
+ 	  implementation for many types of applications. 
 
 Thu Jan 30 13:55:08 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Map_Manager: Changed the return type of total_size() and
-          current_size() to size_t.
+	* ace/Map_Manager: Changed the return type of total_size() and
+ 	  current_size() to size_t.
 
-        * ace/OS: Had to remove the ACE_Time_Value (double) constructor
-          since it caused ambiguities with ACE_Time_Value (long).  Thanks
-          to Per Andersson for figuring this out.
+	* ace/OS: Had to remove the ACE_Time_Value (double) constructor
+ 	  since it caused ambiguities with ACE_Time_Value (long).  Thanks
+ 	  to Per Andersson for figuring this out.
   
-        * include/makeinclude/platform_linux_lxpthread.GNU (CXX): Added
-          -D_REENTRANT to make things work correctly in MT programs.
-          Thanks to Marius for this fix.
+	* include/makeinclude/platform_linux_lxpthread.GNU (CXX): Added
+ 	  -D_REENTRANT to make things work correctly in MT programs.
+  	  Thanks to Marius for this fix.
 
-        * ace/OS.h: Added several extra constructors for ACE_Time_Value so
-          that it won't cause problems with the new ACE_Time_Value
-          (double) constructor.
+	* ace/OS.h: Added several extra constructors for ACE_Time_Value so
+ 	  that it won't cause problems with the new ACE_Time_Value
+	  (double) constructor.
 
-        * ace/Log_Record.cpp (ACE_Log_Record): Added an "L" to the 0
-          initial value used for time_stamp_.  Thanks to Marius for
-          reporting this.
+	* ace/Log_Record.cpp (ACE_Log_Record): Added an "L" to the 0
+ 	  initial value used for time_stamp_.  Thanks to Marius for
+ 	  reporting this.
 
-        * ace: Added the new config-aix-4.2.x.h file, which supports the
-          AIX4.2 platform.  Thanks to Rob Jordan <jordan@hursley.ibm.com>
-          for this.
+	* ace: Added the new config-aix-4.2.x.h file, which supports the
+ 	  AIX4.2 platform.  Thanks to Rob Jordan <jordan@hursley.ibm.com>
+ 	  for this.
 
-        * include/makeinclude/platform_aix4.2.GNU: Added support for the
-          new AIX4.2 platform.  Thanks to Rob Jordan
-          <jordan@hursley.ibm.com> for this.
+	* include/makeinclude/platform_aix4.2.GNU: Added support for the
+ 	  new AIX4.2 platform.  Thanks to Rob Jordan
+ 	  <jordan@hursley.ibm.com> for this.
  
-        * ace/OS.h: It's now possible to override ACE_DEFAULT_BASE_ADDR in
-          a config.h file.  This is important for platforms that need to
-          put shared memory segments at particular address ranges.  Thanks
-          to Rob Jordan <jordan@hursley.ibm.com> for suggesting this.
+	* ace/OS.h: It's now possible to override ACE_DEFAULT_BASE_ADDR in
+ 	  a config.h file.  This is important for platforms that need to
+ 	  put shared memory segments at particular address ranges.  Thanks
+ 	  to Rob Jordan <jordan@hursley.ibm.com> for suggesting this.
 
 Thu Jan 30 16:01:37 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/{config-aix-4.1.x.h,README}: added ACE_HAS_AIX_HIRES_TIMER,
-          see change to gettimeofday in OS.i below; and ACE_HAS_LONGLONG_T.
+	* ace/{config-aix-4.1.x.h,README}: added ACE_HAS_AIX_HIRES_TIMER,
+	  see change to gettimeofday in OS.i below; and ACE_HAS_LONGLONG_T.
 
-        * ace/OS.i (gettimeofday, gethrtime): use read_real_time () if
-          ACE_HAS_AIX_HIRES_TIMER.  Thanks to Bob Olson
-          <olson@mcs.anl.gov> for this suggestion.
+	* ace/OS.i (gettimeofday, gethrtime): use read_real_time () if
+	  ACE_HAS_AIX_HIRES_TIMER.  Thanks to Bob Olson
+	  <olson@mcs.anl.gov> for this suggestion.
 
-        * ace/OS.h: define hrtime_t as long long if ACE_HAS_AIX_HIRES_TIMER.
+	* ace/OS.h: define hrtime_t as long long if ACE_HAS_AIX_HIRES_TIMER.
 
-        * ace/OS.{i,cpp}: uninlined ACE_OS::gethostbyname (),
-          and ACE_OS::inet_ntoa () on VxWorks, because they have
-          static char arrays.
+	* ace/OS.{i,cpp}: uninlined ACE_OS::gethostbyname (),
+	  and ACE_OS::inet_ntoa () on VxWorks, because they have
+	  static char arrays.
 
-        * ace/OS.i (gethostbyaddr, getservbyname, gethostbyaddr,
-          gethostbyname, getservbyname_r): with ACE_HAS_NONCONST_GETBY,
-          instead of copying the const argument, just cast it to (char *).
-          Thanks to Michael Maxie <maxie@acm.org> for pointing out the
-          problem with the nonstatic char arrays with sizes determined at
-          runtime.
+	* ace/OS.i (gethostbyaddr, getservbyname, gethostbyaddr,
+	  gethostbyname, getservbyname_r): with ACE_HAS_NONCONST_GETBY,
+	  instead of copying the const argument, just cast it to (char *).
+	  Thanks to Michael Maxie <maxie@acm.org> for pointing out the
+	  problem with the nonstatic char arrays with sizes determined at
+	  runtime.
 
-        * ace/High_Res_Timer.*: added ACE_HAS_AIX_HIRES_TIMER support.
-          Also, renamed get_time () to elapsed_microseconds ().
+	* ace/High_Res_Timer.*: added ACE_HAS_AIX_HIRES_TIMER support.
+	  Also, renamed get_time () to elapsed_microseconds ().
 
-        * examples/Threads/{Timer.h,context_switch_time.cpp}:
-          ACE_High_Res_Timer::elapsed_microseconds () instead of
-          ACE_High_Res_Timer::get_time ().
+	* examples/Threads/{Timer.h,context_switch_time.cpp}:
+	  ACE_High_Res_Timer::elapsed_microseconds () instead of
+	  ACE_High_Res_Timer::get_time ().
 
-        * bin/create_ace_build: added this script: it creates an ACE build
-          tree in directory "build/<build name>" below the current
-          directory, which must be a ACE "top level" directory (such as
-          $WRAPPER_ROOT).  The build tree directory structure mirrors that
-          of the ACE top level directory structure, except that instead of
-          containing any plain files, it contains only symlinks to the files
-          in the ACE top level structure.
+	* bin/create_ace_build: added this script: it creates an ACE build
+	  tree in directory "build/<build name>" below the current
+	  directory, which must be a ACE "top level" directory (such as
+	  $WRAPPER_ROOT).  The build tree directory structure mirrors that
+	  of the ACE top level directory structure, except that instead of
+	  containing any plain files, it contains only symlinks to the files
+	  in the ACE top level structure.
 
 Thu Jan 30 06:57:50 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Thread_Priority.cpp (convert_to_os_priority): changed
-          switch (priority_class) to switch (priority_class_).
-          Thanks to Chris Lahey <CLahey@cccis.com> for pointing this out.
-          Also, return -1 on other than Solaris, Win32, and VxWorks.
+	* ace/Thread_Priority.cpp (convert_to_os_priority): changed
+	  switch (priority_class) to switch (priority_class_).
+	  Thanks to Chris Lahey <CLahey@cccis.com> for pointing this out.
+	  Also, return -1 on other than Solaris, Win32, and VxWorks.
 
 Wed Jan 29 22:05:01 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/Naming_Test.cpp: Added the prefix "test_" to the bind(),
-          find(), rebind(), and unbind() functions.  This avoids name
-          clashes with the bind() call from the socket API.  Thanks to
-          Marius for this info.
-          
-        * ace/OS.cpp (ACE_Time_Value): Added a new constructor that makes
-          it possible to construct an ACE_Time_Value from a double.
-          Thanks to Brad Flood <BFLOOD@tcs.lmco.com> for this.
+	* tests/Naming_Test.cpp: Added the prefix "test_" to the bind(),
+ 	  find(), rebind(), and unbind() functions.  This avoids name
+ 	  clashes with the bind() call from the socket API.  Thanks to
+ 	  Marius for this info.
+	  
+	* ace/OS.cpp (ACE_Time_Value): Added a new constructor that makes
+ 	  it possible to construct an ACE_Time_Value from a double.
+  	  Thanks to Brad Flood <BFLOOD@tcs.lmco.com> for this.
 
-        * ace/OS.i (thr_join): If ACE_HAS_THREADS is defined, but none of
-          the threading APIs match (e.g., AIX) then we'll return
-          ACE_NOTSUP_RETURN(-1).  Thanks to Chris Lahey for help with
-          this.
+	* ace/OS.i (thr_join): If ACE_HAS_THREADS is defined, but none of
+ 	  the threading APIs match (e.g., AIX) then we'll return
+ 	  ACE_NOTSUP_RETURN(-1).  Thanks to Chris Lahey for help with
+ 	  this.
 
-        * include/makeinclude/platform_aix.GNU: Made some changes to the
-          type of dynamic linker and libraries used by AIX 4.1.  Thanks to
-          Chris Lahey for help with this.
+	* include/makeinclude/platform_aix.GNU: Made some changes to the
+ 	  type of dynamic linker and libraries used by AIX 4.1.  Thanks to
+ 	  Chris Lahey for help with this.
 
-        * ace/config-aix-4.1.x.h: Changed from BSD 4.3 to 4.4.  Thanks
-          to Chris Lahey for help with this.
+	* ace/config-aix-4.1.x.h: Changed from BSD 4.3 to 4.4.  Thanks
+	  to Chris Lahey for help with this.
 
 Wed Jan 29 09:03:48 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: moved ACE_id_t and ACE_pri_t typedefs out of the
-          ACE_HAS_THREADS section.
+	* ace/OS.h: moved ACE_id_t and ACE_pri_t typedefs out of the
+	  ACE_HAS_THREADS section.
 
-        * ace/OS.cpp: fixed ACE_OS::set_sched_params on Win32 and VxWorks.
+	* ace/OS.cpp: fixed ACE_OS::set_sched_params on Win32 and VxWorks.
 
-        * ace/Scheduling_Parameters.*, ace/Thread_Priority.*: updated
-          comments.
+	* ace/Scheduling_Parameters.*, ace/Thread_Priority.*: updated
+	  comments.
 
-        * examples/Threads/{context_switch_time.cpp,Timer.h,Makefile}:
-          added context switch timing test.  Currently only works on
-          Suns because that's the only platform for which ACE has a
-          high-resolution timer.
+	* examples/Threads/{context_switch_time.cpp,Timer.h,Makefile}:
+	  added context switch timing test.  Currently only works on
+	  Suns because that's the only platform for which ACE has a
+	  high-resolution timer.
 
-        * Makefile: added chmod of VERSION file in TIMESTAMP macro.
+	* Makefile: added chmod of VERSION file in TIMESTAMP macro.
 
 Wed Jan 29 00:59:12 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * include/makeinclude/platform_linux_lxpthread.GNU (CXX): Removed
-          the -D_MIT_POSIX_PTHREADS symbol since we're using Xavier's
-          threads instead.  Thanks to Marius Kjeldahl <marius@funcom.com,
-          mariusk@sn.no> for reporting this.
+	* include/makeinclude/platform_linux_lxpthread.GNU (CXX): Removed
+ 	  the -D_MIT_POSIX_PTHREADS symbol since we're using Xavier's
+ 	  threads instead.  Thanks to Marius Kjeldahl <marius@funcom.com,
+ 	  mariusk@sn.no> for reporting this.
 
-        * ace/config-linux-lxpthreads.h: Removed the _MIT_POSIX_PTHREADS
-          symbol since we're using Xavier's threads instead.  Thanks to
-          Marius Kjeldahl <marius@funcom.com, mariusk@sn.no> for reporting
-          this.
+	* ace/config-linux-lxpthreads.h: Removed the _MIT_POSIX_PTHREADS
+ 	  symbol since we're using Xavier's threads instead.  Thanks to
+ 	  Marius Kjeldahl <marius@funcom.com, mariusk@sn.no> for reporting
+ 	  this.
 
 Tue Jan 28 23:32:58 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/SString: Added hash() methods to each ACE String class so
-          that we can use this with the new ACE_Hash_Set implementation of
-          ACE_Map_Manager.
+	* ace/SString: Added hash() methods to each ACE String class so
+ 	  that we can use this with the new ACE_Hash_Set implementation of
+ 	  ACE_Map_Manager.
 
-        * ace/ACE.h (ACE): Added a UNICODE version of hash_pjw() so that
-          we can use it to hash ACE_WString.
+	* ace/ACE.h (ACE): Added a UNICODE version of hash_pjw() so that
+ 	  we can use it to hash ACE_WString.
 
-        * ace/OS.i (thr_setprio): Fixed a typo that was left over from a
-          previous change.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for reporting this.
+	* ace/OS.i (thr_setprio): Fixed a typo that was left over from a
+ 	  previous change.  Thanks to Fred LaBar
+ 	  <flabar@fallschurch.esys.com> for reporting this.
 
-        * apps/Gateway/Gateway/{proxy_config,consumer_config}: Added
-          comments to these config files so they are easier to understand.
-          Thanks to Chuck Gehr for motivating this.
+	* apps/Gateway/Gateway/{proxy_config,consumer_config}: Added
+ 	  comments to these config files so they are easier to understand.
+  	  Thanks to Chuck Gehr for motivating this.
 
-        * apps/Gateway/Peer/Peer.cpp: Changed the name from connection_id_
-          to proxy_id_, which is more accurate.
+	* apps/Gateway/Peer/Peer.cpp: Changed the name from connection_id_
+ 	  to proxy_id_, which is more accurate.
 
-        * apps/Gateway/Peer/Peer.cpp: Added a destructor to Peer_Handler
-          so that it can clean itself up properly when shutdown with a
-          signal.  This fixes a nasty bug.
+	* apps/Gateway/Peer/Peer.cpp: Added a destructor to Peer_Handler
+ 	  so that it can clean itself up properly when shutdown with a
+ 	  signal.  This fixes a nasty bug.
 
-        * ace/config-win32-msvc4.x.h (ACE_HAS_MFC): By default, ACE now
-          enables ACE_HAS_MFC.  This makes it possible to use
-          AfxBeginThread() with the ACE_THR_AFX flag.
+	* ace/config-win32-msvc4.x.h (ACE_HAS_MFC): By default, ACE now
+ 	  enables ACE_HAS_MFC.  This makes it possible to use
+ 	  AfxBeginThread() with the ACE_THR_AFX flag.
 
-        * ace/OS.cpp: Fixed a typo in the call to ::AfxBeginThread()
-          function.  Thanks to Karlheinz for reporting this.
+	* ace/OS.cpp: Fixed a typo in the call to ::AfxBeginThread()
+ 	  function.  Thanks to Karlheinz for reporting this.
 
-        * apps/Gateway/Peer/Peer.cpp: Removed all uses of the Map_Manager
-          from the Peer.  There's only ever one connection from a Gateway
-          per-Peer, so what was this doing here anyway?!  It was causing
-          problems due to multiple deletions, so removing it improves
-          robustness of the tests.
+	* apps/Gateway/Peer/Peer.cpp: Removed all uses of the Map_Manager
+ 	  from the Peer.  There's only ever one connection from a Gateway
+ 	  per-Peer, so what was this doing here anyway?!  It was causing
+ 	  problems due to multiple deletions, so removing it improves
+ 	  robustness of the tests.
 
-        * ace/OS.i: Commented out the "extern char **_sys_siglist"
-          definition since this was conflicting with the definition in
-          Solaris.  If some platforms needs this, we'll need to add a
-          specific #ifdef.
+	* ace/OS.i: Commented out the "extern char **_sys_siglist"
+ 	  definition since this was conflicting with the definition in
+ 	  Solaris.  If some platforms needs this, we'll need to add a
+ 	  specific #ifdef.
 
 Tue Jan 28 21:57:45 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.{h,cpp}:  added ACE_OS::set_sched_params ().  It permits
-          platform-independent setting of thread priorities and
-          priority classes.  It is currently supported on Solaris,
-          Win32, and VxWorks.
+	* ace/OS.{h,cpp}:  added ACE_OS::set_sched_params ().  It permits
+	  platform-independent setting of thread priorities and
+	  priority classes.  It is currently supported on Solaris,
+	  Win32, and VxWorks.
 
-        * ace/Scheduling_Parameters.{h,i,cpp},
-          ace/Thread_Priority.{h,i,cpp}, ace/Makefile:
-          Added these two classes to support ACE_OS::set_sched_params ().
+	* ace/Scheduling_Parameters.{h,i,cpp},
+	  ace/Thread_Priority.{h,i,cpp}, ace/Makefile:
+	  Added these two classes to support ACE_OS::set_sched_params ().
 
 Tue Jan 28 12:42:39 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/ace.mdp: Added the "Using MFC in a Shared DLL" flags.
+	* ace/ace.mdp: Added the "Using MFC in a Shared DLL" flags.
 
-        * tests/test_config.h (ACE_INIT_LOG): Made this UNICODE safe.
+	* tests/test_config.h (ACE_INIT_LOG): Made this UNICODE safe.
 
-        * tests/Pipe_Test.cpp (main): Added an iteration count to control
-          the number of children created by the main process.
+	* tests/Pipe_Test.cpp (main): Added an iteration count to control
+	  the number of children created by the main process.
 
-        * ace/Memory_Pool.cpp (init_acquire): cast this->minimum_bytes_ to
-          size_t to avoid compiler warning if size_t is unsigned.
+	* ace/Memory_Pool.cpp (init_acquire): cast this->minimum_bytes_ to
+	  size_t to avoid compiler warning if size_t is unsigned.
 
-        * ace/OS.h: Added strncat to the OS class.
+	* ace/OS.h: Added strncat to the OS class.
 
 Tue Jan 28 09:13:00 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/ACE.cpp (ACE::ldfind),
-          ace/Local_Name_Space_T.cpp,
-          ace/Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry),
-          ace/Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find),
-          Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool),
-          ace/Naming_Context.cpp (ACE_Naming_Context::open),
-          ace/Parse_Node.cpp (ACE_Location_Node::open_handle),
-          ace/Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, 
+	* ace/ACE.cpp (ACE::ldfind),
+	  ace/Local_Name_Space_T.cpp,
+	  ace/Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry),
+	  ace/Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find),
+	  Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool),
+	  ace/Naming_Context.cpp (ACE_Naming_Context::open),
+	  ace/Parse_Node.cpp (ACE_Location_Node::open_handle),
+	  ace/Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, 
                 ACE_Registry::Binding_Iterator::Object_Iteration::next_n,
-                ACE_Registry::Binding_Iterator::Context_Iteration::next_n),
-          tests/UPIPE_SAP_Test.cpp:
-          changed "sizeof char" to "sizeof (char)" because g++ and Sun C++
-          (properly) choked on it.
+		ACE_Registry::Binding_Iterator::Context_Iteration::next_n),
+	  tests/UPIPE_SAP_Test.cpp:
+	  changed "sizeof char" to "sizeof (char)" because g++ and Sun C++
+	  (properly) choked on it.
 
-        * ace/Local_Name_Space_T.cpp (create_manager_i):
-          -- ::strncat () instead of ACE_OS::strcat ()
+	* ace/Local_Name_Space_T.cpp (create_manager_i):
+	  -- ::strncat () instead of ACE_OS::strcat ()
           -- "lock_name_for_backing_store" instead of
-             "lock_name_for_local_name_space"
+	     "lock_name_for_local_name_space"
 
-        * ace/Naming_Context.cpp (both constructors): reordered
-          initializers to match declaration order.
+	* ace/Naming_Context.cpp (both constructors): reordered
+	  initializers to match declaration order.
  
-        * include/makeinclude/platform_sunos5_g++.GNU: removed
-          -fno-strict-prototypes because it's not needed with SunOS 5.5.1.
+	* include/makeinclude/platform_sunos5_g++.GNU: removed
+	  -fno-strict-prototypes because it's not needed with SunOS 5.5.1.
 
 Mon Jan 27 21:33:00 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * tests/Naming_Test.cpp (main): Made modifications to the test to
-          make it more dynamic.  Also made it work with UNICODE and
-          ACE_Naming_Context.
-
-        * ace/Local_Name_Space_T.cpp (create_manager_i): Added a better
-          naming scheme for the locks.
-
-        * ace: Changed the calculations of string lengths such that the
-          size of the character type is carefully considered.
-
-          The following were affected:
-          
-          ACE.cpp (ACE::ldfind)
-          Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry)
-          Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find)
-          Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool)
-          Naming_Context.cpp (ACE_Naming_Context::open)
-          Parse_Node.cpp (ACE_Location_Node::open_handle)
-          Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, 
+	* tests/Naming_Test.cpp (main): Made modifications to the test to
+	  make it more dynamic.  Also made it work with UNICODE and
+	  ACE_Naming_Context.
+
+	* ace/Local_Name_Space_T.cpp (create_manager_i): Added a better
+	  naming scheme for the locks.
+
+	* ace: Changed the calculations of string lengths such that the
+ 	  size of the character type is carefully considered.
+
+	  The following were affected:
+	  
+	  ACE.cpp (ACE::ldfind)
+	  Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry)
+	  Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find)
+	  Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool)
+	  Naming_Context.cpp (ACE_Naming_Context::open)
+	  Parse_Node.cpp (ACE_Location_Node::open_handle)
+	  Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, 
                 ACE_Registry::Binding_Iterator::Object_Iteration::next_n,
-                ACE_Registry::Binding_Iterator::Context_Iteration::next_n)
-                        
-        * ace/OS.h: Added UNICODE support for ACE_DEFAULT_LOCALNAME.
+		ACE_Registry::Binding_Iterator::Context_Iteration::next_n)
+			
+	* ace/OS.h: Added UNICODE support for ACE_DEFAULT_LOCALNAME.
 
-        * ace/Proactor.cpp: Redid "lost" changes to add UNICODE support to:
+	* ace/Proactor.cpp: Redid "lost" changes to add UNICODE support to:
 
-          /* Proactor */
+	  /* Proactor */
           ACE_Overlapped_File::ACE_Overlapped_File
           ACE_Overlapped_File::open
 
-        * ace/Registry_Name_Space.h: Changed the order of #include and
-          #define as that the correct set of MACROS are defined for the
-          include files.
+	* ace/Registry_Name_Space.h: Changed the order of #include and
+	  #define as that the correct set of MACROS are defined for the
+	  include files.
 
-        * tests/MM_Shared_Memory_Test.cpp: Added UNICODE support.
-        
+	* tests/MM_Shared_Memory_Test.cpp: Added UNICODE support.
+	
 Mon Jan 27 09:16:03 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_sunc++.GNU,
-          include/makeinclude/platform_sunos5_sunc++_orbix.GNU,
-          ace/config-sunos5.5-sunc++-4.x-orbix.h
-          ace/config-sunos5.5-sunc++-4.x.h:
-          disabled exception handling by commenting out ACE_HAS_EXCEPTIONS
-          in the config files and adding -noex to the platform files,
-          because it causes trouble, at least on MP machines.
+	* include/makeinclude/platform_sunos5_sunc++.GNU,
+	  include/makeinclude/platform_sunos5_sunc++_orbix.GNU,
+	  ace/config-sunos5.5-sunc++-4.x-orbix.h
+	  ace/config-sunos5.5-sunc++-4.x.h:
+	  disabled exception handling by commenting out ACE_HAS_EXCEPTIONS
+	  in the config files and adding -noex to the platform files,
+	  because it causes trouble, at least on MP machines.
 
 Mon Jan 27 14:54:31 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Memory_Pool.h: Added code to ACE_MMAP_Memory_Pool_Options to
-          take a minimum_bytes parameter.  This is needed to prevent mmap
-          remapping when a large segment is requested.  Thanks to Fred
-          LaBar <flabar@fallschurch.esys.com> for this.
+	* ace/Memory_Pool.h: Added code to ACE_MMAP_Memory_Pool_Options to
+ 	  take a minimum_bytes parameter.  This is needed to prevent mmap
+ 	  remapping when a large segment is requested.  Thanks to Fred
+ 	  LaBar <flabar@fallschurch.esys.com> for this.
 
 Sun Jan 26 13:39:13 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i: Changed the typo sis_siglist to sys_siglist.  Also,
-          changed the logic from #if !defined (ACE_HAS_SYS_SIGLIST) to
-          #if defined (ACE_HAS_SYS_SIGLIST) since this makes more sense...
-          Thanks to Nanbor Wang <nw1@cs.wustl.edu> for noticing this.
+	* ace/OS.i: Changed the typo sis_siglist to sys_siglist.  Also,
+ 	  changed the logic from #if !defined (ACE_HAS_SYS_SIGLIST) to
+	  #if defined (ACE_HAS_SYS_SIGLIST) since this makes more sense...
+  	  Thanks to Nanbor Wang <nw1@cs.wustl.edu> for noticing this.
 
 Sat Jan 25 20:30:23 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos5.5-sunc++-4.1.h: commented out ACE_HAS_EXCEPTIONS
-          #define because -noex is required with it, and that causes core
-          dump during thread exit on multiprocessor UltraSparcs.
+	* ace/config-sunos5.5-sunc++-4.1.h: commented out ACE_HAS_EXCEPTIONS
+	  #define because -noex is required with it, and that causes core
+	  dump during thread exit on multiprocessor UltraSparcs.
 
-        * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: added -noex
-          back because of core dump during thread exit on
-          multiprocessor UltraSparcs.
+	* include/makeinclude/platform_sunos5_sunc++_4.1.GNU: added -noex
+	  back because of core dump during thread exit on
+	  multiprocessor UltraSparcs.
 
-        * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp,
-          examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp (control):
-          added "default" case to switch statement to eliminate compiler
-          warnings about enumeration values not being handled in switch.
+	* examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp,
+	  examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp (control):
+	  added "default" case to switch statement to eliminate compiler
+	  warnings about enumeration values not being handled in switch.
 
-        * examples/ASX/UPIPE_Event_Server/event_server.cpp (consumer):
-          removed unused variable "iter".
+	* examples/ASX/UPIPE_Event_Server/event_server.cpp (consumer):
+	  removed unused variable "iter".
 
 Sat Jan 25 12:50:24 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.i: Updated all the cond_timedwait() and cond_wait()
-          methods so that they decrement the count of waiters by one even
-          when errors occur.  Thanks to Irfan for finding this.
+	* ace/OS.i: Updated all the cond_timedwait() and cond_wait()
+ 	  methods so that they decrement the count of waiters by one even
+ 	  when errors occur.  Thanks to Irfan for finding this.
 
-        * ace/Map_Manager.cpp: Updated the ACE_Map_Iterator code so that
-          it no longer crashes if the Map has been closed.  Thanks to
-          Slawomir Kuzniar <kuzniar@Bear.COM> for reporting this.
+	* ace/Map_Manager.cpp: Updated the ACE_Map_Iterator code so that
+ 	  it no longer crashes if the Map has been closed.  Thanks to
+	  Slawomir Kuzniar <kuzniar@Bear.COM> for reporting this.
 
 Sat Jan 25 11:34:56 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-        * ace/SOCK_Connector.cpp (complete): Added a sleep of zero seconds
-          which allows non-blocking connects to work properly on NT.
+	* ace/SOCK_Connector.cpp (complete): Added a sleep of zero seconds
+	  which allows non-blocking connects to work properly on NT.
 
-        * ace/config-winnt-4.0-msvc4.x.h and config-win32-msvc4.x.h: 
-          Added ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS.
+	* ace/config-winnt-4.0-msvc4.x.h and config-win32-msvc4.x.h: 
+	  Added ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS.
 
-        * ace/OS.i: Moved out all code for Time_Value from #if region. It
-          is common to all.
+	* ace/OS.i: Moved out all code for Time_Value from #if region. It
+	  is common to all.
 
-        * ace/Reactor: Added helper routines to stop the VC++ compiler from
-          bitching about destructors in exception handling code.
+	* ace/Reactor: Added helper routines to stop the VC++ compiler from
+	  bitching about destructors in exception handling code.
 
-        * ace/ace.{mak,mdp}: Removed Time_Value.cpp from project.
+	* ace/ace.{mak,mdp}: Removed Time_Value.cpp from project.
 
-        * tests/tests.{mak,mdp}: Corrected the creation of SOCK_Test and
-          Message_Blob_Test executables and temporary files.
+	* tests/tests.{mak,mdp}: Corrected the creation of SOCK_Test and
+	  Message_Blob_Test executables and temporary files.
 
 Fri Jan 24 09:01:50 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * examples/Connection/misc/Connection_Handler.cpp: added
-          specialization of ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-          so that subproject will build with g++ without optimization.
+	* examples/Connection/misc/Connection_Handler.cpp: added
+	  specialization of ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+	  so that subproject will build with g++ without optimization.
 
-        * apps/Gateway/Gateway/Proxy_Handler.cpp: added specializations
-          of ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH> and
-          ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-          so that subproject will build with g++ without optimization.
+	* apps/Gateway/Gateway/Proxy_Handler.cpp: added specializations
+	  of ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH> and
+	  ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+	  so that subproject will build with g++ without optimization.
 
-        * tests/Reactor_Exceptions_Test.cpp (main): added ACE_UNUSED_ARG
-          for argc and argv when ACE_HAS_EXCEPTIONS is not defined.
+	* tests/Reactor_Exceptions_Test.cpp (main): added ACE_UNUSED_ARG
+	  for argc and argv when ACE_HAS_EXCEPTIONS is not defined.
 
-        * performance-tests/Misc/test_mutex.cpp: made destructor of
-          Thread_Mutex_Derived virtual because the class has other virtual
-          functions.
+	* performance-tests/Misc/test_mutex.cpp: made destructor of
+	  Thread_Mutex_Derived virtual because the class has other virtual
+	  functions.
 
 Thu Jan 23 11:51:45 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/config-sunos5.5-g++.h: commented out ACE_HAS_EXCEPTIONS because
-          -fhandle-exceptions is broken in g++ 2.7.2 (and is required in order
-          to use exception handling); also, added ACE_HAS_INLINED_OSCALLS, if
-           __ACE_INLINE__ is #defined.
+	* ace/config-sunos5.5-g++.h: commented out ACE_HAS_EXCEPTIONS because
+	  -fhandle-exceptions is broken in g++ 2.7.2 (and is required in order
+	  to use exception handling); also, added ACE_HAS_INLINED_OSCALLS, if
+	   __ACE_INLINE__ is #defined.
 
-        * ace/config-sunos5.5-sunc++-4.1.h: added ACE_HAS_INLINED_OSCALLS,
-          if __ACE_INLINE__ is #defined.
+	* ace/config-sunos5.5-sunc++-4.1.h: added ACE_HAS_INLINED_OSCALLS,
+	  if __ACE_INLINE__ is #defined.
 
 Wed Jan 22 15:04:47 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Moved the ACE_TIMER_SKEW macro to below the #inclusion
-          of config.h and updated it so that it can be overridden in the
-          config.h file if necessary.  Thanks to Bob Olson
-          <olson@mcs.anl.gov> for motivating this.
+	* ace/OS.h: Moved the ACE_TIMER_SKEW macro to below the #inclusion
+ 	  of config.h and updated it so that it can be overridden in the
+ 	  config.h file if necessary.  Thanks to Bob Olson
+ 	  <olson@mcs.anl.gov> for motivating this.
 
-        * ace/OS.cpp: Fixed the implementation of
-          ACE_Thread_ID::operator== so that it works correctly when thread
-          ids and thread handles aren't ints.  Thanks to Chuck Gehr for
-          reporting this.
+	* ace/OS.cpp: Fixed the implementation of
+ 	  ACE_Thread_ID::operator== so that it works correctly when thread
+ 	  ids and thread handles aren't ints.  Thanks to Chuck Gehr for
+ 	  reporting this.
 
-        * ace/OS.i (thr_getprio): Moved a stray #else into the right
-          place.  Thanks to Chuck Gehr for reporting this.
+	* ace/OS.i (thr_getprio): Moved a stray #else into the right
+ 	  place.  Thanks to Chuck Gehr for reporting this.
 
-        * ace/OS.i (sema_post): this->count_++ should have been
-          s->count_++.  Thanks to Chuck Gehr for reporting this.
+	* ace/OS.i (sema_post): this->count_++ should have been
+ 	  s->count_++.  Thanks to Chuck Gehr for reporting this.
 
-        * ace/Synch_T.cpp: Added an extern "C" definition for
-          ACE_TSS_C_cleanup().  Thanks to Chuck Gehr for reporting this.
+	* ace/Synch_T.cpp: Added an extern "C" definition for
+ 	  ACE_TSS_C_cleanup().  Thanks to Chuck Gehr for reporting this.
 
-        * ace: Added a new #define called ACE_LACKS_SYS_NERR to the
-          config files for MVS and VxWorks.  This is used in OS.cpp
-          as follows:
+	* ace: Added a new #define called ACE_LACKS_SYS_NERR to the
+	  config files for MVS and VxWorks.  This is used in OS.cpp
+	  as follows:
 
-          #if defined (ACE_LACKS_SYS_NERR)
-          int sys_nerr = ERRMAX + 1;
-          #endif /* ACE_LACKS_SYS_NERR */
+	  #if defined (ACE_LACKS_SYS_NERR)
+	  int sys_nerr = ERRMAX + 1;
+	  #endif /* ACE_LACKS_SYS_NERR */
 
-          Thanks to Chuck Gehr for reporting this.
+	  Thanks to Chuck Gehr for reporting this.
 
-        * Removed all #inclusions of "ace/Time_Value.h."  This file
-          no longer contains anything besides a #include "ace/OS.h"
-          and is only kept around due to backwards compatibility.
+	* Removed all #inclusions of "ace/Time_Value.h."  This file
+	  no longer contains anything besides a #include "ace/OS.h"
+	  and is only kept around due to backwards compatibility.
 
-        * ace: Moved the contents of Time_Value.h into OS.h to reduce the
-          confusion that arises from the #inclusion of "config.h" in
-          Time_Value.h.  Also merged the contents of Time_Value.{i,cpp}
-          into OS.{i,cpp}.  Thanks to the MDA guys for motivating this.
+	* ace: Moved the contents of Time_Value.h into OS.h to reduce the
+ 	  confusion that arises from the #inclusion of "config.h" in
+ 	  Time_Value.h.  Also merged the contents of Time_Value.{i,cpp}
+ 	  into OS.{i,cpp}.  Thanks to the MDA guys for motivating this.
 
-        * tests/Reactor_Exceptions_Test.cpp: Added a new test that
-          exercises the Reactor with C++ exceptions.  Thanks to Luca for
-          the test.
+	* tests/Reactor_Exceptions_Test.cpp: Added a new test that
+ 	  exercises the Reactor with C++ exceptions.  Thanks to Luca for
+ 	  the test.
 
-        * ace/Reactor.cpp (handle_events): Added Win32 structured
-          exception handling support to the ACE_Reactor::handle_events()
-          method so that it correctly releases the token lock when Win32
-          SEH occur in callback routines.  Thanks to Luca for reporting
-          this problem.
+	* ace/Reactor.cpp (handle_events): Added Win32 structured
+ 	  exception handling support to the ACE_Reactor::handle_events()
+ 	  method so that it correctly releases the token lock when Win32
+ 	  SEH occur in callback routines.  Thanks to Luca for reporting
+ 	  this problem.
 
-        * ace: Added a new macro called ACE_HAS_EXCEPTIONS, which
-          indicates that the compiler supports C++ exception handling.
+	* ace: Added a new macro called ACE_HAS_EXCEPTIONS, which
+ 	  indicates that the compiler supports C++ exception handling.
 
-        * include/makeinclude/platform_sunos5_sunc++*.GNU: Commented out
-          the -noex flag for now.  Hopefully, things will work correctly
-          now.
+	* include/makeinclude/platform_sunos5_sunc++*.GNU: Commented out
+ 	  the -noex flag for now.  Hopefully, things will work correctly
+ 	  now.
 
-        * ace/Thread_Manager.cpp (exit): Removed the final acquire() on
-          ace_mon, which is no longer necessary since the Guard classes
-          now keep track of whether they are "owned".  Thanks to Karlheinz
-          and Detlef for this fix.
+	* ace/Thread_Manager.cpp (exit): Removed the final acquire() on
+ 	  ace_mon, which is no longer necessary since the Guard classes
+ 	  now keep track of whether they are "owned".  Thanks to Karlheinz
+ 	  and Detlef for this fix.
 
 Wed Jan 22 09:05:31 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Makefile,VERSION: modified top-level Makefile (and VERSION)
-          to add a timestamp to the VERSION file if creating a release
-          from the /project/adaptive/ACE_wrappers directory.  If it
-          causes problems, this will disable it:
-          % make  TIMESTAMP=  release.
+	* Makefile,VERSION: modified top-level Makefile (and VERSION)
+	  to add a timestamp to the VERSION file if creating a release
+	  from the /project/adaptive/ACE_wrappers directory.  If it
+	  causes problems, this will disable it:
+	  % make  TIMESTAMP=  release.
 
-        * ace/Local_Tokens.cpp (dump): replaced "ACE_TSS<ACE_TPQ_Entry>"
-          with "ACE_TPQ_ENTRY" so that ACE_NO_TSS_TOKENS is supported.
+	* ace/Local_Tokens.cpp (dump): replaced "ACE_TSS<ACE_TPQ_Entry>"
+	  with "ACE_TPQ_ENTRY" so that ACE_NO_TSS_TOKENS is supported.
 
-        * ace/Synch.h: fixed typo in comment header for ACE_Thread_Semaphore
+	* ace/Synch.h: fixed typo in comment header for ACE_Thread_Semaphore
 
-        * ace/config-vxworks-ghs-1.8.h,config-vxworks5.2-g++.h,
-          config-unixware-2.01-g++.h:
-          protect ACE_HAS_INLINED_OSCALLS #defined with
-          #if defined (__ACE_INLINE__).
+	* ace/config-vxworks-ghs-1.8.h,config-vxworks5.2-g++.h,
+	  config-unixware-2.01-g++.h:
+	  protect ACE_HAS_INLINED_OSCALLS #defined with
+	  #if defined (__ACE_INLINE__).
 
-        * apps/Gateway/Gateway/Event_Channel.cpp (open): added
-          ACE_UNUSED_ARG (sig);.
+	* apps/Gateway/Gateway/Event_Channel.cpp (open): added
+	  ACE_UNUSED_ARG (sig);.
 
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.h:
-          declared a friend of class Peer_Router_Context because it
-          has a private destructor, to eliminate compiler warning
-          about not having any friends.
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.h:
+	  declared a friend of class Peer_Router_Context because it
+	  has a private destructor, to eliminate compiler warning
+	  about not having any friends.
 
-        * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
-          (open): added return 0 in "true" branch of if statement so
-          that the function always returns a value.
+	* examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+	  (open): added return 0 in "true" branch of if statement so
+	  that the function always returns a value.
 
 Tue Jan 21 09:19:44 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * tests/Reader_Writer_Test.cpp (reader): commented out unused
-          variable "n"; also, commented out unused function
-          print_usage_and_die.
+	* tests/Reader_Writer_Test.cpp (reader): commented out unused
+	  variable "n"; also, commented out unused function
+	  print_usage_and_die.
 
-        * tests/TSS_Test.cpp, Thread_Manager_Test.cpp (main): added
-          ACE_UNUSED_ARG (sa);.
+	* tests/TSS_Test.cpp, Thread_Manager_Test.cpp (main): added
+	  ACE_UNUSED_ARG (sa);.
 
-        * tests/Thread_Pool_Test.cpp (open):  added return 0 at end.
+	* tests/Thread_Pool_Test.cpp (open):  added return 0 at end.
 
 Tue Jan 21 11:00:12 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Gateway.cpp (parse_args): There was a small
-          bug in parse_args (latest beta), it mixed proxy and consumer
-          conf files.  Thanks to Per Andersson
-          <Per.Andersson@hfera.ericsson.se> for reporting this.
+	* apps/Gateway/Gateway/Gateway.cpp (parse_args): There was a small
+ 	  bug in parse_args (latest beta), it mixed proxy and consumer
+ 	  conf files.  Thanks to Per Andersson
+ 	  <Per.Andersson@hfera.ericsson.se> for reporting this.
 
 Mon Jan 20 13:29:28 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.i, ace/Task.h, and ace/Thread_Manager.h: changed a few
-          occurrences of NULL to 0 (for other than Win32 platforms),
-          primarily to avoid compiler warnings on VxWorks if ACE.h isn't
-          #included before stddef.h.
+	* ace/OS.i, ace/Task.h, and ace/Thread_Manager.h: changed a few
+	  occurrences of NULL to 0 (for other than Win32 platforms),
+	  primarily to avoid compiler warnings on VxWorks if ACE.h isn't
+	  #included before stddef.h.
 
-        * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
-          (handle_input): replaced %d format with %hu for u_short arg.
+	* netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+	  (handle_input): replaced %d format with %hu for u_short arg.
 
-        * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
-          (run_writer): initialized variable "t" to avoid compiler warning.
+	* netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+	  (run_writer): initialized variable "t" to avoid compiler warning.
 
-        * examples/Connection/misc/Connection_Handler.cpp (handle_timeout):
-          added ACE_UNUSED_ARG (tv); also, added explicit int return type
-          to definition of Connection_Handler::close (u_long).
+	* examples/Connection/misc/Connection_Handler.cpp (handle_timeout):
+	  added ACE_UNUSED_ARG (tv); also, added explicit int return type
+	  to definition of Connection_Handler::close (u_long).
 
-        * examples/Threads/task_four.cpp (Invoker_Task::svc):
-          moved declaration of "task" out of for loop because it is
-          also used after the for loop.
+	* examples/Threads/task_four.cpp (Invoker_Task::svc):
+	  moved declaration of "task" out of for loop because it is
+	  also used after the for loop.
 
-        * netsvcs/lib/Name_Handler.cpp, Server_Logging_Handler.cpp,
-          TS_Clerk_Handler.cpp, TS_Server_Handler.cpp, Token_Handler.cpp:
-          added ACE_UNUSED_ARG (sig);.
+	* netsvcs/lib/Name_Handler.cpp, Server_Logging_Handler.cpp,
+	  TS_Clerk_Handler.cpp, TS_Server_Handler.cpp, Token_Handler.cpp:
+	  added ACE_UNUSED_ARG (sig);.
 
 Sun Jan 19 11:10:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_sunc++.GNU,
-          platform_sunos5_sunc++_4.1.GNU:
-          added comment about compiler warnings with +w option.
-          Also, added +w to platform_sunos5_sunc++_4.1.GNU.  With the
-          other changes in this ChangeLog entry, there no longer should
-          be significant warnings from Sun C++ when building ACE.
-
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
-          (Peer_Handler::put): added ACE_UNUSED_ARG (tv);.
-
-        * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp (main),
-          netsvcs/clients/Tokens/invariant/invariant.cpp (main):
-          commented out argc and argv.
-
-        * examples/Mem_Map/file-reverse/file-reverse.cpp (main):
-          removed unused variable "cp".
-
-        * netsvcs/clients/Tokens/manual/manual.cpp (handle_input,
-          handle_exception): added ACE_UNUSED_ARG (fd); and
-          (create_proxy): added return statement at end:  even
-          though it should never be reached, it eliminates a
-          compiler warning.
-
-        * examples/OS/Process/process.cpp,
-          examples/Reactor/Misc/test_reactors.cpp,
-          netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp,
-          netsvcs/clients/Tokens/mutex/test_mutex.cpp,
-          netsvcs/clients/Tokens/rw_lock/rw_locks.cpp,
-          performance-tests/TTCP/ORBeline/ttcp_i.cpp,
-          performance-tests/TTCP/Orbix/ttcp_i.cpp (main):
-          return 0 instead of 42.
+	* include/makeinclude/platform_sunos5_sunc++.GNU,
+	  platform_sunos5_sunc++_4.1.GNU:
+	  added comment about compiler warnings with +w option.
+	  Also, added +w to platform_sunos5_sunc++_4.1.GNU.  With the
+	  other changes in this ChangeLog entry, there no longer should
+	  be significant warnings from Sun C++ when building ACE.
+
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+	  (Peer_Handler::put): added ACE_UNUSED_ARG (tv);.
+
+	* examples/IPC_SAP/SPIPE_SAP/NPServer.cpp (main),
+	  netsvcs/clients/Tokens/invariant/invariant.cpp (main):
+	  commented out argc and argv.
+
+	* examples/Mem_Map/file-reverse/file-reverse.cpp (main):
+	  removed unused variable "cp".
+
+	* netsvcs/clients/Tokens/manual/manual.cpp (handle_input,
+	  handle_exception): added ACE_UNUSED_ARG (fd); and
+	  (create_proxy): added return statement at end:  even
+	  though it should never be reached, it eliminates a
+	  compiler warning.
+
+	* examples/OS/Process/process.cpp,
+	  examples/Reactor/Misc/test_reactors.cpp,
+	  netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp,
+	  netsvcs/clients/Tokens/mutex/test_mutex.cpp,
+	  netsvcs/clients/Tokens/rw_lock/rw_locks.cpp,
+	  performance-tests/TTCP/ORBeline/ttcp_i.cpp,
+	  performance-tests/TTCP/Orbix/ttcp_i.cpp (main):
+	  return 0 instead of 42.
 
 Sat Jan 18 10:54:25 1997  Prashant Jain  <pjain@merengue.cs.wustl.edu>
 
-        * java/src/README: Updated the README file to indicate how
-          documentation for Java ACE cab be automatically generated.
+	* java/src/README: Updated the README file to indicate how
+	  documentation for Java ACE cab be automatically generated.
 
 Fri Jan 17 11:47:10 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/OS.h: Added an equivalent set of
-          ACE_LSOCK_{STREAM,ACCEPTOR,CONNECTOR} macros to complement the
-          ones for ACE_SOCK_*.  Thanks to Gonzalo Diethelm
-          <gonzo@ing.puc.cl> for suggesting this.
-
-        * ace/OS.cpp (ACE_Thread_Adapter): Added a new feature that allows
-          logging features to be inherited by threads.  It works with
-          those OSs (e.g., Win32) that use ACE_Thread_Adapter class.  At
-          some point, we might do this for all the OSs.  Thanks to Luca
-          for this.
-
-        * examples/Connection/misc/Connection_Handler.cpp: Added a
-          new example that illustrates how to use the Acceptor pattern
-          to create multiple threads, each running its own Reactor.
-
-        * ace/Log_Msg.cpp (dump): Some of the variables in the dump()
-          method have the wrong format specification type. These are:
-          restart_ (%d), flags_ (%x), priority_mask_ (%d).  They are now
-          fixed, thanks to Luca.
-
-        * tests/Priority_Task_Test.cpp (open): Add an ACE_ASSERT to make
-          sure that the tasks activate() correctly.  Thanks to David for
-          finding this.
-
-        * ace/config-linux-lxpthreads.h: Added #defines for
-          ACE_HAS_AUTOMATIC_INIT_FINI and ACE_HAS_SVR4_DYNAMIC_LINKING.
-          Thanks to Marius for this.
-
-        * ace/Malloc.h: Changed the typedef of ACE_Malloc_Align to a macro
-          called ACE_MALLOC_ALIGN to allow users to override this value in
-          their config.h file.  This is necessary for platforms that don't
-          have "long" word alignments.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for this suggestion.
-
-        * ace/OS.h: Added an #ifdef check for ACE_HAS_IRIX62_THREADS and
-          if so, we'll use the if (&a) /* null */; } form of the
-          ACE_UNUSED_ARG macro to avoid unnecessary warnings.  Thanks to
-          Fred LaBar <flabar@fallschurch.esys.com> for testing this out.
+	* ace/OS.h: Added an equivalent set of
+ 	  ACE_LSOCK_{STREAM,ACCEPTOR,CONNECTOR} macros to complement the
+ 	  ones for ACE_SOCK_*.  Thanks to Gonzalo Diethelm
+ 	  <gonzo@ing.puc.cl> for suggesting this.
+
+	* ace/OS.cpp (ACE_Thread_Adapter): Added a new feature that allows
+ 	  logging features to be inherited by threads.  It works with
+ 	  those OSs (e.g., Win32) that use ACE_Thread_Adapter class.  At
+ 	  some point, we might do this for all the OSs.  Thanks to Luca
+ 	  for this.
+
+	* examples/Connection/misc/Connection_Handler.cpp: Added a
+	  new example that illustrates how to use the Acceptor pattern
+	  to create multiple threads, each running its own Reactor.
+
+	* ace/Log_Msg.cpp (dump): Some of the variables in the dump()
+ 	  method have the wrong format specification type. These are:
+ 	  restart_ (%d), flags_ (%x), priority_mask_ (%d).  They are now
+ 	  fixed, thanks to Luca.
+
+	* tests/Priority_Task_Test.cpp (open): Add an ACE_ASSERT to make
+ 	  sure that the tasks activate() correctly.  Thanks to David for
+ 	  finding this.
+
+	* ace/config-linux-lxpthreads.h: Added #defines for
+ 	  ACE_HAS_AUTOMATIC_INIT_FINI and ACE_HAS_SVR4_DYNAMIC_LINKING.
+  	  Thanks to Marius for this.
+
+	* ace/Malloc.h: Changed the typedef of ACE_Malloc_Align to a macro
+ 	  called ACE_MALLOC_ALIGN to allow users to override this value in
+ 	  their config.h file.  This is necessary for platforms that don't
+ 	  have "long" word alignments.  Thanks to Fred LaBar
+ 	  <flabar@fallschurch.esys.com> for this suggestion.
+
+	* ace/OS.h: Added an #ifdef check for ACE_HAS_IRIX62_THREADS and
+ 	  if so, we'll use the if (&a) /* null */; } form of the
+ 	  ACE_UNUSED_ARG macro to avoid unnecessary warnings.  Thanks to
+ 	  Fred LaBar <flabar@fallschurch.esys.com> for testing this out.
 
 Fri Jan 17 16:33:25 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/High_Res_Timer.*: added elapsed_time () and get_time ().
+	* ace/High_Res_Timer.*: added elapsed_time () and get_time ().
 
-        * netsvcs/clients/Tokens/collection/collection.cpp, rw_locks.cpp:
-          commented out unused variables to avoid compiler warnings; and
-          return 0 from main ().
+	* netsvcs/clients/Tokens/collection/collection.cpp, rw_locks.cpp:
+	  commented out unused variables to avoid compiler warnings; and
+	  return 0 from main ().
 
-        * include/makeinclude/rules.local.GNU,
-          netsvcs/lib/Makefile,
-          examples/Service_Configurator/IPC-tests/server/Makefile:
-          fixed ESOBUILD mechanism to work on all platforms, not just Linux.
-          Thanks to Marius Kjeldahl <marius@funcom.com> for this fix.
+	* include/makeinclude/rules.local.GNU,
+	  netsvcs/lib/Makefile,
+	  examples/Service_Configurator/IPC-tests/server/Makefile:
+	  fixed ESOBUILD mechanism to work on all platforms, not just Linux.
+	  Thanks to Marius Kjeldahl <marius@funcom.com> for this fix.
 
-        * ace/OS.i and OS.cpp: uninlined functions that use varargs, because
-          they usually won't get inlined anyways.
+	* ace/OS.i and OS.cpp: uninlined functions that use varargs, because
+	  they usually won't get inlined anyways.
 
-        * ace/OS.cpp (thr_create): added #else clause to be sure that
-          always sparam.sched_priority always get set to the priority argument.
+	* ace/OS.cpp (thr_create): added #else clause to be sure that
+	  always sparam.sched_priority always get set to the priority argument.
 
-        * netsvcs/clients/Naming/Client/Client_Test.cpp: commented out
-          unused parameters and wrapped combined assignments/conditional
-          values to avoid compiler (g++) warnings.
+	* netsvcs/clients/Naming/Client/Client_Test.cpp: commented out
+	  unused parameters and wrapped combined assignments/conditional
+	  values to avoid compiler (g++) warnings.
 
-        * tests/Priority_Task_Test.cpp: added check for successful thread
-          spawn, and ACE_NEW_THREAD to svc () so that messages get logged.
+	* tests/Priority_Task_Test.cpp: added check for successful thread
+	  spawn, and ACE_NEW_THREAD to svc () so that messages get logged.
 
 Thu Jan 16 17:03:47 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * include/makeinclude: Added support for shared object files
-          on Linux.  Thanks to Marius Kjeldahl <mariusk@sn.no,
-          marius@funcom.com> for his help with this. 
+	* include/makeinclude: Added support for shared object files
+	  on Linux.  Thanks to Marius Kjeldahl <mariusk@sn.no,
+	  marius@funcom.com> for his help with this. 
 
-        * ace: Merged in the IRIX support, mainly the missing netdb reentrant 
-          functions.  Thanks to Gonzalo Diethelm <gonzo@ing.puc.cl>
-          and Carlos O'Ryan <coryan@mat.puc.cl> for their help.
+	* ace: Merged in the IRIX support, mainly the missing netdb reentrant 
+	  functions.  Thanks to Gonzalo Diethelm <gonzo@ing.puc.cl>
+	  and Carlos O'Ryan <coryan@mat.puc.cl> for their help.
 
-        * ace/Timer_{List,Heap,Queue}: Changed iterator() to iter() to
-          avoid name clashes with STL (ugh).
+	* ace/Timer_{List,Heap,Queue}: Changed iterator() to iter() to
+ 	  avoid name clashes with STL (ugh).
 
-        * ace/Timer_{Heap,List}.cpp: Added ACE_BUILD_DLL so that things
-          will link.  Thanks to John Morey for reporting this.
+	* ace/Timer_{Heap,List}.cpp: Added ACE_BUILD_DLL so that things
+ 	  will link.  Thanks to John Morey for reporting this.
 
-        * ace/Synch_T.h: Fixed: class ACE_Write_Guard: method:
-          tryacquire_write so that it will call
-          ...->lock_->tryacquire_write() and not
-          ...->lock_->acquire_write().  Thanks to Alexandre Karev
-          <Alexandre.Karev@cern.ch> for this fix.
+	* ace/Synch_T.h: Fixed: class ACE_Write_Guard: method:
+ 	  tryacquire_write so that it will call
+ 	  ...->lock_->tryacquire_write() and not
+ 	  ...->lock_->acquire_write().  Thanks to Alexandre Karev
+	  <Alexandre.Karev@cern.ch> for this fix.
 
 Thu Jan 16 15:51:16 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * Dump.cpp (register_object): initialized "slot" so that g++ doesn't
-          complain about uninitialized use.
+	* Dump.cpp (register_object): initialized "slot" so that g++ doesn't
+	  complain about uninitialized use.
 
-        * Reactor.cpp (initialized): use ACE_GUARD_RETURN instead of
-          ACE_GUARD because the function returns a value;
-          (find): initialize "i" if handle is out of range so that g++
-          doesn't complain about uninitialized use.
+	* Reactor.cpp (initialized): use ACE_GUARD_RETURN instead of
+	  ACE_GUARD because the function returns a value;
+	  (find): initialize "i" if handle is out of range so that g++
+	  doesn't complain about uninitialized use.
 
-        * Service_Repository.cpp (remove): removed unused variable "handle".
+	* Service_Repository.cpp (remove): removed unused variable "handle".
 
-        * Thread_Manager.h: made destructor virtual now that spawn_i () is
-          virtual.
+	* Thread_Manager.h: made destructor virtual now that spawn_i () is
+	  virtual.
 
-        * Timer_Heap.cpp: changed some int loop indicies to size_t to
-          make sure that comparisons are consistently signed or unsigned.
+	* Timer_Heap.cpp: changed some int loop indicies to size_t to
+	  make sure that comparisons are consistently signed or unsigned.
 
-        * OS.h, config-vxworks*.h: removed ACE_HAS_GREENHILLS_SOCKETS
-          ACE macro because the code it wrapped applies to all VxWorks
-          compilers, not just GreenHills.
+	* OS.h, config-vxworks*.h: removed ACE_HAS_GREENHILLS_SOCKETS
+	  ACE macro because the code it wrapped applies to all VxWorks
+	  compilers, not just GreenHills.
 
 Wed Jan 15 02:06:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/ACE.cpp (round_to_pagesize): If _SC_PAGESIZE is enabled then
-          we set the ACE::pagesize_ variable using sysconf(2).  Thanks to
-          James Mansion for this suggestion.
+	* ace/ACE.cpp (round_to_pagesize): If _SC_PAGESIZE is enabled then
+ 	  we set the ACE::pagesize_ variable using sysconf(2).  Thanks to
+ 	  James Mansion for this suggestion.
 
 Wed Jan 15 02:06:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Timer_Queue.cpp (expire): Changed a line of code from
-        
-          ACE_Timer_Queue_Iterator &iterator (this->iterator ());
-
-          to
-
-          ACE_Timer_Queue_Iterator &iterator = this->iterator ();
-
-          so that the Visual C++ compiler can grok it.  Thanks to John
-          Morey for reporting this.
-
-        * ace/Reactor.cpp: Modified the close() method so that it can be
-          called multiple times with no bad side-effects.
-
-        * ace/Pipe.cpp: Modified the close() method so that it can be
-          called multiple times with no bad side-effects.
-
-        * ace/Reactor: Added an initialized() method that indicates
-          whether the Reactor was successfully initialized.  Also
-          rearranged the code in ACE_Reactor::open() so that initialized_
-          is only set at the end of the method when everything succeeds.
-          If things *don't* succeed, we call close() on the way out.
-          Thanks to Luca for these suggestions.
-
-        * ace/Reactor.cpp (close): When closing down the ACE_Reactor, we
-          now set initialized_ back to 0 so that it can be reopened again
-          later.
-
-        * tests/Reader_Writer_Test.cpp: There were some problems with this
-          test due to the fact that on many pthreads platforms pthread_t
-          isn't an int (it's a struct).  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for the fix.
-
-        * ace/OS.i (exit): In WIN32 when the process exits through an
-          ExitProcess() call, some process resources (e.g., file handles)
-          are freed before the static variable destructors are
-          called. This results in an application error when tracing is
-          enabled.  Removing the ACE_TRACE call in ~ACE_Event_Handler
-          seems to fix this.  Thanks to Luca for this fix.
-
-        * ace/OS: Fixed the implementation of semaphores for the POSIX
-          port (POSIX lacks semaphores).  The trick was to add a "waiters"
-          field, along with the semaphore count.  Thanks to John Bossom
-          <John.Bossom@Cognos.COM> for reporting this.
-
-        * examples/Threads/wfmo.cpp: Added a new test program that seems
-          to indicate that the Win32 WaitForMultipleObjects() function can
-          be called in multiple threads, all of which wait on the same set
-          of HANDLEs.  Note that the dispatching of the threads is
-          relatively "fair" (i.e., everyone gets a chance to process the
-          various HANDLEs as they become active).  Thanks to Ari Erev
-          <Ari_Erev@comverse.com> for suggesting this and providing the
-          initial code.
-
-        * ace/Thread_Manager.h: Made the spawn_i() method virtual and
-          moved it into the protected section of the class so that it can
-          be over-ridden by subclasses.  Thanks to Tim Harrison for
-          suggesting this.
+	* ace/Timer_Queue.cpp (expire): Changed a line of code from
+	
+	  ACE_Timer_Queue_Iterator &iterator (this->iterator ());
+
+	  to
+
+	  ACE_Timer_Queue_Iterator &iterator = this->iterator ();
+
+	  so that the Visual C++ compiler can grok it.  Thanks to John
+ 	  Morey for reporting this.
+
+	* ace/Reactor.cpp: Modified the close() method so that it can be
+ 	  called multiple times with no bad side-effects.
+
+	* ace/Pipe.cpp: Modified the close() method so that it can be
+ 	  called multiple times with no bad side-effects.
+
+	* ace/Reactor: Added an initialized() method that indicates
+ 	  whether the Reactor was successfully initialized.  Also
+ 	  rearranged the code in ACE_Reactor::open() so that initialized_
+ 	  is only set at the end of the method when everything succeeds.
+  	  If things *don't* succeed, we call close() on the way out.
+  	  Thanks to Luca for these suggestions.
+
+	* ace/Reactor.cpp (close): When closing down the ACE_Reactor, we
+ 	  now set initialized_ back to 0 so that it can be reopened again
+ 	  later.
+
+	* tests/Reader_Writer_Test.cpp: There were some problems with this
+ 	  test due to the fact that on many pthreads platforms pthread_t
+ 	  isn't an int (it's a struct).  Thanks to Chuck Gehr
+ 	  <gehr@sweng.stortek.com> for the fix.
+
+	* ace/OS.i (exit): In WIN32 when the process exits through an
+ 	  ExitProcess() call, some process resources (e.g., file handles)
+ 	  are freed before the static variable destructors are
+ 	  called. This results in an application error when tracing is
+ 	  enabled.  Removing the ACE_TRACE call in ~ACE_Event_Handler
+	  seems to fix this.  Thanks to Luca for this fix.
+
+	* ace/OS: Fixed the implementation of semaphores for the POSIX
+ 	  port (POSIX lacks semaphores).  The trick was to add a "waiters"
+ 	  field, along with the semaphore count.  Thanks to John Bossom
+ 	  <John.Bossom@Cognos.COM> for reporting this.
+
+	* examples/Threads/wfmo.cpp: Added a new test program that seems
+ 	  to indicate that the Win32 WaitForMultipleObjects() function can
+ 	  be called in multiple threads, all of which wait on the same set
+ 	  of HANDLEs.  Note that the dispatching of the threads is
+ 	  relatively "fair" (i.e., everyone gets a chance to process the
+ 	  various HANDLEs as they become active).  Thanks to Ari Erev
+ 	  <Ari_Erev@comverse.com> for suggesting this and providing the
+ 	  initial code.
+
+	* ace/Thread_Manager.h: Made the spawn_i() method virtual and
+ 	  moved it into the protected section of the class so that it can
+ 	  be over-ridden by subclasses.  Thanks to Tim Harrison for
+ 	  suggesting this.
 
 Tue Jan 14 15:57:55 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.h: Changed the default size of ACE_DEFAULT_TIMERS to
-          _SC_TIMER_MAX (which is typically around 40 or so).
-          Thanks to Stuart Powell <stuartp@in.ot.com.au> for
-          suggesting this.
+	* ace/OS.h: Changed the default size of ACE_DEFAULT_TIMERS to
+ 	  _SC_TIMER_MAX (which is typically around 40 or so).
+	  Thanks to Stuart Powell <stuartp@in.ot.com.au> for
+	  suggesting this.
 
-        * tests/Timer_Queue_Test.cpp (main): Added some additional logic
-          so that we can test the performance of the preallocated and
-          non-preallocated ACE_Timer_Heap.
+	* tests/Timer_Queue_Test.cpp (main): Added some additional logic
+ 	  so that we can test the performance of the preallocated and
+ 	  non-preallocated ACE_Timer_Heap.
 
-        * ace/Timer_Heap: Added a new "preallocate nodes" mechanism to the
-          ACE_Timer_Heap.  If this is enabled by the constructor, then we
-          preallocate as many ACE_Timer_Nodes as there are slots in the
-          heap.  This allows us to completely remove the need for dynamic
-          memory allocation, which is important for real-time systems.
+	* ace/Timer_Heap: Added a new "preallocate nodes" mechanism to the
+ 	  ACE_Timer_Heap.  If this is enabled by the constructor, then we
+ 	  preallocate as many ACE_Timer_Nodes as there are slots in the
+ 	  heap.  This allows us to completely remove the need for dynamic
+ 	  memory allocation, which is important for real-time systems.
 
-        * ace/Thread_Manager.cpp (remove_thr): Optimized the code just a
-          tad by decrementing the current_count_ *first*.  Thanks to Per
-          Andersson <Per.Andersson@hfera.ericsson.se> for suggesting this.
+	* ace/Thread_Manager.cpp (remove_thr): Optimized the code just a
+ 	  tad by decrementing the current_count_ *first*.  Thanks to Per
+ 	  Andersson <Per.Andersson@hfera.ericsson.se> for suggesting this.
 
-        * ace/ReactorEx: Updated the implementation so that the
-          handle_events() method now in fact *does* return the number of
-          event handler's dispatched (i.e., the implementation matches the
-          documentation...).  Thanks to Hamutal Yanay
-          <Hamutal_Yanay@mail.icomverse.com> for reporting this.
+	* ace/ReactorEx: Updated the implementation so that the
+ 	  handle_events() method now in fact *does* return the number of
+ 	  event handler's dispatched (i.e., the implementation matches the
+ 	  documentation...).  Thanks to Hamutal Yanay
+ 	  <Hamutal_Yanay@mail.icomverse.com> for reporting this.
 
-        * ace/Service_Repository.cpp (remove): Removed an extra call to
-          ACE_OS::dlclose().  This is already being called in the
-          destructor of ACE_Service_Record.  Thanks to Karlheinz for
-          reporting this.
+	* ace/Service_Repository.cpp (remove): Removed an extra call to
+ 	  ACE_OS::dlclose().  This is already being called in the
+ 	  destructor of ACE_Service_Record.  Thanks to Karlheinz for
+ 	  reporting this.
 
-        * man: Updated all the nroff and html documentation.
+	* man: Updated all the nroff and html documentation.
 
-        * ace/Timer_Heap: Implemented the spiffy new timer cancellation
-          algorithm that requires only O(log N) time to remove a timer
-          from the ACE_Timer_Heap.  This is about 50 to 100 times faster
-          than using the ACE_Timer_List implementation.
+	* ace/Timer_Heap: Implemented the spiffy new timer cancellation
+ 	  algorithm that requires only O(log N) time to remove a timer
+ 	  from the ACE_Timer_Heap.  This is about 50 to 100 times faster
+ 	  than using the ACE_Timer_List implementation.
 
 Tue Jan 14 21:01:36 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: Replace "Linux" preprocessor symbol with "linux".
+	* ace/OS.h: Replace "Linux" preprocessor symbol with "linux".
 
 Mon Jan 13 17:57:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Synch: Added lock() accessor methods to both
-          ACE_Process_Semaphore and ACE_Process_Mutex.  Thanks to Hamutal
-          Yanay <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
+	* ace/Synch: Added lock() accessor methods to both
+ 	  ACE_Process_Semaphore and ACE_Process_Mutex.  Thanks to Hamutal
+ 	  Yanay <Hamutal_Yanay@mail.icomverse.com> for suggesting this.
 
-        * ace/config-mvs.h: Added a #define for ACE_HAS_GETPAGESIZE.
-          Thanks to Chuck Gehr for this information.
+	* ace/config-mvs.h: Added a #define for ACE_HAS_GETPAGESIZE.
+	  Thanks to Chuck Gehr for this information.
 
-        * ace/LSOCK_Stream.h: Added a new typedef for PEER_ADDR that is
-          associated with ACE_UNIX_Addr.  Thanks to Mark Rabotnikov
-          <mark@usp.elscintcorp.co.il> for suggesting this.
+	* ace/LSOCK_Stream.h: Added a new typedef for PEER_ADDR that is
+ 	  associated with ACE_UNIX_Addr.  Thanks to Mark Rabotnikov
+ 	  <mark@usp.elscintcorp.co.il> for suggesting this.
 
 Mon Jan 13 22:24:09 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/OS.h: Added #undefs of sigemptyset and sigfillset on Linux
-          when __OPTIMIZE__ is enabled.  Yes, the system header on Linux
-          really #defines them when optimizing!  Thanks to an anonymous
-          ACE user for pointing this out.
+	* ace/OS.h: Added #undefs of sigemptyset and sigfillset on Linux
+	  when __OPTIMIZE__ is enabled.  Yes, the system header on Linux
+	  really #defines them when optimizing!  Thanks to an anonymous
+	  ACE user for pointing this out.
 
-        * tests/tests_config.h: Dropped ACE_MAX_ITERATIONS back to 10.
+	* tests/tests_config.h: Dropped ACE_MAX_ITERATIONS back to 10.
 
 Sun Jan 12 16:59:52 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Timer_List.cpp (schedule): Cleanup the code so that (1)
-          timer_id never == -1 (in order to distinguish it from error
-          return values and (2) so that we avoid an unnecessary check for
-          operator new failure.
-
-        * ace/OS.h: Added a new #define called ACE_DEFAULT_MAX_TIMERS,
-          which specifies the maximum number of ACE_Event_Handlers
-          supported by ACE_Timer_Heap.
-
-        * ace/Proactor.cpp (ACE_Proactor): Updated the allocation of
-          ACE_Timer_Queue so that it really points to an ACE_Timer_List by
-          default.  Naturally, this can be overridden by users.
-
-        * ace/ReactorEx.cpp (open): Updated the allocation of
-          ACE_Timer_Queue so that it really points to an ACE_Timer_List by
-          default.  Naturally, this can be overridden by users.
-
-        * ace/Reactor.cpp (open): Updated the allocation of
-          ACE_Timer_Queue so that it really points to an ACE_Timer_List by
-          default.  Naturally, this can be overridden by users.
-
-        * ace: Added two new classes called ACE_Timer_List and
-          ACE_Timer_Heap, which derive from ACE_Timer_Queue.
-          ACE_Timer_List is essentially the old behavior of
-          ACE_Timer_Queue, i.e., it uses an implementation of a linked
-          list of ACE_Timer_Nodes.  ACE_Timer_Heap, on the other hand,
-          uses a heap-based callout queue, which is more appropriate for
-          certain real-time applications.
-
-        * ace/Timer_Queue: Revised the ACE_Timer_Queue implementation so
-          that it's now an abstract base class with most of the
-          implementation details pushed into the ACE_Timer_List and
-          ACE_Timer_Heap subclasses.
-
-        * ace/Timer_Queue.h: Made all the ACE_Timer_Queue methods public
-          so that we can override them in a subclass (e.g., the new
-          ACE_Timer_Heap).
-
-        * examples/Logger/Acceptor-server/server_loggerd.cpp: Fixed this
-          example application so that it only uses a single Reactor (the
-          REACTOR::instance()) rather than two Reactors.  Thanks to Sandro
-          Doro <alex@aureus.sublink.org> for reporting this.
-
-        * netsvcs/lib/Logging_Strategy.cpp: Fixed the #include of
-          fstream.h and iostream.h to use the '<' '>' notation rather than
-          the '"' and '"' notation.  This avoids problems with running
-          "make depend".  Thanks to Rino Simioni <sir@necsy.it> for
-          reporting this fix.
+	* ace/Timer_List.cpp (schedule): Cleanup the code so that (1)
+ 	  timer_id never == -1 (in order to distinguish it from error
+ 	  return values and (2) so that we avoid an unnecessary check for
+ 	  operator new failure.
+
+	* ace/OS.h: Added a new #define called ACE_DEFAULT_MAX_TIMERS,
+ 	  which specifies the maximum number of ACE_Event_Handlers
+ 	  supported by ACE_Timer_Heap.
+
+	* ace/Proactor.cpp (ACE_Proactor): Updated the allocation of
+ 	  ACE_Timer_Queue so that it really points to an ACE_Timer_List by
+ 	  default.  Naturally, this can be overridden by users.
+
+	* ace/ReactorEx.cpp (open): Updated the allocation of
+ 	  ACE_Timer_Queue so that it really points to an ACE_Timer_List by
+ 	  default.  Naturally, this can be overridden by users.
+
+	* ace/Reactor.cpp (open): Updated the allocation of
+ 	  ACE_Timer_Queue so that it really points to an ACE_Timer_List by
+ 	  default.  Naturally, this can be overridden by users.
+
+	* ace: Added two new classes called ACE_Timer_List and
+ 	  ACE_Timer_Heap, which derive from ACE_Timer_Queue.
+  	  ACE_Timer_List is essentially the old behavior of
+ 	  ACE_Timer_Queue, i.e., it uses an implementation of a linked
+ 	  list of ACE_Timer_Nodes.  ACE_Timer_Heap, on the other hand,
+ 	  uses a heap-based callout queue, which is more appropriate for
+ 	  certain real-time applications.
+
+	* ace/Timer_Queue: Revised the ACE_Timer_Queue implementation so
+ 	  that it's now an abstract base class with most of the
+ 	  implementation details pushed into the ACE_Timer_List and
+ 	  ACE_Timer_Heap subclasses.
+
+	* ace/Timer_Queue.h: Made all the ACE_Timer_Queue methods public
+ 	  so that we can override them in a subclass (e.g., the new
+ 	  ACE_Timer_Heap).
+
+	* examples/Logger/Acceptor-server/server_loggerd.cpp: Fixed this
+ 	  example application so that it only uses a single Reactor (the
+ 	  REACTOR::instance()) rather than two Reactors.  Thanks to Sandro
+ 	  Doro <alex@aureus.sublink.org> for reporting this.
+
+	* netsvcs/lib/Logging_Strategy.cpp: Fixed the #include of
+ 	  fstream.h and iostream.h to use the '<' '>' notation rather than
+ 	  the '"' and '"' notation.  This avoids problems with running
+ 	  "make depend".  Thanks to Rino Simioni <sir@necsy.it> for
+ 	  reporting this fix.
 
 Sun Jan 12 18:20:49 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/ACE.cpp (round_to_pagesize): fixed typo in reference to
-          ACE::pagesize_.
+	* ace/ACE.cpp (round_to_pagesize): fixed typo in reference to
+	  ACE::pagesize_.
 
-        * ace/ACE.cpp: initialize ACE::pagesize_ to 0.
+	* ace/ACE.cpp: initialize ACE::pagesize_ to 0.
 
-        * ace/config-irix*.h and config-win*.h: removed ACE_PAGE_SIZE
-          definition because these platforms no longer use it.
+	* ace/config-irix*.h and config-win*.h: removed ACE_PAGE_SIZE
+	  definition because these platforms no longer use it.
 
-        * tests/UNIX*.conf and Win32server.conf:  replaced net_svcs
-          with netsvcs.
+	* tests/UNIX*.conf and Win32server.conf:  replaced net_svcs
+	  with netsvcs.
 
 Sat Jan 11 15:11:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/OS.i (thr_setprio): The POSIX implementation of
-          ACE_OS:thr_setprio did not set the priority.  It calls:
+	* ace/OS.i (thr_setprio): The POSIX implementation of
+ 	  ACE_OS:thr_setprio did not set the priority.  It calls:
 
-          pthread_setschedparam( thr_id, &policy, &param )
+	  pthread_setschedparam( thr_id, &policy, &param )
  
           and then does
  
@@ -8770,434 +8770,434 @@ Sat Jan 11 15:11:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
  
           instead of
 
-          param.sched_priority = prio;
-          
-          This is now fixed.  Thanks to John Bossom <John.Bossom@Cognos.COM>
-          for reporting this.
-
-        * ace/config-irix*.h: Modified all the IRIX config files to
-          use the new ACE_HAS_GETPAGESIZE feature since this is necessary 
-          to differentiate between IRIX and IRIX64.
-          Thanks to Fred LaBar <flabar@fallschurch.esys.com> for
-          reporting this.
-
-        * ace/ACE.cpp: Modified the round_to_pagesize() so that if
-          a config.h file enables ACE_HAS_GETPAGESIZE then we use
-          that function in preference to the value in config.h.
-          Thanks to Fred LaBar <flabar@fallschurch.esys.com> for
-          suggesting this.
-
-        * ace/ACE.cpp: Modified the round_to_pagesize() so that on
-          platforms that allow the page size to be obtained dynamically
-          we'll get that rather than replying on what it set in the
-          config.h file.  We'll cache this value in a static variable
-          to speedup searches.  Thanks to James Mansion for suggesting
-          this.
-
-        * apps/Gateway/Gateway: Finished adding support for thread-safe
-          reference counting to the uses of ACE_Message_Block.
-
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Replaced
-          the use of ACE_MT_SYNCH with ACE_SYNCH so that this will compile
-          correctly on non-MT platforms.
+	  param.sched_priority = prio;
+	  
+	  This is now fixed.  Thanks to John Bossom <John.Bossom@Cognos.COM>
+	  for reporting this.
+
+	* ace/config-irix*.h: Modified all the IRIX config files to
+	  use the new ACE_HAS_GETPAGESIZE feature since this is necessary 
+	  to differentiate between IRIX and IRIX64.
+	  Thanks to Fred LaBar <flabar@fallschurch.esys.com> for
+	  reporting this.
+
+	* ace/ACE.cpp: Modified the round_to_pagesize() so that if
+	  a config.h file enables ACE_HAS_GETPAGESIZE then we use
+	  that function in preference to the value in config.h.
+	  Thanks to Fred LaBar <flabar@fallschurch.esys.com> for
+	  suggesting this.
+
+	* ace/ACE.cpp: Modified the round_to_pagesize() so that on
+ 	  platforms that allow the page size to be obtained dynamically
+ 	  we'll get that rather than replying on what it set in the
+ 	  config.h file.  We'll cache this value in a static variable
+	  to speedup searches.  Thanks to James Mansion for suggesting
+	  this.
+
+	* apps/Gateway/Gateway: Finished adding support for thread-safe
+ 	  reference counting to the uses of ACE_Message_Block.
+
+	* examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Replaced
+ 	  the use of ACE_MT_SYNCH with ACE_SYNCH so that this will compile
+ 	  correctly on non-MT platforms.
 
 Fri Jan 10 12:38:42 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * Added a COPYING file that explicitly states the copyright status
-          of ACE.
+	* Added a COPYING file that explicitly states the copyright status
+ 	  of ACE.
 
-        * ace/config-win32-msvc4.x.h and ace/config-winnt-4.0-msvc4.x.h:
-          By default, we'll revert to *not* enabling
-          ACE_HAS_TEMPLATE_TYPEDEFS for MSVC++ 4.2, even though this is
-          well-support by the compiler since it breaks some application
-          code that expects to use 3 template parameters for
-          ACE_Svc_Handler<>.  The "fix" is to use the ACE_SOCK_STREAM
-          macros (rather than using the "ACE_SOCK_Stream, ACE_INET_Addr"
-          tuple) in order to achieve portability in either case.  Thanks
-          to Karlheinz for pointing out the need for backwards
-          compatibility.
+	* ace/config-win32-msvc4.x.h and ace/config-winnt-4.0-msvc4.x.h:
+ 	  By default, we'll revert to *not* enabling
+ 	  ACE_HAS_TEMPLATE_TYPEDEFS for MSVC++ 4.2, even though this is
+ 	  well-support by the compiler since it breaks some application
+ 	  code that expects to use 3 template parameters for
+ 	  ACE_Svc_Handler<>.  The "fix" is to use the ACE_SOCK_STREAM
+ 	  macros (rather than using the "ACE_SOCK_Stream, ACE_INET_Addr"
+ 	  tuple) in order to achieve portability in either case.  Thanks
+ 	  to Karlheinz for pointing out the need for backwards
+ 	  compatibility.
 
 Wed Jan  8 01:00:05 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/Message_Block_Test.cpp: Enhanced the torture test of the
-          ACE_Message_Block so that it stresses the reference counting
-          implementation in a multi-threaded environment.
+	* tests/Message_Block_Test.cpp: Enhanced the torture test of the
+ 	  ACE_Message_Block so that it stresses the reference counting
+ 	  implementation in a multi-threaded environment.
 
 Wed Jan 08 10:26:45 1997  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Message_Block.cpp (~ACE_Data_Block): assigned 0 to
-          allocator_strategry_ after deleting it; fixed template
-          specializations (for g++) by using macros instead of class names;
-          commented out template specializations because Service_Record.cpp
-          already has them, and they should only appear once in the library
-          in order to avoid link clashes
+	* ace/Message_Block.cpp (~ACE_Data_Block): assigned 0 to
+	  allocator_strategry_ after deleting it; fixed template
+	  specializations (for g++) by using macros instead of class names;
+	  commented out template specializations because Service_Record.cpp
+	  already has them, and they should only appear once in the library
+	  in order to avoid link clashes
 
-        * ace/Service_Object.cpp (ACE_Service_Object): reordered
-          initializations in constructor
+	* ace/Service_Object.cpp (ACE_Service_Object): reordered
+	  initializations in constructor
 
-        * ace/Service_Record.cpp (ACE_Service_Record): reordered
-          initializations in constructor
+	* ace/Service_Record.cpp (ACE_Service_Record): reordered
+	  initializations in constructor
 
-        * ace/config-linux-lxpthreads.h:  added
-          ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS, thanks to
-          James CE Johnson <jcej@lads.com> for tracking down this
-          problem and testing the fix.
+	* ace/config-linux-lxpthreads.h:  added
+	  ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS, thanks to
+	  James CE Johnson <jcej@lads.com> for tracking down this
+	  problem and testing the fix.
 
 Tue Jan  7 13:03:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Message_Block: Continued to improve the
-          ACE_Message_Block/ACE_Data_Block implementation.
+	* ace/Message_Block: Continued to improve the
+	  ACE_Message_Block/ACE_Data_Block implementation.
 
-        * ace/Message_Block: Added a new constructor to ACE_Message_Block
-          that takes an ACE_Data_Block * and "owns" it.  Thanks to Tim for
-          this idea.
+	* ace/Message_Block: Added a new constructor to ACE_Message_Block
+ 	  that takes an ACE_Data_Block * and "owns" it.  Thanks to Tim for
+ 	  this idea.
 
-        * ace/Log_Msg.cpp: Now that we've prevented signal handlers from
-          occurring within critical sections of ACE_Log_Msg::log() we
-          don't need to use the ACE_Recursive_Thread_Mutex anymore.
-          Instead, we just need ACE_Thread_Mutex.
+	* ace/Log_Msg.cpp: Now that we've prevented signal handlers from
+ 	  occurring within critical sections of ACE_Log_Msg::log() we
+ 	  don't need to use the ACE_Recursive_Thread_Mutex anymore.
+  	  Instead, we just need ACE_Thread_Mutex.
 
-        * ace/Log_Msg.cpp (log): Added an ACE_Sig_Guard to the block in
-          ACE_Log_Msg::log() that acquires the mutex that serializes
-          output.  This prevents nasty problems with recursive to
-          ACE_Log_Msg::log() from within signal handlers.
+	* ace/Log_Msg.cpp (log): Added an ACE_Sig_Guard to the block in
+ 	  ACE_Log_Msg::log() that acquires the mutex that serializes
+ 	  output.  This prevents nasty problems with recursive to
+ 	  ACE_Log_Msg::log() from within signal handlers.
 
-        * ace/Service_Config.cpp (end_reactor_event_loop): Added a timeout
-          of ACE_Time_Value::zero to the ACE_Reactor::notify() method when
-          called in the ACE_Service_Config::end_reactor_event_loop().
-          This prevents the Reactor from blocking indefinitely if there's
-          no longer a thread to receive from the notification pipe.
+	* ace/Service_Config.cpp (end_reactor_event_loop): Added a timeout
+ 	  of ACE_Time_Value::zero to the ACE_Reactor::notify() method when
+ 	  called in the ACE_Service_Config::end_reactor_event_loop().
+  	  This prevents the Reactor from blocking indefinitely if there's
+ 	  no longer a thread to receive from the notification pipe.
   
-        * netsvcs/clients/Naming/Dump_Restore: Removed the vestigal
-          nametest.cpp and nametest.h files.  I'm not sure why they were
-          still there, but they shouldn't have been!
-
-        * ace/Synch.i (remove): this->owner_ should be set to -1 before
-          calling this->release().  Thanks to Per Andersson
-          <Per.Andersson@hfera.ericsson.se> for suggesting this.
-
-        * ace/Thread_Manager.cpp (exit): Added a flag called "do_thr_exit"
-          to the ACE_Thread_Control::exit() method.  This controls whether
-          we call ACE_OS::thr_exit() after removing the thread from the
-          Thread Manager's internal table.  This is necessary to work
-          around pthread bugs on certain platforms (e.g., AIX and Linux).
-
-        * ace/Synch.h: Removed the
-          ACE_Recursive_Thread_Mutex::set_nesting() method since this
-          isn't being used and is potentially dangerous.  Thanks to Per
-          Andersson <Per.Andersson@hfera.ericsson.se> for suggesting this.
-
-        * ace/XtReactor: Updated the XtReactor so that it uses the next
-          internal Reactor implementation.  Thanks to Mark Rabotnikov
-          <mark@usp.elscintcorp.co.il> for reporting this.
-
-        * ace/Task.i: Updated the grp_id(int) method to cache the group id
-          in the task and then set it in the Thread_Manager, if there is
-          one.  Thanks to Hamutal Yanay <Hamutal_Yanay@mail.icomverse.com>
-          for suggesting this.
-
-        * ace/Log_Record.h: Updated the ACE_Log_Record class to use the
-          new ACE_MAXLOGMSGLEN macro.
-
-        * ace/OS.h: Added a new #define called ACE_MAXLOGMSGLEN.  By
-          default this is 4k.  However, you can reset it in the config.h
-          file if you'd like to increase or decrease the size.  Thanks to
-          Anthony McConnell for suggesting this.
-          
-        * examples/Threads/tss[12].cpp: Tidied up the tss1.cpp and
-          tss2.cpp examples and improved the comments.  Thanks to Luca for
-          suggesting this.
-
-        * ace/Service_Object.cpp (fini): Added the "virtual" keyword to
-          the new destructor of ACE_Service_Type.  Thanks to David for
-          reporting this.
-
-        * ace/Message_Block.i: Rearranged the order of the ACE_Data_Block
-          and ACE_Message_Block locking_strategy() methods so that they'd
-          be defined as inline before being used.  Thanks to David for
-          reporting this.
+	* netsvcs/clients/Naming/Dump_Restore: Removed the vestigal
+ 	  nametest.cpp and nametest.h files.  I'm not sure why they were
+ 	  still there, but they shouldn't have been!
+
+	* ace/Synch.i (remove): this->owner_ should be set to -1 before
+ 	  calling this->release().  Thanks to Per Andersson
+ 	  <Per.Andersson@hfera.ericsson.se> for suggesting this.
+
+	* ace/Thread_Manager.cpp (exit): Added a flag called "do_thr_exit"
+ 	  to the ACE_Thread_Control::exit() method.  This controls whether
+ 	  we call ACE_OS::thr_exit() after removing the thread from the
+ 	  Thread Manager's internal table.  This is necessary to work
+ 	  around pthread bugs on certain platforms (e.g., AIX and Linux).
+
+	* ace/Synch.h: Removed the
+ 	  ACE_Recursive_Thread_Mutex::set_nesting() method since this
+ 	  isn't being used and is potentially dangerous.  Thanks to Per
+ 	  Andersson <Per.Andersson@hfera.ericsson.se> for suggesting this.
+
+	* ace/XtReactor: Updated the XtReactor so that it uses the next
+ 	  internal Reactor implementation.  Thanks to Mark Rabotnikov
+ 	  <mark@usp.elscintcorp.co.il> for reporting this.
+
+	* ace/Task.i: Updated the grp_id(int) method to cache the group id
+ 	  in the task and then set it in the Thread_Manager, if there is
+ 	  one.  Thanks to Hamutal Yanay <Hamutal_Yanay@mail.icomverse.com>
+ 	  for suggesting this.
+
+	* ace/Log_Record.h: Updated the ACE_Log_Record class to use the
+ 	  new ACE_MAXLOGMSGLEN macro.
+
+	* ace/OS.h: Added a new #define called ACE_MAXLOGMSGLEN.  By
+ 	  default this is 4k.  However, you can reset it in the config.h
+ 	  file if you'd like to increase or decrease the size.  Thanks to
+ 	  Anthony McConnell for suggesting this.
+	  
+	* examples/Threads/tss[12].cpp: Tidied up the tss1.cpp and
+ 	  tss2.cpp examples and improved the comments.  Thanks to Luca for
+ 	  suggesting this.
+
+	* ace/Service_Object.cpp (fini): Added the "virtual" keyword to
+ 	  the new destructor of ACE_Service_Type.  Thanks to David for
+ 	  reporting this.
+
+	* ace/Message_Block.i: Rearranged the order of the ACE_Data_Block
+ 	  and ACE_Message_Block locking_strategy() methods so that they'd
+ 	  be defined as inline before being used.  Thanks to David for
+ 	  reporting this.
 
 Mon Jan  6 16:46:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Service_Manager.cpp (fini): Only try to remove the
-          ACE_Service_Manager from the Reactor if it's actually been
-          registered in the first place (i.e., if it's get_handle() method
-          does not return ACE_INVALID_HANDLE).
+	* ace/Service_Manager.cpp (fini): Only try to remove the
+ 	  ACE_Service_Manager from the Reactor if it's actually been
+ 	  registered in the first place (i.e., if it's get_handle() method
+ 	  does not return ACE_INVALID_HANDLE).
 
-        * netsvcs/servers/svc.conf: Changed the name of the net services
-          .so file from libnet_svcs to netsvcs so that it will work
-          correctly with our new "cross-platform" svc.conf ACE::ldfind()
-          strategy.  Thanks to Marius Kjeldahl <marius@funcom.com> for
-          reporting this.
+	* netsvcs/servers/svc.conf: Changed the name of the net services
+ 	  .so file from libnet_svcs to netsvcs so that it will work
+ 	  correctly with our new "cross-platform" svc.conf ACE::ldfind()
+ 	  strategy.  Thanks to Marius Kjeldahl <marius@funcom.com> for
+ 	  reporting this.
 
-        * ace/Reactor.cpp (find): Added a strategic break and a check for
-          handle_in_range().  Thanks to Tim for this help!
+	* ace/Reactor.cpp (find): Added a strategic break and a check for
+ 	  handle_in_range().  Thanks to Tim for this help!
 
-        * netsvcs/clients/Naming/Client/svc.conf: Removed the "lib" part
-          from the executable shared object file names in the svc.conf
-          file so that it will work with the new "cross-platform" svc.conf
-          ACE::ldfind() strategy.  Thanks to Marius Kjeldahl
-          <marius@funcom.com> for reporting this.
+	* netsvcs/clients/Naming/Client/svc.conf: Removed the "lib" part
+ 	  from the executable shared object file names in the svc.conf
+ 	  file so that it will work with the new "cross-platform" svc.conf
+ 	  ACE::ldfind() strategy.  Thanks to Marius Kjeldahl
+ 	  <marius@funcom.com> for reporting this.
 
-        * ace/Service_Record.cpp (fini): Added an extra assignment to a
-          temporary const void *obj to avoid problems with MSVC++ and it's
-          cast mechanism.
+	* ace/Service_Record.cpp (fini): Added an extra assignment to a
+ 	  temporary const void *obj to avoid problems with MSVC++ and it's
+ 	  cast mechanism.
 
-        * ace/ReactorEx.h: Added a default parameter to
-          ACE_ReactorEx::notify().  Thanks to Tim for noticing this.
+	* ace/ReactorEx.h: Added a default parameter to
+ 	  ACE_ReactorEx::notify().  Thanks to Tim for noticing this.
 
 Sun Jan  5 10:48:23 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests: Added a new test for ACE_Message_Block, which is called
-          Message_Block_Test.cpp (no surprise there ;-)).  This test
-          exercises the reference counting mechanisms.
+	* tests: Added a new test for ACE_Message_Block, which is called
+ 	  Message_Block_Test.cpp (no surprise there ;-)).  This test
+ 	  exercises the reference counting mechanisms.
 
-        * ace/Message_Block.h: Made the destructors for ACE_Message_Block
-          and ACE_Data_Block virtual, so that these classes can be
-          subclassed and ACE_Message_Blocks can delete these
-          subclasses (either via release() or delete).  Thanks to Tilo
-          Christ for suggesting this.
+	* ace/Message_Block.h: Made the destructors for ACE_Message_Block
+ 	  and ACE_Data_Block virtual, so that these classes can be
+ 	  subclassed and ACE_Message_Blocks can delete these
+	  subclasses (either via release() or delete).  Thanks to Tilo
+	  Christ for suggesting this.
 
-        * ace/Message_Block.cpp: Modified the implementation
-          of ACE_Message_Block/ACE_Data_Block so that we always create
-          an allocator_strategy_.  By default, this strategy will be
-          ACE_Allocator_Adapter <ACE_Malloc <ACE_Local_Memory_Pool, ACE_Null_Mutex> >;
-          This greatly simplifies the code.
+	* ace/Message_Block.cpp: Modified the implementation
+	  of ACE_Message_Block/ACE_Data_Block so that we always create
+	  an allocator_strategy_.  By default, this strategy will be
+	  ACE_Allocator_Adapter <ACE_Malloc <ACE_Local_Memory_Pool, ACE_Null_Mutex> >;
+	  This greatly simplifies the code.
 
-        * ace/Message_Block.h: It's now possible to assign a
-          Message_Block's priority when you create it.
+	* ace/Message_Block.h: It's now possible to assign a
+ 	  Message_Block's priority when you create it.
 
-        * ace/Reactor: Sped things up some more by merging the Reactor's
-          any_ready() and fill_in_ready() methods together.  This reduces
-          redundant computations.
+	* ace/Reactor: Sped things up some more by merging the Reactor's
+ 	  any_ready() and fill_in_ready() methods together.  This reduces
+ 	  redundant computations.
 
-        * ace/Reactor: Changed the name of ACE_Reactor::detach() to
-          ACE_Reactor::remove_handler_i() and changed the name of
-          ACE_Reactor::attach() to ACE_Reactor::register_handler_i().
-          This is more consistent with the other naming schemes.
+	* ace/Reactor: Changed the name of ACE_Reactor::detach() to
+ 	  ACE_Reactor::remove_handler_i() and changed the name of
+ 	  ACE_Reactor::attach() to ACE_Reactor::register_handler_i().
+  	  This is more consistent with the other naming schemes.
 
-        * ace/Reactor.cpp: Reworked the implementation of the Handler
-          Repository's unbind() method in order to simplfy the logic.
-          Also merged in all the Reactor's detach() functionality into the
-          unbind() method in order to localize all the handler removal
-          processing.
+	* ace/Reactor.cpp: Reworked the implementation of the Handler
+ 	  Repository's unbind() method in order to simplfy the logic.
+  	  Also merged in all the Reactor's detach() functionality into the
+ 	  unbind() method in order to localize all the handler removal
+ 	  processing.
 
-        * ace/Reactor[Ex].cpp: Added more descriptive errno entries for
-          failed operations in the handler repository.
+	* ace/Reactor[Ex].cpp: Added more descriptive errno entries for
+ 	  failed operations in the handler repository.
 
-        * ace/Reactor.cpp: Modified the implementation of the Handler
-          Repository's bind() method so that it reports an error if you
-          try to register an Event_Handler for an invalid HANDLE.
+	* ace/Reactor.cpp: Modified the implementation of the Handler
+ 	  Repository's bind() method so that it reports an error if you
+ 	  try to register an Event_Handler for an invalid HANDLE.
 
-        * ace/Reactor.cpp: Reimplemented the internals of the Reactor to
-          prepare for the upcoming merge of the Reactor and ReactorEx to
-          use a single code base.
+	* ace/Reactor.cpp: Reimplemented the internals of the Reactor to
+ 	  prepare for the upcoming merge of the Reactor and ReactorEx to
+ 	  use a single code base.
 
-        * ace/Timer_Queue.cpp: Modified the behavior of the expire()
-          methods so that they return the number of ACE_Event_Handlers
-          whose handle_timeout() method was called.
+	* ace/Timer_Queue.cpp: Modified the behavior of the expire()
+ 	  methods so that they return the number of ACE_Event_Handlers
+ 	  whose handle_timeout() method was called.
 
 Sat Jan  4 11:47:05 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Reactor.h: Removed the #ifdefs for ACE_HAS_POLL.  This will
-          be recast as a strategy in subsequent implementations.
+	* ace/Reactor.h: Removed the #ifdefs for ACE_HAS_POLL.  This will
+ 	  be recast as a strategy in subsequent implementations.
 
-        * ace/Reactor.cpp: Added a new call,
-          ACE_Handler_Repository::handle_in_range(), which checks to make
-          sure that the HANDLE is within the range of 0 .. max_handlep1_.
-          This factors out some redundant code.
+	* ace/Reactor.cpp: Added a new call,
+ 	  ACE_Handler_Repository::handle_in_range(), which checks to make
+ 	  sure that the HANDLE is within the range of 0 .. max_handlep1_.
+  	  This factors out some redundant code.
 
-        * ace/Reactor.cpp: Sped up the performance of the Reactor by
-          removing redundant calls to
-          ACE_Handler_Repository::invalid_handle() and
-          ACE_Handler_Repository::find().
+	* ace/Reactor.cpp: Sped up the performance of the Reactor by
+ 	  removing redundant calls to
+ 	  ACE_Handler_Repository::invalid_handle() and
+ 	  ACE_Handler_Repository::find().
 
-        * tests/Reactors_Test.cpp: Added a test for
-          the new Reactor::notify() method with timeouts.
+	* tests/Reactors_Test.cpp: Added a test for
+ 	  the new Reactor::notify() method with timeouts.
 
-        * examples/Reactor/Misc/notification.cpp (svc): Added a test for
-          the new Reactor::notify() method with timeouts.
+	* examples/Reactor/Misc/notification.cpp (svc): Added a test for
+ 	  the new Reactor::notify() method with timeouts.
 
-        * ace/Reactor[Ex]: Modified the Reactor and ReactorEx so that they
-          use timed send() operations for their notify() methods.  This
-          makes it possible for users to bound the amount of time they're
-          willing to wait to try and notify the Reactor.  This is mostly
-          useful to avoid infinite blocking if there is congestion in the
-          Reactor's notification mechanism.
+	* ace/Reactor[Ex]: Modified the Reactor and ReactorEx so that they
+ 	  use timed send() operations for their notify() methods.  This
+ 	  makes it possible for users to bound the amount of time they're
+ 	  willing to wait to try and notify the Reactor.  This is mostly
+ 	  useful to avoid infinite blocking if there is congestion in the
+ 	  Reactor's notification mechanism.
 
-        * ace/ACE.cpp: Added a new timed send() method that uses the
-          write() system call on UNIX and the socket send() call on Win32.
-          This new method is used in the new ACE_Reactor::notify() method,
-          which now supported timed notifications.
+	* ace/ACE.cpp: Added a new timed send() method that uses the
+ 	  write() system call on UNIX and the socket send() call on Win32.
+  	  This new method is used in the new ACE_Reactor::notify() method,
+ 	  which now supported timed notifications.
 
-        * ace/Reactor.cpp (ACE_Handler_Repository): To simplify the code
-          and reduce unnecessary #ifdefs, I've merged the max_handlep1_
-          and cur_size_ fields (which are now called max_handlep1_).
+	* ace/Reactor.cpp (ACE_Handler_Repository): To simplify the code
+ 	  and reduce unnecessary #ifdefs, I've merged the max_handlep1_
+ 	  and cur_size_ fields (which are now called max_handlep1_).
 
 Fri Jan  3 10:47:15 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace: Replaced all uses of "delete mb" with mb->release ();
+	* ace: Replaced all uses of "delete mb" with mb->release ();
 
-        * ace/Stream_Modules.cpp: Replaced the use of explicit bit
-          twiddling with the ACE_BIT* macros.
+	* ace/Stream_Modules.cpp: Replaced the use of explicit bit
+	  twiddling with the ACE_BIT* macros.
 
-        * ace/Message_Block.cpp: Make sure that we use the
-          allocator_strategy_ to create the memory for the reference count
-          since this may need to go into shared memory if that's the
-          memory pool where the Message_Block allocations are coming from.
+	* ace/Message_Block.cpp: Make sure that we use the
+ 	  allocator_strategy_ to create the memory for the reference count
+ 	  since this may need to go into shared memory if that's the
+ 	  memory pool where the Message_Block allocations are coming from.
 
-        * ace/OS.h: Added two new macros, ACE_ALLOCATOR_RETURN and
-          ACE_ALLOCATOR, which are similar to ACE_NEW_RETURN and ACE_NEW, 
-          except that these
+	* ace/OS.h: Added two new macros, ACE_ALLOCATOR_RETURN and
+	  ACE_ALLOCATOR, which are similar to ACE_NEW_RETURN and ACE_NEW, 
+	  except that these
 
-        * ace/Message_Block.cpp (release): Make sure to "delete this"
-          outside the scope of the locking_strategy_.
+	* ace/Message_Block.cpp (release): Make sure to "delete this"
+ 	  outside the scope of the locking_strategy_.
 
-        * ace/Service_Object.cpp: Added a destructor to ACE_Service_Type.
-          Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for
-          suggesting this.
+	* ace/Service_Object.cpp: Added a destructor to ACE_Service_Type.
+  	  Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for
+ 	  suggesting this.
 
-        * ace/Service_Object.i: Be smarter about how we reassign the name_
-          pointer, i.e., delete the old one and make a copy.  Thanks to
-          Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
-          this.
+	* ace/Service_Object.i: Be smarter about how we reassign the name_
+ 	  pointer, i.e., delete the old one and make a copy.  Thanks to
+ 	  Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
+ 	  this.
 
-        * ace/Module.cpp (open): Rearranged the assignments to
-          reader_q->mod_ and writer_q->mod_ so that we don't try to
-          initialize through NULL pointers.  Thanks to
-          Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
-          this.
+	* ace/Module.cpp (open): Rearranged the assignments to
+ 	  reader_q->mod_ and writer_q->mod_ so that we don't try to
+ 	  initialize through NULL pointers.  Thanks to
+ 	  Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
+ 	  this.
 
-        * ace/Service_Record.cpp (ACE_Service_Record): Initialized name_
-          to NULL so that the following change works correctly now.
-          Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for
-          reporting this.
+	* ace/Service_Record.cpp (ACE_Service_Record): Initialized name_
+ 	  to NULL so that the following change works correctly now.
+  	  Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for
+ 	  reporting this.
 
-        * ace/Service_Record.i (name): Make sure to delete [] (char *)
-          this->name_ before allocating a new one.  Thanks to
-          Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
-          this.
+	* ace/Service_Record.i (name): Make sure to delete [] (char *)
+ 	  this->name_ before allocating a new one.  Thanks to
+ 	  Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting
+ 	  this.
 
-        * ace/Message_Block: Reworked the reference counting implemention
-          so that reference counts are shared correctly amongst their
-          various owners.  This requires making a deep copy the "header"
-          portion, but a shallow copy of the "data."
+	* ace/Message_Block: Reworked the reference counting implemention
+ 	  so that reference counts are shared correctly amongst their
+ 	  various owners.  This requires making a deep copy the "header"
+ 	  portion, but a shallow copy of the "data."
 
-        * ace/Message_Block.cpp (ACE_Message_Block): Updated all three
-          ACE_Message_Block constructors so that they all call the init()
-          method.  This centralizes all the initialization logic in one
-          place.
+	* ace/Message_Block.cpp (ACE_Message_Block): Updated all three
+ 	  ACE_Message_Block constructors so that they all call the init()
+ 	  method.  This centralizes all the initialization logic in one
+ 	  place.
 
 Thu Jan  2 00:42:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Message_Block.cpp (ACE_Message_Block): Make sure to set the
-          cont_ field to 0 after "releasing" it so that we don't
-          mistakenly think it's still around later on.  This problem arose
-          in the ACE_Message_Queue::close() method, which was trying to
-          count the number of bytes being freed.
+	* ace/Message_Block.cpp (ACE_Message_Block): Make sure to set the
+ 	  cont_ field to 0 after "releasing" it so that we don't
+ 	  mistakenly think it's still around later on.  This problem arose
+ 	  in the ACE_Message_Queue::close() method, which was trying to
+ 	  count the number of bytes being freed.
 
-        * ace/Message_Queue.cpp (close): Fixed a subtle bug where we
-          weren't actually deleting messages from the
-          ACE_Message_Queue::close() routine.  This should work now...
+	* ace/Message_Queue.cpp (close): Fixed a subtle bug where we
+ 	  weren't actually deleting messages from the
+ 	  ACE_Message_Queue::close() routine.  This should work now...
 
-        * ace/Message_Queue.cpp (close): Replaced the use of "delete mb"
-          with "mb->release()" since the Message_Blocks are now reference
-          counted.  
+	* ace/Message_Queue.cpp (close): Replaced the use of "delete mb"
+ 	  with "mb->release()" since the Message_Blocks are now reference
+ 	  counted.  
 
-        * ace/Message_Block: Enhanced the reference counting scheme so
-          that you can increment and decrement the count by an arbitrary
-          amount.  This is particular useful when you know you'll be
-          sending the same Message_Block to N consumers.
+	* ace/Message_Block: Enhanced the reference counting scheme so
+ 	  that you can increment and decrement the count by an arbitrary
+ 	  amount.  This is particular useful when you know you'll be
+ 	  sending the same Message_Block to N consumers.
 
-        * ace/Singleton: The dump() must be used same as instance()
+	* ace/Singleton: The dump() must be used same as instance()
           (without supplying an object) so it must be declarated *static*,
-          i.e.,
+	  i.e.,
 
-          static void dump (void);
+	  static void dump (void);
 
-          Thanks to Sandro Doro <alex@aureus.sublink.org> for reporting
-          this.
+	  Thanks to Sandro Doro <alex@aureus.sublink.org> for reporting
+ 	  this.
 
-        * examples/ASX/Event_Server: Completely rewrote and retested the
-          ACE Event Server example.  The new code is *much* easier to
-          understand, has many more comments, is more robust, and compiles
-          much faster since I removed many of the templates.
+	* examples/ASX/Event_Server: Completely rewrote and retested the
+ 	  ACE Event Server example.  The new code is *much* easier to
+ 	  understand, has many more comments, is more robust, and compiles
+ 	  much faster since I removed many of the templates.
 
-        * examples/ASX/Event_Server/Tranceiver/tranceiver.cpp: Fixed the
-          tranceiver so that it shuts down correctly when the Event_Server
-          exits.
+	* examples/ASX/Event_Server/Tranceiver/tranceiver.cpp: Fixed the
+ 	  tranceiver so that it shuts down correctly when the Event_Server
+ 	  exits.
 
-        * examples/Connection/non_blocking/CPP-connector.cpp: Fixed a
-          problem where we were trying to select() on ACE_STDIN on Win32.
-          Naturally, this doesn't work, so we used the
-          ACE::register_stdin_handler() to fix this.  Thanks to
-          Samuel_Bercovici <Samuel_Bercovici_at_EFT__AD2@mail.icomverse.com>
-          for reporting this.
+	* examples/Connection/non_blocking/CPP-connector.cpp: Fixed a
+ 	  problem where we were trying to select() on ACE_STDIN on Win32.
+  	  Naturally, this doesn't work, so we used the
+ 	  ACE::register_stdin_handler() to fix this.  Thanks to
+ 	  Samuel_Bercovici <Samuel_Bercovici_at_EFT__AD2@mail.icomverse.com>
+	  for reporting this.
 
-        * examples/ASX/Event_Server/Event_Server/Options: Changed the
-          Options class to be a Singleton...
+	* examples/ASX/Event_Server/Event_Server/Options: Changed the
+ 	  Options class to be a Singleton...
 
-        * ace/Task.h: Added "const" method qualifier to accessor methods
-          like is_reader() and is_writer().
+	* ace/Task.h: Added "const" method qualifier to accessor methods
+ 	  like is_reader() and is_writer().
 
 Wed Jan  1 00:10:47 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Message_Block: Added a new static release() method that
-          behaves like the non-static method release(), except that it
-          checks if <mb> is 0.  This is similar to CORBA::release(), which
-          is useful if you want to eliminate lots of checks for NULL
-          pointers before calling release() on them.
-
-        * Updated all places in ACE where we use
-          ACE_Event_Handler::READ_MASK when we should be using
-          ACE_Event_Handler::ACCEPT_MASK.
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-          Changed the name of the acceptor class from Handle_Thr_Stream to
-          Handle_Thr_Acceptor, which is more accurate.
-
-        * ace/Reactor: Since we've now got an
-          ACE_Event_Handler::ACCEPT_MASK (intended primarily to accept
-          connections asynchronously using Win32 overlapped I/O) we can
-          now use this with the ACE_Reactor, as well.  In particular, any
-          time that we are registering a "passive-mode" socket acceptor we
-          can now specify ACE_Event_Handler::ACCEPT_MASK.  This is much
-          more intuitive than using the READ_MASK (which never made any
-          sense...).  The ACE_Reactor now treats the ACCEPT_MASK as a
-          READ_MASK internally, so you can still use READ_MASK if you'd
-          like (i.e., this change doesn't break any existing code).
-
-        * ace/Event_Handler: Changed "get_priority" and "set_priority" to
-          simply "priority(void)" and "priority(int)" to be more
-          consistent with other parts of ACE.
-
-        * apps/Gateway/Gateway: Updated the Gateway so that the
-          concurrency strategies can now be specified on the
-          command-line (or in the svc.conf file), rather than being
-          determined at compile-time.  This is much more flexible.
-          See the ./apps/Gateway/Gateway/README file for details.
-
-        * apps/Gateway/Gateway: Verified that all the multi-threading
-          strategies still work.
-
-        * ace/Message_Block.cpp (ACE_Message_Block): Make sure that we
-          "release" the continuation field, rather than delete it, since
-          its reference count may be > 1.
-
-        * ace/Log_Msg.cpp (log): Change the abort_prog logic a bit so that
-          we always print a message to stderr if we're exiting,
-          regardless...  Thanks to David Levine for pointing this out.
-
-        * apps/Gateway/Gateway: Moved all of the configuration file
-          parsing logic *outside* of the Event_Channel into the Gateway
-          class so that we wouldn't have unnecessary dependencies.
-
-        * apps/Gateway/Gateway: Redesigned the Gateway so that the
-          Proxy_Handlers (i.e., the Consumer_Proxy and Supplier_Proxy)
-          most of their work to the Event_Channel.  This "lightweight
-          proxy" design is an improvement since it is now possible to
-          emulate the COS Event Channel semantics within the Event_Channel
-          "kernel."
-
-        * Happy new year!  Let's start a new ChangeLog to celebrate the
-          new year.
+	* ace/Message_Block: Added a new static release() method that
+ 	  behaves like the non-static method release(), except that it
+ 	  checks if <mb> is 0.  This is similar to CORBA::release(), which
+ 	  is useful if you want to eliminate lots of checks for NULL
+ 	  pointers before calling release() on them.
+
+	* Updated all places in ACE where we use
+ 	  ACE_Event_Handler::READ_MASK when we should be using
+ 	  ACE_Event_Handler::ACCEPT_MASK.
+
+	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
+ 	  Changed the name of the acceptor class from Handle_Thr_Stream to
+ 	  Handle_Thr_Acceptor, which is more accurate.
+
+	* ace/Reactor: Since we've now got an
+ 	  ACE_Event_Handler::ACCEPT_MASK (intended primarily to accept
+ 	  connections asynchronously using Win32 overlapped I/O) we can
+ 	  now use this with the ACE_Reactor, as well.  In particular, any
+ 	  time that we are registering a "passive-mode" socket acceptor we
+ 	  can now specify ACE_Event_Handler::ACCEPT_MASK.  This is much
+ 	  more intuitive than using the READ_MASK (which never made any
+ 	  sense...).  The ACE_Reactor now treats the ACCEPT_MASK as a
+ 	  READ_MASK internally, so you can still use READ_MASK if you'd
+ 	  like (i.e., this change doesn't break any existing code).
+
+	* ace/Event_Handler: Changed "get_priority" and "set_priority" to
+ 	  simply "priority(void)" and "priority(int)" to be more
+ 	  consistent with other parts of ACE.
+
+	* apps/Gateway/Gateway: Updated the Gateway so that the
+	  concurrency strategies can now be specified on the
+	  command-line (or in the svc.conf file), rather than being
+	  determined at compile-time.  This is much more flexible.
+	  See the ./apps/Gateway/Gateway/README file for details.
+
+	* apps/Gateway/Gateway: Verified that all the multi-threading
+ 	  strategies still work.
+
+	* ace/Message_Block.cpp (ACE_Message_Block): Make sure that we
+ 	  "release" the continuation field, rather than delete it, since
+ 	  its reference count may be > 1.
+
+	* ace/Log_Msg.cpp (log): Change the abort_prog logic a bit so that
+ 	  we always print a message to stderr if we're exiting,
+ 	  regardless...  Thanks to David Levine for pointing this out.
+
+	* apps/Gateway/Gateway: Moved all of the configuration file
+ 	  parsing logic *outside* of the Event_Channel into the Gateway
+ 	  class so that we wouldn't have unnecessary dependencies.
+
+	* apps/Gateway/Gateway: Redesigned the Gateway so that the
+ 	  Proxy_Handlers (i.e., the Consumer_Proxy and Supplier_Proxy)
+ 	  most of their work to the Event_Channel.  This "lightweight
+ 	  proxy" design is an improvement since it is now possible to
+ 	  emulate the COS Event Channel semantics within the Event_Channel
+ 	  "kernel."
+
+	* Happy new year!  Let's start a new ChangeLog to celebrate the
+	  new year.
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 20bc06aa401..cb3e925925f 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -22,119 +22,119 @@ Sun Nov 23 13:32:02 1997  David L. Levine  <levine@cs.wustl.edu>
 
 Sat Nov 22 19:16:35 1997    <irfan@TWOSTEP>
 
-        * tests/Process_Strategy_Test.cpp:
+	* tests/Process_Strategy_Test.cpp:
 
-          main: Removed signal handling code.  It is unnecessary since we
-          do not use kill() anymore.
+	  main: Removed signal handling code.  It is unnecessary since we
+ 	  do not use kill() anymore.
 
-          Process_Strategy: This subclass of ACE_Process_Strategy
-          overwrites the process creation method to include connection
-          counting.
+	  Process_Strategy: This subclass of ACE_Process_Strategy
+ 	  overwrites the process creation method to include connection
+ 	  counting.
 
-          connection_completed: Made sure that the Reactor is woken up
-          after all the connections have completed.
+	  connection_completed: Made sure that the Reactor is woken up
+ 	  after all the connections have completed.
 
-        * ace/Priority_Reactor.cpp (init_bucket): Removed extra code.
+	* ace/Priority_Reactor.cpp (init_bucket): Removed extra code.
 
-        * ace/Acceptor.cpp (activate_svc_handler): open svc_handler only
-          if result is 0.  Also removed extra tracing code.
+	* ace/Acceptor.cpp (activate_svc_handler): open svc_handler only
+ 	  if result is 0.  Also removed extra tracing code.
 
-        * ace/Handle_Set.i (reset): Purify is reporting a UMR
-          (uninitialized memory copy) when copying a Handle_Set.  This
-          comes from the mask fd_set not being memset to 0 by FD_ZERO.
-          This is therefore a harmless error.
+	* ace/Handle_Set.i (reset): Purify is reporting a UMR
+ 	  (uninitialized memory copy) when copying a Handle_Set.  This
+ 	  comes from the mask fd_set not being memset to 0 by FD_ZERO.
+  	  This is therefore a harmless error.
 
-        * tests/Priority_Reactor_Test.cpp (main): The ordering of
-          auto_ptrs is very subtle....  "auto_ptr<ACE_Reactor> reactor"
-          should come before "auto_ptr<ACE_Select_Reactor> impl", i.e.,
-          the implementation should be destroyed *before* the forwarding
-          class.  This is apparent when the implementation class is
-          removing registered event handlers that hold a pointer to the
-          forwarding class.
+	* tests/Priority_Reactor_Test.cpp (main): The ordering of
+ 	  auto_ptrs is very subtle....  "auto_ptr<ACE_Reactor> reactor"
+ 	  should come before "auto_ptr<ACE_Select_Reactor> impl", i.e.,
+ 	  the implementation should be destroyed *before* the forwarding
+ 	  class.  This is apparent when the implementation class is
+ 	  removing registered event handlers that hold a pointer to the
+ 	  forwarding class.
 
 Sat Nov 22 16:04:07 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
 
-        * ace/Message_Queue.cpp:
-          Fixed some formating problems in the ACE_Message_Queue::dump
-          method, thanks to Arturo Montes <mitosys@colomsat.net.co> for
-          finding this one.
+	* ace/Message_Queue.cpp:
+	  Fixed some formating problems in the ACE_Message_Queue::dump
+	  method, thanks to Arturo Montes <mitosys@colomsat.net.co> for
+	  finding this one.
 
 Sat Nov 22 14:38:22 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/config-aix-4.2.x.h: Added ACE_TLI_TCP_DEVICE "/dev/xti/tcp".
-          This fixes Riverace problem ID P32; AIX now joins HP-UX in
-          supporting XTI/TLI, but not everything (problem P27).
+	* ace/config-aix-4.2.x.h: Added ACE_TLI_TCP_DEVICE "/dev/xti/tcp".
+	  This fixes Riverace problem ID P32; AIX now joins HP-UX in
+	  supporting XTI/TLI, but not everything (problem P27).
 
-        * ace/UPIPE_Connector.h:
-        * ace/TLI_Connector.h:  Added meta-type information PEER_ADDR and
-          PEER_STREAM.  Fixes Riverace problem ID P37.
+	* ace/UPIPE_Connector.h:
+	* ace/TLI_Connector.h:	Added meta-type information PEER_ADDR and
+	  PEER_STREAM.  Fixes Riverace problem ID P37.
 
-        * apps/JAWS/server/HTTP_Server.cpp: Added 'const' to "char *prog".
-          Fixes Riverace problem P36.
+	* apps/JAWS/server/HTTP_Server.cpp: Added 'const' to "char *prog".
+	  Fixes Riverace problem P36.
 
-        * examples/Connection/misc/test_upipe.cpp:
-        * examples/Connection/non_blocking/CPP-connector.cpp:
-        * examples/Threads/process_mutex.cpp:
-        * examples/Threads/process_semaphore.cpp:
-          Added 'const' to "char *" - can't initialize a char * with
-          a const string.  Fixes Riverace problem ID P38, P40.
+	* examples/Connection/misc/test_upipe.cpp:
+ 	* examples/Connection/non_blocking/CPP-connector.cpp:
+	* examples/Threads/process_mutex.cpp:
+	* examples/Threads/process_semaphore.cpp:
+	  Added 'const' to "char *" - can't initialize a char * with
+	  a const string.  Fixes Riverace problem ID P38, P40.
 
-        * examples/Threads/thread_specific.cpp, tss1.cpp:  Moved the Errno
-          class out to a new file, thread_specific.h.  AIX xlC needs to have
-          the class in a .h file for template generation.  Fixes Riverace
-          problem P42.
-        * examples/Threads/Makefile: Make sure that, on AIX, the tempinc
-          directory is cleared before building each new program.
+	* examples/Threads/thread_specific.cpp, tss1.cpp:  Moved the Errno
+	  class out to a new file, thread_specific.h.  AIX xlC needs to have
+	  the class in a .h file for template generation.  Fixes Riverace
+	  problem P42.
+	* examples/Threads/Makefile: Make sure that, on AIX, the tempinc
+	  directory is cleared before building each new program.
 
-        * performance-tests/Synch-Benchmarks/Makefile: Changed SHLIB to use
-          $(SOEXT) rather than .so.  Fixes Riverace problem ID P41.
+	* performance-tests/Synch-Benchmarks/Makefile: Changed SHLIB to use
+	  $(SOEXT) rather than .so.  Fixes Riverace problem ID P41.
 
-        * tests/Thread_Pool_Test.cpp: Moved 'this->getq(mb)' out of an
-          ACE_ASSERT.  Thanks to Arturo Montes <mitosys@colomsat.net.co>
-          for finding this.
+	* tests/Thread_Pool_Test.cpp: Moved 'this->getq(mb)' out of an
+	  ACE_ASSERT.  Thanks to Arturo Montes <mitosys@colomsat.net.co>
+	  for finding this.
 
 Sat Nov 22 05:44:10 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
-        * tests/Process_Strategy_Test.cpp (main): Shuffled things around
-          in fork() block.  This is fun.
+	* tests/Process_Strategy_Test.cpp (main): Shuffled things around
+	  in fork() block.  This is fun.
 
-        * ace/Strategies_T.cpp (activate_svc_handler): Added an
-          ACE_UNUSED_ARG macro to muffle g++.
+	* ace/Strategies_T.cpp (activate_svc_handler): Added an
+	  ACE_UNUSED_ARG macro to muffle g++.
 
-        * tests/Process_Strategy_Test.cpp (handle_close): Added a return
-          type specifier.  Without it, g++ laments.
+	* tests/Process_Strategy_Test.cpp (handle_close): Added a return
+	  type specifier.  Without it, g++ laments.
 
-        * ace/Acceptor.cpp (activate_svc_handler): Should be if (open (...) ==
-          -1) then error, not if (open (...) != -1) then error.
+	* ace/Acceptor.cpp (activate_svc_handler): Should be if (open (...) ==
+	  -1) then error, not if (open (...) != -1) then error.
 
-        * ace/ACE.cpp (set_handle_limit): Removed a duplicated ACE_TRACE
-          macro.
+	* ace/ACE.cpp (set_handle_limit): Removed a duplicated ACE_TRACE
+	  macro.
 
 Sat Nov 22 00:26:11 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
-        * ace/Thread_Manager.cpp (close): Activated automatic wait on
-          close functionality.  I think I get it right this time.
+	* ace/Thread_Manager.cpp (close): Activated automatic wait on
+	  close functionality.  I think I get it right this time.
 
 Fri Nov 21 19:59:37 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
 
-        * ace/IPC_SAP.cpp:
-          Added a couple of ACE_NOTREACHED protections. Thanks to Brian
-          Mendel <bmendel@mdc.com> for reporting this.
+	* ace/IPC_SAP.cpp:
+	  Added a couple of ACE_NOTREACHED protections. Thanks to Brian
+	  Mendel <bmendel@mdc.com> for reporting this.
 
 Fri Nov 21 17:12:48 1997    <nw1@CHA-CHA>
 
-        * ace/Thread_Manager.cpp (close): Deactivated automatic wait on
-          close for now.  It doesn't seem to work on Solaris.
+	* ace/Thread_Manager.cpp (close): Deactivated automatic wait on
+ 	  close for now.  It doesn't seem to work on Solaris.
 
-        * ace/Thread_Manager.{h,cpp} (wait): Added codes to remove detached
-          threads.  This function can be activated selectively.  I added
-          this so we can ignore detached threads when closing down the
-          default thread manager.
+	* ace/Thread_Manager.{h,cpp} (wait): Added codes to remove detached
+ 	  threads.  This function can be activated selectively.  I added
+ 	  this so we can ignore detached threads when closing down the
+ 	  default thread manager.
 
-          (close): Activated the code to wait (join) all threads managed
-          by the thread manager.  It will ask wait function to remove all
-          detached thread first (and so they won't be counted into threads
-          we are waiting for.)
+	  (close): Activated the code to wait (join) all threads managed
+ 	  by the thread manager.  It will ask wait function to remove all
+ 	  detached thread first (and so they won't be counted into threads
+ 	  we are waiting for.)
 
 Fri Nov 21 13:22:25 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -142,139 +142,139 @@ Fri Nov 21 13:22:25 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Fri Nov 21 12:18:28 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Acceptor.cpp,Strategy_T.cpp: Removed the use of gotos.  See
-          Dijkstra '67 for motivation...
+	* ace/Acceptor.cpp,Strategy_T.cpp: Removed the use of gotos.  See
+ 	  Dijkstra '67 for motivation...
 
-        * tests/Process_Strategy_Test.cpp (open): Make sure that we set
-          the Reactor of the Svc_Handler to 0 if we're running the
-          threading test.
+	* tests/Process_Strategy_Test.cpp (open): Make sure that we set
+ 	  the Reactor of the Svc_Handler to 0 if we're running the
+ 	  threading test.
 
-        * tests/Reactor_Notify_Test.cpp: Added back THR_BOUND to
-          make things work on Solaris.
+	* tests/Reactor_Notify_Test.cpp: Added back THR_BOUND to
+	  make things work on Solaris.
 
 Fri Nov 21 02:23:47 1997    <irfan@TWOSTEP>
 
-        * tests/Process_Strategy_Test.cpp:
-
-          - The event loop execution was based on a fragile timeout
-            mechanism.  This was changed to a more robust mechanism that
-            counts the connections.
-
-          - The unlinking of the file was moved from the server to the
-            client.  This is necessary since there maybe multiple server
-            processes that cannot really coordinate when the file should
-            be removed.
-
-        * ace/Strategies_T.cpp (ACE_Concurrency_Strategy):
-          ACE_Concurrency_Strategy and all three of the subclasses
-          (ACE_Reactive_Strategy, ACE_Process_Strategy, and
-          ACE_Thread_Strategy) were messed up.  Only ACE_Reactive_Strategy
-          was (trying) to set the correct blocking mode of the socket.
-          Therefore, moved the socket mode setting code to the base class,
-          ACE_Concurrency_Strategy, so that all the classes can share it.
-
-          This did create one problem though.  If the implementation of
-          the reactor uses event associations (i.e., WFMO_Reactor), we
-          cannot try to set the socket mode since the registration of the
-          svc_handler caused an event association to be created for the
-          socket and by default (thanks Microslush) the socket is set to
-          non-blocking mode.  If the user is excepting to have a socket in
-          blocking mode, he is in for a surprise.  Maybe we should return
-          a failure if the user is expecting a socket in blocking mode.
-          This is probably too harsh for now.
-
-        * tests/Future_Test.cpp (open): Added THR_DETACHED since we don't
-          wait for this thread.
-
-        * tests/Reactor_Notify_Test.cpp (open): Changed THR_BOUND to
-          THR_DETACHED since we don't wait for this thread.
-
-        * tests/IOStream_Test.cpp (server): Make sure to close the socket
-          in ACE_SOCK_Acceptor and ACE_SOCK_IOStream.
-
-        * ace/WFMO_Reactor.cpp (open): When I changed open() last, I
-          ignored the order of the registeration of notify_handler_ and
-          wakeup_all_threads_handler_.  Unfortunately, the order of the
-          two registrations is very important since the optimization for
-          owner thread takes advantage of this ordering.  Therefore,
-          revert the order of registertion to notify_handler_ followed by
-          wakeup_all_threads_handler_.
-
-        * tests/version_tests/run_all_tests.bat: Added new bat file to
-          make the running of all the different configurations easier.
-
-        * tests/version_tests/version_tests.{mak,mdp}: Added a mammoth
-          testing scheme that is used to test all 8 configurations of the
-          tests under Win32.  These 8 configurations are:
-
-          DLL Debug
-          DLL Release
-          DLL Unicode Debug
-          DLL Unicode Release
-          static Debug
-          static Release
-          static Unicode Debug
-          static Unicode Release
-
-          run_tests.bat from the test directory can then be used to run
-          these various configurations.  run_tests.bat was also extended
-          to allow the user to purify the tests.  Simply execute
-          run_tests.bat with the purify command line option.
+	* tests/Process_Strategy_Test.cpp:
+
+	  - The event loop execution was based on a fragile timeout
+ 	    mechanism.  This was changed to a more robust mechanism that
+ 	    counts the connections.
+
+	  - The unlinking of the file was moved from the server to the
+ 	    client.  This is necessary since there maybe multiple server
+ 	    processes that cannot really coordinate when the file should
+ 	    be removed.
+
+	* ace/Strategies_T.cpp (ACE_Concurrency_Strategy):
+ 	  ACE_Concurrency_Strategy and all three of the subclasses
+ 	  (ACE_Reactive_Strategy, ACE_Process_Strategy, and
+ 	  ACE_Thread_Strategy) were messed up.  Only ACE_Reactive_Strategy
+ 	  was (trying) to set the correct blocking mode of the socket.
+  	  Therefore, moved the socket mode setting code to the base class,
+ 	  ACE_Concurrency_Strategy, so that all the classes can share it.
+
+	  This did create one problem though.  If the implementation of
+ 	  the reactor uses event associations (i.e., WFMO_Reactor), we
+ 	  cannot try to set the socket mode since the registration of the
+ 	  svc_handler caused an event association to be created for the
+ 	  socket and by default (thanks Microslush) the socket is set to
+ 	  non-blocking mode.  If the user is excepting to have a socket in
+ 	  blocking mode, he is in for a surprise.  Maybe we should return
+ 	  a failure if the user is expecting a socket in blocking mode.
+  	  This is probably too harsh for now.
+
+	* tests/Future_Test.cpp (open): Added THR_DETACHED since we don't
+ 	  wait for this thread.
+
+	* tests/Reactor_Notify_Test.cpp (open): Changed THR_BOUND to
+ 	  THR_DETACHED since we don't wait for this thread.
+
+	* tests/IOStream_Test.cpp (server): Make sure to close the socket
+ 	  in ACE_SOCK_Acceptor and ACE_SOCK_IOStream.
+
+	* ace/WFMO_Reactor.cpp (open): When I changed open() last, I
+ 	  ignored the order of the registeration of notify_handler_ and
+ 	  wakeup_all_threads_handler_.  Unfortunately, the order of the
+ 	  two registrations is very important since the optimization for
+ 	  owner thread takes advantage of this ordering.  Therefore,
+ 	  revert the order of registertion to notify_handler_ followed by
+ 	  wakeup_all_threads_handler_.
+
+	* tests/version_tests/run_all_tests.bat: Added new bat file to
+ 	  make the running of all the different configurations easier.
+
+	* tests/version_tests/version_tests.{mak,mdp}: Added a mammoth
+ 	  testing scheme that is used to test all 8 configurations of the
+ 	  tests under Win32.  These 8 configurations are:
+
+	  DLL Debug
+	  DLL Release
+	  DLL Unicode Debug
+	  DLL Unicode Release
+	  static Debug
+	  static Release
+	  static Unicode Debug
+	  static Unicode Release
+
+	  run_tests.bat from the test directory can then be used to run
+ 	  these various configurations.  run_tests.bat was also extended
+ 	  to allow the user to purify the tests.  Simply execute
+ 	  run_tests.bat with the purify command line option.
 
 Thu Nov 20 17:43:15 1997    <nw1@COYOTE>
 
-        * ace/Thread_Manager.cpp (kill_thr): Changed to prevent thread
-          manager from "discard" a thread when a certain operation is not
-          supported by the operation system.  Removed the mechanism that
-          preserves errno during "thread removal."  We no longer remove
-          thread right after an error occured.
+	* ace/Thread_Manager.cpp (kill_thr): Changed to prevent thread
+ 	  manager from "discard" a thread when a certain operation is not
+ 	  supported by the operation system.  Removed the mechanism that
+ 	  preserves errno during "thread removal."  We no longer remove
+ 	  thread right after an error occured.
 
 Thu Nov 20 17:53:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * examples/Shared_Malloc/test_multiple_mallocs.cpp (main): Make
-          sure make sure that the semaphores created by the program are
-          released as well as the storage files deleted.  Thanks to Tom
-          Arbuckle <arbuckle@uran.informatik.uni-bonn.de> for reporting
-          this.
+	* examples/Shared_Malloc/test_multiple_mallocs.cpp (main): Make
+ 	  sure make sure that the semaphores created by the program are
+ 	  released as well as the storage files deleted.  Thanks to Tom
+ 	  Arbuckle <arbuckle@uran.informatik.uni-bonn.de> for reporting
+ 	  this.
 
-        * ace: Added a new version of config-osf1-3.2.h.  Thanks to Dani
-          Flexer <danif@ivory-sw.com> for updating this.
+	* ace: Added a new version of config-osf1-3.2.h.  Thanks to Dani
+ 	  Flexer <danif@ivory-sw.com> for updating this.
 
 Thu Nov 20 18:22:24 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/README
-          ace/TLI.h
-          ace/TLI_Acceptor.h
-          ace/TLI_Connector.h
-          Changed from using hardcoded "/dev/tcp" as the XTI device name to
-          a new config-related define, ACE_TLI_TCP_DEVICE.  If the config
-          doesn't set one, it defaults to "/dev/tcp".  Thanks to Steve Coy
-          <stevec@magna.com.au> for zeroing in on this problem in HP-UX.
+	* ace/README
+	  ace/TLI.h
+	  ace/TLI_Acceptor.h
+	  ace/TLI_Connector.h
+	  Changed from using hardcoded "/dev/tcp" as the XTI device name to
+	  a new config-related define, ACE_TLI_TCP_DEVICE.  If the config
+	  doesn't set one, it defaults to "/dev/tcp".  Thanks to Steve Coy
+	  <stevec@magna.com.au> for zeroing in on this problem in HP-UX.
 
-          ace/config-hpux-10.x.h:  ACE_TLI_TCP_DEVICE is "/dev/inet_cots".
-          Note that XTI won't work 100% well on HP still - this is Riverace
-          problem ID P27.
+	  ace/config-hpux-10.x.h:  ACE_TLI_TCP_DEVICE is "/dev/inet_cots".
+	  Note that XTI won't work 100% well on HP still - this is Riverace
+	  problem ID P27.
 
-        * netsvcs/lib/Server_Logging_Handler_T.h: Hardcoded to always use
-          ACE_SOCK_Stream (and friends) rather than ACE_TLI_Stream and friends.
-          XTI doesn't work real well on some platforms (particularly HP-UX
-          and AIX).  When they're fixed, this can be undone (Riverace problem
-          ID P28).
+	* netsvcs/lib/Server_Logging_Handler_T.h: Hardcoded to always use
+	  ACE_SOCK_Stream (and friends) rather than ACE_TLI_Stream and friends.
+	  XTI doesn't work real well on some platforms (particularly HP-UX
+	  and AIX).  When they're fixed, this can be undone (Riverace problem
+	  ID P28).
 
-        * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: Changed 'char *host' to
-          'const char *host' so it can be initialized from a const char string.
+	* examples/IPC_SAP/TLI_SAP/CPP-client.cpp: Changed 'char *host' to
+	  'const char *host' so it can be initialized from a const char string.
 
 Thu Nov 20 14:19:57 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
 
-        * tests/Priority_Reactor_Test.h:
-        * tests/Priority_Reactor_Test.cpp:
-          The test has a limited execution time now, and only reports a
-          warning if runs out of time. This may be due to some failed
-          connections, but it is hard to avoid that.  On the other hand
-          the default time should be large enough, in our machines the
-          test only takes 14 seconds, so 60 seconds should be enough.
-          NOTE: this problem reveals a problem *only* in the test itself
-          not in ACE_Priority_Reactor.
+	* tests/Priority_Reactor_Test.h:
+	* tests/Priority_Reactor_Test.cpp:
+	  The test has a limited execution time now, and only reports a
+ 	  warning if runs out of time. This may be due to some failed
+ 	  connections, but it is hard to avoid that.  On the other hand
+ 	  the default time should be large enough, in our machines the
+ 	  test only takes 14 seconds, so 60 seconds should be enough.
+  	  NOTE: this problem reveals a problem *only* in the test itself
+ 	  not in ACE_Priority_Reactor.
 
 Thu Nov 20 11:29:51 1997  David L. Levine  <levine@cs.wustl.edu>
 
@@ -288,27 +288,27 @@ Thu Nov 20 11:27:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Thu Nov 20 10:45:08 1997    <irfan@TWOSTEP>
 
-        * tests/MT_SOCK_Test.cpp: Uncommented socket close call.
+	* tests/MT_SOCK_Test.cpp: Uncommented socket close call.
 
-        * ace/WFMO_Reactor.cpp (open): Open the notification handler
-          *after* the timer queue has been created.
+	* ace/WFMO_Reactor.cpp (open): Open the notification handler
+ 	  *after* the timer queue has been created.
 
-        * ace/ACE.cpp (get_ip_interfaces): Changed rep() to fast_rep() to
-          prevent memory leak.
+	* ace/ACE.cpp (get_ip_interfaces): Changed rep() to fast_rep() to
+ 	  prevent memory leak.
 
-        * ace/Reactor.cpp (ACE_Reactor): Fixed error of not creating any
-          Reactors on UNIX.
+	* ace/Reactor.cpp (ACE_Reactor): Fixed error of not creating any
+ 	  Reactors on UNIX.
 
 Thu Nov 20 08:36:54 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
-        * ace/Thread_Manager.{h,cpp}:  Added a dummy argument to internal
-          thread functions.  Without them, MSVC wrongly optimizes codes
-          and the stack were all clobbered when entering these functions.
+	* ace/Thread_Manager.{h,cpp}:  Added a dummy argument to internal
+	  thread functions.  Without them, MSVC wrongly optimizes codes
+	  and the stack were all clobbered when entering these functions.
 
 Wed Nov 19 23:24:03 1997    <nw1@CHA-CHA>
 
-        * ace/Reactor.cpp: Rearragned macros so we use Select_Reactor as
-          default if we don't have Winsock2.  Irfan did it, not me.
+	* ace/Reactor.cpp: Rearragned macros so we use Select_Reactor as
+ 	  default if we don't have Winsock2.  Irfan did it, not me.
 
 Wed Nov 19 22:11:20 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -316,48 +316,48 @@ Wed Nov 19 22:11:20 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Wed Nov 19 15:55:52 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
 
-        * config-netbsd.h: NetBSD 1.3alpha has a better MSYNC. Commented out
-        ACE_HAS_BROKEN_NETBSD_MSYNC
+	* config-netbsd.h: NetBSD 1.3alpha has a better MSYNC. Commented out
+	ACE_HAS_BROKEN_NETBSD_MSYNC
 
 Wed Nov 19 14:26:36 1997  Nanbor Wang  <nw1@lindy.cs.wustl.edu>
 
-        * stdcpp.h, OS.h: Changed ACE_CONFIG_H to ACE_USER_CONFIG_H.  It
-        conflicts with the macro in various configuration files.
+	* stdcpp.h, OS.h: Changed ACE_CONFIG_H to ACE_USER_CONFIG_H.  It
+	conflicts with the macro in various configuration files.
 
 Wed Nov 19 15:55:45 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/config-sunos5.*.h: Replaced all uses of ACE_HAS_UNICODE with
-          ACE_HAS_XPG4_MULTIBYTE_CHAR.  At this point, I think only NT has
-          the UNICODE macro now.  Thanks to Steve Huston for validating
-          this.
+	* ace/config-sunos5.*.h: Replaced all uses of ACE_HAS_UNICODE with
+ 	  ACE_HAS_XPG4_MULTIBYTE_CHAR.  At this point, I think only NT has
+ 	  the UNICODE macro now.  Thanks to Steve Huston for validating
+ 	  this.
 
-        * STL/bstring.h: Added a special-case for BorlandC++.  However, I
-          think this can be generalized for all compilers.  Thanks to
-          Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
+	* STL/bstring.h: Added a special-case for BorlandC++.  However, I
+ 	  think this can be generalized for all compilers.  Thanks to
+ 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
 
-        * ace/OS: Fixed strpbrk() to handle the const char * and char *
-          cases of ANSI C++.  Thanks to Valik Solorzano Barboza
-          <valik@xs4all.nl> for reporting this.
+	* ace/OS: Fixed strpbrk() to handle the const char * and char *
+ 	  cases of ANSI C++.  Thanks to Valik Solorzano Barboza
+ 	  <valik@xs4all.nl> for reporting this.
 
-        * ace/OS.h: Added a special case for _MSC_VER since BC++ doesn't
-          have wchar.h!  Thanks to Valik Solorzano Barboza
-          <valik@xs4all.nl> for reporting this.
+	* ace/OS.h: Added a special case for _MSC_VER since BC++ doesn't
+ 	  have wchar.h!  Thanks to Valik Solorzano Barboza
+ 	  <valik@xs4all.nl> for reporting this.
 
 Wed Nov 19 13:43:33 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
-        * Merged the purify testing into run_tests.  Just use
+	* Merged the purify testing into run_tests.  Just use
 
-          "run_tests purify ..."
+	  "run_tests purify ..."
 
-          to purify instead of running the tests.  If you thought this
-          batch file looked bad before....
+	  to purify instead of running the tests.  If you thought this
+	  batch file looked bad before....
 
 Wed Nov 19 12:17:50 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
-        * ace/{OS,stdcpp}.h (ACE_CONFIG_H): Added this macro to protect
-          config.h from getting included multiple times.
+	* ace/{OS,stdcpp}.h (ACE_CONFIG_H): Added this macro to protect
+	  config.h from getting included multiple times.
 
-        * ace/stdcpp.h:  Reverted include OS.h back to config.h.
+	* ace/stdcpp.h:  Reverted include OS.h back to config.h.
 
 Wed Nov 19 09:20:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -365,21 +365,21 @@ Wed Nov 19 09:20:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Wed Nov 19 07:54:44 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/ACE.cpp (crc32): Reverted the COMPUTE macro back to its
-          original value.  For some reason, the version given by Valik was
-          failing.
+	* ace/ACE.cpp (crc32): Reverted the COMPUTE macro back to its
+ 	  original value.  For some reason, the version given by Valik was
+ 	  failing.
 
-        * ace/SV_Semaphore_Complex.cpp (open): Make sure initialize the
-          sem_number_ data member, though this isn't actually used for
-          anything.
+	* ace/SV_Semaphore_Complex.cpp (open): Make sure initialize the
+ 	  sem_number_ data member, though this isn't actually used for
+ 	  anything.
 
-        * ace/ACE.cpp: Added a #ifdef for __unix since this is the only
-          case where we'll actually have the ifreq autoptr.  Thanks to
-          Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
+	* ace/ACE.cpp: Added a #ifdef for __unix since this is the only
+ 	  case where we'll actually have the ifreq autoptr.  Thanks to
+ 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
 
-        * ace/Log_Record.cpp (print): Added a work around for a really
-          lame bug with BORLANDC.  Thanks to Valik Solorzano Barboza
-          <valik@xs4all.nl> for reporting this.
+	* ace/Log_Record.cpp (print): Added a work around for a really
+ 	  lame bug with BORLANDC.  Thanks to Valik Solorzano Barboza
+ 	  <valik@xs4all.nl> for reporting this.
 
 Wed Nov 19 04:22:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -387,126 +387,126 @@ Wed Nov 19 04:22:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Wed Nov 19 04:02:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * include/makeinclude/rules.local.GNU (show_uninit): It seems
-          there was a missing '@' at the beginning of the line.  Thanks to
-          Hans Rohnert for reporting this.
+	* include/makeinclude/rules.local.GNU (show_uninit): It seems
+ 	  there was a missing '@' at the beginning of the line.  Thanks to
+ 	  Hans Rohnert for reporting this.
 
-        * tests/Process_Strategy_Test.cpp (handle_input): Fixed Irfan's
-          code, which keeps breaking ACE ;-).
+	* tests/Process_Strategy_Test.cpp (handle_input): Fixed Irfan's
+ 	  code, which keeps breaking ACE ;-).
 
 Wed Nov 19 01:55:06 1997    <irfan@TWOSTEP>
 
-        * ace/WFMO_Reactor.cpp (resume_handler_i, suspend_handler_i,
-          unbind_i): Since things don't happen immediately in the
-          WFMO_Reactor world, we must make sure that this request is not a
-          duplicate.  If so we must ignore it.
+	* ace/WFMO_Reactor.cpp (resume_handler_i, suspend_handler_i,
+ 	  unbind_i): Since things don't happen immediately in the
+ 	  WFMO_Reactor world, we must make sure that this request is not a
+ 	  duplicate.  If so we must ignore it.
 
-        * ace/Asynch_Acceptor.cpp (open): Fixed addr type mismatch problem.
+	* ace/Asynch_Acceptor.cpp (open): Fixed addr type mismatch problem.
 
-        * tests/UPIPE_SAP_Test.cpp (main): Make sure to close the socket
-          in ACE_UPIPE_Acceptor.
+	* tests/UPIPE_SAP_Test.cpp (main): Make sure to close the socket
+ 	  in ACE_UPIPE_Acceptor.
 
-        * tests/SPIPE_Test.cpp (server): Make sure to close the socket in
-          ACE_SPIPE_Acceptor.
+	* tests/SPIPE_Test.cpp (server): Make sure to close the socket in
+ 	  ACE_SPIPE_Acceptor.
 
-        * tests/SOCK_Test.cpp (spawn): Make sure to close the socket in
-          ACE_SOCK_Acceptor.
+	* tests/SOCK_Test.cpp (spawn): Make sure to close the socket in
+ 	  ACE_SOCK_Acceptor.
 
-        * tests/Reactor_Notify_Test.cpp (Supplier_Task): Make sure to
-          close the pipe down.
+	* tests/Reactor_Notify_Test.cpp (Supplier_Task): Make sure to
+ 	  close the pipe down.
 
-        * tests/Process_Strategy_Test.cpp (handle_input): Fixed ACE_DEBUG
-          statement to pass the correct number of arguments.
+	* tests/Process_Strategy_Test.cpp (handle_input): Fixed ACE_DEBUG
+ 	  statement to pass the correct number of arguments.
 
-        * tests/MT_SOCK_Test.cpp (spawn): Make sure to close the socket in
-          ACE_SOCK_Acceptor.
+	* tests/MT_SOCK_Test.cpp (spawn): Make sure to close the socket in
+ 	  ACE_SOCK_Acceptor.
 
-        * tests/Reactor_Exceptions_Test.cpp (main): Make sure to close the
-          socket in ACE_SOCK_Dgram.
+	* tests/Reactor_Exceptions_Test.cpp (main): Make sure to close the
+ 	  socket in ACE_SOCK_Dgram.
 
-        * tests/run_purify_tests.bat: Added "mkdir purify_results".
+	* tests/run_purify_tests.bat: Added "mkdir purify_results".
 
-        * tests/run_tests.bat, run_purify_tests.bat: Changed explicit name
-          of bat file (e.g., run_tests, run_purify_tests) to %0.  This
-          will allow the bat file to be used from other directories.
+	* tests/run_tests.bat, run_purify_tests.bat: Changed explicit name
+ 	  of bat file (e.g., run_tests, run_purify_tests) to %0.  This
+ 	  will allow the bat file to be used from other directories.
 
-        * ace/config-win32-common.h: Removed extraneous define of
-          ACE_HAS_TEMPLATE_INSTANTIATION.
+	* ace/config-win32-common.h: Removed extraneous define of
+ 	  ACE_HAS_TEMPLATE_INSTANTIATION.
 
 Wed Nov 19 00:37:22 1997    <nw1@COYOTE>
 
-        * ace/stdcpp.h: Changed to use "ace/OS.h" instead of using
-          "ace/config.h" directly to avoid redefinition of user defined
-          macros.
+	* ace/stdcpp.h: Changed to use "ace/OS.h" instead of using
+ 	  "ace/config.h" directly to avoid redefinition of user defined
+ 	  macros.
 
-        * ace/Log_Msg.cpp (close): Disable Win32 to delete
-          ACE_Log_Msg::instance ().  On Win32, this should be done by
-          ACE_TSS_Cleanup.
+	* ace/Log_Msg.cpp (close): Disable Win32 to delete
+ 	  ACE_Log_Msg::instance ().  On Win32, this should be done by
+ 	  ACE_TSS_Cleanup.
 
-        * ace/OS.cpp (cleanup_tss): Enabled Win32 to call
-          ACE_Log_Msg::close.  This is required to properly release
-          resourses held by ACE_Log_Msg_Manager.
+	* ace/OS.cpp (cleanup_tss): Enabled Win32 to call
+ 	  ACE_Log_Msg::close.  This is required to properly release
+ 	  resourses held by ACE_Log_Msg_Manager.
 
 Tue Nov 18 19:28:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-        * ace/Select_Reactor.cpp (unbind),
-          ace/WFMO_Reactor.cpp (handle_signal): Fixed a large number of
-          bugs with non-portable "scope of the for loop counter"...
-          Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
-          reporting this.
+	* ace/Select_Reactor.cpp (unbind),
+	  ace/WFMO_Reactor.cpp (handle_signal): Fixed a large number of
+ 	  bugs with non-portable "scope of the for loop counter"...
+  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
+ 	  reporting this.
 
-        * ace/Thread_Manager: Added == and != operators for
-          ACE_Thread_Descriptor to fix things with BORLANDC's template
-          mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
-          for reporting this.
+	* ace/Thread_Manager: Added == and != operators for
+ 	  ACE_Thread_Descriptor to fix things with BORLANDC's template
+ 	  mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
+ 	  for reporting this.
 
-        * ace/Select_Reactor: Added == and != operators for
-          ACE_Event_Tuple to fix things with BORLANDC's template
-          mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
-          for reporting this.
+	* ace/Select_Reactor: Added == and != operators for
+ 	  ACE_Event_Tuple to fix things with BORLANDC's template
+ 	  mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
+ 	  for reporting this.
 
-        * ace/OS.i (tempnam): Fixed a typo -- WIN32 should be ACE_WIN32.
-          Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
-          reporting this.
+	* ace/OS.i (tempnam): Fixed a typo -- WIN32 should be ACE_WIN32.
+  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
+ 	  reporting this.
 
-        * ace/OS.h: Reordered the ACE_SEH_* macros so they work correctly
-          with BORLANDC.  Thanks to Valik Solorzano Barboza
-          <valik@xs4all.nl> for reporting this.
+	* ace/OS.h: Reordered the ACE_SEH_* macros so they work correctly
+ 	  with BORLANDC.  Thanks to Valik Solorzano Barboza
+ 	  <valik@xs4all.nl> for reporting this.
 
-        * ace/OS: Added operator== and operator!= for ACE_Cleanup_Info so
-          that it will work correctly with BORLANDC's template mechanism.
-          Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
-          reporting this.
+	* ace/OS: Added operator== and operator!= for ACE_Cleanup_Info so
+ 	  that it will work correctly with BORLANDC's template mechanism.
+  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
+ 	  reporting this.
 
-        * ace/config-win32-common.h: Added
-          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for BORLANDC.  Thanks to
-          Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
+	* ace/config-win32-common.h: Added
+ 	  ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for BORLANDC.  Thanks to
+ 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
 
-        * ace/Filecache.cpp: Fixed a bug with BORLANDC.  Thanks to Valik
-          Solorzano Barboza <valik@xs4all.nl> for reporting this.
+	* ace/Filecache.cpp: Fixed a bug with BORLANDC.  Thanks to Valik
+ 	  Solorzano Barboza <valik@xs4all.nl> for reporting this.
 
-        * ace/ACE.cpp (crc32): Added some parens to the COMPUTE macro to
-          make it easier to grok.  Thanks to Valik Solorzano Barboza
-          <valik@xs4all.nl> for reporting this.
+	* ace/ACE.cpp (crc32): Added some parens to the COMPUTE macro to
+ 	  make it easier to grok.  Thanks to Valik Solorzano Barboza
+ 	  <valik@xs4all.nl> for reporting this.
 
 Tue Nov 18 16:27:32 1997    <irfan@TWOSTEP>
 
-        * ace/Log_Msg.cpp (log): Added a %D option to Log_Msg for
-          "month/day/year hour:minute:second:microsecond". Thanks to John
-          Mulhern <9107@MN3.LAWSON.lawson.com> for suggesting this.
+	* ace/Log_Msg.cpp (log): Added a %D option to Log_Msg for
+ 	  "month/day/year hour:minute:second:microsecond". Thanks to John
+ 	  Mulhern <9107@MN3.LAWSON.lawson.com> for suggesting this.
 
-        * ace/config-win32-common.h: If __ACE_INLINE__ is defined to be 0,
-          we will undefine it.
+	* ace/config-win32-common.h: If __ACE_INLINE__ is defined to be 0,
+ 	  we will undefine it.
 
 Tue Nov 18 15:59:37 1997  Steve Huston  <shuston@riverace.com>
 
-        * ace/IOStream.cpp: In underflow() and overflow(), use base() to
-          check for buffer in use in every case - not just without
-          ACE_HAS_STANDARD_CPP_LIBRARY==1.  Thanks to James CE Johnson
-          (jcej@lads.com) for this fix.
+	* ace/IOStream.cpp: In underflow() and overflow(), use base() to
+	  check for buffer in use in every case - not just without
+	  ACE_HAS_STANDARD_CPP_LIBRARY==1.  Thanks to James CE Johnson
+	  (jcej@lads.com) for this fix.
 
-        * tests/MT_SOCK_Test.cpp: Allow the test to run even if not all of
-          the proceses can be forked.
+	* tests/MT_SOCK_Test.cpp: Allow the test to run even if not all of
+	  the proceses can be forked.
 
 Tue Nov 18 15:27:37 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
 
@@ -973,7 +973,7 @@ Tue Nov 11 23:44:17 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 Tue Nov 11 21:26:36 1997  Douglas C. Schmidt  <schmidt@lindy.cs.wustl.edu>
 
         * platform_sunos5_sunc++.GNU, platform_irix6.x-sgic++.GNU, rules.local.GNU:
-          Added some minor fixes.
+	  Added some minor fixes.
 
 Tue Nov 11 20:18:27 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
@@ -6195,13 +6195,13 @@ Wed Sep  3 21:38:18 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
         * ace/Timer_Queue_T.h:
         * ace/Timer_Wheel_T.cpp:
         * ace/Timer_Wheel_T.h:
-          In the word of its author: Modified the iterators kept in
-          each of these classes so that they are constructed
-          dynamically on the heap after the Queue has been properly
-          initialized. Otherwise, the iterators try to iterate over a
-          non-initialized queue, and fail miserably (usually dumping
-          core).  Once more thanks to Gonzalo Diethelm
-          (gonzo@ing.puc.cl) for this changes.
+          In the word of its author: Modified the iterators kept in each
+          of these classes so that they are constructed dynamically on the
+          heap after the Queue has been properly initialized. Otherwise,
+          the iterators try to iterate over a non-initialized queue, and
+          fail miserably (usually dumping core).
+          Once more thanks to Gonzalo Diethelm (gonzo@ing.puc.cl) for this
+          changes.
 
         * tests/UPIPE_SAP_Test.cpp:
           Gonzalo improved the error message.
@@ -7822,8 +7822,8 @@ Tue Aug 12 15:03:42 1997  Steve Huston <shuston@riverace.com>
 
         * ace/Timer_Hash_T.cpp, Timer_Wheel_T.cpp: Replaced references to
           ACE_High_Res_Timer::gettimeofday with ACE_OS::gettimeofday.
-          The High Res version is deprecated, and doesn't work
-          correctly on HP-UX.
+          The High Res version is deprecated, and doesn't work correctly
+          on HP-UX.
 
 Tue Aug 12 07:51:02 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
diff --git a/ChangeLog-99b b/ChangeLog-99b
index a5cac06a98b..896c7403b69 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,2016 +1,41 @@
-Wed Jul 07 21:37:33 1999  David L. Levine  <levine@cs.wustl.edu>
+Wed Jul  7 18:10:35 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * tests/test_config.h: removed special ACE_MAX_PROCESSES
-          and ACE_MAX_THREADS values for LynxOS, because most
-          tests don't need them.
+	* ace/CDR_Stream.i: Fixed the <byte_order> implementation again.    
 
-        * tests/Process_Mutex_Test.cpp: use only 4 processes
-          instead of ACE_MAX_PROCESSES, on LynxOS only.  Otherwise,
-          the test's ACE_LOG_MSG->op_status assertion fails.
-
-        * ACE-INSTALL.html: removed statements about some tests
-          failing on LynxOS/PPC.  Just Naming_Test and
-          MM_Shared_Memory_Test fail now.
-
-Wed Jul 07 19:51:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/config-ghs-common.h: removed use of native auto_ptrs, as they
-          implement an older specification which lacks the reset method.
-
-Wed Jul  7 17:17:10 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/ARGV.cpp (ACE_ARGV):
-        * ace/OS.cpp (ACE_OS_Recursive_Thread_Mutex_Guard):
-        * ace/Sched_Params.i (ACE_Sched_Priority_Iterator):
-
-          Added some class members to the member initializer lists to fix
-          some "Effective C++" warnings from EGCS.
-
-Wed Jul  7 16:33:29 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cached_Conn_Test.cpp (main): Added default testing of LRU,
-          LFU, FIFO caching strategies.
-
-        * tests/Cached_Conn_Test.cpp (parse_args):
-        * tests/Cache_Map_Manager_Test (parse_args):
-          Runtime selection of different caching strategies
-          (lru/lfu/fifo/null) made possible.
-
-        * Caching_Strategies_T.{i,cpp}:
-          Removed typos and also definied the virtual destructor for
-          ACE_Caching_Strategy.
-
-        * tests/Map_Manager_Test.cpp (test_cache_map_manager):
-          Added <null_caching_strategy> to the construction of
-          <cache_map_manager> and <hash_cache_map_manager> objects to make
-          it in sync with the changes made below.
-
-Wed Jul 07 16:06:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Recursive_Mutex_Test.cpp: explicitly set the
-          stack size.  This solves the problem on LynxOS/PPC, below, so
-          the 65-iteration workaround was removed.  Thanks to Doug for
-          this suggestion.
-
-Wed Jul  7 13:27:53 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/config-win32-borland.h,
-          ace/config-win32.h: Added support for the ACE::major_versions(), etc.
-          for PC versions of ACE, as well as UNIX.  Thanks to
-          Jeff Hellzen <jhellzen@my-deja.com> for suggesting this.
-
-        * ace: Added a new Based_Pointer_T.i file that inlines the
-          small methods.
-
-        * ace/Malloc[_T]: Cleaned up the code so that we can use the
-          ACE_Based_Pointer<> consistently when
-          ACE_HAS_POSITION_INDEPENDENT_MALLOC is enabled and disable.
-
-        * ace/Malloc.h: By default, ACE_MALLOC_PADDING is set to 1 so that
-          we don't get "divide by zero" errors.  However, it's only used
-          in the computation of the ACE_Malloc_Header if it's > 1.
-
-        * config-aix-4.x.h,
-          config-lynxos.h,
-          config-psos-diab-mips.h,
-          config-psos-diab-ppc.h,
-          config-psos-diab.h,
-          config-psos-tm.h,
-          config-psosim-g++.h,
-          config-sunos5.5.h:
-          Removed the ACE_MALLOC_ALIGN macro since it should no longer
-          be necessary.
-
-        * ace/Malloc.h: Renamed the macro ACE_MALLOC_ALIGN to
-          ACE_MALLOC_PADDING, which is more descriptive.  However, I've
-          retained ACE_MALLOC_ALIGN for backwards compatibility to keep
-          Steve Huston happy ;-).
-
-        * Fixed a typo in the TAO-mail.html program where ace-*
-          should have been tao-*.  Thanks to Pedro Alves Ferreira
-          <pedro.ferreira@inescn.pt> for reporting this.
-
-        * Fixed all vestiages of "BUG-REPORT-FORM" to say
-          "PROBLEM-REPORT-FORM."  Thanks to Neil B. Cohen <nbc@cisco.com>
-          for reporting this.
-
-Wed Jul 07 12:27:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-lynxos.h: added ACE_LACKS_FORK for PowerPC
-          only.  This cleans up most of the remaining test problems
-          on LynxOS/PPC.
-
-Wed Jul 07 11:26:06 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Malloc_T.cpp: Added ASYS_TEXT macros.
-
-Wed Jul  7 09:05:32 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Caching_Strategies_T.i (ACE_Caching_Strategy_Adapter<>::purge_
-          percent): Don't return a value from a void function.
-
-Tue Jul  6 17:54:52 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Caching_Strategies_T.{h,i,cpp}: Added Abstract Base class
-          called ACE_Caching_Strategy and ACE_Caching_Strategy_Adaptor
-          which facilitate changing of caching strategies at runtime using
-          the External Polymorphism pattern.
-
-        * ace/Cached_Connect_Strategy_T.{h, cpp}: Changed the signature of
-          the constructor and also removed the <caching_strategy_> member.
-
-        * ace/Cache_Map_Manager_T.{h, cpp}:
-        * ace/Hash_Cache_Map_Manager_T.{h,cpp}:
-          Changed the signature of the constructor.This was needed to be
-          able to use the External Polymorphism pattern.
-
-        * tests/Cache_Map_Manager_Test.cpp:
-        * tests/Cached_Conn_Test.cpp:
-          Made necessary changes to reflect the changes above.
-          Thanks to Irfan of the DOC group for helping with this.
-
-Tue Jul  6 17:34:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Enabled ACE_HAS_PTHREADS_UNIX98_EXT and
-          removed ACE_LACKS_RWLOCK_T for AIX 4.3. Moved some other
-          ACE_LACKS settings to the pre-4.3 threads section to allow
-          taking advantage of more capability on AIX 4.3.
-
-Tue Jul 06 16:29:32 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h: Moved the string conversion macros before including
-          OS.i because we also use them in the file.  Thanks to Carlos for
-          reporting this.
-
-        * OS.{h,i,cpp}:
-        * Parse_Node.cpp: Windows CE fixes.
-
-Tue Jul 06 15:56:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.h,Object_Manager.{h,cpp},OS.{h,cpp}
-          (ACE_Object_Manager*::init () and fini ()): return 1 instead
-          of -1 after the first call, per program invocation.  Thanks
-          to Jody Hagins <jody@atdesk.com> for this suggestion.
-
-Tue Jul  6 15:04:49 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/OS.i (sigwait): Fixed a problem with macro-itis and GCC.  The
-          following macro
-
-          # if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS)
-
-          was always evaluating to true, even when we're not on FreeBSD!.
-          The following macro works around this:
-
-          # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) ||
-            defined (CHORUS) || defined (ACE_PSOS)
-
-          Thanks to Elias Sreih <sealstd1@nortelnetworks.com> for
-          reporting this and Carlos for suggesting the workaround.
-
-Tue Jul  6 11:39:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Updated the comment for ACE_ADAPT_RETVAL to
-          clarify why it is needed.  Thanks to Elias Sreih
-          <sealstd1@nortelnetworks.com> for motivating this clarification.
-
-Tue Jul  6 10:42:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/test_config.h (ACE_INIT_LOG): Fixed a typo in VxWorks'
-          definition of ACE_INIT_LOG.  Thanks to David for reporting
-          this.
-
-Tue Jul  6 10:17:19 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/ace_flags.bor: Removed an extraneous
-          "\orbsvcs".  Thanks to Eugene Surovegin (surovegin@softlab.ru)
-          for reporting this.
-
-Tue Jul 06 10:17:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/check_build_logs: use mhmail instead of mailx on Suns.
-          mailx loses the subject, when run from my cron job.  Thanks
-          to Naga for reporting this.
-
-Mon Jul  5 20:45:21 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.(h i): Added code for support of pthread suspend/resume and
-          pthreads reader-writer locks. These features are enabled by setting
-          the ACE_HAS_PTHREADS_UNIX98_EXT and removing ACE_LACKS_RWLOCK_T.
-
-        * ace/config-hpux11.h: Added ACE_HAS_PTHREADS_UNIX98_EXT and removed
-          ACE_LACKS_RWLOCK_T - this enables native reader/writer locks as well
-          as thread suspend and reusme.
-
-        * ace/README: Added ACE_HAS_PTHREADS_UNIX98_EXT.
-
-        * apps/JAWS/server/HTTP_Config.(h cpp):
-        * apps/JAWS/server/HTTP_Response.( h cpp): const-corrected char *.
-
-Mon Jul  5 16:39:50 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * ACE-INSTALL.html: Updated the discussion to point out
-          our support for KAI C++ 3.3, Borland C++ Builder 4.0, and the
-          IBM VisualAge C++ compiler.
-
-        * ace/Future.h: Moved the static methods until the bottom
-          of the ACE_Future_Rep class to workaround a bug with Borland's
-          C++ Builder.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for testing this fix.
-
-        * ace/Timer_Heap_T.cpp (grow_heap): Removed an extra memory
-          allocation that snuck in whilst integrating the IBM VisualAge
-          C++ compiler patches.  Thanks to David Levine for reporting
-          this.
-
-        * Added new Borland Makefiles.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for these.
-
-        * include/makeinclude: Added several new platform configuration
-          files for Borland C++ Builder.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for these.
-
-Mon Jul  5 13:08:36 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cache_Map_Manager_Test.cpp: Added ACE_UNUSED_ARG macros
-          for <result> to ward off warnings.
-
-Mon Jul 05 13:00:19 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Malloc.i (free): Fixed unused arg warning for <ptr>.
-
-        * examples/Threads/future1.cpp:
-        * examples/Threads/future2.cpp:
-
-          Fixed template instantiations.
-
-Mon Jul  5 12:25:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i (strspn):
-          This function cannot return -1 to indicate errors, the function
-          returns an unsigned integral type.
-
-Mon Jul 05 12:14:56 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i: Wchat_t version of strenvdup should only be available
-          on Win32.  Thanks to Bala, Carlos, and David for noticing this.
-          (strspn): Ditto to this function.
-
-Mon Jul 05 09:58:07 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: in example config.h for VxWorks on NT,
-          use "" style #includes instead of <>.  <> should only be
-          used for system headers.
-
-Mon Jul 05 04:11:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/version_tests/Future_Set_Test.dsp:
-        * tests/version_tests/version_tests.dsw: Added Future_Set_Test
-          into version tests workspace.
-
-        * ace/ACE.cpp:
-        * ace/ACE.h:
-        * ace/DLL.cpp:
-        * ace/DLL.h:
-        * ace/Env_Value_T.h:
-        * ace/Env_Value_T.i:
-        * ace/FIFO.cpp:
-        * ace/FIFO.h:
-        * ace/FIFO.i:
-        * ace/FIFO_Recv.cpp:
-        * ace/FIFO_Recv.h:
-        * ace/FIFO_Recv_Msg.cpp:
-        * ace/FIFO_Recv_Msg.h:
-        * ace/FIFO_Send.cpp:
-        * ace/FIFO_Send.h:
-        * ace/FIFO_Send_Msg.cpp:
-        * ace/FIFO_Send_Msg.h:
-        * ace/FILE_Connector.i:
-        * ace/Filecache.cpp:
-        * ace/Get_Opt.cpp:
-        * ace/INET_Addr.cpp:
-        * ace/Local_Name_Space_T.cpp:
-        * ace/Log_Record.cpp:
-        * ace/Message_Queue_T.cpp:
-        * ace/Name_Proxy.cpp:
-        * ace/Naming_Context.cpp:
-        * ace/Naming_Context.h:
-        * ace/OS.cpp:
-        * ace/OS.h:
-        * ace/OS.i:
-        * ace/Parse_Node.cpp:
-        * ace/Parse_Node.h:
-        * ace/Proactor.cpp:
-        * ace/Process.cpp:
-        * ace/RB_Tree.cpp:
-        * ace/Registry_Name_Space.cpp:
-        * ace/Remote_Name_Space.cpp:
-        * ace/Remote_Name_Space.h:
-        * ace/Remote_Tokens.cpp:
-        * ace/Remote_Tokens.h:
-        * ace/Remote_Tokens.i:
-        * ace/SOCK_Dgram_Mcast.cpp:
-        * ace/SPIPE_Connector.cpp:
-        * ace/SV_Message_Queue.cpp:
-        * ace/SV_Semaphore_Simple.cpp:
-        * ace/SV_Shared_Memory.cpp:
-        * ace/Stats.cpp:
-        * ace/Stats.h:
-        * ace/Strategies_T.cpp:
-        * ace/Strategies_T.i:
-        * ace/Svc_Conf.h:
-        * ace/Svc_Conf.y:
-        * ace/Svc_Conf_y.cpp:
-        * ace/Token_Collection.cpp:
-        * ace/Token_Collection.h:
-        * ace/Token_Collection.i:
-        * ace/Token_Invariants.cpp:
-        * ace/Token_Invariants.h:
-        * ace/UPIPE_Acceptor.cpp:
-        * ace/UPIPE_Connector.cpp:
-        * ace/UPIPE_Connector.i:
-        * ace/WFMO_Reactor.cpp:
-        * ace/WIN32_Asynch_IO.cpp:
-        * ace/WIN32_Proactor.cpp:
-        * ace/config-win32-common.h:
-        * tests/CDR_Test.cpp:
-        * tests/Cache_Map_Manager_Test.cpp:
-        * tests/Collection_Test.cpp:
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test.h:
-        * tests/DLList_Test.cpp:
-        * tests/Dynamic_Priority_Test.cpp:
-        * tests/Env_Value_Test.cpp:
-        * tests/Handle_Set_Test.cpp:
-        * tests/High_Res_Timer_Test.cpp:
-        * tests/IOStream_Test.cpp:
-        * tests/MT_Reactor_Timer_Test.cpp:
-        * tests/Map_Manager_Test.cpp:
-        * tests/Map_Test.cpp:
-        * tests/Message_Queue_Test.cpp:
-        * tests/Naming_Test.cpp:
-        * tests/New_Fail_Test.cpp:
-        * tests/Pipe_Test.cpp:
-        * tests/Priority_Reactor_Test.cpp:
-        * tests/Process_Mutex_Test.cpp:
-        * tests/Process_Strategy_Test.cpp:
-        * tests/Process_Strategy_Test.h:
-        * tests/Reactor_Performance_Test.cpp:
-        * tests/SOCK_Connector_Test.cpp:
-        * tests/SPIPE_Test.cpp:
-        * tests/SV_Shared_Memory_Test.cpp:
-        * tests/Service_Config_Test.cpp:
-        * tests/Thread_Manager_Test.cpp:
-        * tests/Time_Service_Test.cpp:
-        * tests/Tokens_Test.cpp:
-        * tests/UPIPE_SAP_Test.cpp:
-        * tests/Upgradable_RW_Test.cpp:
-        * tests/test_config.h: Changes to make it possible to write pure
-          UNICODE programs on NT.  Now it is possible to compile ACE on NT
-          with ACE_HAS_MOSTLY_UNICODE_APIS defined.  Most tests passed
-          without trouble.  However, Future_Set_Test is not yet included
-          in the version_tests and Dynamic_Priority_Test also
-          failed. Thanks to Valery Arkhangorodsky
-          <valerya@servicesoft.com> for providing a preliminary patch for
-          ACE to motivate the change.
-
-Sun Jul 04 18:57:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: when building tao_idl on NT to be
-          used for generating code for VxWorks, build without
-          ACE_HAS_EXCEPTIONS.  Otherwise, TAO_IDLFLAGS must
-          be overridden to be null instead of -Ge 1.  Thanks to
-          Carlos for this suggestion.
-
-Sun Jul  4 17:06:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Notify_Performance_Test.cpp,
-          tests/Message_Block_Test.cpp,
-          tests/Priority_Task_Test.cpp,
-          tests/Thread_Pool_Reactor_Test.cpp: Fixed a couple of
-          warnings related to initializing char *'s with const char *'s.
-          Thanks to SunC++ 5.0 for reporting this.
-
-Sun Jul 04 16:07:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: updated instructions for building on
-          NT host for VxWorks.
-
-Sun Jul 04 15:41:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * many Makefiles: call ace_components via sh, instead of
-          directly in the make $(shell) command.  This allows it
-          to work on platforms that don't have /bin/sh, such as NT.
-
-Sun Jul  4 12:34:24 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Timer_Hash_T.cpp (cancel): Reversed a comparison from
-          <= to > to make the ACE_ASSERT replacement work properly.
-          Thanks to David Levine for reporting this.
-
-        * tests/Thread_Pool_Test.cpp (open): We need to define 'int i'
-          outside of the for loop to keep EGCS from complaining for some
-          reason.
-
-        * ace/Timer_Heap_T.cpp: Reformatted this code to conform to
-          the ACE programming guidelines.
-
-        * ace/Timer_Heap_T.cpp (schedule): Replaced an ad hoc check for
-          allocator failure with the ACE_ALLOCATOR_RETURN macro.
-
-        * ace/RB_Tree.cpp: Modified Carlo's change so that we add an
-          extra set of parens in a special way, rather than using a new
-          macro.  This is more consistent with how we deal with this
-          problem in other parts of ACE.
-
-        * ace/RB_Tree.cpp (insert_i): Removed an unreachable statement.
-          Thanks to David Levine for reporting this.
-
-Sat Jul  3 22:12:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Object_Manager.cpp (get_singleton_lock):
-          Fixed one of the ACE_Thread_Mutex version of this method. One of
-          the braces after an if() statement got "accidentaly" removed;
-          binding the "else" part of the statement to the previous if()
-          instead.
-
-Sat Jul  3 18:54:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/RB_Tree.cpp:
-          If the "constructor" parameter in an ACE_NEW_RETURN macro has a
-          comma in it (such as Foo(x,y,z)) we need to replace it with a
-          macro, so it is seen as a single token by the pre-processor.
-          Otherwise it (the pre-processor) gets confused and uses
-          the comma as separator. Thanks to David for detecting this one.
-
-Sat Jul  3 15:57:40 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-          Fixed error code return, it should be -1 not ACE_INVALID_HANDLE
-
-        * ace/SOCK_Connector.cpp:
-          Fixed stray comment characters.
-
-Sat Jul 03 14:04:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: call ace_components via sh, and use single
-          instead of double quotes, so that it works with Cygwin
-          on NT host.
-
-Sat Jul  3 12:05:46 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK_Dgram_Mcast: Modified the subscribe() method to return
-          0 or -1 rather than ACE_HANDLE.  Thanks to Vidya Narayanan
-          <CVN065@lmpsil02.comm.mot.com> for suggesting this.
-
-        * ace/SOCK_Acceptor,
-          ace/SOCK_Connector,
-          ace/SOCK: Added the ACE_Protocol_Info *, ACE_SOCK_GROUP, and
-          flags parameters to these classes so we can pass down the GQoS
-          information.  Thanks to Vidya Narayanan
-          <CVN065@lmpsil02.comm.mot.com> for suggesting this.
-
-        * ace/SOCK.h: Added the reuse_addr parameter to open() and the
-          ACE_SOCK constructor.
-
-        * tests/Future_Set_Test.cpp (main): We were casting a
-          const ASYS_TCHAR * to u_int, yikes!
-
-        * ace/RB_Tree.cpp: Cleaned up the code so it's conformant with the
-          ACE programming style, particularly for dynamic memory
-          allocation (which wasn't using ACE_NEW).
-
-        * ace/ACE.cpp (get_ip_interfaces): Cleaned up the code so it conforms
-          to the ACE programming guidelines.
-
-        * ace/Timer_Hash_T.cpp: Fixed a number mistakes where the return
-          value of new wasn't being checked.
-
-        * ace/Timer_Heap_T.cpp,
-          ace/Timer_Wheel_T.cpp: Removed the apparently extraneous parens
-          used in the ACE_NEW* macros in order to keep EGCS 2.95 happy.
-          Thanks to Jody Hagins and Arturo Montes
-          <mitosys@colomsat.com.co> for reporting this.  BTW, if this
-          causes problems on any compilers please let me know.
-
-        * ace: Reformatted all the ACE_NEW* macros so they conform to
-          ACE programming style.
-
-        * ace/Priority_Reactor.cpp: Cleaned up the code to conform to
-          the ACE programming style.
-
-        * ace/OS.cpp (tss_base): Cleaned up a loop a bit so it conforms
-          to the ACE programming style.
-
-Sat Jul  3 11:09:51 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/WIN32_Asynch_IO.cpp
-        * ace/WIN32_Proactor.cpp
-          Addressed Doug's @@ Alex comments. It was simply making some
-          debug statements conditional upon ACE::debug () flag.
-
-Fri Jul  2 19:50:29 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.h: There was a typo in the ACE_WIN32CALL_RETURN() macro
-          for Borland C++.  Thanks to Jody Hagins <jody@atdesk.com> for
-          reporting this.
-
-        * ace/config-win32-borland.h: Clarified the fact that this file
-          shouldn't be #included directly.  Thanks to Thaddeus Olczyk
-          <olczyk@interaccess.com> for motivating this.
-
-Fri Jul 02 22:22:12 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-11.x-hpc++.h: Added
-          ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for aC++.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Removed the suppression
-          of warning 829 (auto convert of string literal to char * deprecated).
-          With the exception of some JAWS code, all of ACE has been rid of the
-          offenders.
-
-        * websvcs/tests/Makefile: Replace VLDLIBS with correct LDLIBS. Now
-          works on AIX.
-
-Fri Jul  2 19:37:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Future_Test.cpp:
-          The timeout variable was declared in one scope but used in
-          another one.  Added another timeout variable to keep it happy.
-
-        * tests/Message_Queue_Test.cpp:
-          A pointer was initialize using "0x" i think it was a typo and
-          should be "0".
-
-Fri Jul 02 18:28:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux11.h: Added ACE_HAS_BROKEN_T_ERROR.
-          Enable threads by default, unless site config explicitly turns it
-          off by setting ACE_HAS_THREADS to 0. Thanks to Brian Wallis
-          <Brian.Wallis@sr.com.au> for motivating this change.
-
-        * ace/config-hpux-11.x-hpc++.h: Added
-          ACE_HAS_STD_TEMPLATE_SPECIALIZATION.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: If on 11.00 and the
-          user requests a build w/o threads, set ACE_HAS_THREADS to 0 to
-          override the config default (see config-hpux11.h, above).
-
-Fri Jul  2 11:49:12 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cached_Conn_Test.cpp: This is a test which shows how the
-          Strategy Connector can automagically as well as explicitly cache
-          and purge connection from its connection cache using different
-          caching strategies.
-
-        * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method
-          "purge_connections ()" which allows explicit purging of
-          connnections from the connection cache.
-
-Fri Jul  2 13:54:14 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Future_Set.cpp,
-          ace/Future.cpp: Added ACE_TYPENAME at a couple of places
-          to make HP/UX aCC happy.  Thanks to Eric Mitchell
-          <emitchell@altaira.com> for reporting this.
-
-        * ace/SOCK_Dgram: Added send() and recv() methods that take
-          ACE_OVERLAPPED structures.  Thanks to Vidya Narayanan
-          <CVN065@lmpsil02.comm.mot.com> for suggesting this.
-
-        * ace/OS.h: Added an ACE_OVERLAPPED_FLAG that's used to abstract
-          away from the WSA_FLAG_OVERLAPPED macro on Win32.  Thanks to
-          Vidya Narayanan <CVN065@lmpsil02.comm.mot.com> for suggesting
-          this.
-
-        * ace/OS.cpp: Removed unnecessary ';' after ACE_BEGINTHREADEX() and
-          ACE_ENDTHREADEX().  Thanks to Kris Johnson
-          <kjohnson@gardnersys.com> for reporting this.
-
-        * ace/Service_Config.cpp (open_i): It appears that
-
-          if (ACE::debug ())
-            ACE_Log_Msg::disable_debug_messages ();
-
-          should really be
-
-          if (ACE::debug () == 0)
-            ACE_Log_Msg::disable_debug_messages ();
-
-          Thanks to Jonathan Reis <reis@minniemouse.cemax.com> for
-          reporting this.
-
-        * tests/Future_Test.cpp   (main): Make sure to use absolute time
-          rather than relative time for the timeouts.  Thanks to Peter
-          Brandstrom <peter.brandstrom@ericsson.com> for reporting this.
-
-Fri Jul 02 13:44:17 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Thread_Pool_Reactor_Test.cpp (worker): Added const fix to
-          <msg> and <rendezvous>.
-
-        * tests/Priority_Task_Test.cpp: Added const fix to <usage>.
-
-        * tests/Notify_Performance_Test.cpp (print_results): Added const
-          fix to <reactor_type>.
-
-        * tests/Message_Block_Test.cpp: Added const fix to <name_>.
-
-Fri Jul  2 11:49:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * Initialized some variables to zero to avoid some silly warnings
-          from egcs (with exceptions):
-
-          - ace/Free_List.cpp
-          - ace/Malloc.i
-          - tests/DLL_Test.cpp
-          - tests/Mem_Map_Test.cpp
-          - tests/Message_Queue_Test.cpp
-          - tests/Reactor_Notify_Test.cpp
-
-Fri Jul  2 11:49:12 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Strategies_T.h (ACE_Cached_Connect_Strategy): Made "virtual"
-          methods which were getting overriden in the derived
-          Cached_Connect_Strategy_Ex class.
-
-        * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method
-          "purge_connections ()" which allows explicit purging of
-          connnections from the connection cache.
-
-        * tests/Cached_Conn_Test.cpp: This is a test which shows how the
-          Strategy Connector can automagically as well as explicitly cache
-          and purge connection from its connection cache using different
-          caching strategies.
-
-Fri Jul  2 11:49:12 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cached_Conn_Test.cpp: This is a test which shows how the
-          Strategy Connector can automagically as well as explicitly cache
-          and purge connection from its connection cache using different
-          caching strategies.
-
-        * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method
-          "purge_connections ()" which allows explicit purging of
-          connnections from the connection cache.
-
-Fri Jul 02 11:50:21 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ace_lib.dsp: Added Pharlap ETS configurations for Debug and
-          Release.
-
-        * ace/config-pharlap.h: Added ACE_LACKS_* definitions to avoid some
-          unimplemented memory mapped things. Added a definition for
-          ACE_PAGE_SIZE because it's not obvious how to get it at run time.
-          Include <embkern.h> because some of the OS functions call ETS
-          kernel functions for low-level system info gathering.
-          Set ACE_HAS_TSS_EMULATION. The PharLap TSS leaves some to be
-          desired, according to TSS_Test.
-
-        * ace/config-win32-common.h: In building for PharLap, don't bring in
-          the OS-supplied wsock32.lib - need to use the PharLap one.
-
-        * ace/ACE.cpp: PharLap ETS changes:
-          ACE::ldfind: PharLap doesn't have expand environment strings.
-          ACE::get_ip_interfaces: Use PharLap kernel functions to find
-             interfaces and learn their addresses.
-          ACE::terminate_process: Unsupported on PharLap.
-          ACE::handle_timed_open: If the open times out, set errno to
-             ETIMEDOUT, not ETIME.
-          ACE::handle_timed_accept: If the select times out, set errno to
-             ETIMEDOUT, not ETIME.
-          ACE::sock_error: If not a known error, format a message with the
-             error number in it - this is the only chance for a PharLap
-             system error to indicate the error number.
-
-        * ace/OS.h: Changed def of ACE_DEFAULT_SERVER_HOST to ACE_LOCALHOST.
-
-        * ace/OS.cpp (ACE_OS::uname): PharLap: Use ETS kernel functions to get
-          target processor class. PharLap doesn't do GetSystemInfo.
-
-        * ace/OS.i (ACE_OS::hostname): PharLap: Attempt gethostname if using
-          RT version, though this isn't too reliable (requires ethernet and
-          BOOTP).
-          (ACE_OS::dlerror): PharLap doesn't support FormatMessage,
-          so format the error number.
-          (ACE_OS::mmap, ACE_OS::mprotect, ACE_OS::msync): PharLap doesn't
-          do memory-mapped files.
-          (ACE_OS::getpagesize): PharLap - use page size set from config.h.
-          Don't know a way to get this info at run time.
-          (ACE_OS::hostname (whar_t *, size_t)): PharLap - no wide chars.
-
-        * ace/Log_Msg.cpp (log): PharLap doesn't do FormatMessage, so print
-          <unknown error> = %d for %p.
-
-        * ace/Pipe.cpp (open): The protocol level for TCP_NODELAY on PharLap
-          is SOL_SOCKET, as opposed to Win32, where it's IPPROTO_TCP.
-
-        * ace/SPIPE_Connector.cpp (connect): PharLap doesn't have the
-          SetNamedPipeHandleState function.
-
-        * ace/WFMO_Reactor.cpp: PharLap ETS changes, because PharLap doesn't
-          implement async I/O, or WaitForMultipleObjectsEx.
-          register_handler_i: (This is a general Winsock 1.1 change) Creating
-              an event handle for a socket is not supported.
-          ok_to_wait, wait_for_multiple_events: Use WaitForMultipleObjects,
-              not WaitForMultipleObjectsEx. Should be fine since the big
-              difference is alertable, and that's not supported on ETS anyway.
-
-        * tests/test_config.h: On PharLap, direct all logging to host console.
-
-        * tests/tests_pharlap_msvc.lnk: Cleaned things up; extended stack size
-          from 8K to 32K. Change the starting load offset to
-          0x100000 - the tests don't all fit in the default range.
-          Disabled the target screen driver to make all the test output from
-          all threads go to the host, thereby getting saved in the log files.
-
-        * tests/run_pharlap_tests.bat: Fixed names of the executables.
-
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Test_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Upgradeable_RW_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-          Fixed settings for PharLap ETS configurations.
-
-        * tests/Conn_Test.cpp (server): If the acceptor fails, do not try to
-          close the svc_handler - the failed ACE_Oneshot_Acceptor already
-          closed it.
-
-        * tests/SOCK_Send_Recv_Test.cpp: Use ACE_LOCALHOST, not "localhost".
-
-Thu Jul  1 21:49:39 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Containers_T.i,h,cpp
-          Added reset () methods to the derived classes of
-          ACE_Double_Linked_List_Iterator because the behavior of the base
-          class's version was not sufficient (and would cause way fun
-          segfaults when used).
-
-        * tests/Map_Manager_Test.cpp
-        * tests/DLList_Test.cpp
-          ACE_const_cast'ed some string literals to char *'s to appease
-          the evil monstrosity that is SC 5.0.
-
-Wed Jun 30 18:11:41 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.i (strncasecmp):
-
-          Corrected ACE_TRACE statement to contain "strncasecmp" instead
-          of "strcasecmp."
-
-Thu Jul 01 21:07:22 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.43 released.
-
-Thu Jul 01 10:53:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
-          set INCLDIRS, so that wrapper_macros.GNU doesn't insert -I.
-          Otherwise, with GHS on NT host, ACE's Signal.h gets #included
-          instead of VxWorks' signal.h by target/h/private/sigLibP.h.
-          Thanks to Dale Wood <dale_wood@Mitel.com> and
-          Dave Steele <Dave_Steele@Mitel.COM> for helping to figure
-          this out.
-
-Thu Jul 01 10:53:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU,
-          bin/ace_ld: changed -c option to -C [...] --, so
-          that its arguments don't need to be quoted.  I
-          couldn't figure out a way to quote on NT host.  Thanks
-          to Dale Wood <dale_wood@Mitel.com> for enlightening me
-          on some of the intricacies of NT.
-
-Thu Jul 01 10:47:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/libsize.pl: always use `pwd`, because the PWD environment
-          variable doesn't appear to get updated by recursive makes.
-
-Thu Jul 01 08:46:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/check_build_logs: filter out lines from IDL_Cubit
-          that contain "0 errors".
-
-Thu Jul 01 00:24:52 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: Added a table explaining how to use
-          all the different ACE_*_STRING macros.
-
-        * tests/DLList_Test.cpp:
-        * tests/Hash_Map_Manager_Test.cpp:
-        * tests/Map_Manager_Test.cpp:
-        * tests/Message_Block_Test.cpp:
-        * tests/Notify_Performance_Test.cpp:
-        * tests/Priority_Task_Test.cpp:
-        * tests/Thread_Pool_Reactor_Test.cpp:
-        * tests/test_config.h: UNICODE fixes.  The usage of ASYS_TCHAR and
-          LPCTSTR were mistaken in many places.
-
-Wed Jun 30 16:13:58 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Future_Set_Test.cpp: Added missing template instantiation
-          for ACE_Hash_Map_Reverse_Iterator_Ex.  Also, added some fixes
-          from John Tucker <jtucker@infoglide.com>.
-
-Wed Jun 30 12:09:22 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_bcc.ide:
-        * tests/tests_bcc.ide:
-        * *.{bpr,bpg}: Removed unused BCB project files.
-
-Tue Jun 29 23:12:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Use ACE_CAST_CONST to keep the silly Sun/CC 4.2 from
-          complaining.
-
-Tue Jun 29 22:48:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.i (strncasecmp): Changed <n> to <len>.
-
-Tue Jun 29 22:33:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Fixed warnings in green hills and possibly othre EDG-based
-          compilers.
-
-        * tests/run_tests.sh:
-        * tests/run_tests.vxworks:
-          Take Future_Set_Test out, it does not work in too many
-          platforms.
-
-Tue Jun 29 21:24:13 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK.cpp (open): Removed an unused variable.  Thanks
-          to Carlos for reporting this.
-
-Tue Jun 29 20:53:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/config-irix5.3-g++.h:
-          IRIX 5.3 (!) has a DIRENT structure, thanks to Isaac Stoddard
-          <i_stoddard@hso.link.com> for providing this fix.
-
-Tue Jun 28 20:19:11 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-          Manually cleaned up these projects and fixed them so they should
-          work on NT Alpha again.
-
-Tue Jun 29 18:48:22 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Functor_T.h (class ACE_Pointer_Hash): Added new class for
-          hashing pointers on their values.
-
-        * ace/Future_Set: Restored future map to be a
-          ACE_Hash_Map_Manager_Ex.
-
-Tue Jun 29 14:45:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/run_tests.bat: Removed New_Fail_Test from the
-          run_tests.bat (the script for NT).  This tests takes too long to
-          run and swaps out the entire machine making is impossible to do
-          useful things while the test is running.  Note that the test is
-          still there and can be run by hand (i.e., on its own, without
-          the run_tests.bat script).
-
-        * ace/Future: Changed the observer collection to be an unbounded
-          set and changed the future map to map manager.  These are
-          temporary changes to get things compiling again.  Once we figure
-          out the correct hashing functions, we can restore the original
-          code.
-
-Tue Jun 29 13:38:52 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * AUTHORS:
-
-          Added an AUTHORS file to bring ACE closer to recent software
-          distribution conventions.
-
-        * Makefile:
-
-          Added Carlos' websvcs directory to the release, in addition to
-          the missing top-level ACE Configuration project files and
-          directories.
-
-        * config.guess:
-        * config.sub:
-        * ltconfig:
-        * ltmain.sh:
-        * missing:
-        * mkinstalldirs:
-
-          Updated from latest GNU libtool and GNU automake.
-
-Tue Jun 29 12:07:08 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * README:
-        * THANKS:
-
-          Moved list of contributors to the file `THANKS' to bring the
-          distribution closer to conventional distribution standards.
-
-        * Makefile:
-
-          Added the THANKS file to the list of controlled files so that it
-          gets distributed with ACE.
-
-Tue Jun 29 11:27:23 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Containers_T.i: Modified next method in ACE_DLList_Iterator
-          to avoid segfaults (a bad thing).
-
-Tue Jun 29 10:54:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Sun/CC was not pleased with a cast from "void* const" to "const
-          char*", and rightly so.
-
-Tue Jun 29 09:21:06 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.h:
-        * ace/OS.i:
-        * ace/SOCK_Dgram.h:
-        * ace/SOCK_Dgram.i:
-          Fixed the unix version ACE_OS::sendto() call.
-          Also fixed the Win32 version and the Win32 version of
-          ACE_OS::recvfrom, had to change the signatures to make them safe
-          and fit the WinSock2 interfaces.
-
-Tue Jun 29 07:07:30 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/check_build_logs: allow _ with -l and -m options, and
-          @ and . with -m option.
-
-Mon Jun 28 21:31:58 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS: Added a constructor to ACE_Flow_Spec to initialize
-          its various fields wholesale.  Thanks to Kumar Surender
-          <csk037@lmpsil02.comm.mot.com> for this suggestion.
-
-        * ace/SOCK: Added a new constructor and a new open() method
-          that pass through the QoS information required by WSASocket().
-
-        * ace/{OS,SOCK_Connector,SOCK_Dgram,SOCK_Dgram_Mcast}: Renamed
-          ACE_Connect_QoS_Params to ACE_QoS_Params since (1) it's used in
-          ACE_OS::connect() *and* ACE_OS::join_leaf() and (2) it's used
-          for Dgrams, which aren't connection oriented.  Thanks to Kumar
-          Surender <csk037@lmpsil02.comm.mot.com> for this suggestion.
-
-        * ace/OS: Added set/get methods for time-to-live on the
-          ACE_Flow_Spec classes.  This is necessary since RAPI defines
-          this.
-
-        * ace/OS: Added a new ACE_OS::recvfrom() method that's a wrapper
-          for the WSARecvFrom() on Win32 and (will be) an "emulation" on
-          non-Win32 platforms.
-
-        * ace/OS: Added a new ACE_OS::sendto() method that's a wrapper
-          for the WSASendTo() on Win32 and an "emulation" on non-Win32
-          platforms.
-
-        * ace/OS.h: Updated the QoS documentation to clarify that these
-          features are appropriate for IntServ (RSVP) *and* DiffServ.
-          Thanks to Kumar Surender <csk037@lmpsil02.comm.mot.com>, Vidya
-          Narayanan <CVN065@lmpsil02.comm.mot.com> and Pradeep Avasthi
-          <Pradeep.Avasthi@motorola.com> suggesting this.
-
-        * ace/SOCK_Dgram.h: Added send() and recv() methods for
-          ACE_SOCK_Dgram that take overlapped I/O parameters.  This is
-          needed for the GQoS WinSock API.
-
-Mon Jun 28 21:53:06 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/libsize.pl: added support for liborbsvcs, and
-          for shared libs (with -s option).
-
-        * bin/check_build_logs: fixed command-line argument processing.
-
-Mon Jun 28 17:30:08 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i (recvv): We must not passed a null pointer to <flags>
-          but a pointer pointing to a real flag.  This fixed the
-          SOCK_Send_Recv_Test failing on NT problem.  Thanks to Jody
-          Hagins <jody@atdesk.com> for reporting this.
-
-Mon Jun 28 15:10:50 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Strategies_T: Removed ACE_Hash_Addr which was no longer used
-          in ACE and is not necessary given the new
-          ACE_Hash_Map_Manager_Ex class.
-
-Mon Jun 28 15:00:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-          Added new method to reset the state of a CDR stream without need
-          for any memory allocations.
-
-Mon Jun 28 12:48:35 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/check_build_logs: added this script, which checks build
-          logs named *.log, of current day.
-
-Mon Jun 28 09:32:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/{Future_Set,Future}: Integrated new enhancements to use
-          the ACE_Hash_Map_Manager rather than the ACE_DLL_Linked_List to
-          speed up notifications for the Future Set.  Thanks to John
-          Tucker <jtucker@infoglide.com> for this enhancement.
-
-        * tests: Integrated the Future_Set_Test into this directory and the
-          various batch files.  Thanks to John Tucker
-          <jtucker@infoglide.com> for this test.
-
-        * ace/Map_Manager.i: Added an ACE_const_cast to the lock_ used
-          in the newly const total_size() and current_size() methods.
-
-        * ace/Map_T,
-        * ace/Map_Manager,
-        * ace/Cache_Map_Manager_T,
-        * ace/Active_Map_Manager_T,
-        * ace/Hash_Map_Manager_T: The current_size() and total_size() methods
-          must be const.
-
-        * ace/OS.i: Fixed a type inconsistency where wchar_t should have been
-          char and added a missing ';'.
-
-        * ace/OS.i: Fixed a typo where last_error should have been
-          lerror.  Thanks to Chris Gill for reporting this.
-
-        * ace/OS.cpp (ACE_BEGINTHREADEX): Oops, mistyped "_beginthreadex()"
-          as "_beingthreadex()".  I must be going through an existential
-          phase ;-).  Thanks to Chris Gill for reporting this.
-
-        * ace/OS.i: Fixed a typo where last_error should have been
-          lerror.  Thanks to Chris Gill for reporting this.
-
-        * ace/OS.cpp (ACE_BEGINTHREADEX): Oops, mistyped "_beginthreadex()"
-          as "_beingthreadex()".  I must be going through an existential
-          phase ;-).  Thanks to Chris Gill for reporting this.
-
-Sun Jun 27 18:03:24 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
-
-        * ACE-INSTALL.html: Updated the discussion for Borland C++
-          Building 4.0 and IBM's VisualAge C++ compiler to reference the
-          appropriate maintainers.
-
-        * ace/WIN32_Proactor.cpp, ace/WIN32_Asynch_IO.cpp: Added back some
-          initializers to keep EGCS happy.
-
-        * ace/config-g++-common.h: Added ACE_LACKS_AUTO_PTR to work around
-          an omission within the EGCS standard library.
-
-        * ace/Auto_Ptr.h: If ACE_LACKS_AUTO_PTR is enabled then use our
-          version of auto_ptr.  This is necessary to work around problems
-          with EGCS.
-
-        * ace/config-g++-common.h: Define ACE_HAS_STANDARD_CPP_LIBRARY so
-          that #include <exception> will work properly.  However, this
-          required that we also set ACE_USES_OLD_IOSTREAMS, as well.
-          Thanks to Carlos for help with this.
-
-        * ace/config-g++-common.h: The EGCS 1.1.1 compiler supports the
-          template<> syntax.  If this breaks older EGCS or GCC compilers
-          we'll have to handle each of those cases.
-
-        * ace/config-win32-borland.h:
-          Added ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION.
-
-        * ace/OS.h: Replaced the const's for ACE_DEFAULT_SHLIB_MODE and
-          ACE_SHLIB_INVALID_HANDLE with #defines since it's more portable.
-
-        * ace/OS.i: All the strcasecmp() and strncasecmp() methods were
-          broken.  Thanks to David Levine for reporting this.
-
-        * ace/WFMO_Reactor.cpp: Updated the programming style a bit to
-          conform to the ACE guidelines.
-
-Sun Jun 27 20:50:02 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        Added support for IBM's VisualAge C++ compiler.  Thanks to Rene
-        Matteau <matteau@ca.ibm.com> for contributing the following fixes:
-
-        * ace: Added a new config-visualage.h file that automatically
-          includes the proper configurations for IBM's VisualAge C++
-          compiler on Win32 and AIX.
-
-        * ace/OS.i: The IBM VisualAge C++ compiler's prototypes for _chdir(),
-          _mkdir(), and _tempnam() are broken, so we must add a cast to
-          char *.
-
-        * ace/OS.cpp: Added new macros ACE_ENDTHREADEX and
-          ACE_BEGINTHREADEX to work around a bugs with _endthreadex() and
-          _beginthreadex() on IBM's VisualAge C++ compiler.
-
-        * ace/OS.cpp (ACE_Time_Value::set): Replaced this expression:
-
-          this->tv_.tv_usec = long ((_100ns.QuadPart % (10000 * 1000)) / 10);
-
-          with this expression:
-
-          this->tv_.tv_usec = long ((long (_100ns.QuadPart) % long (10000 * 1000)) / 10);
-
-          to work around a bug with IBM's VisualAge C++ compiler.
-
-        * ace/OS.cpp: Replaced a hard-coded MSVC++'ism for signed long long
-          with a use of the ACE_UINT64_LITERAL macro, which works for all
-          Win32 C++ compilers.
-
-        * ace/config-win32-visualage.h,
-          ace/config-aix-4.x.h: Added a workaround for an IBM VisualAge
-          C++ bug with the WIFEXITED and WEXITSTATUS macro.
-
-        * ace/OS.h: Added workarounds for bugs with IBM's VisualAge C++ compiler
-          as it pertains to the ACE_DES_FREE_TEMPLATE and
-          ACE_DES_FREE_TEMPLATE2 macros.
-
-        * ace/Map_T.h: Added a workaround for a bug with IBM's VisualAge C++
-          compiler.  I think this workaround should help with other C++
-          compilers, as well.  Also reformated the code to make it
-          consistent with the ACE programming guidelines.
-
-        * ace/Hash_Purgable_Map_Manager_T.cpp: Added a workaround for a
-          VisualAge C++ bug.
-
-        * ace/config-aix-4.x.h: Added VisualAge C++ compiler support.
-
-        * ace/Timer_Heap_T.cpp: We must hard code numbers like
-          1024 for an array size to workaround bugs with the IBM VisualAge
-          C++ compiler.
-
-        * ace/Basic_Types.h: Added #defines for ACE_INT64_LITERAL.
-
-        * ace/config-win32-common.h: #include the
-          config-win32-visualage.h file.
-
-        * ace: Added the following files for the IBM VisualAge C++ compiler:
-
-          ace-lib.icc - WinNT configuration file to create a static library
-          ace-dll.icc - WinNT configuration file to create a dynamic library
-          config-win32-visualage.h  - VisualAge C++ defines
-
-        * tests: Added the icc.bat and makeicc.pl files, which build the
-          tests for the IBM VisualAge C++ compiler.
-
-        * tests: Added the *.icc project files for the IBM VisualAge C++ compiler.
-
-Sun Jun 27 18:17:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CORBA_macros.h:
-          On platforms with native C++ exceptions we use ACE_UNUSED_ARG()
-          in the throw macros to avoid warnings about the unused
-          ACE_TRY_ENV variable.
-
-Sun Jun 27 14:56:16 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/run_tests.bat: Added the patch for running tests compiled
-          with Borland C++.  Thanks to Jody Hagins <jody@atdesk.com> for
-          the patch.
-
-        * tests/Cache_Map_Manager_Test.dsp: The project file was
-          mis-configured.
-
-        * tests/version_tests/version_tests.dsw:
-        * tests/version_tests/Cache_Map_Manager_Test.dsp: Added this new
-          project file.
-
-Sun Jun 27 12:36:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.{h, i}: Moved non-deprecated iterator base class
-          method next (RB_Tree_Node<...>) down into derived forward and
-          reverse iterator classes due to method resolution conflict
-          with deprecated next (void) method in forward iterator class.
-          When the deprecated next method is removed, these will be
-          moved out of the derived classes and into the base class.
-          Thanks to Matt Braun and Carlos O'Ryan for pointing out
-          this problem.
-
-Sat Jun 26 16:22:07 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * ace/ace_lib.dsp
-        * ace/ace_dll.dsp:
-          Updated to include Hash_Map_With_Allocator_T.* files.
-
-Sat Jun 26 16:05:29 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * configure.in:
-
-          Added support/test for ACE_HAS_MEMCHR macro.
-
-        * ace/Makefile.am:
-        * tests/Makefile.am:
-
-          Synchronized with latest version of ACE.
-
-        * m4/features.m4:
-
-          Updated asynchronous IO tests.
-
-Sat Jun 26 14:41:31 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * ace/Event_Handler_T.h
-          Removed "ACE_Export" - it is not necessary for a template class.
-
-        * ace/Hash_Map_With_Allocator.{h,i,cpp}:
-          Added these files to ACE.  These files contain a thin wrapper
-          around ACE_Hash_Map_Manager, which is useful when
-          ACE_Hash_Map_Manager is used with a shared memory (or memory
-          mapped file) allocator (e.g., ACE Naming Service, and TAO Naming
-          Service are example use cases).  Please see header file for more
-          details.
-
-Sat Jun 26 12:45:26 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cache_Map_Manager_Test.cpp: Fixed this test so that it
-          compiles with SunC++ 4.2 and its broken C++ templates...  Thanks
-          to David Levine for reporting this.
-
-        * ace/Malloc_T.i: Make sure to put ACE_INLINE on all the methods
-          in the .i files.  Thank to Marina for reporting this.
-
-        * ace/Hash_Map_Manager_T.h: Fixed the programming style a bit.
-
-        * ace/Arg_Shifter.cpp (ACE_Arg_Shifter): Reformatted this
-          stuff a bit.
-
-Sat Jun 26 12:45:26 1999  Jody Hagins <jody@atdesk.com>
-
-        This is a change log for the modifications made to support
-        Borland C++Builder 4.0, Patch 1.  Thanks to
-        Christopher Kohlhoff <chris@kohlhoff.com> and Chris Uzdavinis
-        <chris@uzdavinis.com> for helping with this.
-
-        First, I did not get integrate the makefiles to the BCB environment
-        as it requires alot of tools and more time.  I hope to fet to this
-        in the somewhat near future.  However, each directory that has stuff
-        that I built and tested has a Makefile.bor, which will make whatever
-        is there with BCB4.  Note that the makefiles do not, at present,
-        have a clean or anything except the default make.
-
-        To build, make sure config.h points to, or simply includes
-        ace/config-win32.h.
-
-        Finally, not all the programs and exampales have BCB makefiles.
-        However, it should not be too difficult to adapt the ones that are
-        there.  In addition, the .bpr files should NOT be used to build
-        the libraries, or any examples.  If you want to build examples,
-        you will need to start with a fresh project in BCB.
-
-        At present (4.6.42) all tests, except SOCK_Send_Recv_Test run
-        successfully, and some of my own tests run.  Also, the TAO services
-        and programs seem to be operating as well.
-
-        * ace/Asynch_Acceptor.cpp: Need CancelIO for BCB as well
-
-        * ace/Atomic_Op.i: Need ACE_TEMPLATE_SPECIALIZE on specializations.
-
-        * ace/CDR_Stream.h: Need LongLong for BCB as well
-
-        * ace/Functor.i: Need ACE_TEMPLATE_SPECIALIZE on specializations.
-
-        * ace/Future.h: Work around a BCB4 bug which causes the create()
-          method from being seen.
-
-        * ace/IOStream.h: Only want CString stuff for MSC.
-
-        * ace/IOStream_T.cpp: Only want CString stuff for MSC.
-
-        * ace/OS.cpp: _fdopen, in BCB, takes a non-const pointer
-
-        * ace/OS.h: Differentiate between mode masks and user mode masks.
-
-          BCB doesn't like initialized data in precompiled header files so
-          define certain constants instead.  A bug in BCB prevents calling
-          a destructor explicitly on a typedef declared inside a class.
-          So, TEMPLATE3 and TEMPLATE4 versions of ACE_DES_FREE are
-          necessary for destruction of templates with more parameters.
-
-          BCB4 has a bug in the RTL that resets the GetLastError() value
-          to zero when errno is accessed.  Thus, setting errno to
-          ::GetLastError requires a copy.  To keep from having the code
-          everywhere, I added ACE_OS::set_errno_to_last_error () and
-          ACE_OS::set_errno_to_wsa_last_error (), and used it everywhere
-          errno was being set to GetLastError() or WSAGetLastError().
-
-          BCB4 has a bug in the optimizer that screws up the return from
-          certain expressions when a variable is set on both sides of an
-          assignment.  Thus, the definition of ACE_WIN32CALL_RETURN needed
-          to change.
-
-        * ace/OS.i: Use ACE_set_errno_to_last_error where appropriate.
-          BCB4 bug requires splitting FILETIME dummy_1, dummy_2; into
-          separate declarations.
-
-        * ace/Select_Reactor.h: Need ACE_TEMPLATE_SPECIALIZE on
-          specializations.
-
-        * ace/WFMO_Reactor.cpp: Use ACE_set_errno_to_last_error where
-          appropriate.  Likewise, fix the use of auto_ptr copy ctor, which
-          can not take a const ref.
-
-        * ace/WIN32_Asynch_IO.cpp: Use ACE_set_errno_to_last_error
-          where appropriate.  Need CancelIo for BCB as well.
-
-        * ace/WIN32_Proactor.cpp: Use ACE_set_errno_to_last_error
-          where appropriate.
-
-        * ace/config-win32-borland.h: Specific build stuff for BCB
-
-        * ace/config-win32-common.h: Differences between BCB and MSC
-
-        * apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp: BCB4 bug prevents
-          using typedef inside class for explicit dextructor.
-
-        * apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp:
-          BCB4 bug prevents using typedef inside class for explicit
-          dextructor.
-
-        * apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp: BCB4 bug prevents
-          using typedef inside class for explicit dextructor.
-
-        * apps/JAWS/PROTOTYPE/JAWS/IO.cpp: Get rid of const warning
-
-        * tests/DLL_Test.cpp: The get_hello function has calling
-          convention __cdecl (by default since the calling convention is
-          not mentioned).  However, BCB decorates __cdecl with a leading
-          underscore (and doesn't decorate __stdcall). Thus, we needed to
-          add some decoration to find the function.  Also, added prefix to
-          find the executable.
-
-        * tests/Message_Queue_Test.cpp: BCB4 defines a "messages" and by
-          default sucks that namespace into the global namespace, so a new
-          variable name was needed.
-
-        * tests/Reactor_Exceptions_Test.cpp: The test throws a structured
-          exception.  The ISO does not require non C++ exceptions to be
-          caught by catch (...).  MSVC catches it but BCB4 does not.  So,
-          the code needed to be changed to catch a structured exception as
-          well.
-
-        * tests/run_tests.bat: Changed to allow running the BCB tests,
-          when in another directory.
-
-Sat Jun 26 08:40:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Proactor.cpp: fixed template instantiation pragmas
-          (to match explicit template instantiation directives).
-
-Sat Jun 26 08:21:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Signal.h: reordered #includes to avoid warning about
-          #pragma once.
-
-Fri Jun 25 22:30:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: always test on egcs before
-          commiting.  It catches real problems that are missed
-          by some of the other compilers we (well, some of us :-)
-          use.
-
-Fri Jun 25 22:20:16 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Future.cpp (detach): changed equality comparison of
-          curr_observer from itself to the observer argument.
-          Thanks to egcs -W for snagging this.
-
-Fri Jun 25 21:46:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h,ace/Signal.h,ace/config-psos-tm.h
-          (ACE_DONT_INCLUDE_ACE_SIGNAL_H): added this interlock
-          diagnostic to inform the user when ace/Signal.h gets #included
-          instead of signal.h.  Thanks to Dale Wood <Dale_Wood@Mitel.com>
-          and Timothy Canham <Timothy.Canham@jpl.nasa.gov> for tripping
-          over it, on the same day, and reporting it.
-
-Fri Jun 25 17:22:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Select_Reactor_T.cpp (close): Don't call close() on the
-          <notify_handler_> if there isn't one.
-
-        * ace/SOCK_Acceptor.cpp (open): The error status was not set
-          correctly if listen() failed.
-
-        Thanks to Irfan for helping with this.
-
-Fri Jun 25 16:48:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: don't #include <signal.h> directly on VxWorks.
-          When cross-compiling on NT host, the GreenHills compiler
-          #includes ace's Signal.h instead of VxWorks' signal.h.
-          No comment.  OS.h doesn't need to #include signal.h directly,
-          because it gets indirectly #included through sigLib.h.  Thanks
-          to Dale Wood <Dale_Wood@Mitel.com> for reporting this.
-
-Fri Jun 25 16:03:59 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Future.cpp: Fixed a couple of places where the set() method
-          didn't have the new *this parameter added.
-
-        * ace: Added Future_Set.{h,cpp} and Future_Node.{h,cpp}, as well
-          as the new Future.{h,cpp} files to the ACE release.  Thanks to
-          John Tucker <jtucker@infoglide.com> for contributing these.
-
-        * ace/Synch.h: Added a comment pointing out that Solaris
-          threads do not support timed acquire().  Thanks to Darren
-          DeRidder <darren.deridder@bridgewatersys.com> for reporting
-          this.
-
-Fri Jun 25 15:07:00 1999  John Tucker <jtucker@infoglide.com>
-
-        The following describes the changes to ACE_Future_Set:
-
-        * I followed the Observer Pattern where the ACE_Future_Set is the
-          "Observer" and the ACE_Future_Rep is the "Subject".
-
-        * I created an abstract base class called ACE_Future_Observer<T>
-          which contains a single pure virtual member function "update()".
-
-        * The ACE_Future_Rep is modified so that it contains a list of
-          ACE_Future_Observer<T> pointers and an interface for attaching
-          and detaching ACE_Future_Observer<T> Observer objects.  The
-          "attach(...)" member function allows objects which implement the
-          ACE_Future_Observer<T> interface to attach themselves to
-          ACE_Future_Rep<T> objects so that they will be notified of
-          changes to the ACE_Future_Rep<T> Subject.  The "detach(...)"
-          member function allows objects which implement the
-          ACE_Future_Observer<T> interface to detach themselves from
-          ACE_Future_Rep<T> objects so that they will no longer be
-          notified of changes to the ACE_Future_Rep<T> Subject.
-
-        * The ACE_Future_Rep::set() method is modified so that it invokes the
-          "update()" method of each ACE_Future_Observer<T> object stored
-          in its list of attached ACE_Future_Observer<T> Observer
-          objects. It also removes each ACE_Future_Observer<T> Observer
-          object from its list.
-
-        * The ACE_Future_Set<T> class derives from the ACE_Future_Observer<T>
-          class.
-
-        * The ACE_Future_Set<T> class contains its own ACE_Message_Queue
-          attribute which will be used by writer threads to notify reader
-          threads that an ACE_Future is readable.
-
-        * The ACE_Future_Set<T> class contains a list of ACE_Future<T>
-          Subject objects which clients in the reader threads insert into
-          it.  When an ACE_Future<T> is inserted into an
-          ACE_Future_Set<T>, the ACE_Future_Set<T> attaches itself to the
-          specified ACE_Future<T>, keeping in mind the ACE_Future_Set<T>
-          implements the ACE_Future_Observer<T> interface, and also
-          inserts the specified ACE_Future<T> object into its list of
-          ACE_Future<T> objects.
-
-        * The ACE_Future_Set<T> class implements its "update()" method to
-          just enqueue an ACE_Message_Block with Null data onto its
-          ACE_Message_Queue.  Since this "ACE_Future_Set<T>::update()"
-          method will be invoked by the ACE_Future_Rep::set() method in
-          the writer thread, it will allow the ACE_Future_Set<T> in the
-          writer thread to signal itself that an ACE_Future has become
-          readable.
-
-        * The "int ACE_Future_Set<T>::next_readable(ACE_Future<T> &future,
-          ACE_Time_Value *)" method in the reader thread will block via a
-          call to "dequeue()" on its ACE_Message_Queue until is awakened
-          by a call to "ACE_Future_Set<T>::update()" in the writer thread.
-          Once awakened, the ACE_Future_Set<T> object iterates through its
-          list of ACE_Future<T> objects until it encounters a readable
-          one.  This readable ACE_Future<T> will be removed from its list
-          and assigned to the specified "future" parameter".
-
-        * The ACE_Future_Set<T> destructor detaches itself from all
-          ACE_Future<T> objects remaining in its list.
-
-        * I did not use the ACE_Reactor since I could foresee the
-          ACE_Future_Set being used by applications which did not run,or
-          want to run, the event loop.
-
-Fri Jun 25 14:28:05 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/UNIX_Addr.cpp (ACE_UNIX_Addr): Moved base_set() call in
-          constructor to member initializer list.  This is cleaner coding
-          style.  The original code, before a bug fix was made, was like
-          that.  I just forgot to put it back in the member initializer
-          list after the fix.
-
-Fri Jun 25 15:15:32 1999  Steve Huston  <shuston@riverace.com>
-
-        * performance-tests/Misc/Makefile: set static_libs_only so the library
-          selection gets done right on AIX. Clean out the tempinc dir
-          between binaries on AIX.
-
-        * performance-tests/Misc/test_singleton.cpp: Moved def of DC_Singleton
-          to new file, test_singleton.h so it works on AIX w/ xlC.
-
-        * ace/Hash_Cache_Map_Manager_T.h: Removed the "ace/" from the
-          #pragma implementation line. The compiler remembers the directory
-          it came from.
-
-        * examples/ASX/UPIPE_Event_Server/Peer_Router.h:
-        * examples/Connection/non_blocking/CPP-connector.h:
-        * examples/Connection/non_blocking/CPP-acceptor.h:
-          Added #pragma implementation, for AIX IBM C++.
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
-        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp:
-          Split the Options class to a new file, CPP-inclient.h, to make
-          IBM C++ (xlC) like it.
-
-        * examples/IOStream/server/iostream_server.cpp: Split the Handler
-          class off to new iostream_server.h file, to make IBM C++ (xlC)
-          like it.
-
-        * examples/Logger/Acceptor-server/server_loggerd.cpp: Moved the
-          Options and handler classes' definitions to new server_loggerd.h
-          file to build with AIX IBM C++.
-
-        * examples/Misc/testr_dump.cpp: Moved the program's classes'
-          definitions to new server_loggerd.h file to build with AIX IBM
-          C++.
-
-        * examples/IPC_SAP/SOCK_SAP/Makefile:
-        * examples/Connection/non_blocking/Makefile:
-        * examples/Misc/Makefile:
-          On AIX w/ IBM C++, delete the tempinc directory before compiling
-          each new program. Keeps the template instantiations from one
-          program from conflicting with the others.
-
-        * include/makeinclude/rules.lib.GNU: On AIX using IBM C++ only, don't
-          try to link in the auto-instantiated template object modules if
-          there aren't any.
-
-        * include/platform_aix4_cset++.GNU: Removed TMPL_OBJS - not needed now.
-        * examples/Misc/Makefile: On AIX w/ IBM C++, delete the tempinc
-          directory before compiling each new program. Keeps the template
-          instantiations from one program from conflicting with the
-          others.
-
-Fri Jun 25 12:40:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: added/expanded/moved discussions of
-          enabling/increasing virtual memory on Linux and LynxOS.  Thanks
-          to Fabrice Podlyski <podlyski@clrhp04.in2p3.fr> for providing
-          detailed information for LynxOS.
-
-Fri Jun 25 11:16:32 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Makefile: Updated dependencies for Cache_Map_Manager_Test
-          and Map_Manager_Test.
-
-Fri Jun 25 07:41:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: added guideline to include
-          directories containing files with template definitions in a -I.
-
-Thu Jun 24 22:42:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp (subscribe): fixed UNICOS
-          preprocessor usage so that it's not in the middle of the
-          ACE_reintepret_cast.
-
-Thu Jun 24 22:18:52 1999  Doug Anderson  <doug@clark.net>
-
-        * ace/CDR_Stream.*,ace/SOCK_Dgram_Mcast.cpp,ace/config-cray.h:
-          updates for Cray UNICOS port.
-
-Thu Jun 24 21:33:11 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Caching_Strategies_T.{h, cpp} (class ACE_FIFO_Caching_Strategy):
-        * ace/Caching_Strategies_T.{h, cpp} (class ACE_LRU_Caching_Strategy):
-        * ace/Caching_Strategies_T.{h, cpp} (class ACE_LFU_Caching_Strategy):
-          Removed the overloaded clear_cache () method with entries as an
-          formal argument.
-
-        * ace/Caching_Strategy_Utility_T.{h,i,cpp}: Renamed as
-          Caching_Utiltity.{h, i, cpp}. Also, removed <entries> formal
-          argument from the clear_cache() method, and made purge_percent
-          of type double instead of unsigned int.
-
-        * tests/Cache_Map_Manager_Test.cpp: Changed the purge_test and
-          added a test for the Cache_Map_Manager using the Map_Manager.
-
-        * tests/Map_Manager_Test.cpp: Changed the template instantiation
-          in vein with the changes to the names of the Caching_Utility
-          classes.
-
-        * tests/Cache_Map_Manager_test.dsp:
-        * tests/tests.dsw:
-          Made NT project for the test and added it to the tests workspace.
-
-Thu Jun 24 20:43:54 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/Reactor/WFMO_Reactor/test_multithreading.cpp
-          (Task_Handler): Change loop to go from 1 to number_of_handles
-          instead of 0 to number_of_handles - 1.
-
-Thu Jun 24 18:36:22 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Signal.h: Removed the still-born
-          ACE_Sig_Action (struct sigaction *) method.  Thanks to Umar
-          Syyid for reporting this.
-
-Thu Jun 24 15:47:32 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/run_pharlap_tests.bat: One-button script for running the tests
-          built for PharLap ETS.
-
-        * tests/tests_pharlap_msvc.lnk: PharLap ETS LinkLoc input file for
-          building test for ETS. Very possible that local sites will need to
-          adjust this for the target environment.
-
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Test_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Upgradeable_RW_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-          Added "PharLap ETS Debug" configurations.
-
-        * ACE-INSTALL.html: Added some info about the PharLap TNT ETS port.
-
-Thu Jun 24 14:10:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/libsize.pl: use appropriate size command for all of
-          our cross-compile platforms.
-
-Thu Jun 24 14:00:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.7.h: with ghs only, undef ACE_HAS_PROC_FS
-          and ACE_HAS_PRUSAGE_T because the Sun's sys/procfs_isa
-          requires 64-bit ints.
-
-Thu Jun 24 13:53:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Proactor.cpp: added missing backslash to one of
-          the instantiation pragmas.
-
-Thu Jun 24 12:53:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.(h i): Added check for ACE_HAS_WINSOCK2 != 0 wherever
-          the check was only for ifdef ACE_HAS_WINSOCK2. Allows building on
-          Winsock 1.1.
-
-        * ace/config-pharlap.h: New config file for use with PharLap TNT
-          Embedded ToolSuite. This is not really tested yet - that activity
-          continues.
-
-Thu Jun 24 07:05:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1-4.0.h,include/makeinclude/platform_osf1_4.0.GNU,
-          include/makeinclude/platform_osf1_cxx.GNU: use pragmas instead of
-          command line arguments to disable specific warning messages.
-          This cleans up the command line, and makes it easier to control
-          warning message suppression (because the compiler version is
-          available in __DECCXX_VER to the preprocessor.)
-
-Wed Jun 23 21:27:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: removed space from "resource requirements"
-          tag to avoid problems with web browers.
-
-Wed Jun 23 20:18:42 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/WFMO_Reactor: Added a no-op work_pending()
-          implementation until we figure out how to implement this.
-
-        * ace/Reactor_Impl.h,
-        * ace/Reactor.{cpp,h},
-        * ace/Select_Reactor_T.{h,cpp}: Added a work_pending() method
-          that just checks if there are I/O events "ready" for
-          dispatching, but doesn't actually dispatch event handlers.  This
-          is needed for TAO's work_pending() API.  Thanks to Irfan for
-          suggesting this.
-
-Wed Jun 23 15:27:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/libsize.pl: added this script, which provide a size
-          breakdown of either the ACE or TAO libraries.
-
-Wed Jun 23 14:34:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: added link to ACE Library Size Breakdown
-          in System Resource Requirements discussion.
-
-Wed Jun 23 14:09:27 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Caching_Strategies_T.cpp (ACE_LRU_Caching_Strategy):
-          Checked and modified the creation and deletion logic of the
-          caching utility object.
-        * ace/Cache_Map_Manager_T.cpp (~Cache_Map_Manager):
-          Added the close method call to avoid memory leaks.
-        * tests/run_test.pl:
-        * tests/run_test.bat:
-          Added Cache_Map_Manager_Test.
-        * tests/Cache_Map_Manager_Test: Removed extra comma.
-        * ace/Caching_Strategies_T.{h, i, cpp}
-        * ace/Cache_Map_Manager_T.{i,h,cpp}
-        * ace/Caching_Strategy_Utility_T.{h,i,cpp}
-        * ace/Cleanup_Strategies_T.{h, i,cpp}
-        * ace/Hash_Cache_Map_Manager_T.{h, i,cpp}
-        * ace/ace_dll.dsp:
-          Added above caching related files into the NT ace workspace.
-
-Wed Jun 23 10:09:06 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: updated System Resource requirements discussion.
-          All of ACE+TAO requires well over 1 Gb of disk now :-/.
-
-Wed Jun 23 00:03:31 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK_Dgram.cpp (ACE_SOCK_Dgram): Fixed an unused args
-          warning.  Thanks to David for reporting this.
-
-        * ace/Service_Config.h (ACE_Service_Config): Moved the
-          documentation for the open() method's "argv" parameters *to* the
-          open() method.  Also clarified that by default we don't install
-          the "statically configured services" (such as ACE_Svc_Manager).
-          Thanks to Ian MacDonald <ianmacd@bg.com> for motivating this.
-
-        * ace/OS.i (accept): Added a new workaround for platforms
-          like VxWorks that can't handle NULL addrs to accept().  Thanks
-          to James Hu <jhx@entera.com> and John Weald
-          <John.Weald@sylantro.com> for this fix.
-
-        * ace/config-vxworks5.x.h: Added a new macro
-          ACE_HAS_BROKEN_ACCEPT_ADDR to work around VxWorks problems
-          with NULL addrs to accept().
-
-Tue Jun 22 21:17:49 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Cache_Map_Manager_Test.cpp: Tests the Cache_Map_Manager
-          as well as the Hash_Cache_Map_Manager which has additional
-          features of caching and purging of entries along with the map
-          properties.
-        * tests/Makefile: Added Cache_Map_Manager_Test.cpp
-
-Tue Jun 22 15:20:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp (main): removed THR_DETACHED.
-          That seems to solve the libthread panic problem on Solaris,
-          even with group signalling enabled.  Thanks to Carlos for
-          suggesting this.
-
-Tue Jun 22 15:11:34 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Containers_T.h,i
-          Added new next(T *&) methods to the ACE_DLList_Iterator
-          classes and marked the old versions as DEPRECATED.
-
-Tue Jun 22 13:40:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/tutorials/*/Makefile: replace rm -f with $(RM).
-
-Tue Jun 22 13:07:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Message_Block_Test.cpp:
-        * websvcs/lib/URL_Addr.i:
-        * websvcs/lib/URL_Addr.cpp:
-          Removed more g++ -W warnings
-
-Tue Jun 22 11:12:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: added System Resource Requirements
-          section.  Thanks to Hakan Kallberg <hk@simulina.se>
-          and Eric Mitchell <emitchell@altaira.com> for the
-          Linux swap space and -pipe removal suggestions.
-
-Tue Jun 22 07:45:59 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Event_Handler_T.i: fixed some occurrences of
-          ACE_INLINE that were after the function return type.
-
-Tue Jun 22 07:30:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Stats.cpp: fixed for ACE_LACKS_LONGLONG_T platforms.
-          (sample): replace return statement with an else branch, to
-          make it easier to see what the code is doing.
-
-Mon Jun 21 23:36:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * websvcs/lib/URL_Addr.cpp:
-          Fixed warnings about unused variables.
-
-Mon Jun 21 23:27:01 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * ace/SString.h: Added ACE_TString typdef that is either a
-          ACE_CString or ACE_WString, depending on whether UNICODE
-          is defined.
-
-Mon Jun 21 23:22:46 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/Misc/test_trace.cpp: Improved this test so it will
-          work more effectively on single-threaded *and* multi-threaded
-          platforms.  Thanks to Hao Ruan <hruan@lucent.com> for reporting
-          this.  Also fixed a warnng in this test caused by failure to
-          return a value on every return path.  Thanks to David Levine for
-          reporting this.
-
-Mon Jun 21 14:17:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Stats.h:
-        * ace/Stats.cpp:
-          Added new class to keep latency and throughput statistics.
-
-Mon Jun 21 13:24:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_freebsd.GNU,platform_linux.GNU,
-          platform_linux_lxpthread.GNU,platform_psosim_g++.GNU,
-          platform_qnx_neutrino.GNU,platform_sunos5_g++.GNU,
-          platform_vxworks5.x_g++.GNU: added -W to CFLAGS.  -Wall
-          doesn't include the -W checks, at least with egcs 1.1.2.
-
-Mon Jun 21 10:18:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: moved FlReactor, Msg_WFMO_Reactor, TkReactor,
-          and XtReactor from OTHER to DEMUX_FILES because TAO uses
-          them in some configurations.  They add negligible size
-          overhead when not used.  Thanks to Nanbor for pointing this
-          out.
-
-Mon Jun 21 10:11:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Makefile:
-          The TP_Reactor is used by TAO, but was listed in the OTHER
-          component. Moved to the DEMUX component to make it always
-          available.  Thanks to David Levine for pointing this out.
-
-Mon Jun 21 09:58:42 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * ace/QoS.{h,cpp}: Removed these files from ACE since they have a
-          lot of problems. Will add back later when they compile and are
-          tested.
-
-Mon Jun 21 08:40:14 1999  Steve Huston  <shuston@riverace.com>
-
-        * examples/Connection/misc/Connection_Handler.cpp (handle_input):
-          Corrected signed/unsigned mismatch I accidentally put in last week.
-
-        * ace/CORBA_macros.h: Added __HP_aCC to the compilers that need
-          special handling for throwing an exception from a value-returning
-          function.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Added +DAportable
-          to CCFLAGS if no architecture specified.  Added -z to LDFLAGS
-          to force SEGV on dereference 0 pointer. Added definition for
-          CPP_LOCATION to not use aCC - it displays warnings for unrecognized
-          #pragmas and this dirties the TAO builds. Thanks to Brian Wallis
-          <Brian.Wallis@sr.com.au> for these ideas.
+	 * ace/CDR_Stream.h
+	 * ace/CDR_Stream.i
+  
+ 	   Added a method to return <byte_order>. 
 
 Sat Jun 19 22:28:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * bin/auto_compile:
-          Updated the list of tests run every night.
+	* bin/auto_compile:
+	  Updated the list of tests run every night.
 
 Sat Jun 19 18:15:48 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * ace/OS.h:
-        * ace/CORBA_macros.h:
-          The ACE_GUARD macros needed some blanks to work with a template
-          as the lock type parameter.
+	* ace/OS.h:
+	* ace/CORBA_macros.h:
+	  The ACE_GUARD macros needed some blanks to work with a template
+	  as the lock type parameter.
 
 Sat Jun 19 10:34:55 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Acceptor.cpp,
-          ace/Connector.cpp: Modified the make_svc_handler() hook method
-          in these classes to set the Reactor of the newly created
-          SVC_HANDLER to the same reactor that the Acceptor or Connector
-          is using.  Thanks to John Aughey <jha@FreeBSD.ORG> for
-          this suggestion.
+	* ace/Acceptor.cpp,
+	  ace/Connector.cpp: Modified the make_svc_handler() hook method
+ 	  in these classes to set the Reactor of the newly created
+ 	  SVC_HANDLER to the same reactor that the Acceptor or Connector
+ 	  is using.  Thanks to John Aughey <jha@FreeBSD.ORG> for
+ 	  this suggestion.
 
-        * man/{html,man3}: Zapped the Ace_Export.* files since
-          they don't belong here.  Thanks to Zoran Ivanovic
+	* man/{html,man3}: Zapped the Ace_Export.* files since
+	  they don't belong here.  Thanks to Zoran Ivanovic
           <zorani@pathcom.com> for reporting this.
 
 Fri Jun 18 20:49:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * ace/Synch.cpp: Added template instantiations for
-          ACE_Write_Guard<ACE_Thread_Mutex>.
+	* ace/Synch.cpp: Added template instantiations for
+	  ACE_Write_Guard<ACE_Thread_Mutex>.
 
 Fri Jun 18 19:30:09 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -2018,110 +43,110 @@ Fri Jun 18 19:30:09 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Fri Jun 18 18:49:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/Makefile:
-        * tests/run_tests.psosim:
-        * tests/run_tests.sh:
-        * tests/run_tests.vxworks:
-          Disabled Map_Manager_Test, it does not work with too many
-          platforms and the features it tests are not used (yet).
+	* tests/Makefile:
+	* tests/run_tests.psosim:
+	* tests/run_tests.sh:
+	* tests/run_tests.vxworks:
+	  Disabled Map_Manager_Test, it does not work with too many
+	  platforms and the features it tests are not used (yet).
 
 Fri Jun 18 16:54:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tests/Message_Queue_Test.cpp:
-        * tests/Message_Block_Test.cpp:
-          Removed template instantiations for ACE_Message_Queue_Iterator
-          and ACE_Message_Queue_Reverse_Iterator.  They are already
-          available in the ace library.
+	* tests/Message_Queue_Test.cpp:
+	* tests/Message_Block_Test.cpp:
+	  Removed template instantiations for ACE_Message_Queue_Iterator
+	  and ACE_Message_Queue_Reverse_Iterator.  They are already
+	  available in the ace library.
 
-        * ace/Service_Types.cpp: Added explicit instantiations for
-          ACE_Message_Queue_Reverse_Iterator.  ACE_Message_Queue and
-          ACE_Message_Queue_Iterator were already there.  This addition
-          will complete the set.
+	* ace/Service_Types.cpp: Added explicit instantiations for
+ 	  ACE_Message_Queue_Reverse_Iterator.  ACE_Message_Queue and
+ 	  ACE_Message_Queue_Iterator were already there.  This addition
+ 	  will complete the set.
 
 Fri Jun 18 12:12:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/SOCK_Dgram: Added the first set of hooks to support
-          QoS-enabled data grams for Win2K GQoS.
+	* ace/SOCK_Dgram: Added the first set of hooks to support
+ 	  QoS-enabled data grams for Win2K GQoS.
 
 Fri Jun 18 11:37:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * *.{mdp,mak}: Removed all MSVC++ 4.x workspaces and makefiles.
-          We are no longer supporting this version of MSVC++.  If you need
-          support for MSVC++ 4.x please contact Steve Huston
-          <shuston@riverace.com> of Riverace to arrange a support
-          contract.
+	* *.{mdp,mak}: Removed all MSVC++ 4.x workspaces and makefiles.
+  	  We are no longer supporting this version of MSVC++.  If you need
+ 	  support for MSVC++ 4.x please contact Steve Huston
+ 	  <shuston@riverace.com> of Riverace to arrange a support
+ 	  contract.
 
 Fri Jun 18 12:19:42 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
 
-        * tests/DLList_Test.cpp: Removeed unnecessary explicit template
-          instantiation that mirrored ones in ace/Containers.cpp to fix
-          compile errors on VxWorks. Why this _ever_ worked, I don't
-          know...
+	* tests/DLList_Test.cpp: Removeed unnecessary explicit template
+ 	  instantiation that mirrored ones in ace/Containers.cpp to fix
+ 	  compile errors on VxWorks. Why this _ever_ worked, I don't
+ 	  know...
 
 Fri Jun 18 11:37:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * ace/Service_Config.h (class ACE_Static_Svc_Descriptor): Changed
-          the type of <name_> from LPTCSTR to 'const ASYS_TCHAR*'.
+	* ace/Service_Config.h (class ACE_Static_Svc_Descriptor): Changed
+	  the type of <name_> from LPTCSTR to 'const ASYS_TCHAR*'.
 
 Thu Jun 17 12:46:30 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tests/Conn_Test.cpp: Fixed a problem with explicit template
-          instantiations so that this test will compile even if ACE isn't
-          built with threads.
+	* tests/Conn_Test.cpp: Fixed a problem with explicit template
+ 	  instantiations so that this test will compile even if ACE isn't
+ 	  built with threads.
 
-        * netsvcs/lib/Server_Logging_Handler.cpp: Fixed the explicit
-          template instantiations so hopefully they'll work when ACE is
-          compiled without threads.  Thanks to Carlos for reporting this.
+	* netsvcs/lib/Server_Logging_Handler.cpp: Fixed the explicit
+ 	  template instantiations so hopefully they'll work when ACE is
+ 	  compiled without threads.  Thanks to Carlos for reporting this.
 
-        * ace/SOCK_Dgram_Mcast.cpp: We needed to modify the return values
-          of subscribe_i() so that we'd have the ability to differentiate
-          a "short-circuit" return on NT.  Thanks to Marina for reporting
-          this.
+	* ace/SOCK_Dgram_Mcast.cpp: We needed to modify the return values
+ 	  of subscribe_i() so that we'd have the ability to differentiate
+ 	  a "short-circuit" return on NT.  Thanks to Marina for reporting
+ 	  this.
 
-        * ace/OS.h: Added an automatic test to check if we're running on
-          an EBCDIC character set, and if so, set
-          ACE_STANDARD_CHARACTER_SET_SIZE to 256 rather than 128.  Thanks
-          to Jim Rogers for this suggestion.
+	* ace/OS.h: Added an automatic test to check if we're running on
+ 	  an EBCDIC character set, and if so, set
+ 	  ACE_STANDARD_CHARACTER_SET_SIZE to 256 rather than 128.  Thanks
+ 	  to Jim Rogers for this suggestion.
 
-        * performance-tests/TTCP/Makefile: Zapped the Orbix and ORBeline
-          directories from the Makefile.  These are *way* out of date and
-          have been superceeded by the versions in
-          $TAO_ROOT/performance-tests/Thruput/.  Thanks to Youzhong Liu
-          <yoliu@cise.ufl.edu> for reporting this.
+	* performance-tests/TTCP/Makefile: Zapped the Orbix and ORBeline
+ 	  directories from the Makefile.  These are *way* out of date and
+ 	  have been superceeded by the versions in
+ 	  $TAO_ROOT/performance-tests/Thruput/.  Thanks to Youzhong Liu
+ 	  <yoliu@cise.ufl.edu> for reporting this.
 
 Thu Jun 17 12:59:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-          Added accessors for the codeset translators.
+	* ace/CDR_Stream.h:
+	* ace/CDR_Stream.i:
+	  Added accessors for the codeset translators.
 
 Thu Jun 17 00:33:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * include/makeinclude/platform_freebsd.GNU (VERSION): Applied the
-          patch to automatically detect FreeBSD version.  Thanks to
-          Goldshtain Dmitry <goldshtain@bank.gov.ua> for providing the
-          patch.
+	* include/makeinclude/platform_freebsd.GNU (VERSION): Applied the
+ 	  patch to automatically detect FreeBSD version.  Thanks to
+ 	  Goldshtain Dmitry <goldshtain@bank.gov.ua> for providing the
+ 	  patch.
 
-        * bin/Process_Win32.pm (TimedWait):
-          Get and return the exit status from the waited process.
+	* bin/Process_Win32.pm (TimedWait):
+	  Get and return the exit status from the waited process.
 
 Wed Jun 16 22:03:29 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * ace/OS.h (ACE_OS): Removed ACE_WIDE_DL_TYPE and the wide char
-          versions of dlopen(), dlsym(), and dlerror().  Even Win32
-          doesn't support them.
+	* ace/OS.h (ACE_OS): Removed ACE_WIDE_DL_TYPE and the wide char
+	  versions of dlopen(), dlsym(), and dlerror().  Even Win32
+	  doesn't support them.
 
-          Also changed the argument type of ACE_OS::dlopen(),
-          ACE_OS::dlsym(), ACE_DLL::ACE_DLL(), ACE_DLL::open(), and
-          ACE_DLL::symbol() from ACE_DL_TYPE to const char *.  Now the
-          ACE_OS wrappers do the correct const cast before calling the OS
-          function.  Note that since this change is only adding constness
-          to the argument, the change is backward compatible.
+	  Also changed the argument type of ACE_OS::dlopen(),
+	  ACE_OS::dlsym(), ACE_DLL::ACE_DLL(), ACE_DLL::open(), and
+	  ACE_DLL::symbol() from ACE_DL_TYPE to const char *.  Now the
+	  ACE_OS wrappers do the correct const cast before calling the OS
+	  function.  Note that since this change is only adding constness
+	  to the argument, the change is backward compatible.
 
 Wed Jun 16 20:47:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * bin/Process_Win32.pm:
-          The wait time for a process seems to be in milliseconds.
+	* bin/Process_Win32.pm:
+	  The wait time for a process seems to be in milliseconds.
 
 Wed Jun 16 20:03:41 1999  Steve Huston  <shuston@riverace.com>
 
@@ -2135,48 +160,48 @@ Wed Jun 16 20:03:41 1999  Steve Huston  <shuston@riverace.com>
 
 Wed Jun 16 18:50:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * ace/OS.i:
-          Fixed typos in single threaded code.
+	* ace/OS.i:
+	  Fixed typos in single threaded code.
 
 Wed Jun 16 18:14:45 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-        * ace/Cached_Connect_Strategy_T.{h, cpp}: Added ATTRIBUTES to
-          the template list for the Cached_Connect_Strategy_Ex class to
-          ward off g++ compiler errors.
+	* ace/Cached_Connect_Strategy_T.{h, cpp}: Added ATTRIBUTES to
+	  the template list for the Cached_Connect_Strategy_Ex class to
+	  ward off g++ compiler errors.
 
 Mon Jun 14 22:52:48 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-        * tests/Map_Manager_Test.cpp: Removed template instantiation
-          regarding ACE_Read_Mutex<Thread_Mutex>. Added template
-          instantiations for ACE_Pair<VALUE, int> and
-          ACE_Reference_Pair<TYPE, VALUE> to make sunc++5.0 happy.
+	* tests/Map_Manager_Test.cpp: Removed template instantiation
+	  regarding ACE_Read_Mutex<Thread_Mutex>. Added template
+	  instantiations for ACE_Pair<VALUE, int> and
+	  ACE_Reference_Pair<TYPE, VALUE> to make sunc++5.0 happy.
 
-        * ace/Caching_Strategy_Utility_T.{h.cpp}: Removed math.h from the
-          include list since it caused problems when native exceptions were
-          enabled.
+	* ace/Caching_Strategy_Utility_T.{h.cpp}: Removed math.h from the
+	  include list since it caused problems when native exceptions were
+	  enabled.
 
 Mon Jun 14 21:41:40 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
 
-        * ace/Connector.h: Added a comment to clarify that if
-          Connector::connect() fails the close() hook of the Svc_Handler
-          is called to prevent resource leaks.  Thanks to V. Lakshmanan
-          <lakshman@doplight.nssl.noaa.gov> for motivating this.
+	* ace/Connector.h: Added a comment to clarify that if
+ 	  Connector::connect() fails the close() hook of the Svc_Handler
+ 	  is called to prevent resource leaks.  Thanks to V. Lakshmanan
+ 	  <lakshman@doplight.nssl.noaa.gov> for motivating this.
 
 Mon Jun 14 20:54:09 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-        * ace/Synch.cpp: Declared template definitions for
-          ACE_Read_Mutex<ACE_Thread_Mutex> to get around compiler errors
-          while building $ACE_ROOT/tests. Thanks to Dr.Schmidt for
-          suggesting this.
+	* ace/Synch.cpp: Declared template definitions for
+	  ACE_Read_Mutex<ACE_Thread_Mutex> to get around compiler errors
+	  while building $ACE_ROOT/tests. Thanks to Dr.Schmidt for
+	  suggesting this.
 
 Mon Jun 14 19:33:04 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/SOCK_Acceptor.cpp (accept): Fixed a bizarre problem with
-          Win32 where it's imperative that the third parameter to <accept>
-          must be a NULL pointer if we want to ignore the client address.
+	* ace/SOCK_Acceptor.cpp (accept): Fixed a bizarre problem with
+ 	  Win32 where it's imperative that the third parameter to <accept>
+ 	  must be a NULL pointer if we want to ignore the client address.
 
-        * ace/OS.i: Cleaned up warnings in join_leaf() and ioctl() due to
-          unused args.  Thanks to Marina for reporting this.
+	* ace/OS.i: Cleaned up warnings in join_leaf() and ioctl() due to
+ 	  unused args.  Thanks to Marina for reporting this.
 
 Mon Jun 14 15:56:27 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -10863,132 +8888,4 @@ Sun Jan  3 14:39:49 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
         * ace/ACE: Added a simple dirname() wrapper method.
 
         * ace/SString: The set(const char *, size_t, int = 1) and
-          set(const char *, size_t) methods were inherently ambiguous.
-          I've fixed this by changing removing the default parameters.
-          Thanks to Irfan for suggesting this fix.
-
-        * ace/Mem_Map.cpp: mmap() will fail if the length of the file
-          mapping is 0, which will be the case if we've just created the
-          file.  Therefore, don't even bother trying to mmap() in this
-          case and return a successful result.
-
-        * ace/FILE: Moved the get_remote_addr() and get_local_addr()
-          methods from the FILE_IO class to the FILE class since that's
-          more properly where they belong.  Also added a new remove()
-          method that unlinks the file.
-
-        * tests/Priority_Reactor_Test.cpp,
-          tests/Conn_Test.cpp,
-          tests/Notify_Performance_Test.cpp,
-          Priority_Reactor_Test.cpp,
-          Reactor_Performance_Test.cpp: Since the default is to skip argv0
-          there's no sense explicitly saying this in the constructor of
-          ACE_Get_Opt.
-
-        * ace/FILE_Connector.h: Updated the comments to reflect recent
-          changes.
-
-        * ace/FILE.h: Added a new get_info() method that takes a reference
-          to an ACE_FILE_Info rather than a pointer.  This is a cleaner
-          API, IMHO.
-
-        * ace/FILE_Connector.cpp (connect): When the <remote_sap> argument
-          is ACE_Addr::sap_any, then connect will select a temporary
-          filename using the new feature of ACE_FILE_Addr described below.
-
-        * ace/FILE_Addr.cpp (set): When the address is ACE_Addr::sap_any,
-          then we'll select a new temporary filename using the new
-          ACE_DEFAULT_TEMP_FILE macro and ACE_OS::mktemp().
-
-        * ace/OS.h: Added a new ACE_DEFAULT_TEMP_FILE macro that defaults
-          to "/tmp/ace-file-XXXXXX" and is used by the ACE_FILE_Connector
-          to create a temporary file when it's given an ACE_Addr::sap_any.
-
-        * ace/FILE_Addr.h: The <set> accessor should return an int to be
-          consistent.
-
-        * ace/OS.h: Added a new ACE_sap_any_cast macro, which makes it
-          much easier to cast the ACE_Addr::sap_any to the right subclass.
-
-        * tests/Reactor_Performance_Test.cpp,
-          tests/Reactor_Exceptions_Test.cpp,
-          tests/Process_Strategy_Test.cpp,
-          tests/Priority_Reactor_Test.cpp,
-          tests/IOStream_Test.cpp,
-          tests/Conn_Test.cpp: Replaced all the C-style casts for
-          ACE_Addr::sap_any with the new ACE_sap_any_cast macro.
-
-Sun Jan 03 21:48:37 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Asynch_Acceptor.cpp: Since this is a template file, I
-          removed it from the ace library build on NT.
-
-        * ace/Asynch_Acceptor.cpp (open): Changed C-style cast to use the
-          new ACE_sap_any_cast macro from Dr. Schmidt.
-
-Sun Jan 03 09:12:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: with GreenHills, added
-          ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR.
-
-        * ace/Basic_Types.* (ACE_U_LongLong): unioned the data members
-          with a double, to ensure alignment on 8-byte boundaries.  It
-          could matter when an ACE_U_LongLong is used as a true 8-byte
-          quantity, such as in a call to Solaris ::gethrtime ().
-
-        * tests/Time_Value_Test.cpp: replaced remaining #ifdef
-          ACE_HAS_STHREADS with #ifdef sun.
-
-Sat Jan  2 23:48:44 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/ACE-tutorials.html
-        * docs/tutorials/guide-tutorials.html
-        * docs/tutorials/new-tutorials.html
-        * docs/tutorials/online-tutorials.html
-        Converted some of the absolute URLs to relative.  I only have the
-        docs/tutorials tree here at home so I couldn't do any more than
-        these.
-
-        * docs/tutorials/021/*
-        New tutorial on ACE_Malloc<>.  I haven't begun the documentation
-        yet but wanted to get the code commited so it doesn't get lost.
-
-Sat Jan 02 08:34:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/ASX/Event_Server/Event_Server/event_server.cpp
-          (handle_input),
-          examples/Reactor/Misc/test_early_timeouts.cpp (main):
-          added ACE_UNUSED_ARG (n), to avoid compile warning with ACE_NDEBUG.
-
-        * performance-tests/Misc/test_naming.cpp (find): moved function
-          call w/side effect out of ACE_ASSERT.  Thanks to DU 4.0 cxx
-          for noticiing it, with ACE_NDEBUG.
-
-Fri Jan 01 18:57:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Containers_T.i (ACE_Array,ACE_Array::operator=):
-          added missing ACE_INLINE's.
-
-        * ace/OS.{h,cpp} (ACE_TSS_Info::operator{==,!=}): added
-          constness.  It's necessary with the ACE_Array changes,
-          with ACE_HAS_TSS_EMULATION.
-
-Fri Jan  1 12:22:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Containers_T.h:
-        * ace/Containers_T.i:
-        * ace/Containers_T.cpp:
-        * bin/Array_Helper:
-        * bin/Array.pl:
-          Moved most of the implementation of ACE_Array into
-          ACE_Array_Base this class does not require == or != operators
-          defined for the template parameter.
-          I also added methods to access and manipulate the capacity of
-          the array (max_size) as opposed to always changing its size (the
-          portion actually used).
-
-        * ace/Object_Manager.cpp:
-        * ace/Template_Instantiations.cpp:
-        * ace/OS.cpp:
-        * apps/JAWS/clients/Caching/URL_Properties.cpp:
-          Fixed ACE_Array instantiations.
+          set(const c
diff --git a/Makefile b/Makefile
index 3ea949f3d19..2166e35493a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@
 #----------------------------------------------------------------------------
 
 INFO    = README \
-          THANKS \
           VERSION
 
 DIRS    = ace \
@@ -38,8 +37,7 @@ DIRS    = ace \
           tests \
           apps \
           examples \
-          performance-tests \
-          websvcs
+          performance-tests
 
 CLONE   = Makefile \
           ace \
@@ -51,8 +49,7 @@ CLONE   = Makefile \
           netsvcs \
           performance-tests \
           TAO \
-          tests \
-          websvcs
+          tests
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -79,7 +76,6 @@ CONTROLLED_FILES = \
         ACE-INSTALL.html \
         ACE-install.sh \
         ASNMP \
-        AUTHORS \
         BIBLIOGRAPHY \
         COPYING \
         ChangeLog \
@@ -96,36 +92,19 @@ CONTROLLED_FILES = \
         Makefile \
         PROBLEM-REPORT-FORM \
         README \
-        THANKS \
         VERSION \
-        WindozeCE \
-        acconfig.h \
-        aclocal.m4 \
         ace \
-        ace-config.1.in \
-        ace-config.in \
-        aceConf.sh.in \
         apps \
         bin \
-        config.guess \
-        config.sub \
-        configure \
-        configure.in \
         docs \
         etc \
         examples \
         include \
-        install-sh \
-        ltconfig \
-        ltmain.sh \
-        m4 \
-        missing \
-        mkinstalldirs \
         netsvcs \
         os-patches \
         performance-tests \
         tests \
-        websvcs
+        WindozeCE
 
 RELEASE_FILES = \
         $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
@@ -142,10 +121,8 @@ RELEASE_LIB_FILES = \
         ACE_wrappers/bin \
         ACE_wrappers/etc \
         ACE_wrappers/include \
-        ACE_wrappers/m4 \
         ACE_wrappers/netsvcs \
-        ACE_wrappers/tests \
-        ACE_wrappers/websvcs
+        ACE_wrappers/tests
 
 .PHONY: release releasetao releaseall
 
diff --git a/Makefile.am b/Makefile.am
index cf30310e5f9..e45e5ea1dc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,7 @@ noinst_DATA = ACE.ifnames
 
 ACE.ifnames: ChangeLog acconfig.h
 if MAINTAINER_MODE
-	rm -f $@
+        rm -f $@
 	ifnames $(top_srcdir)/ace/*.{h,i,cpp} | sed -e 's/ .*//g' \
            > $(top_srcdir)/$@
 else
diff --git a/Makefile.bor b/Makefile.bor
deleted file mode 100644
index 3b660adfa5c..00000000000
--- a/Makefile.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-      
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-     
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-     
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
- 
-all:
-        cd $(ACE_ROOT)\ace
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\tests
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\apps
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\TAO
-        $(MAKE) -f Makefile.bor $(FLAGS)
-
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index ee5d2134a4f..e2a98618158 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -25,7 +25,7 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 4.6.43
+    ACE VERSION: 4.6.42
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/README b/README
index 9d862053b62..238b7b145f5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This document is also available at the following URL:
+[This document is also available at the following URL:
 
 http://www.cs.wustl.edu/~schmidt/ACE.html.
 
@@ -221,5 +221,672 @@ To ensure that you see responses, please do one of the following:
 
 ACKNOWLEDGEMENTS
 
-Please see the file `THANKS' for a list of people who have contributed
-to ACE and TAO over the years.
+ACE has been deeply influenced and improved by the following members
+of my research group at Washington University:
+
+Everett Anderson <eea1@cec.wustl.edu>
+Alexander Babu Arulanthu <alex@cs.wustl.edu>
+Shawn Atkins <sma1@cs.wustl.edu>
+Matt Braun <mjb2@cs.wustl.edu>
+Darrell Brunsch <brunsch@cs.wustl.edu>
+Chris Cleeland <chris@cs.wustl.edu>
+Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+Chris Gill <cdgill@cs.wustl.edu>
+Aniruddha Gokhale <gokhale@cs.wustl.edu>
+Pradeep Gore <pradeep@cs.wustl.edu>
+Tim Harrison <harrison@cs.wustl.edu>
+John Heitmann  <jwh1@cs.wustl.edu>
+James Hu <jxh@cs.wustl.edu>
+Prashant Jain <pjain@cs.wustl.edu>
+Vishal Kachroo <vishal@cs.wustl.edu>
+Michael Kircher <mlkirche@trick.informatik.uni-stuttgart.de>
+Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+Fred Kuhns <fredk@cs.wustl.edu>
+David Levine <levine@cs.wustl.edu>
+Balachandran Natarajan <bala@cs.wustl.edu>
+Kirthika Parameswaran <kirthika@cs.wustl.edu>
+Carlos O'Ryan <coryan@cs.wustl.edu>
+Ossama Othman <ossama@cs.wustl.edu>
+Jeff Parsons <parsons@cs.wustl.edu>
+Irfan Pyarali <irfan@cs.wustl.edu>
+Marina Spivak <marina@cs.wustl.edu>
+Nagarajan Surendran <naga@cs.wustl.edu>
+Nanbor Wang <nanbor@cs.wustl.edu>
+Seth Widoff <sbw1@cs.wustl.edu>
+Torben Worm <tworm@cs.wustl.edu>
+
+I would also like to thank all the following people who have also
+contributed to ACE and TAO over the years:
+
+Paul Stephenson <pstephenson@objectspace.com>
+Olaf Kruger <okruger@cssc-melb.tansu.com.au>
+Ed Brown <eebrown@netcom.com>
+Lee Baker <baker@ctis.af.mil>
+Alex Ranous <ranous@nsa.hp.com>
+Mark Patton <mark_patton@tx72.mot.com>
+Steffen Winther Sorensen <sts@dad.stibo.dk> for
+Troy Warner <tnw1@core01.osi.com>
+Stacy Mahlon <mcs@contour.mayo.edu>
+Charles Eads <eads@synoptics.com>
+Mark Frutig <mfrutig@fnbc.com>
+Todd Hoff <thm@ictv.com>
+George <george@truffula.fp.trw.com>
+Brad Needham <bneedham@ix.netcom.com>
+Leslee Xu <lxu@ics.uci.edu>
+Detlef Becker <detlef.becker@med.siemens.de>
+Bruce Worden <bruce@betsy.gps.caltech.edu>
+Chris Tarr <ctarr@objectspace.co>
+Bill Sears <wsears@world.std.com>
+Greg Lavendar <g.lavender@isode.com>
+Steve Warwick <sjw@aesthetic.com>
+Mats Sundvall <sundvall@perrier.embnet.se>
+Andreas Ueltschi <Andreas.Ueltschi@ska.com>
+Nigel Hooke <n.hooke@trl.oz.au>
+Medhi Tabatabai <Mehdi.Tabatabai@ed.nce.sita.int>
+Stuart Powell <stuartp@ot.com.au>
+Bin Mu <mubin@wfg.com>
+Andrew McGowan <mcgowan@wg2.waii.com>
+Ken Konecki <kenk@wfg.com>
+John P. Hearn <jph@ccrl.nj.nec.com>
+Giang Hoang Nguyen <yang@titan.com>
+Carlos Garcia Braschi <cgarcia@caramba.tid.es>
+Jam Hamidi <jh1@osi.com>
+Eric Vaughan <evaughan@arinc.com>
+Karl-Heinz Dorn <karlheinz.dorn@med.siemens.de>
+Steve Ritter <ritter@titan.com>
+Chandra Venkatapathy <cvenkat@develop.bsis.com>
+Matt Stevens <mstevens@kirk.softeng.infonautics.com>
+Bob Vistica <robertv@ims.com>
+David Trumble <trumble@cvg.enet.dec.com>
+John Morey <jmorey@crl.com>
+George Reynolds <george@dvcorp.com>
+Hans Rohnert <hans.rohnert@mchp.siemens.de>
+Alex V. Maclinovsky <alexm@teltrunk1.tait.co.nz>
+Todd Blanchard <tblancha@evolving.com>
+Rob Clairmont <rclairmo@bnr.ca>
+Christian Millour <chris@etca.fr>
+Neil Cohen <nbc@metsci.com>
+Dieter Quehl <dieter.quehl@med.siemens.de>
+Reginald S. Perry <perry@zso.dec.com>
+James Morris <jmorris@aurora.apana.org.au>
+Mark Seaborn <mseaborn@itthp1.comm.mot.com>
+Phil Brooks <phil_brooks@mentorg.com>
+E. Jason Scheck <jasons@ims.com>
+Daniel Proulx <daproulx@qc.bell.ca>
+Bill Tang <tang@tekats.com>
+John Huchinson <hutchiso@epi.syr.ge.com>
+Jack Erickson <JErickson@exchange.ml.com>
+Byron Walton <bwalton@hughes.scg.hac.com>
+Bill Lear <rael@anarchy.cybercom.net>
+Mark Zusman <marklz@topaz.technion.ac.il>
+Aurelio Nocerino <aurelio@irsipcs2-27-le0.irsip.na.cnr.it>
+Walt Akers <akers@cebaf.gov>
+Greg Baker <GBaker@p01.az15m.iac.honeywell.com>
+Alexandre Karev <karev@vxcern.cern.ch>
+Pramod Kumar Singh <pramod@saturn.miel.mot.com>
+Bryon Rigg <bryon_rigg@mail.telecorpsys.com>
+Brad Brown <bbrown@rdxsunhost.aud.alcatel.com>
+Patty Genualdi <genualdp@agcs.com>
+Eshel Liran <liran@bimacs.cs.biu.ac.il>
+Mick Adams <eeimas@eei.ericsson.se>
+Chris Eich <Chris_Eich@optilink.optilink.dsccc.com>
+Mike Flinn <mike.flinn@smtpgate.aws.waii.com>
+Audun Tornquist <Audun.Tornquist@iu.hioslo.no>
+Sandeep Joshi <sandeepj@emailbox.att.com>
+Bernd Hofner <hofner@pd.et-inf.uni-siegen.de>
+Craig Perras <craigp@wolfenet.com>
+Kirk Sinnard <kirk.sinnard@lawson.com>
+Matthew Newhook <matthew@ooc.com>
+Gerolf Wendland <wendland@hpp015.mch2.scn.de>
+Phil Mesnier <phil@envision.com>
+Ross Dargahi <rossd@krinfo.com>
+Richard Orr <rorr@costello.den.csci.csc.com>
+Rich Ryan <rryan@mseng.kla.com>
+Jan Rychter <jwr@icm.edu.pl>
+Tom Marrs <0002104588@mcimail.com>
+Bob Olson <olson@mcs.anl.gov>
+Jean-Francois Ripouteau <Jean-Francois.Ripouteau@netsurf.org>
+Ajit Sagar <asagar@spdmail.spd.dsccc.com>
+Ashish Singhai <singhai@delirius.cs.uiuc.edu>
+David Sames <David.L.Sames.1@gsfc.nasa.gov>
+Gonzalo Diethelm <gonzo@ing.puc.cl>
+Raj <raj@itd.ssb.com>
+Darrin <darrin@jeeves.net>
+Steve Weismuller <spweismu@rsoc.rockwell.com>
+Eric C. Newton <ecn@smart.net>
+Andres Kruse <kruse@cern.ch>
+Ramesh Nagabushnam <rcn@nynexst.com>
+Antonio Tortorici <antonio@rh0011.roma.tlsoft.it>
+Nigel Lowe <nigel@nt.com>
+Tom Leith <trl@icon-stl.net>
+Michael Fortinsky <mike@vocaltec.com>
+Marco Sommerau <sommerau@matisse.informatik.uni-stuttgart.de>
+Gary Salsbery <gsalsber@simsun.atsc.allied.com>
+Eric Beser <beser@simsun.atsc.allied.com>
+Alfred Keller <kellera@pop.eunet.ch>
+John Lu <johnlu@f1.telekurs.ch>
+James Mansion <james@wgold.demon.co.uk>
+Jesper S. M|ller <Jesper.Moller@ameridata.dk>
+Chris Lahey <clahey@cccis.com>
+Michael R"uger <m_rueger@syscomp.de>
+Istvan Buki <istvan.buki@euronet.be>
+Greg Wilson <gvwilson@vnet.ibm.com>
+Garrett Conaty <gconaty@outbackinc.com>
+Brad Flood <BFLOOD@slc.unisysgsg.com>
+Marius Kjeldahl <marius@funcom.com>
+Steve Huston <shuston@riverace.com>
+Eugene K. Plaude <jec@r-style.msk.su>
+Joseph DeAngelis <bytor@faxint.com>
+Kim Gillies <gillies@noao.edu>
+Luca Priorelli <lucapri@mbox.vol.it>
+Alan Stewart <axs2@osi.com>
+Hani Yakan <hani@i-online.com>
+William L. Gerecke <gerecke@rayva.org>
+Craig Johnston <johnston@tortilla.ds.boeing.com>
+Pierre-Yves Duval <duval@cppm.in2p3.fr>
+Rochi Febo Dommarco <rocky@alter.it>
+Jonathan Biggar <jon@biggar.org>
+Scott Shupe <shupes@mitre.org>
+Chuck Gehr <gehr@sweng.stortek.com>
+Avi Nash <anash@RedBrick.COM>
+Padhu Ramalingam <padhu@magicnet.net>
+Jay Denkberg <jay_denkberg@comverse.com>
+Ayman Farahat <afarahat@CCGATE.HAC.COM>
+Tilo Christ <christ@swl.fh-heilbronn.de>
+Ari Erev <Ari_Erev@icomverse.com>
+Hamutal Yanay <Hamutal_Yanay@icomverse.com>
+Vital Aza <va3@cs.wustl.edu>
+Alex Villazon <villazon@cui.unige.ch>
+David Artus <david.artus@sbil.co.uk>
+Todd Barkalow <todd_barkalow@stortek.com>
+Alexander Smundak <sasha@migration.com>
+Thilo Kielmann <kielmann@informatik.uni-siegen.de>
+Matthias Kerkhoff <make@cs.tu-berlin.de>
+Fred LaBar <flabar@fallschurch.esys.com>
+Hanan Herzog <hanan@wallenda.stanford.edu>
+Eric Parker <eparker@credence.com>
+James Michael Dwyer <jdwyer@knox.edu>
+Arun Katkere <katkere@praja.com>
+Bob Dunmire <bobd@titan.com>
+Sandro Doro <alex@aureus.sublink.org>
+Robert Lyng <rlyng@synertech.highmark.com>
+Phil Logan <phill@in.ot.com.au>
+John Cosby <John.D.Cosby@cpmx.saic.com>
+Wayne Vucenic <wvucenic@netgate.net>
+Harry Gunnarsson <hg@carmenta.se>
+James CE Johnson <jcej@lads.com>
+Samuel_Bercovici <Samuel_Bercovici_at_EFT__AD2@mail.icomverse.com>
+Per Andersson <Per.Andersson@hfera.ericsson.se>
+Anthony McConnell <Tonym@datel.demon.co.uk>
+Mark Rabotnikov <mark@usp.elscintcorp.co.il>
+John Bossom <John.Bossom@Cognos.COM>
+Rino Simioni <sir@necsy.it>
+Slawomir Kuzniar <kuzniar@Bear.COM>
+Rob Jordan <jordan@hursley.ibm.com>
+Michael Maxie <maxie@acm.org>
+John Cosby <John.D.Cosby@cpmx.saic.com>
+Nigel Owen <Nigel@voicelink.co.nz>
+Jorn Jensen <jornj@funcom.com>
+Paul Roman <proman@npac.syr.edu>
+Dave Mayerhoefer <davem@lynx.com>
+Bert Craytor  <Bert_Craytor@peoplesoft.com>
+Joey Zhu <joey.zhu@wcom.com>
+Arthur J. Lewis <hfdh99a@prodigy.com>
+Michael R. MacFaden <mrm@yagosys.com>
+Eugene R. Somdahl <gene@endo.com>
+Paul Han <phan@CCGATE.HAC.COM>
+Jeff Morgan <jeff@audioactive.com>
+Arturo Montes <mitosys@colomsat.net.co>
+Elliot Lau <eeklau@post1.com>
+Mark Wright <markw@odi.com.au>
+Michael Newton <michaeln@in.ot.com.au>
+Kumar Neelakantan <kneelaka@painewebber.com>
+Scott Halstead <scott.halstead@gs.com>
+Jean-Marc Strauss <jms97@club-internet.fr>
+Adam Porter <aporter@cs.umd.edu>
+Hakan Kallberg <hk@simulina.se>
+Eric Dean Russell <edrusse@somnet.sandia.gov>
+Daniel Montalibet <daniel_montalibet@stortek.com>
+Norbert Rapp <norbert.rapp@nexus-informatics.de>
+Ganesh Pai <gpai@voicetek.com>
+Berni Merkle <merkle@io.freinet.de>
+Tom Wright <twright@gem-net.demon.co.uk>
+Torbjorn Lindgren <tl@funcom.no>
+Mike Bernat <sagmb@sagus.com>
+Brian Mendel <bmendel@mdc.com>
+Jeremy Buch <davinci@nortel.ca>
+Kevin Boyle <kboyle@sanwafp.com>
+Kevin Martindale <kevin_martindale@stortek.com>
+Luis Lopes <llopes@tick.rcc.Ryerson.CA>
+Adrian Salt <acsalt@magi.com>
+Hongbo Xu <hxu@mas.co.nz>
+Michael Hartman <c62nt57@ibx.com>
+Tom Dobridge <dobridge@persimmon.com>
+Rich Christy <rchristy@cccis.com>
+Satoshi Ueno <satoshi.ueno@gs.com>
+Eugene R. Somdahl <gene@endo.com>
+Robert Head <rhead@mail.virtc.com>
+Ivan Murphy <Ivan.Murphy@med.siemens.de>
+Jan Perman <jan.perman@osd.uab.ericsson.se>
+Shankar Krishnamoorthy <kshankar@lucent.com>
+Reza Roodsari <reza@sprynet.com>
+Jim Crossley <jim@lads.com>
+Johannes Gutleber <Johannes.Gutleber@cern.ch>
+Marina Spivak <marina@cs.wustl.edu>
+Yigong Liu <ygl@emailbox.lucent.com>
+Erik Urdang <erik@bhi.com>
+Mike Schweiger <mikes@bmo.com>
+Anthony Mutiso <amutiso@hughes.cg.hac.com>
+Jeff R. Hayes <Jeff.Hayes@osi.com>
+David Brackman <dbrackman@OhioEE.com>
+Dave Moore <dave.moore@gecm.com>
+Joseph Cross <joseph.k.cross@lmco.com>
+Cherif Sleiman <sleiman@research.moore.com>
+Stefan Ericsson <Stefan.Ericsson@osd.uab.ericsson.se>
+Wei Chiang <wei.chiang@horizon.ntc.nokia.com>
+Thanh Ma <tma@encore.com>
+Oleg Krivosheev <kriol@fnal.gov>
+Stephen Coy <stevec@wsa.com.au>
+Bob Laferriere <laferrie@gsao.med.ge.com>
+Satheesh Kumar MG <satheesh@india.aspectdv.com>
+Karen Amestoy <kamestoy@CCGATE.HAC.COM>
+Jeff Richard <jrichard@OhioEE.com>
+Samuel Melamed <sam@vdo.net>
+Vladimir Schipunov <vlad@staff.prodigy.com>
+Felix Popp <fxpopp@immd9.informatik.uni-erlangen.de>
+Billy Quinn <bquinn@lads.com>
+Michael McKnight <mcknight@signalsoftcorp.com>
+Huiying Shen <shen@environ.org>
+Alex Chan <Alex.Chan@Aspect.com>
+Aaron Valdivia <avaldivia@hns.com>
+Edan Ayal <edana@vdo.net>
+Jeffrey Peterson <jpeterson@fallschurch.esys.com>
+Neil Lavelle <nlavelle@imcl.com>
+Steven Wohlever <wohlever@mitre.org>
+Manojkumar Acharya <mja@cvsf325.gpt.co.uk>
+Evgeny Beskrovny <evgeny_beskrovny@icomverse.com>
+Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
+Laura Paterno <lpaterno@d0chb.fnal.gov>
+Ben Eng <ben@jetpen.com>
+Mike Kamrad <J.M.KAMRAD.II@cdev.com>
+Marios Zikos <zikos@csi.forth.gr>
+Mark L Boriack <mboriack@std.saic.com>
+Mark Hyett <mhyett@std.saic.com>
+Caleb Epstein <epstein_caleb_unix@jpmorgan.com>
+Valik Solrzano Barboza <valik@xs4all.nl>
+John Connett <jrc@skylon.demon.co.uk>
+Tom Arbuckle <arbuckle@uran.informatik.uni-bonn.de>
+Stephen Henry <shenry@mdc.com>
+Dani Flexer <danif@ivory-sw.com>
+Michael Hoffman <Hoffman_Michael@mac-mailserver.atc.ll.mit.edu>
+John Lindal <jafl@cheshire-cat.caltech.edu>
+Dustin Laurence <laurence@alice.wonderland.caltech.edu>
+Ernie Makris <emakris@ziplink.net>
+Timothy A. Brown <tabrown@montana.com>
+Patrick J. McNerthney <pat@cartia.com>
+Lori Anderson <lori@probita.com>
+Erik Margraf <erik@asgard.gud.siemens.co.at>
+Bryan Doerr <Bryan.S.Doerr@boeing.com>
+Adam Miller <adam@royalblueny.com>
+Thomas Jordan <ace@programmer.net>
+Keith Nicewarner <knicewar@sanders.com>
+Frederic Andres <andres@rd.nacsis.ac.jp>
+Achint Sandhu <sandhu@nortel.ca>
+Mitch Kuninsky <Mitch_Kuninsky@avid.com>
+Alex Chan <Alex.Chan@Aspect.com>
+Jeff Hellzen <JHellzen@hwdcsaws.cahwnet.gov>
+Thomas Venturella <tventurell@mdc.com>
+Philippe O'Reilly <philippe@robot.ireq.ca>
+Stan Leeson <STANLEY.D.LEESON@cdev.com>
+Richard Keizer <RICHARD.L.KEIZER@cdev.com>
+Edgar Villanueva <edgarvil@ix.netcom.com>
+Oliver Kellogg <Oliver.Kellogg@vs.dasa.de>
+Dave Meyer <dmeyer@std.saic.com>
+Thomas Hampson <thomas.hampson@lmco.com>
+Jay Kistler <jjk@pa.dec.com>
+Scott Snyder <snyder@d0sgif.fnal.gov>
+Mark Evans <mark.evans@tandem.com>
+Todd Pack <todd@rwii.com>
+Mark Maris <maris@scgp.com>
+Jason Katz <Jason@email.rts-inc.com>
+Jim Penny <jpenny@universal-fasteners.com>
+Chris Ryan <cryan@qualcomm.com>
+J. Russell Noseworthy <rnosewor@objectsciences.com>
+Carol Sanders <csanders@mdc.com>
+Jerry Bickle <glbick@most.fw.hac.com>
+Paul von Behren <Paul_von_Behren@stortek.com>
+Sudish Joseph <sj@eng.mindspring.net>
+Loren Rittle <rittle@comm.mot.com>
+Alexander Ovsiankin <sasha@technologist.com>
+Fred Kuhns <fredk@arl.wustl.edu>
+Ravi Nagabhyru <ravi@future-minds.com>
+Tom Brusehaver <tgb@cozy.netco.com>
+Dave Tallman <tallman@acsys.com>
+Monish Rajpal <monish@cs.jhu.edu>
+Garry Brother <gmbroth@romulus.ncsc.mil>
+Andreas Schuelke <Andreas.Schuelke@med.siemens.de>
+Ganapathi <guns@fs.IConNet.NET>
+James Garrison <jhg@austx.tandem.com>
+Brad Walton <brad.walton@transnexus.com>
+Paul Motuzenko <p_motuzenko@hotmail.com>
+Kurt Sussman <kls@best.com>
+Rob Thornton <ret1@cec.wustl.edu>
+Chanaka Liyanaarachchi <chanakal@ittc.ukans.edu>
+Saneyasu <sane@sail.t.u-tokyo.ac.jp>
+Steve Kay <slk1@icore.ih.lucent.com>
+Greg White <gwhite@northlink.com>
+Ki-hyun Yoon <abird@nextware.co.kr>
+Umar Syyid <usyyid@hns.com>
+Bill Fulton <fultonb@pcnet1.ascs.aro.allied.com>
+Amancio Hasty <hasty@rah.star-gate.com>
+Zoran Ivanovic <zorani@pathcom.com>
+Sree Oggu <dharani@sutmyn.com>
+James Risinger <jrisinge@cgi.com>
+Leo Modica <lmodica@lucent.com>
+Bob Scott <bob_scott@broder.com>
+Mark Kettner <m.kettner@elsevier.nl>
+Kent Watsen <kent@watsen.net>
+Chris Healey <chealey@entera.com>
+Philippe Klein <Philippe_Klein@vocaltec.com>
+William S. Lear <rael@dejanews.com>
+John Geiss <jtgb@eci-esyst.com>
+Ernesto Guisado <eguisado@saincotrafico.com>
+Stuart Myles <smyles@wsj.dowjones.com>
+Lothar Werzinger <lwerzinger@krones.de>
+Andrew Harbick <aharbick@opentext.com>
+Pavel Motuzenko <p_motuzenko@hotmail.com>
+Ross J. Lillie <lillie@rsch.comm.mot.com>
+Sam Hauer <shauer@nmo.gtegsc.com>
+Frank. J. Hodum <fhdum@std.saic.com>
+David Miron <dxm@crapper.dsto.defence.gov.au>
+Anton van Straaten <anton@appsolutions.com>
+Joe Covalesky <joe@nowsol.com>
+Bill Backstrom <backstr@anubis.network.com>
+Jeff Franks <Jeffrey_Franks@i-o.com>
+John Mulhern <9107@mn3.lawson.lawson.com>
+Johan Lundin <johan@lundin.com>
+Eric Powers <powerg@deltanet.com>
+Zheng Han <zhan@glenvan.glenayre.com>
+Gabriel Lima <gali@enea.se>
+Doug Anderson <doug@clark.net>
+Hongyin Quan <hq1@arl.wustl.edu>
+Maximilian Hoferer <mhoferer@krones.de>
+Kevin Stanley <kstanley1@mdc.com>
+Jeff Greif <jmg@trivida.com>
+Jeff McDaniel <jsmcdani@gte.net>
+Andreas Geisler <andreas.geisler@erls.siemens.de>
+Bob McWhirter <bob@werken.com>
+Daniel Winder <Daniel.Winder@cern.ch>
+Zheng Han <zhan@glenvan.glenayre.com>
+Christa Schwanninger <christa.schwanninger@mchp.siemens.de>
+Byron Harris <harris_b@ociweb.com>
+Barney Dalton <barneyd@cyllene.uwa.edu.au>
+Peter Gorgia <Peter.Gorgia@libnet.com>
+Dirk Broer <Dirk.Broer@gsfc.nasa.gov>
+Joseph E. LaPrade <laprade@engw.ana.bna.boeing.com>
+Goran Lowkrantz <Goran.Lowkrantz@infologigruppen.se>
+Susan Liebeskind <susan.liebeskind@gtri.gatech.edu>
+Dana Hackman <upboms@network-one.com>
+Margherita Vittone Wiersma <vittone@fndaub.fnal.gov>
+Priya Narasimhan <priya@lambda.ece.ucsb.edu>
+Jeff Hopper <jhopper@nosc.mil>
+Mats Nilsson <mats.nilsson@xware.se>
+Dongwook Kim <baksoo@dbserver.kaist.ac.kr>
+Don Davis <ded@heart.jhuapl.edu>
+Alberto Villarica <Alberto.Villarica.rav@nt.com>
+XuYifeng <xuyf@pop.zg169.net>
+Ossama Othman <othman@astrosun.tn.cornell.edu>
+Tom Shields <Shields@MarsHotel.CMPU.NET>
+Krishna Padmasola <pkrishna@cybercash.co.in>
+Andre Folkers <folkers@informatik.mu-luebeck.de>
+Paul Sexton <pauls@ENTERPRISE.bt.co.uk>
+Marc Lehmann <pcg@goof.com>
+Anne Blankert <anne@geodan.nl>
+Raja Ati <rati@montereynets.com>
+Clinton Carr <ccarr@websocket.com>
+Peter Liqun Na <liqunna@cs.sunysb.edu>
+Frank Adcock <frank@bushlife.com.au>
+Xu Yifeng <xuyifeng@www.kali.com.cn>
+Valery Arkhangorodsky <valerya@servicesoft.com>
+Alan Scheinine <scheinin@crs4.it>
+Andrew G. Harvey <agh@cisco.com>
+Dann Corbit <DCorbit@SolutionsIQ.com>
+James <james@tsunami.com>
+Jason Milley <Jason.Milley.jcmilley@nt.com>
+Ulf Jaehrig <jaehrig@desys.com>
+Peter Nordlund <petern@nada.kth.se>
+Mark Weel <weel@lucent.com>
+Tres Seaver <tseaver@palladion.com>
+Erik Koerber <erik.koerber@siemens.at>
+Eric R. Medley <palantir@net56.net>
+David O'Farrell <dave@virgo.aersoft.ie>
+Amir Bahmanyari <abahmany@teknowledge.com>
+Ian Wright <I.Wright@elsevier.co.uk>
+David Janello <David.Janello@abnamro.com>
+Rich Wellner <rw2@wellner.org>
+Fernando D. Mato Mira <matomira@acm.org>
+Jonathan Reis <reis@minniemouse.cemax.com>
+Seung-Lee Hoon <tarjan@lgsoft.com>
+Russell L. Carter <rcarter@dnstoo.consys.com>
+Bill Hall <hts@gte.net>
+Brian Gilstrap <gilstrap_b@ociweb.com>
+Balaji Srinivasan <balaji@cplane.com>
+Anders W. Tell <anderst@toolsmiths.se>
+Larry Lachman <larry@paradigmsim.com>
+Terry Rosenbaum <Terry.Rosenbaum@Radiology.MSU.edu>
+Rainer Blome <rainer_blome@de.ibm.com>
+Kirk Ellett <kellett@mdc.com>
+Sunil Kumar <skumar@sutmyn.com>
+T Stach <t.stach@inobis.de>
+Ron Barack <r.barack@inobis.de>
+Daniel Nieten <dnieten@bellsouth.net>
+Paul K. Fisher <pfisher@plexware.com>
+Jim Buck <jim@nowsol.com>
+Olivier Lau <olivier_lau@srtelecom.com>
+Achim Stindt <stindt@inobis.de>
+Fredrik Lindahl <fredrik.lindahl@ausys.se>
+Joseph Weihs <joseph-w@Orbotech.Co.IL>
+Serge Kolgan <skolgan@cisco.com>
+James Megquier <jmegq@bbn.com>
+Martin Krumpolec <krumpo@pobox.sk>
+Michael Thomas <Michael.Thomas@Australia.Boeing.com>
+Vicentini Emanuele <arena.sci.univr.it>
+Bob Price <Bob_Price@tssdc.saic.com>
+Ramiro Penataro Blanco <penataro@ll.iac.es>
+Sigg Pascal <pascal.sigg@zkb.ch>
+Ivan Leong <ivanl@pacific.net.sg>
+Virginie Amar<vamar@amadeus.net>
+Tom Ziomek <tomz@cc.comm.mot.com>
+Hamish Friedlander <hamishf@usa.net>
+Mark De Jong <mdj@intervu.net>
+Knut Johannessen <knutj@funcom.com>
+Leif Jakobsmeier <leif@informatik.uni-frankfurt.de>
+Jon Lindgren <jlindgren@SLK.com>
+Steve Vinoski <vinoski@iona.com>
+Christian Mueffling <cvm@aiss.de>
+Victor Yu <victor.yu@computechnics.com.au>
+Jeff Donner's <JDonner@schedsys.com>
+Joe Loyall <jloyall@bbn.com>
+Stanislav Meduna <stanom@etm.co.at>
+Christian Korn <korn@gate.qaqa.com>
+Ron Barack <rab@terminal.cz>
+Steve Totten <totten_s@ociweb.com>
+Faron Dutton <fdutton@avxus.com>
+Gary York <gfyork@ix.netcom.com>
+Patty Hair <patty@Lynx.COM>
+Ivan Pascal <pascal@info.tsu.ru>
+William A. Hoffman <hoffman@crd.ge.com>
+Mark Lucovsky <markl@microsoft.com>
+Greg Holtmeyer <gholtmeyer@mdc.com>
+Jody Hagins <jody@atdesk.com>
+Patrice Bensoussan <pbensoussan@amadeus.net>
+Keith Brown <kalbrown@ix.netcom.com>
+Barry Hoggard <hoggard@cfx.com>
+Peter J. Mason <peterm@fl.net.au>
+Jerry De Master <jdemaste@ipdinc.com>
+Greg Gallant <greg.gallant@jhuapl.edu>
+wym <wym@dekang.com>
+Karel Zuiderveld <kzuiderveld@vitalimages.com>
+Mike Goldman <whig@by.net>
+Peter Gross <pgross@signalsoftcorp.com>
+Greg Ross <gwross@west.raytheon.com>
+Stanford S. Guillory <sguillory@vignette.com>
+Peter Weat <weatp@syntron.com>
+Magnus Karlsson <magnus.karlsson@syncom.se>
+Andreas Tobler <toa@pop.agri.ch>
+John Aughey <jha@FreeBSD.ORG>
+Knut-Havard Aksnes <knut@orion.no>
+Eric Mitchell <emitchell@altaira.com>
+Tommy Andreasen <tommy.andreasen@radiometer.dk>
+Slava Galperin <galperin@teknowledge.com>
+Jeff Olszewski <jolszewski@std.saic.com>
+Sudhanshu Garg <sg2@ladybug.cec.wustl.edu>
+Mike Preradovic <michael_preradovic@epicdata.com>
+Greg Harrison <harrisog@erinet.com>
+Sangwoo Jin <swjinjin@sei.co.kr>
+Jacques Salerian <Jacques.Salerian@era.ericsson.se>
+Steve Coleman <Steve.Coleman@jhuapl.edu>
+Diethard Ohrt <Diethard.Ohrt@siemens.at>
+Jacob Jones <Jacob.J.Jones@notesmta.gd-is.com>
+Phil Ruelle <Phil.Ruelle@adv.sonybpe.com>
+Sush Bankapura <Sush.Bankapura@sylantro.com>
+Eric Covington <eric@nowsol.com>
+Darren Whobrey <whobrey@fecit.co.uk>
+Mason Taube <taube@westcon.prc.com>
+Rod Joseph <rodjoseph@adt.com>
+Hans Horsmann <Hans.Horsmann@icn.siemens.de>
+Kevin Royalty <kroyalty@mdc.com>
+Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca>
+Mark Little <M.C.Little@ncl.ac.uk>
+Tim Stack <stack@cs.utah.edu>
+Marc Engel <engelm@tlse.sofreavia.fr>
+Uma Markandu <umam@nortelnetworks.com>
+Henrik Nordberg <hnordberg@lbl.gov>
+Tad Jarosinski <tadj@qualcomm.com>
+Andy Marchewka <AndyM@who.net>
+Neal Norwitz <nnorwitz@arinc.com>
+Frederic Maria <fmaria@lucent.com>
+David Hooker <DHooker@uniview.net>
+Christian.Destor <Christian.Destor@alcatel.fr>
+Andrew Hobson <ahobson@eng.mindspring.net>
+Andre Folkers <folkers@informatik.mu-leubeck.de>
+Torsten Kuepper <kuepper2@uni-wuppertal.de>
+Hao Ruan <hruan@lucent.com>
+Alexander Davidovich <sasha@ms.com>
+Cristian Ferretti <cfs@mat.puc.cl>
+N Becker <nbecker@fred.net>
+Yaolong Lan <lyaolong@cs.sunysb.edu>
+Elias Sreih <sealstd1@nortelnetworks.com>
+Liang Chen <chenl@nortelnetworks.com>
+Mark Laffoon <mark.laffoon@centraxcorp.com>
+Ti Z <tiz@cisco.com>
+Brian Dance <Brian_Dance@UECCS.co.uk>
+Alexey Gadzhiev <alg@null.ru>
+Francois Bernier <fbernier@gel.ulaval.ca>
+Bill Rizzi <rizzi@softserv.com>
+Peter Windle <peterw@ugsolutions.com>
+Andy Alvarez <axab@eci.esys.com>
+Jaepil Kim <jpkim@lgsoft.com>
+Goldshtain Dmitry <goldshtain.dmitry@usa.net>
+Carl Grinstead <grinstea@tsunami.com>
+Henric Jungheim <junghelh@pe-nelson.com>
+Konstantinos Margaritis <kmargar@cc.uoa.gr>
+Michael Preobrazhensky <mikep@xpedite.com>
+Gregory D. Fee <gdf2@cec.wustl.edu>
+Roland Gigler <roland@mch.pn.siemens.de>
+Frank Buschmann <Frank.Buschmann@mchp.siemens.de>
+Eric Eide <eeide@cs.utah.edu>
+Don Busch <busch_d@ociweb.com>
+Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
+David Hauck <davidh@realtimeint.com>
+Joe Hoffert  <joeh@tango.cs.wustl.edu>
+Keith Rohrer <KRohrer@hnv.com>
+Tim Rose <trose@bridgewatersys.com>
+Sam Rhine <rmsolution20@earchlink.net>
+Chris Schleicher <chrissch@cnd.hp.com>
+Margaret Reitz <margaret@veritas.com>
+Thomas Mehrkam <Thomas_Mehrkam@i-o.com>
+Erik Ivanenko <erik.ivanenko@utoronto.ca>
+Sarmeesha Reddy <sreddy@tr.comm.mot.com>
+Steven Tine <stevent@tr.comm.mot.com>
+Dave Steele <Dave_Steele@Mitel.COM>
+Simeon Simeonov <simeons@allaire.com>
+David H. Whittington <david.h.whittington@boeing.com>
+Ian MacDonald <ianmacd@bg.com>
+Rene Matteau <matteau@ca.ibm.com>
+Hans Ridder <ridder@veritas.com>
+Todd Mullanix <Todd.Mullanix@sylantro.com>
+Hai Vu <Hai_Vu@Mitel.Com>
+Paul Francis <pfrancis@dkl.com>
+Kristopher Johnson <kjohnson@gardnersys.com>
+Dave Butenhof <butenhof@zko.dec.com>
+Dominic Williams <dom@connected-place.co.uk>
+Srikumar Kareti <skareti@htc.honeywell.com>
+Ian Pepper <ian@aptest.ie>
+Kevin Lyda <kevin.lyda@trintech.com>
+James D. Rucker <jdrucker@huey.jpl.nasa.gov>
+Brian Wallis <Brian.Wallis@sr.com.au>
+Sandeep Goyal <sagoyal@hss.hns.com>
+englishmalc@my-dejanew.com
+Frank O'Dwyer <fod@brd.ie>
+Long Hoang <LHoang@hwdcsaws.cahwnet.gov>
+Steven D. Chen <sdc2951@aw101.iasl.ca.boeing.com>
+Alain Magloire <alain@qnx.com>
+Jim Rogers <jrogers@viasoft.com>
+Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com>
+David Brownell <david-b@pacbell.net>
+Richard Stallman <rms@gnu.org>
+Casey Lucas <clucas@sabre.com>
+Brian C. Olson <bolson@rtlogic.com>
+Joseph A. Condlin <jac@slpmbo.ed.ray.com>
+Serge Du <du@lal.in2p3.fr>
+Mike Mazurek <mmazurek@std.saic.com>
+Christian Schuderer <Christian.Schuderer@erl9.siemens.de>
+John R. Taylor <jrtaylor@george.lbl.gov>
+Bill Tovrea <gwtovrea@west.raytheon.com>
+Wallace Owen <owen@visicom.com>
+Vyacheslav A. Batenin <slavikb@iname.com>
+Edwin D. Windes <ewindes@usa.net>
+Christopher Kohlhoff <chris@kohlhoff.com>
+Andreas Terstegge <andreas.terstegge@nokia.com>
+Stefaan Kiebooms <stefaan@ghs.com>
+Keith Nichol <knichol@syscorp.com.au>
+Rebecca Sanford <Rebecca.A.Sanford@gd-is.com>
+Ram Vishnuvajjala <rvishnuvajjala@lucent.com>
+Tom Bradley <thomas.bradley@maisel-gw.enst-bretagne.fr>
+Shaun Ohagan <jk13@dial.pipex.com>
+Dale/Christine Wood <dale_wood@Mitel.COM>
+Robert Flanders <rdfa@eci.esys.com>
+Gul Onural <Gul_Onural@Mitel.COM>
+Stephen E Blake <stephen_e_blake@email.moore.com>
+Eric S Rosenthal <esr@netcom.com>
+Sridevi Subramanian <subrams@erols.com>
+Bruce Trask <BTRASK@contactsystems.com>
+Jake Hamby <jehamby@anobject.com>
+Rick Weisner <Rick.Weisner@East.Sun.COM>
+Dennis C. De Mars <demars@mminternet.com>
+V. Lakshmanan <lakshman@doplight.nssl.noaa.gov>
+Hata Yoshiaki <hatay@alpha.co.jp>
+Narayanan Vidya <CVN065@lmpsil02.comm.mot.com>
+Sean Landis <seanl@rsch.comm.mot.com>   
+Youzhong Liu <yoliu@cise.ufl.edu>
+
+I would particularly like to thank Paul Stephenson, who worked with me
+at Ericsson and is now at ObjectSpace.  Paul devised the recursive
+Makefile scheme that underlies this distribution and also spent
+countless hours with me discussing object-oriented techniques for
+developing distributed application frameworks.
+
+Finally, I'd also like to thank Todd L. Montgomery <tmont@cs.wvu.edu>,
+fellow heavy metal head, for fulfilling his quest to get ACE to
+compile with GCC!
+
+In conclusion, my goal is to see ACE continue to evolve and become a
+more comprehensive, robust, and well-documented C++ class library that
+is freely available to researchers and developers.  If you have any
+improvements, suggestions, and or comments, I'd like to hear about it.
+
+        Thanks,
+
+                Douglas C. Schmidt
+                schmidt@cs.wustl.edu
diff --git a/STL/ACE_Changes b/STL/ACE_Changes
deleted file mode 100644
index 902fb94c94c..00000000000
--- a/STL/ACE_Changes
+++ /dev/null
@@ -1,53 +0,0 @@
-This version of STL was obtained from
-http://www.rahul.net/terris/.  This is a modified version of the
-implementation that comes with VC++4.0.  Please see readme2.stl for
-details. 
-
-The following modification have been made for compilation with VC++4.x
-
-________________________________________
-
-vector.h (line 85)
-________________________________________
-
-
-    /*
-     *  This is cause the VC++ compiler sucks
-     *  and does not recognize nested classes properly
-     *       
-     */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
-	start = static_allocator.allocate(n);
-	uninitialized_fill_n(start, n, value);
-	finish = start + n;
-	end_of_storage = finish;
-    }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
-
-
-________________________________________
-
-bstring.h (line 1102)
-________________________________________
-
-
-    /* 
-     * This should be correctly scoped
-     *
-     * if (cap == ::reserve)
-     */
-
-    if (cap == std::reserve)
-    {
-       len = 0;
-       res = size;
-       ptr = new charT [res];
-    }
-    /* 
-     * This should be correctly scoped
-     *
-     *     else if ((cap == ::default_size) && (size != NPOS))
-     */
-
-    else if ((cap == std::default_size) && (size != NPOS))
diff --git a/STL/readme2.stl b/STL/readme2.stl
deleted file mode 100644
index 5132bc1189b..00000000000
--- a/STL/readme2.stl
+++ /dev/null
@@ -1,272 +0,0 @@
-STL2.ZIP
-
-Standard Template Library for Visual C++ 4.0 
-and Related Classes
-
-Revised 10/15/96 - Bug fixes and change to bit_vector.
-
-This version supports DLLs and threading.  You must use critical
-sections around code that uses the same container in different
-threads.  These features come at a price -- since memory
-usage is not optimal, this code may use more memory and
-may be slower.
-
-+ General strategy: Remove all statics except the
-  static allocator objects.  
-+ Vectors were not affected.
-+ Major changes made to tree.h
-+ Stability: Very stable.
-
-This code should be considered for experimental use only.  There
-are still statics lurking in some functions; these functions
-are not thread-safe.
-
--------------------------
-Fix for bit_vector
--------------------------
-This version also has a fix for bit_vector, which doesn't really
-work with VC++ 4.x.  Please include bvector.cpp in your
-project if you use bit_vector.  This fixes the linker errors
-that occur if you use bector.h in multiple .cpp files.
-
--------------------------
-Disclaimer
--------------------------
-Code is provided without warranty, liability, or technical support.
-
-STL.H and PTR.H are freely distributable and can be 
-modified in any way.
-
---------------------------------
-STRING.H does not compile.
---------------------------------
-
-"D. Pirzadeh" <ddp@crl.com> Explains how to fix:
-
-First, I got compile errors in "bstring.h"
-and changed it as follows to correct:
-        line 1104               "::reserve" -> "std::reserve"
-        line 1110               "::default_size" -> "std::default_size"
-
-Also, I got an INTERNAL COMPILER ERROR with Visual C++ v4.0 when I did the fol-
-lowing:
-        class xyz : public std::string { }
-
-I fixed it with:
-        typedef std::string XyzString;
-        class xyz : public XyzString { }
-
---------------------------------
-Changes made to STL distribution
---------------------------------
-
-These files were modified from the STL distribution shipped with 
-Microsoft Visual C++ 4.0.  The files here are a complete,
-working version of the STL.  These files have been tested with
-MFC applications.
-
-Changes were made to practically all header files.  Look for
-comments like:
-
-*Added by...
-*Changed by...
- 
-------------------
-Usage Instructions
-------------------
-
-Set the preprocessor variable NOMINMAX.
-
-As Microsoft recommends, the STL is compiled in the std namespace.
-
-When including these files, do **not** do this:
-
-	namespace std
-	{
-	  #include <vector.h>
-	}
-
-Instead, do this:
-
-	#include <vector.h>
-
-Recommended usage:
-
-	First, include:
-
-	#include <afxwin.h>
-	#include <afxext.h>
-	#include <afxtempl.h>
-
-	Then include the STL header files.
-
--------------------
-Support for CString
--------------------
-The stl.h file contains code written by me.  The file contains
-operators that will allow you to use CString objects with STL
-containers and functions.
-
-!!!! CString will not work with STL unless you include <stl.h> !!!!
-
--------------------------------------------
-Helper functions for pointers-in-containers
--------------------------------------------
-There is a file called stl.h which contains two functions:
-  SequenceDelete
-  MapDelete
-These functions send "delete" to all of the objects in a container.
-
-If you don't like this approach, you can use a supplied "pointer
-wrapper" class.
-
-There is a file called ptr.h which contains a class called Ptr 
-that can be used exactly like a pointer.  The object has a pointer 
-inside it that points to an object of any class.  When a Ptr object 
-is deleted, "delete" is sent to its underlying pointer.  Ptr can be 
-used with any STL container, as it has a copy constructor and 
-assignment operator, which transfers "ownership" of the pointer from 
-the source object to the destination object.  Ptr is from the book 
-Design Patterns by Gamma et al -- see the Proxy pattern.  
-
-The Ptr class makes memory leaks impossible, because it deletes
-objects automatically when the container is deleted, or when 
-functions like "delete" are used.
-
-Example:
-
-  This is a vector of CStrings:
-
-  std::vector< Ptr<CString> > StringVector;
-
-  StringVector.push_back( Ptr( new CString( "hello" ) ) );
-  StringVector.push_back( Ptr( new CString( "This is another string" ) ) );
-
-------------------------
-Common Problems with STL
-------------------------
-
-1) Compiler error: != is ambiguous
-
-   Solution: put the following line at the beginning of the method
-             that caused the error:
-
-   using namespace std;
-
-2) When using maps, the debugger crashes.
-
-   This is because symbols for maps (actually, for the "pair")
-   get truncated to 255 characters.  Solution:  Turn off the
-   variables window in the debugger.  Don't try to look at
-   a symbol that has been truncated.  This is not an STL-specific
-   bug --  It's a bug in the debugger.
-
-3) All sorts of compile errors in STL header files
-
-   Make sure the preprocessor variable NOMINMAX is defined
-
-
-4) Compiler errors about "operator < is not available", etc.
-   The class involved has global comparison operators.
-
-   Solution:
-   Write "routers" in the std namespace to the global namespace.
-   Example (see also stl.h - this is how CString is able
-   to work with STL):
-
-	namespace std
-	{
-		BOOL operator < ( const MyClass & rLhs,
-				  const AnotherClass & rRhs )
-		{
-		return ::operator < ( rLhs, rRhs );
-		}
-	}
-
-   See also 5.
-
-5) When you use find() or another algorithm, the compiler
-   complains that it cannot find the == or < operators.
-
-If your code compiles without any error messages, then disregard
-this section.  However, if you get errors like "cannot convert
-first argument from const class X" then read on. 
-
-I am assuming that your code is calling an STL algorithm like
-std::sort() or std::find().  If you're not, I can't help
-you.
-
-There is apparently a bug in the Microsoft compiler regarding
-namespaces.  Namespaces cannot locate global 
-functions that reside in the global namespace.  For example, 
-the binary == operator.
-
-Maybe this is a bug, maybe it isn't.  This is not clear
-to me.  However, I do know what works and have tried many other
-approaches that do not work.  If you have a better solution I
-would appreciate it if you could let me know about it. 
-
-So, if you declare your own class and want to use algorithms 
-like find() on an STL container, you have two choices:
-
-(1) Declare == as a member function.
-(2) Declare global operators == and !=.
-
-(1) simply works.  There will come a time, however, when (1)
-won't satisfy your needs.  If A == B, then B == A.  You can't
-do this using member functions if A and B are from different 
-classes.
-
-If you choose (2), you must add the != operator to the std
-namespace.  There are two ways to do this.  First, you can do
-this:
-   namespace std
-   { 
-     inline operator != ( const MyClass &rLhs, const MyClass &rRhs )
-     {
-       return ::operator != ( rLhs, rRhs );
-     }
-   }
-This "routes" != from the std namespace to the global namespace.
-
-Note that ( lhs != rhs ) can be derived from the == operator
-as !( lhs == rhs ).  There is a macro in STL.H, 
-STL_DECLARE_GLOBAL_NE, that does this derivation. 
-This derivation will not work when for whatever reason, !(lhs == rhs)
-is not the same as ( lhs != rhs ).
-
-The following example shows what you have to do for find().  Other
-algorithms require you to declare <, <=, and >= too.  See the
-macros STL_DECLARE_GLOBAL_GE, STL_DECLARE_GLOBAL_LT, and
-STL_GLOBAL_LE.  These macros derive new comparison operators
-from "operator <( const T&, const T& )".
-
-class MyClass
-{
-  public:
-  
-  int units;
-  CString description;
-};
-
-// We want to be able to test two MyClass objects against each other
-// in STL.  Need to create a global operator for this purpose.
-// Since we use find(), we need to declare not-equal too.
-bool operator == ( const MyClass &, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, MyClass )
-
-// These operators test for a matching description.
-// We do A == B and B == A to be consistent.
-bool operator == ( const MyClass&, const CString & );
-bool operator == ( const CString&, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, CString )
-STL_DECLARE_GLOBAL_NE( CString, MyClass )
-
-6. Errors when creating vectors that have vectors and deques
-   that have deques.
-
-   Solution:  Provide atruments to the constructor.
-
-    std::vector< std::vector<int> >
-      TwoDimensional( 0, std::vector<int>() );
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
index 159d7beaa6b..0c40916fb67 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile
+++ b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
@@ -67,7 +67,7 @@ marshal.h marshalC.cpp marshalS.cpp: marshal.idl
 	$(IDL) $(IDLFLAGS) $< 
 
 clean:
-	$(RM) core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
+	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
 	$(MAKE) realclean
 
 
diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile
index 8e512953752..845516695dd 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/Makefile
+++ b/TAO/Benchmark/Marshal_Test/TAO/Makefile
@@ -53,7 +53,7 @@ client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 clean:
-	$(RM) core *.o *~ client server
+	rm -f core *.o *~ client server
 	$(MAKE) realclean
 
 
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
index 3b0bf024df4..93cfc461a32 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
@@ -59,6 +59,6 @@ marshalC.h marshalS.h marshalC.cpp marshalS.cpp: marshal.idl
 	$(IDL) $(IDLFLAGS) $< 
 
 clean:
-	$(RM) core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
+	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
 	$(MAKE) realclean
 
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 306f4e69012..fc458dfd933 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,4429 +1,670 @@
-Wed Jul 07 21:28:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/Sched/DynSched.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.{cpp, h}
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.{cpp, h}
-          orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
-          orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
-          orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp: bug fixes from
-          testing the reconfig scheduler alongside the config scheduler.
-          Reconfig scheduler now executes with no exceptions and generates
-          a schedule in the Sched_Conf test.
-
-Wed Jul  7 21:16:24 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/ORB.cpp (multicast_to_service): Revised the code to use
-	  TAO_DEFAULT_IOR_SIZE rather than 2*BUFSIZ since we can
- 	  explicitly control this size, whereas BUFSIZ ranges a lot across
- 	  platforms.
-
-	* tao/orbconf.h: Added a new macro called TAO_DEFAULT_IOR_SIZE,
-	  which is set to 1024.
-
-Wed Jul  7 20:36:20 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-	* tao/ORB.{h,cpp}
-	* orbsvcs/orbsvcs/IOR_Multicast.cpp:
-	  Buffer of size BUFSIZ, which is used to receive the ior from
-	  Naming/Trading service in response to a multicast message, was
-	  allocated off the stack.  On some platforms (notably, NT), BUFSIZ
-	  wasn't big enough to house the ior, so the ior got truncated,
-	  and weird things happenned.  Updated the code, to allocate
-	  buffer space for ior dynamically, if what was allocated off the
-	  stack wasn't enough.  To make this simpler, changed
-	  <handle_input> method in TAO_IOR_Multicast to reply to the
-	  client with iovec, containing the length of the ior, followed by
-	  the ior itself.
-
-	  Fixed several memory leaks and other bugs in the surrounding code.
-
-Wed Jul 07 19:51:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/RtecScheduler.idl
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: fixed casting
-          problems reported by GHS and OSF1 builds.
-
-Wed Jul  7 19:24:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* docs/Options.html:
-	* tao/Makefile:
-	* tao/default_resource.h:
-	* tao/default_resource.cpp:
-	* tao/xt_resource.h:
-	* tao/xt_resource.i:
-	* tao/xt_resource.cpp:
-	  Removed the <xt> ReactorType from the default resource factory,
-	  it simply did not work because the context was not properly
-	  initialized.
-	  Added a new Resource_Factory that can create XtReactors, but
-	  only after the context has been properly set.
-
-	* tests/FL_Cube/svc.conf:
-	  Fixed the reactor type for this example
-
-	* tests/Xt_Stopwatch/client.cpp:
-	* tests/Xt_Stopwatch/server.cpp:
-	* tests/Xt_Stopwatch/svc.conf:
-	  Use the new TAO_XT_Resource_Factory in this example.
-
-Wed Jul 07 18:26:58 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-	* tao: Fixed determination of collocation.  It is not necessary to
-	  have a servant for a object to be collocated.  A servant manager
-	  or a default servant will also do.  Now Nanbor needs to take
-	  advantage of these changes by changing _narrow appropriately.
-
-Wed Jul 07 16:25:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbafwd.h,Exception.cpp (_tao_errno,_info):
-          1) Added support for these errnos:
-            EAGAIN, ENOMEM, EACCES, EFAULT, EBUSY, EEXIST
-          2) Changed minor code to use 5 bits for location and
-            7 for errno encoding, instead of 8 and 4, respectively.
-          3) If an unknown errno is given to _tao_errno, it
-            returns the low 7 bits.  These are stored directly
-            in the 7 bit minor code field.  _info then prints
-            out the value.  Not perfect, due to the loss of
-            information, but it often provides a lot more useful
-            information than it did before.  [18]
-
-Wed Jul  7 16:14:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Sequence_T.h:
-        * tao/Sequence_T.cpp:
-          Fixed assignment from TAO_Object_Field_T<> to
-          TAO_Object_Manager<>.
-
-Wed Jul  7 15:50:10 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp: Removed some commented out
-        code that was not required.
-
-Wed Jul  7 15:35:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * docs/Options.html:
-
-          Added documentation for the -ORBProtocolFactory option.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-
-          Changed some print statement to print on stderr so that they get
-          printed before the tests actually run.
-
-        * tao/UIOP_Acceptor.{h,cpp}:
-
-          Added a destructor to aid in post-error rendezvous point clean
-          up.
-
-        * tao/Acceptor_Registry.cpp (~TAO_Acceptor_Registry):
-
-          Added a call to TAO_Acceptor_Registry::close_all () in the
-          TAO_Acceptor_Registry destructor.  The call in the destructor
-          shouldn't be necessary since close_all () is already called by
-          the ORB, but it is safer to add the call to the destructor.
-
-        * tao/Acceptor_Registry.cpp (open, open_default):
-        * tao/Connector_Registry.cpp (open):
-
-          Added some useful and/or missing error checks.
-
-          Fixed some memory leaks that may occur when an error occurs.
-
-        * tao/Connector_Registry.cpp (TAO_Connector_Registry):
-
-          Added connectors_ member to the member initializer list.
-
-        * tao/Connector_Registry.cpp (create_profile):
-        * tao/default_resource.cpp (init):
-
-          Explicitly initialized some variables to fix potential
-          "uninitialized variable" warnings.
-
-        * tao/default_resource.cpp:
-
-          Added protocol_factories_ member to TAO_Default_Resource_Factory
-          member initializer list.
-
-          Fixed potential memory leaks due to failed (and unlikely)
-          insertions into the protocol factory set.
-
-        * tao/Resource_Factory.h (TAO_Protocol_Item):
-
-          Minor spelling correction in comment.
-
-Wed Jul  7 14:24:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/varout.h:
-        * tao/varout.i:
-        * tao/varout.cpp:
-        * tao/CDR_Interpreter.cpp:
-        * tao/DomainC.cpp:
-        * tao/DynAnyC.cpp:
-        * tao/IORC.cpp:
-        * tao/IORC.h:
-        * tao/IORC.i:
-        * tao/IORManipulation.cpp:
-        * tao/MessagingC.cpp:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.h:
-        * tao/Object.cpp:
-        * tao/PolicyC.cpp:
-        * tao/PollableC.cpp:
-        * tao/decode.cpp:
-        * tao/deep_free.cpp:
-        * tao/encode.cpp:
-          Changed TAO_Object_Field_T to take two arguments, that way it
-          can have an assignment operator from Object_Manager and properly
-          increment the reference count in that case [BUGID:16]
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/elemtype.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_access_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_include/be_sequence.h:
-        * TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h:
-        * TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h:
-          The IDL compiler generates proper code with two arguments now.
-
-        * tests/Param_Test/tmplinst.cpp:
-          Fixed template instantiations
-
-        * examples/Simple/bank/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl:
-          Fixed output and fine tune execution time.
-
-Wed Jul 07 13:07:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * rules.tao.GNU: removed check for whether we should add
-          -Wno-uninitialized with g++.  We were no longer using
-          it anyways, and the check was causing a warning if the
-          compiler wasn't on the user's PATH.
-
-Wed Jul  7 12:59:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Invocation.cpp:
-          Fixed the timeout computations so it works in platforms without
-          native 64 bit ints.
-
-        * tao/ORB.cpp:
-          It was not compiling in platforms without native C++
-          exceptions.
-
-Wed Jul  7 12:49:13 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Concurrency_Service/Concurrency_Service.cpp:
-        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp:
-        * orbsvcs/tests/Concurrency/CC_client.cpp:
-        * orbsvcs/tests/Concurrency/CC_command.cpp:
-        * orbsvcs/tests/Concurrency/CC_naming_service.cpp:
-        * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
-        * orbsvcs/tests/Concurrency/CC_tests.cpp:
-          The concurrency service compiles now, and does not use any of
-          the old TAO_TRY macros.  It is still disabled because it is so
-          rarely used.
-
-        * tests/NestedUpcall/Simple/Makefile:
-          Updated dependencies
-
-Wed Jul 07 12:41:17 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/compiler.html: Added documentation on how to control the
-          generation of collocation stubs of different strategies.
-
-Wed Jul 07 09:47:58 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
-          (~Cubit_Factory_i): Removed the deactivation of the servant in
-          ~Cubit_Factory_i. The deactivation was actually already
-          performed when ORB::shutdown was called. When the deactivation
-          was happening again in ~Cubit_Factory_i, implicit activation was
-          actually reregistering the servant, just to be immediately
-          deactivate it.  I would not have noticed this if it weren't for
-          the fact that on some platforms, the second deactivation occurs
-          before the shutdown() upcall completes, causing the second
-          deactivation to fail since the servant is still in the active
-          object map.
-
-Wed Jul  7 03:17:52 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html: Removed the -ORBReactorLock entry into the
-          Resource_Factory section and replaced it with a note.  Removed
-          the -ORBColTable entry from the Resource_Factory section.
-
-          Removed the -ORBColTblLockType entry from the
-          Server_Strategy_Factory section.
-
-          Added the -ORBEventLoopLock entry into the
-          Server_Strategy_Factory section.  Added the -ORBProtocolFactory
-          entry into the Resource_Factory section.  Somebody, document us.
-
-Tue Jul  6 22:23:01 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test2.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl,
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl,
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-          Updated these scripts to use Naming_Server rather than Naming_Service
-          to match the change described in the next bullet.
-
-        * orbsvcs/Naming_Service: Renamed the executable for the Naming Service
-          to "Naming_Server", which is more descriptive.
-
-        * orbsvcs/Naming_Service: Created a new file called Naming_Server.cpp
-          that contains the main() function.  This makes it easy for folks
-          to reuse the TAO Naming Service in other ways, such as
-          integrating it with the Windows NT Service Config Manager.
-          Thanks to Gul Onural <Gul_Onural@Mitel.COM> for suggesting this.
-
-Tue Jul 06 22:22:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp: added explicit
-          template instantiations for auto_ptr classes.
-
-Tue Jul  6 16:54:32 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp: Fixed several
-          'unreachable statements' warnings in <run> method.
-
-Tue Jul  6 16:35:19 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * replaced calls to printf in IORTest.ccp with ACE_DEBUG
-
-Tue Jul  6 15:55:12 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html:
-        * tao/ORB_Core.cpp (init): Merged the flags '-ORBCollocation yes/no'
-          and '-ORBGlobalCollocation yes/no'.  The collocation policy is
-          now controlled only by the flag '-ORBCollocation
-          yes/global/per-orb/no'.  Thanks to Irfan for suggesting this.
-
-Tue Jul  6 15:31:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/GIOP.h:
-        * tao/GIOP.cpp:
-        * tao/IIOP_Transport.h:
-        * tao/IIOP_Transport.cpp:
-        * tao/Pluggable.h:
-        * tao/Pluggable.cpp:
-        * tao/UIOP_Transport.h:
-        * tao/UIOP_Transport.cpp:
-        * tao/Wait_Strategy.cpp:
-          Completed the implementation of timeouts when using
-          Block_On_Read (RW) and Block_On_Select (ST) client connection
-          handlers. [BUG ID 12]
-
-        * tests/Timeout/run_test.pl:
-          Fine tune the test so there are more significant samples in the
-          execution.
-
-Tue Jul 06 15:05:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Makefile:  added
-          -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched, so that DU cxx 6.2
-          can find Reconfig_Scheduler_T.cpp for template instantiation.
-
-Tue Jul 06 14:15:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.{cpp, h}:
-          added missing template instantiations, fixed exception
-          specification problems reported by Sun C++, OSF1 cxx.
-
-
-Tue Jul 06 13:00:00 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp (servant_locator_cleanup): Using the
-          zero'ness of the cookie to determine if we need to call the
-          servant locator <postinvoke> method is not a good idea since the
-          cookie itself might be set to zero by the user. Therefore, a new
-          and separate variable <using_servant_locator_> is used for this
-          purpose.
-
-        * tao/POA.cpp: Made sure to setup and teardown the single threaded
-          poa lock for servants returned from servant managers.  Thanks to
-          Mike Moran <mm4@cs.wustl.edu> for pointing this out.
-
-          In addition, _add_ref() was not being invoked on a servant
-          returned from a servant activator.  This is fixed now.
-
-        * tao/ORB.cpp (_get_collocated_servant): Factored out some common
-          code into <_find_collocated_servant>.
-
-Tue Jul  6 12:05:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Simple/bank/run_test.pl:
-          Remove the IOR file before running the server
-
-        * examples/Simple/bank/Bank_Client_i.cpp:
-          Fixed debugging messages.
-
-Tue Jul 06 11:36:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Multiple/Makefile: don't build EC_Multiple
-          with g++ prior to 2.8, because it causes g++ 2.7.2.3 (the
-          compiler) to core dump.
-
-Tue Jul  6 11:31:44 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/MT_Client/client.cpp:
-          Fixed warning in IRIX when compiled without debugging info.
-
-Tue Jul  6 11:01:57 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Connector.cpp (connect):
-
-          Minor update to size of character array that is only used when
-          ORB debugging output is enabled.
-
-Tue Jul  6 10:25:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Timeout/Makefile:
-          Added -Ge 1 flag to the IDL compiler invocation
-
-Tue Jul  6 09:42:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Invocation.cpp:
-          Cast the arguments in a call to ACE_Time_Value::set to long from
-          CORBA::ULongLong to avert an MSVC warning.
-
-Mon Jul  5 21:20:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Connector_Registry.h:
-        * tao/Connector_Registry.cpp:
-        * tao/GIOP.h:
-        * tao/GIOP.cpp:
-        * tao/Wait_Strategy.h:
-        * tao/Wait_Strategy.cpp:
-        * tao/Invocation.h:
-        * tao/Invocation.cpp:
-        * tao/Pluggable.h:
-        * tao/Pluggable.cpp:
-        * tao/Reply_Dispatcher.cpp:
-        * tao/Transport_Mux_Strategy.cpp:
-        * tao/UIOP_Connector.h:
-        * tao/UIOP_Connector.cpp:
-        * tao/UIOP_Transport.h:
-        * tao/UIOP_Transport.cpp:
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Transport.h:
-        * tao/IIOP_Transport.cpp:
-          Added support for timeouts in the ORB.
-          The Invocation classes keep track of the total time allowed for
-          the request, this time is used to limit the duration of every
-          expensive operation (connecting to the server, sending the
-          request, receiving the reply, etc.).
-          After each operation the total time is decremented, this is
-          specially important if the operation requires transparent
-          rebinds and forwarding.
-
-        * tao/corbafwd.h:
-        * tao/Exception.cpp:
-        * tao/docs/Tags.html:
-          Added new minor codes to document the timeouts.
-
-        * tests/Makefile:
-        * tests/Timeout/Makefile:
-        * tests/Timeout/README:
-        * tests/Timeout/client.cpp:
-        * tests/Timeout/run_test.pl:
-        * tests/Timeout/server.cpp:
-        * tests/Timeout/test.idl:
-        * tests/Timeout/test_i.cpp:
-        * tests/Timeout/test_i.h:
-        * tests/Timeout/test_i.i:
-          A simple test for timeouts.
-
-        * tests/Timeout/client.dsp:
-        * tests/Timeout/server.dsp:
-        * tests/Timeout/Timeout.dsw:
-        * version_test.dsw:
-        * tests/TAO_Tests.dsw:
-          Added project files for the new Timeout test.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-          The test for UIOP required the 'English' module.
-
-        * tao/Typecode_Constants.cpp:
-          Fixed memory leak, the CORBA::ORB::_tc_InvalidName type code was
-          not released.  Thanks to Marina for reporting this problem.
-
-Mon Jul 05 20:50:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h: added missing explicit
-          template instantiations, fixed TAO_String_Manager warnings and
-          incorrect type instantiation errors.
-
-Mon Jul  5 20:44:44 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/Acceptor_Registry.cpp (open, open_default):
-
-          Moved loop that iterates over the protocol factories to an outer
-          level since it only needs to be run once for each protocol.
-          Previously it was being run for each addr within a given
-          endpoint.  The code flow now makes more sense. This fix also
-          removes and simplifies some code in the open_default() method.
-          Bonus!
-
-          Add a test that checks if a usable protocol was found.  If one
-          wasn't found then return an error.
-
-        * tao/Makefile:
-
-          Updated dependencies.
-
-Mon Jul  5 19:47:04 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
-        * orbsvcs/orbsvcs/Naming/Entries.h
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
-        * orbsvcs/orbsvcs/Naming/Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Naming_Context.h
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.h
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h :
-          Fixed several memory leaks that were due to superclass
-          destructors not being virtual.  Updated the implementation to
-          reflect several changes/clarifications from the INS
-          specification (mostly regarding exception conditions).  Added
-          comments, cleaned up the code, etc. in the remaining files,
-          which brings my 'review' of Naming implementation files to a
-          close.
-
-        * orbsvcs/orbsvcs/Naming/README
-          Added a short description about the structure of implementation
-          files.
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-          Destroy the POA on shutdown.
-
-        * orbsvcs/Naming_Service/README
-          Updated the file and added description of
-          implementation-specific policies.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp
-          Updated test to reflect changes in the behaviour of the Naming
-          Service (due to clarifications in the INS spec).
-
-Mon Jul 05 17:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/RtecScheduler.idl
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.{cpp, h}
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils[_T].{cpp, h}: bug
-          fixes from testing, added missing schedule configuration code.
-
-Mon Jul 05 16:06:51 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Exception.cpp (_info): Added _info() to CORBA::Exception and
-          CORBA::SystemException. This allows the user to get the
-          exception information as a string and does not force the user to
-          have the print out the information.  Note that _info() is a TAO
-          specific method.
-
-Mon Jul 05 15:16:58 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/compiler.html: Added instructions on using environment
-          variables CPP_LOCATION and TAO_IDL_DEFAULT_CPP_FLAGS.
-          Also reformatted the document a bit.
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init): Allow users to
-          customize the command line options passed to the preprocessor so
-          it's easier to use TAO_IDL for cross compilation.  Thanks to
-          David for reporting the problem.
-
-Mon Jul 05 14:01:44 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Exception.cpp (CORBA_Exception): Made the default
-          constructor similar to the other constructors. The <refcount_>
-          starts off at 0.
-
-Mon Jul  5 13:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: fixed a number
-          of errors and warnings detected by various compilers that
-          fully instantiate all template methods.
-
-Mon Jul  5 12:18:46 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Added new Borland Makefiles.  Thanks to Christopher Kohlhoff
-          <chris@kohlhoff.com> for these.
-
-Mon Jul  5 11:07:04 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Modified a check of the char value in an AST_Expression
-          to work also with unsigned chars. which is apparently
-          the type used by IRIX, since a warning from that
-          platform prompted this change.
-
-Mon Jul  5 10:09:15 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/objref.cpp:
-          Moved an unreachable return statement.
-
-Sun Jul  4 22:27:42 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-
-          Added a UIOP IDL_Cubit run.
-
-Sun Jul 04 18:57:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO-INSTALL.html: added link to ACE-INSTALL#VxWorks/NT.
-
-Sun Jul 04 15:41:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * many Makefiles: call ace_components via sh, instead of
-          directly in the make $(shell) command.  This allows it
-          to work on platforms that don't have /bin/sh, such as NT.
-
-Sun Jul  4 14:43:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/Options.html:
-        * docs/configurations.html:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic:
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Client_Strategy_Factory.h:
-        * tao/Stub.cpp:
-        * tao/default_client.cpp:
-        * tao/default_client.h:
-        * tests/MT_Client/client.conf:
-          Changed the name of the -ORBIIOPProfileLock option to
-          -ORBProfileLock, leave the old option there with a warning for
-          backwards compatibility.
-
-Sat Jul  3 19:06:06 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-          Initialized some pointers at declaration to avoid
-          Linux/egcs warnings.
-
-Sat Jul  3 18:00:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Added a check in printing char literal for '. Like \,
-          isprint() sees this as a printable character, and it is
-          not stored in AST_Expression with its escape backslash.
-          Thanks to Bala for pointing out this case.
-
-Sat Jul  3 17:44:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-          The scan_obv_token() function was bypassing the keyword
-          table lookup before assigning. Since 'public' and
-          'private' are in the keyword lookup table, they were
-          getting mapped as identifiers without the _cxx_ prepend,
-          since they are also OBV tokens.
-
-Sat Jul  3 16:41:52 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-          Fixed a previous change to one of the lex rules for
-          float that wasn't quite right. Thanks to Bala for
-          finding the case where it still didn't work.
-
-Sat Jul 03 14:40:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.{cpp, dsp, h (new)}:
-          refactored Scheduling Service to use a class for options etc.,
-          added -p option for file name in which to write service pid,
-          added -o option for file name in which to write servant ior,
-          added -s <CONFIG | reconfig> option to specify whether service
-          uses config or reconfig scheduler implementation.
-
-        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
-          orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp: replaced TAO
-          try macros with ACE try macros.
-
-Sat Jul 03 14:04:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile, orbsvcs/orbsvcs/Makefile: call ace_components
-          via sh, and use single instead of double quotes, so that it
-          works with Cygwin on NT host.
-
-Sat Jul  3 13:05:00 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/server.cpp (main): Removed
-          an unreachable ACE_TRY_CHECK.
-
-        * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp: Replaced the
-          TAO_THROW macros with ACE_THROW macros.
-
-Sat Jul 03 09:30:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h: Added
-          #include "ace/inc_user_config.h" prior to conditional compilation
-          guard for old (pre 2.8) g++, in order to remove a precompiler
-          warning by OSF1 cxx.
-
-Fri Jul 02 22:27:53 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          Fixed unitiliazed variable problem in TAO_ORB_Table.
-
-        * version_test.dsw:
-          Removed obsolete projects in
-          $TAO_ROOT/tests/NestedUpcall/Reactor
-
-        * orbsvcs/examples/RtEC/Simple/Simple.dsw:
-        * orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.dsp:
-        * orbsvcs/examples/RtEC/Simple/EC_Simple_Service.dsp:
-        * orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.dsp:
-          Added new project files for the simple real-time EC example.
-
-        * orbsvcs/tests/Event/Basic/BCast.dsp:
-          Removed unnecesary libraries.
-
-Fri Jul  2 21:09:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-          We were depending on the fact that the first ORB in the
-          ORB_Table iterator was the first ORB created, but this is not
-          guaranteed by the underlying data structures.  We keep track of
-          the first ORB explicitly now.
-
-        * orbsvcs/examples/Makefile:
-        * orbsvcs/examples/RtEC/Makefile:
-        * orbsvcs/examples/RtEC/Simple/Makefile:
-        * orbsvcs/examples/RtEC/Simple/README:
-        * orbsvcs/examples/RtEC/Simple/ec.conf:
-        * orbsvcs/examples/RtEC/Simple/run_test.pl:
-        * orbsvcs/examples/RtEC/Simple/Service.cpp:
-        * orbsvcs/examples/RtEC/Simple/Supplier.h:
-        * orbsvcs/examples/RtEC/Simple/Supplier.cpp:
-        * orbsvcs/examples/RtEC/Simple/Consumer.h:
-        * orbsvcs/examples/RtEC/Simple/Consumer.cpp:
-          Added the simplest example i could think of
-
-Fri Jul  2 19:30:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h
-          orbsvcs/orbsvcs/Sched/Strategy_Scheduler.{cpp, h}: Removed
-          RMS_Dyn scheduling strategy from TAO.
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils[_T].{cpp, h, i}
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler[_T].{cpp, h, i}:
-          integrated reconfig scheduler into scheduling service, cleaned
-          up errors: factored template code out into separate files for NT.
-
-Fri Jul  2 17:50:56 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/{IIOP,UIOP}_Profile.cpp (to_string):
-
-          Removed code that adds one to length of string for the "null
-          terminator" in calls to CORBA::string_alloc().
-          CORBA::string_alloc() already allocates additional space for the
-          null terminator.
-
-        * tao/Connector_Registry.{h,cpp}:
-
-          Added an object_key_delimiter() method that returns the object
-          key delimiter that the protocol in a provided URL style IOR
-          uses.
-
-        * tao/Pluggable.h:
-        * tao/{IIOP,UIOP}_Connector.h:
-
-          Made check_prefix() and object_key_delimiter() methods public.
-          There is no need for them to be otherwise.  This change was also
-          needed so that the TAO_Connector_Registry could call them.
-
-        * tao/ORB.cpp (resolve_initial_references):
-
-          Generalized this method so that it is now non-protocol
-          specific by using the newly added object_key_delimiter() method
-          in the TAO_Connector_Registry.
-
-        * tao/ORB.{h,cpp}:
-
-          Moved URL style string to object conversion code into a separate
-          routine to improve code readability.
-
-          Updated some exception handling code.
-          Various pluggable protocol related code cleanups and updates.
-          Removed null pointer checks in *String_var destructors and
-          assignment operators since it is safe to pass a null pointer to
-          CORBA::string_free().
-
-        * tao/MProfile.h:
-
-          Added default value of zero to TAO_MProfile (CORBA::ULong)
-          constructor.  This is just a coding style change.
-
-        * tao/corbafwd.i:
-
-          Added a line to force Emacs into C++ mode.
-
-Fri Jul  2 15:29:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-          Modified idl_escape_reader() to use the new
-          idl_atoui() function. Changes to idl_atoi(),
-          which was called from here formerly, were
-          causing incorrect return values.
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Added a check for char values < 0 before printing
-          char literals. If one is found, it is output as
-          a signed integer. This handles larger values of
-          hex and octal escape sequences in a portable and
-          overflow-safe way.
-
-Fri Jul  2 14:50:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-          Use close() instead of unsubscribe() to close the
-          SOCK_Dgram_Mcast in the TAO_ECG_Mcast_EH class. Thanks to Robert
-          V. Head <rhead@virtc.com> for tracking down this problem and
-          suggesting the fix.
-
-Fri Jul  2 14:14:28 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/{IIOP,UIOP}_Profile.cpp (parse_string):
-
-          More exception handling fixes.
-
-        * tao/IIOP_Profile.cpp:
-
-          Modified code that causes g++ 2.7.x to complain.
-
-Fri Jul  2 14:03:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/ub_objref_seq.cpp:
-          Fixed typo in this file.
-
-Fri Jul 02 13:26:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * version_test.dsw
-        * orbsvcs/tests/tests.dsw
-
-          Removed Concurrency tests (since they don't compile currently).
-
-        * tests/NestedUpcall/Simple/client.cpp: Fixed exception handling
-          typos.
-
-Fri Jul  2 12:39:42 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * docs/Tags.html:
-
-          Updated "location encoding" table with the three new minor
-          exception codes I added.
-
-Fri Jul  2 11:53:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/Sequence_T.cpp:
-
-          Removed some unnecessary null pointer checks that were performed
-          before calling delete.
-
-          Minor exception handling updates.
-
-Fri Jul  2 12:06:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-        * tao/Typecode_Constants.cpp:
-        * tests/InterOp-Naming/INS_test_client.cpp:
-        * tests/InterOp-Naming/run_test.pl:
-          The CORBA::ORB::InvalidName exception was broken and crashed the
-          application if raised. Thanks to Eugene Surovegin
-          <ebs@glasnet.ru> for pointing out this problem.
-
-Fri Jul  2 11:13:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IORC.i:
-        * tao/Sequence_T.cpp:
-
-          Fixed uninitialized variable warnings.
-
-        * tao/Pluggable.h (TAO_Connector):
-        * tao/Pluggable.cpp (make_mprofile):
-        * tao/{IIOP,UIOP}_Connector.h (TAO_{IIOP,UIOP}_Connector):
-        * tao/{IIOP,UIOP}_Connector.cpp (make_profile):
-
-          Removed the return value from make_profile().  This was a case
-          where an error return value was "competing" with native
-          exception handling.  It makes more sense to handle the exception
-          alone. Thanks to Carlos for talking this issue through with me.
-
-        * tao/IIOP_Connector.h (TAO_IIOP_Connector):
-
-          Added a default value for the CORBA_Environment argument in
-          make_profile().
-
-        * tao/{IIOP,UIOP}_Transport.*:
-
-          Comment updates and some cosmetic updates.
-
-Fri Jul 02 11:11:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
-          Fixed bug in the EC_Dispatching_Task, one of the variables was
-          not initialized in the constructor.
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-          The options are case insensitive, but we use intercapts to make
-          them more readable.
-
-        * docs/ec_options.html:
-          Added new document describing the EC options.
-
-Fri Jul  2 11:00:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/ge_unbounded_obj_sequence_ci.cpp:
-          Assigned pointers to 0 before plugging them into ACE_NEW (in
-          generated code). Averted some Linux/egcs warnings.
-
-Fri Jul  2 10:52:05 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp:
-          Fixed few IRIX warnings thanks to Carlos.
-
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp (TAO_AV_Child_Process):
-          Moved the naming service unbind code from ~TAO_AV_Child_Process
-          to a helper function unbind_names to avoid IRIX errors. Thanks
-          to Carlos for helping with this.
-
-Fri Jul  2 09:49:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/PP_Test_Server.cpp:
-          Put back an ACE_CHECK macro removed by some previous
-          fix.
-
-        * TAO/tests/Param_Test/any.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_short_seq.cpp:
-        * TAO/tests/Param_Test/bd_str_seq.cpp:
-        * TAO/tests/Param_Test/bd_string.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_struct_seq.cpp:
-        * TAO/tests/Param_Test/complex_any.cpp:
-        * TAO/tests/Param_Test/except.cpp:
-        * TAO/tests/Param_Test/fixed_array.cpp:
-        * TAO/tests/Param_Test/fixed_struct.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/big_union.cpp:
-        * TAO/tests/Param_Test/ub_string.cpp:
-        * TAO/tests/Param_Test/objref_struct.cpp:
-        * TAO/tests/Param_Test/short.cpp:
-        * TAO/tests/Param_Test/ulonglong.cpp:
-        * TAO/tests/Param_Test/typecode.cpp:
-        * TAO/tests/Param_Test/ub_any_seq.cpp:
-        * TAO/tests/Param_Test/ub_long_seq.cpp:
-        * TAO/tests/Param_Test/ub_objref_seq.cpp:
-        * TAO/tests/Param_Test/ub_short_seq.cpp:
-        * TAO/tests/Param_Test/ub_str_seq.cpp:
-        * TAO/tests/Param_Test/var_struct.cpp:
-        * TAO/tests/Param_Test/var_array.cpp:
-        * TAO/tests/Param_Test/recursive_struct.cpp:
-          Removed the return statement from inside some
-          ACE_CATCHANY blocks and also removed the
-          ACE_NOTREACHED wrapper from the return statement
-          following each block. This keep some compilers
-          from getting confused, either by reaching the end
-          of a non-vois function or having the last statement
-          of the function unreachable.
-
-Fri Jul  2 09:25:12 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/append.cpp:
-          Initialized some variables that were causing Linux/egcs warnings in
-          TAO_Marshal_Objref::append().
-
-Thu Jul 01 22:31:06 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA: Made sure that the POA correctly deals with servants
-          that have been deactivated but are still in the active object
-          map since there are still some requests running on them.  Also,
-          reactivation of such servants must wait till the deactivation
-          completes.
-
-        * tests/POA/Deactivation: This program tests the reactivation of a
-          servant that has been deactivated but not removed from the
-          Active Object Map yet.
-
-        * tests/NestedUpcall/Simple:
-
-          This is a test of the nested upcall feature in TAO.  The client
-          will start off by calling the server and providing a callback
-          object and a time-to-live number.  The server will callback the
-          client (using the callback object) and decrement the
-          time-to-live number. The client will turn around and call the
-          server again.
-
-          The above process of calling each other will continue until the
-          time-to-live number reaches zero.
-
-          Both client and server can be run in multi-threaded mode.  A
-          multi-threaded client can be used to check the client side
-          leader follower model, while the multi-threaded server can be
-          used to check the integration of the leader follower model of
-          the TP reactor and the client side leader follower model in the
-          ORB.
-
-          In addition, the server can be used with the
-          thread-per-connection model.
-
-        * tests/NestedUpcall/MT_Client_Test
-        * tests/NestedUpcall/Triangle_Test
-
-          Fixed the above two tests. The servant was been killed before
-          the POA died, without letting the POA know that the servant has
-          deactivated.
-
-        * tests/NestedUpcall/Reactor: Removed old and complicated test.
-          Replaced by tests/NestedUpcall/Simple.
-
-        * version_test.dsw: New workspace that contains projects from:
-
-          - ACE_wrappers/ace
-          - ACE_wrappers/apps/gperf
-          - ACE_wrappers/tests
-          - ACE_wrappers/TAO/tao
-          - ACE_wrappers/TAO/TAO_IDL
-          - ACE_wrappers/TAO/orbsvcs
-          - ACE_wrappers/TAO/orbsvcs/tests
-          - ACE_wrappers/TAO/orbsvcs/tests/Event
-          - ACE_wrappers/TAO/examples
-          - ACE_wrappers/TAO/tests
-          - ACE_wrappers/TAO/performance-tests
-
-Thu Jul  1 22:29:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_visitor_decl.h:
-          Fixed include's to compile on Unix boxes.
-
-Thu Jul  1 22:23:15 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IIOP_Profile.h:
-
-          Removed extraneous forward declaration.
-
-Thu Jul  1 19:42:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp (parse_args):
-
-          Added check for invalid number of iterations (<=0).
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp:
-
-          Added all initializable Cubit_Server members to the
-          Cubit_Server constructor member initializer list.  This fixes a
-          segmentation fault that occurs in the ~Cubit_Server destructor
-          when deleting an uninitialized factory_impl_ member.
-
-        * tao/Exception.cpp (_tao_print_system_exception):
-        * tao/corbafwd.h:
-
-          Added some minor codes for the CORBA::INV_OBJREF() system
-          exception to aid in pin-pointing object reference related
-          exceptions.
-
-        * tao/Exception.h:
-
-          Added some documentation that explains what each CORBA system
-          exception implies.
-
-        * tao/{IIOP,UIOP}_Profile.cpp (parse_string):
-        * tao/{IIOP,UIOP}_Connector.cpp (make_profile):
-        * tao/Connector_Registry.cpp (make_mprofile):
-        * tao/Pluggable.cpp (make_mprofile):
-
-          Exception handling fixes.  Exception handling code was working
-          but it was based on old code that needed updating.  Corrected
-          exceptions that get thrown.  CORBA::string_to_object() is
-          supposed to throw an INV_OBJREF system exception.  The methods
-          that were fixed all get called when CORBA::string_to_object() is
-          called.
-
-        * tao/IIOP_Profile.{h,i,cpp}:
-        * tao/UIOP_Profile.cpp:
-
-          Updated to use CORBA::String_var to fix potential exception
-          safety problems.
-
-        * tao/UIOP_Connect.cpp:
-
-          Cosmetic updates.
-
-        * tao/Acceptor_Registry.i:
-
-          Added a comment to force C++ mode in Emacs.
-
-        * tao/Makefile:
-
-          Updated dependencies.
-
-        * rules.tao.GNU:
-
-          Enabled uninitialized variable warnings for EGCS.  There no
-          longer appears to be a need to keep this warning disabled since
-          recent versions of EGCS appear to be better behaved.
-
-        * tao/decode.cpp (decode):
-
-          Fixed "uninitialized variable" warning.
-
-Thu Jul  1 21:43:29 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/idl.ll:
-        * TAO_IDL/lex.yy.cpp:
-          A couple of changes to the scanner's regular
-          expressions - one to allow decimal point
-          numbers without a leading integer to be
-          assigned to float and double constants, the
-          other to allow the escape character '\"' to
-          appear in string literals. Thanks to Carlos
-          for suggesting a regular expression for the
-          latter that was very, very close.
-
-Thu Jul  1 21:37:10 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
-        * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp:
-        * TAO_IDL/be/be_visitor_decl.cpp:
-        * TAO_IDL/be_include/be_visitor_decl.h:
-          Fixed a couple of related bugs - (1) anonymous array
-          containing an anonymous sequence, contained in
-          struct, union, or exception and (2) typedef'd
-          array containing anonymous sequence. Added a helper
-          method to be_visitor_decl, and code in the
-          be_visitor_array files to recognize the case and
-          call the function.
-
-          Added comments in the union_branch and exception
-          cdr_op_ci.cpp files.
-
-          There was also a problem with an exception containing
-          an array, whether typedef'd or not. The copy constructor,
-          constructor from arg list, and assignment operator were
-          all just assigning the arg array to the member array,
-          which caused C++ compile errors. We now use the
-          array's *_copy() function for this.
-
-Thu Jul 01 21:14:56 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.4 released.
-
-Thu Jul 01 18:01:13 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/tests.dsw:
-        * orbsvcs/tests/Concurrency/CC_client.dsp:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.dsp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.dsp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.dsp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.dsp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.dsp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.dsp:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf.dsp:
-        * orbsvcs/tests/Simple_Naming/client.dsp:
-        * orbsvcs/tests/Trading/Colocated_Test.dsp:
-        * orbsvcs/tests/Trading/Export_Test.dsp:
-        * orbsvcs/tests/Trading/Import_Test.dsp:
-        * orbsvcs/tests/Trading/TradingLib.dsp:
-          Fixed several .dsp files, the Release version had several broken
-          paths and options, obsolete or removed tests were still listed,
-          etc.
-
-Thu Jul  1 19:46:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/Makefile:
-          Fixed order of libraries so the test would compile with static
-          libraries.
-
-Thu Jul  1 12:37:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/decode.cpp:
-          Fixed interpretive demarshaling of object references inside
-          unions, this was breaking Param_Test for big_union using DII.
-
-        * tests/Multiple_Inheritance/Multiple_Inheritance_i.h:
-        * tests/Multiple_Inheritance/server.cpp:
-          This test crashed on Sun/CC 5.0 because there was no explicit
-          constructor, the compiler generated constructor was broken.
-
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-          Fine tune the test timeout.
-
-        * tests/Param_Test/run_test.pl:
-          The test was falling off the end without an explicit exit
-          status.
-
-        * orbsvcs/tests/Property/run_test.pl:
-          Remove the IOR files before waiting for it
-
-Thu Jul 01 00:45:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/Makefile: changed location
-          for idl2java from Visibroker 3.3 to 3.4.
-
-        * examples/Simulator/Event_Supplier/DualEC_Sup.h
-          examples/Simulator/Event_Supplier/Event_Sup.cpp
-          examples/Simulator/Event_Supplier/Logging_Sup.cpp: fixed constness
-          warnings generated by Sun C++ 5.0.
-
-        * examples/Simulator/Event_Supplier/Makefile: added -I($TAO_ROOT) and
-          -Ge 1 to TAO_IDL flags.
-
-Thu Jul  1 10:45:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Trading/run_test.pl:
-          The export_test must be shutdown using a signal, it does not
-          exit on its own.
-
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-          There was an error in the logic of the program, probably
-          introduced in the hectic activity to get exceptions to work.
-
-        * orbsvcs/Trading_Service/Trading_Service.cpp:
-          The POA manager was not activated
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-          Fixed some more typos that i missed last time.
-
-        * examples/Event_Comm/Event_Comm_i.cpp:
-        * examples/Quoter/Generic_Factory_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-          Fixed unreachable statements warnings in DU/CXX, thanks to David
-          for reporting this problems.
-
-Thu Jul 01 00:45:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEMIB/AnyAnalyser.cpp
-          examples/Simulator/DOVEMIB/DOVEMIB.{cpp, h}
-          examples/Simulator/DOVEMIB/PrintVisitor.cpp
-          examples/Simulator/DOVEMIB/any_test_i.cpp
-          examples/Simulator/DOVEMIB/clnt.cpp
-          examples/Simulator/DOVEMIB/svr.cpp
-          examples/Simulator/Event_Supplier/DOVE_Supplier.{cpp, h}
-          examples/Simulator/Event_Supplier/DualEC_Sup.cpp
-          examples/Simulator/Event_Supplier/Event_Con.cpp
-          examples/Simulator/Event_Supplier/Event_Sup.cpp
-          examples/Simulator/Event_Supplier/Logging_Sup.cpp: Fixed exception
-          specifications and replaced TAO try macros with ACE try macros.
-          Thanks to Randy Heiland <heiland@ncsa.uiuc.edu> for reporting
-          these problems.
-
-Wed Jun 30 21:09:34 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Options.cpp:
-        * orbsvcs/ImplRepo_Service/Repository.cpp:
-        * orbsvcs/ImplRepo_Service/Repository.h:
-        * orbsvcs/ImplRepo_Service/tao_ir_i.cpp:
-          Fixed #pragma based instantiations and made several minor
-          cosmetic changes.
-
-Wed Jun 30 19:29:53 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/IORManipulation/IORTest.cpp:
-          Fixed debug message.
-
-Wed Jun 30 18:17:00 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynEnum_i.cpp:
-          Added an ACE_UNUSED_ARG macro to get_longlong().
-
-Wed Jun 30 18:14:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Repository.cpp:
-          Fixed template instantiations, the ACE_Equal_To<ACE_CString>
-          template was instantiated twice, but this is not a problem with
-          shared libraries so we didn't noticed until now.
-
-Wed Jun 30 17:39:14 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs.dsp:
-        * orbsvcs_static.dsp:
-          Removed the Concurrency Service from the project.
-
-        * Concurrency/CC_LockSet.cpp:
-        * Concurrency/CC_LockSetFactory.cpp:
-        * Concurrency/Concurrency_Utils.cpp:
-        * Concurrency/Concurrency_Utils.h: Fixed exception handling
-          stuff.
-
-Wed Jun 30 16:44:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/RtecScheduler.idl,
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h}: fixed throw
-          exception discrepancies.
-
-Wed Jun 30 16:18:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Connector_Registry.cpp:
-          Fixed problem when trying to connect using foreign or unknown
-          profiles. Thanks to "alvarez" <alvarez@nagra-kudelski.ch> for
-          reporting this problem.
-
-        * tests/MT_Client/run_test.pl:
-          Fixed error status, it was reporting problems when there were
-          none.
-
-Wed Jun 30 15:46:32 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-
-          Updated UIOP release notes with list of restrictions/guidelines
-          the user should follow or be aware of when using the UIOP
-          pluggable protocol.
-
-        * tao/UIOP_Profile.{h,cpp}:
-
-          Comment/documentation updates based on the release notes
-          updates.  No code changes.
-
-        * tao/Pluggable.cpp (start_request, start_locate):
-
-          Removed ACE_UNUSED_ARG since ACE_THROW already contains an
-          ACE_UNUSED_ARG.  This corrects an "unreachable statement"
-          warning.
-
-Wed Jun 30 15:39:11 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp;
-          Removed ACE_NOTREACHED macros and subsituted 'return xxx' statement.
-          Also removed return statement from catch block so as not to
-          confuse some compilers.
-
-Wed Jun 30 15:04:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp: Removed
-          ACE_Equal_To<PortableServer::ObjectId> templates instantiation.
-          TAO already has it.
-
-Wed Jun 30 14:39:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Logging/Logging_Test_i.cpp:
-        * examples/Logging/Logging_Service_i.cpp:
-        * examples/Event_Comm/Consumer_Handler.cpp:
-        * examples/Event_Comm/Consumer_Input_Handler.cpp:
-        * examples/Event_Comm/Supplier_Input_Handler.cpp:
-          Fixed exception handling stuff, thanks to Matt for providing the
-          fixes.
-
-Wed Jun 30 14:20:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.{cpp, h},
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h}: Added conditional
-          macros around Reconfig Scheduler code for old g++: the templatized
-          method parameters break that compiler hopelessly.
-
-Wed Jun 30 14:03:27 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/DynAny_Test/driver.cpp:
-        * TAO/tests/DynAny_Test/test_dynany.cpp:
-        * TAO/tests/DynAny_Test/test_dynarray.cpp:
-        * TAO/tests/DynAny_Test/test_dynenum.cpp:
-        * TAO/tests/DynAny_Test/test_dynsequence.cpp:
-        * TAO/tests/DynAny_Test/test_dynstruct.cpp:
-        * TAO/tests/DynAny_Test/test_dynunion.cpp:
-          Substituted ACE_PRINT_EXCEPTION macro where
-          needed.
-
-        * TAO/tests/Param_Test/ub_struct_seq.cpp:
-          Subistituted a missed ACE_CHECK_RETURN macro.
-
-Wed Jun 30 13:43:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Quoter/Generic_Factory.cpp:
-        * examples/Quoter/Generic_Factory_i.cpp:
-        * examples/Quoter/Generic_Factory_i.h:
-          More exception handling fixes
-
-Wed Jun 30 13:36:29 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Fixed the exception warnings for the following:
-        * orbsvcs/tests/Time/Client_i.cpp
-        * TAO_ROOT/tests/InterOp-Naming/Server_i.cpp
-        * TAO_ROOT/tests/InterOp-Naming/INS_test_server.cpp
-
-Wed Jun 30 12:03:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Simple/bank/Account_i.cpp:
-        * examples/Simple/bank/AccountManager_i.cpp:
-          Fixed more exception handling problems.
-
-Wed Jun 30 11:28:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.cpp:
-          Fixed warnings related to CORBA::LongLong.
-
-Wed Jun 30 11:27:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/NestedUpcall/MT_Client_Test/client.cpp:
-        * tests/Multiple_Inheritance/client.cpp:
-        * tests/Multiple_Inheritance/server.cpp:
-          More exception handling fixes.
-
-Wed Jun 30 11:09:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
-          Fixed more exception handling problems.
-
-Wed Jun 30 10:04:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h:
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
-          Use ACE_THROW_SPEC and ACE_THROW instead of TAO_THROW_SPEC or
-          TAO_THROW.
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-          Fixed syntax errors.
-
-Wed Jun 30 09:40:20 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp: added intermediate
-          const cast for const void * args in qsort comparison function.
-          This makes Sun C++ 4.2 happy.
-
-Wed Jun 30 04:04:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAOACE_Static.dsw: Fixed project dependencies.
-
-        * TAO/tao/try_macros.h: The TAO try macros are now deprecated.
-
-        * TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp:
-        * TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
-        * TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp:
-        * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp:
-        * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h:
-        * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
-        * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
-        * TAO/orbsvcs/Trading_Service/Trading_Service.cpp:
-        * TAO/orbsvcs/Trading_Service/Trading_Service.h:
-        * TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp:
-        * TAO/orbsvcs/tests/Trading/Offer_Exporter.h:
-        * TAO/orbsvcs/tests/Trading/Offer_Importer.cpp:
-        * TAO/orbsvcs/tests/Trading/Offer_Importer.h:
-        * TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
-        * TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h:
-        * TAO/orbsvcs/tests/Trading/TT_Info.cpp:
-        * TAO/orbsvcs/tests/Trading/TT_Info.h:
-        * TAO/orbsvcs/tests/Trading/colocated_test.cpp:
-        * TAO/orbsvcs/tests/Trading/export_test.cpp:
-        * TAO/orbsvcs/tests/Trading/import_test.cpp:
-          Fixed exception handling.
-
-        * TAO/tao/CurrentS.cpp:
-        * TAO/tao/PolicyS.cpp: Replaced TAO try macros with ACE try
-          macros.
-
-Tue Jun 29 22:46:34 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * TAOACE.dsw: Fixed inter-project dependencies.
-
-Tue Jun 29 22:34:12 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Profile.{h,i,cpp}:
-
-          Removed rendezvous_point_ from the TAO_UIOP_Profile class.  It
-          is already stored in the profile's object_addr_ member, and name
-          lookup overhead isn't an issue for UNIX domain rendezvous points
-          as it is for hostname lookup in the INET domain.
-
-          TAO_UIOP_Profile now warns if a provided rendezvous_point is too
-          long, i.e. if the ACE_UNIX_Addr truncates it since it is larger
-          than the sun_path[] array in the underlying sockaddr_un
-          structure.
-
-Tue Jun 29 21:59:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO/orbsvcs/Time_Service/Clerk_i.cpp:
-        * TAO/orbsvcs/Time_Service/Server_i.cpp:
-        * TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp:
-        * TAO/orbsvcs/Time_Service/Time_Service_Server.cpp:
-          Fixed more exception handling problems.
-
-Tue Jun 29 21:26:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/Pluggable/PP_Test_Server.cpp (run): Removed
-          an unnecessary duplicate call to ORB_Manager::run().  Thanks to
-          Carlos for reporting this.
-
-Tue Jun 29 21:06:17 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/client.cpp:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-          Fixed the exception problems reported by Carlos. Thanks Carlos.
-
-Tue Jun 29 20:57:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Simple/chat/Broadcaster_i.cpp:
-        * examples/Event_Comm/Event_Comm_i.cpp:
-        * examples/Event_Comm/Notifier_Handler.cpp:
-        * examples/Event_Comm/Notifier_Server.cpp:
-        * examples/Event_Comm/notifier.cpp:
-          Fixed exception handling macros
-
-Tue Jun 29 20:37:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/configurations.html: Updated documentation for thread-pool
-          concurrency policy.  Thanks to Madhu Konety
-          <madhu.konety@stdc.com> for motivating this.
-
-Tue Jun 28 20:19:11 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * tao/ORB.cpp:  Changed resolve_implrepo_service () to work
-          correctly with the ACE CORBA macros.
-
-        * examples/Quoter/Factory_Finder.cpp:
-        * examples/Quoter/Generic_Factory.cpp:
-        * examples/Quoter/Quoter_i.cpp:
-        * examples/Quoter/client.cpp:
-        * examples/Quoter/server.cpp:
-        * examples/Simple/time/Time_Client_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_client_i.cpp:
-          Fixed some bugs with using old print_exception method instead of
-          ACE_PRINT_EXCEPTION.
-
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp: Removed the
-          clearing of the ACE_TRY_ENV in get_planes ().
-
-        * examples/Quoter/client.h:  Made sure the ORB_var member variable
-          appears before any other var's in the Quoter_Client class.
-
-        * tao/TAO.dsp:
-        * TAO_IDL/tao_idl.dsp:
-        * tao/TAO_Static.dsp:
-        * TAO_IDL/tao_idl_static.dsp:
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-          Manually cleaned up these projects and fixed them so they should
-          work on NT Alpha again.
-
-        * TAOACE.dsw:
-          Fixed dependencies.
-
-        * orbsvcs/orbsvcs/IR_Helper.cpp:
-        * orbsvcs/orbsvcs/IR_Helper.h:
-          Changed the constructor to take in a const char * instead of a char *
-          so literals can be passed in without warnings.
-
-Tue Jun 29 19:48:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/OBV/Simple_util.cpp:
-        * examples/OBV/Typed_Events/server.cpp:
-        * examples/Simple/Simple_util.cpp:
-        * examples/Simple/time-date/Time_Date.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * performance-tests/Thruput/TAO/client.cpp:
-        * performance-tests/Thruput/TAO/server.cpp:
-          Fixed several problems with exception handling.
-
-        * orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/tests/Makefile:
-          Removed the Concurrency service from the library, it is not
-          required by default now.
-
-Tue Jun 29 19:44:45 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Simple/Simple_util.cpp: Fixed exception macros.
-
-Tue Jun 29 19:39:14 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp:
-          Fixed 'ACE_TRY_ENV.print_exception...' statements.
-
-Tue Jun 29 16:49:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ACE_wrappers/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
-        * ACE_wrappers/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
-        * ACE_wrappers/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
-        * ACE_wrappers/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
-
-          Added user32.lib to static project settings.  Thanks to
-          Guicheney Christophe <guichene@clrhp04.in2p3.fr> for reporting
-          this.
-
-Tue Jun 29 17:22:20 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile
-          orbsvcs/orbsvcs/Sched/Makefile.am
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.{cpp, h},
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h}: Reconfig
-          Scheduler compiles on Solaris using egcs.
-
-Tue Jun 29 13:44:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/TAO_Tests.dsw:
-        * tests/IORManipulation/IORManipulation.dsw:
-        * tests/IORManipulation/IORTest.dsp: Added new workspace and
-          project files.
-
-        * tao/IORC.h: Added a whole bunch of TAO_Export's.
-
-Tue Jun 29 12:20:24 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
-        * orbsvcs/orbsvcs/Naming/README
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h:
-
-          Factored out code for creation of a Naming Context and
-          registration with poa into static functions <make_new_context>
-          in TAO_Transient_Naming_Context, and
-          TAO_Persistent_Naming_Context.
-
-          Added comments, cleaned up code, fixed a memory leak in
-          Naming_Utils::init_new_naming, and improved handling of error
-          conditions in a few places.
-
-Mon Jun 28 21:41:20 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp
-          orbsvcs/orbsvcs/orbsvcs_static.dsp
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.{cpp, h},
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h}: Reconfig
-          Scheduler compiles on NT.
-
-Tue Jun 29 04:12:49 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * Trader/Constraint_Interpreter.cpp:
-        * Trader/Constraint_Interpreter.h:
-        * Trader/Constraint_Nodes.cpp:
-        * Trader/Constraint_Visitors.cpp:
-        * Trader/Offer_Database.h:
-        * Trader/Offer_Iterators.cpp:
-        * Trader/Offer_Iterators.h:
-        * Trader/Offer_Iterators_T.cpp:
-        * Trader/Service_Type_Repository.cpp:
-        * Trader/Service_Type_Repository.h:
-        * Trader/Trader.cpp:
-        * Trader/Trader_Interfaces.cpp:
-        * Trader/Trader_Interfaces.h:
-        * Trader/Trader_T.cpp:
-        * Trader/Trader_Utils.cpp: Fixed some exception macros and added
-          some more.  This is stll unfinished.
-
-Mon Jun 28 23:03:06 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp (visit_predefined_type):
-
-          Fixed code generation for multidimensional arrays. The fix required
-          us to cast the flattened array to the appropriate type.
-
-          Thanks to Joyce Fu <fu@gsao.med.ge.com> for reporting the bug.
-
-Mon Jun 28 21:41:20 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp,
-          orbsvcs/Scheduling_Service/Scheduling_Service.cpp,
-          orbsvcs/tests/Sched_Conf/Sched_Conf.cpp: Replaced TAO TRY macros
-          with ACE TRY macros.
-
-Mon Jun 28 19:28:17 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Generic_Servant/MyFooServant.cpp: Removed #define
-          ACE_BUILD_SVC_EXPORT. I don't know what it was for.
-
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
-        * orbsvcs/orbsvcs/Trader/Trader_T.cpp
-
-          Fixed exception handling.
-
-Mon Jun 28 19:16:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Makefile:
-          Added the new IORManipulation directory to the top-level
-          Makefile.
-
-        * tao/IORC.cpp:
-        * tao/IORS.cpp:
-          More exception handling fixes
-
-Mon Jun 28 18:35:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/append.cpp:
-        * tao/skip.cpp:
-          Changed declaration of discrim_val in TAO_Marshal_Union to be
-          CORBA::ULongLong instead of CORBA::Long. A CORBA::Long
-          discriminator holder would decode incorrectly if the
-          real disicriminator were a CORBA::ULong and perhaps
-          crash if it were a 64-bit type.
-
-]Mon Jun 28 18:24:52 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/README: Updated this to describe all the examples.
-
-Mon Jun 28 18:06:20 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * tao: Commited fixes for type codes in IOR exceptions
-          IORS.cpp and IORC.cpp
-
-Mon Jun 28 18:04:54 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * TAO/tests/IORManipultion: Added test for IORManipultion.
-
-Mon Jun 28 17:50:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/client.cpp:
-          Added some ACE_CHECK_* macros.
-
-        * TAO/tests/Param_Test/big_union.cpp:
-          Added initialization code for out_ and ret_
-          members. Makes the DII test happier.
-
-Mon Jun 28 17:38:55 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * examples/Simple/chat/Broadcaster_i.h:
-        * examples/Simple/chat/Receiver_i.h:
-        * examples/Simple/chat/Broadcaster_i.cpp:
-        * examples/Simple/chat/Server_i.cpp:
-        * examples/Simple/chat/Client_i.cpp:
-        * examples/Simple/chat/server.cpp:
-        * examples/Simple/chat/client.cpp:
-          replaced TAO_TRY* macros with ACE_TRY macros.
-          replaced ACE_TRY_ENV.print_exception with ACE_PRINT_EXCEPTION
-
-Mon Jun 28 16:18:28 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/README:
-          Documentation updates due to pluggable protocol updates in
-          MT_Cubit.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
-
-          Pluggable protocol updates.  MT_Cubit is now non-protocol
-          specific.  The MT_Cubit server options have been changed.  Use
-          the `-e' option, documented in MT_Cubit's README file, instead
-          of `-h' and `-p'.  The default protocol is IIOP if one isn't
-          specified.
-
-Mon Jun 28 16:15:21 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Consumer_Handler.cpp
-        * examples/Callback_Quoter/Consumer_Input_Handler.cpp
-        * examples/Callback_Quoter/Consumer_i.cpp:
-          Set the <interactive> flag which helped in having a run_test.pl
-          for this example. Activated the poa_manager on the consumer side
-          as it was an callback client. Removed any obsolete
-          print_exception calls and modified it to ACE_PRINT_EXCEPTION
-          macro calls. The bug in Callback Quoter related to the
-          interative option was solved thanks to inputs from Christopher
-          Kohlhoff <chris@kohlhoff.com>.
-
-        * examples/Callback_Quoter/Notifier_Input_Handler.cpp
-        * examples/Callback_Quoter/Notifier_i.cpp:
-        * examples/Callback_Quoter/notifier.cpp:
-          Removed any obsolete print_exception calls and modified it to
-          ACE_PRINT_EXCEPTION macro calls.
-
-        * examples/Callback_Quoter/Supplier_i.{h, cpp}:
-          Added a file_ptr variable to handle input form a file for the
-          non-interactive run_test.pl execution.
-
-        * examples/Callback_Quoter/README:
-          Added extra information on execution of this example.
-
-Mon Jun 28 15:44:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader: Completed a pass through the Trading
-          Service to update its exception handling scheme to the new
-          ACE_TRY techniques.
-
-        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp (operator <):
-          Fixed a typo where "this_laxity" should have been "that_laxity".
-          Thanks to Christopher Kohlhoff <chris@kohlhoff.com> for this
-          fix.
-
-Mon Jun 28 15:40:22 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IR_Helper.cpp: Fixed some bugs with using old
-          print_exception method instead of ACE_PRINT_EXCEPTION.
-
-Mon Jun 28 12:53:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/Makefile: Updated the dependencies.
-
-        * tao/IIOP_Connect.cpp: Removed unnecessary explicit template
-          instantiations.
-
-        * tao/IIOP_Connect.h:
-        * tao/IIOP_Connect.cpp:
-        * tao/UIOP_Connect.h:
-        * tao/UIOP_Connect.cpp: Changed transport_ member from pointer
-          member to non-pointer member.  This removes the need to
-          instantiate the transport_ member on the heap, thus avoiding any
-          potential memory management problems.
-
-        * tao/IIOP_Connect.i:
-        * tao/UIOP_Connect.i: Moved all good inline method candidates from
-          `.cpp' files to their corresponding inline `.i' files.
-
-Mon Jun 28 15:11:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp: Use the
-          ACE_TRY macros to write portable code when dealing with
-          exceptions.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/server.cpp: Don't use
-          print_exception directly, use the ACE_PRINT_EXCEPTION macro
-          instead.
-
-Mon Jun 28 15:01:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/GIOP.i: Use the new reset_contents() method in the InputCDR
-          stream to avoid extra memory allocations in the critical path.
-
-Mon Jun 28 14:52:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
-        * TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
-          (visit_interface):  Fixed problem with generating multiple base
-          classes.  Thanks to Carlos for helping this out.
-
-Mon Jun 28 13:39:15 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/client.cpp: Made the test more
-          silent.  Put a lot debug statements under TAO_debug_level > 4.
-
-Mon Jun 28 12:57:50 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp (compute_coll_name): Fixed ABW
-          errors.
-
-Mon Jun 28 12:54:26 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp: Changed one line of method
-          idl_parse_line_and_file() to call idl_atoui() instead of
-          idl_atoi(). This fixes a line number off-by-one error in error
-          outputs. Thanks to Hata Yoshiaki <hatay@alpha.co.jp> for
-          reporting the error and supplying a fix.
-
-Mon Jun 28 12:46:57 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed the
-          exception macros problems. Thanks Carlos for reporting the
-          errors.
-
-Mon Jun 28 12:19:21 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * examples/Logging/Logger_i.cpp
-        * examples/Logging/Logging_Service.cpp: Removed some remaining TAO
-          exceptions macros.
-
-Mon Jun 28 12:15:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/any.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests/Param_Test/big_union.cpp: Moved some code I had
-          mistakenly left outside ACE_TRY blocks.
-
-Mon Jun 28 12:05:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf: Fixed
-          configuration file, the parameters to -ORBInputCDRAllocator have
-          changed.
-
-Mon Jun 28 11:25:47 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: Updated dependencies.
-
-Mon Jun 28 11:17:45 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/append.cpp: Fixed bugs in interpretive marshaling of arrays,
-          it was raising an exception even when there was no error, my
-          bad.
-
-Mon Jun 28 11:02:52 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Dynenum_i.cpp: Removed some useless code from
-          get_longlong().  Thanks to Carlos for reporting this warning.
-
-Mon Jun 28 10:41:43 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynUnion_i.cpp: Added all necessary ACE_CHECK_* macros and
-          fixed a 'code not reached' warning.
-
-Mon Jun 28 10:20:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: Use
-          ACE_TEMPLATE_METHOD_SPECIALIZATION instead of
-          ACE_TEMPLATE_SPECIALIZATION.
-
-Mon Jun 28 05:17:01 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * be/be_visitor_interface/collocated_sh.cpp:
-        * be/be_visitor_interface/collocated_ss.cpp:
-        * be/be_visitor_operation/collocated_sh.cpp:
-        * be/be_visitor_operation/collocated_ss.cpp:
-        * be_include/be_visitor_interface/collocated_sh.h:
-        * be_include/be_visitor_interface/collocated_ss.h:
-        * be_include/be_visitor_operation/collocated_sh.h:
-        * be_include/be_visitor_operation/collocated_ss.h: Replaced the
-          old, conglomerated collocated stub visitors with the following
-          specialized collocated stub visitors.  After all, downsizing,
-          i.e., breaking up large stuff and creating a bunch of small
-          pieces, is the latest trend.
-
-        * be/be_visitor_interface/direct_collocated_sh.cpp:
-        * be/be_visitor_interface/direct_collocated_ss.cpp:
-        * be/be_visitor_interface/thru_poa_collocated_sh.cpp:
-        * be/be_visitor_interface/thru_poa_collocated_ss.cpp:
-        * be/be_visitor_operation/direct_collocated_sh.cpp:
-        * be/be_visitor_operation/direct_collocated_ss.cpp:
-        * be/be_visitor_operation/thru_poa_collocated_sh.cpp:
-        * be/be_visitor_operation/thru_poa_collocated_ss.cpp:
-        * be_include/be_visitor_interface/direct_collocated_sh.h:
-        * be_include/be_visitor_interface/direct_collocated_ss.h:
-        * be_include/be_visitor_interface/thru_poa_collocated_sh.h:
-        * be_include/be_visitor_interface/thru_poa_collocated_ss.h:
-        * be_include/be_visitor_operation/direct_collocated_sh.h:
-        * be_include/be_visitor_operation/direct_collocated_ss.h:
-        * be_include/be_visitor_operation/thru_poa_collocated_sh.h:
-        * be_include/be_visitor_operation/thru_poa_collocated_ss.h: Those
-          specialized collocated stub visitors.
-
-        * be/be_interface.cpp:
-        * be/be_visitor_factory.cpp:
-        * be/be_visitor_interface.cpp:
-        * be/be_visitor_operation.cpp:
-        * be/be_visitor_attribute/attribute.cpp:
-        * be/be_visitor_interface/interface.cpp:
-        * be/be_visitor_interface/interface_cs.cpp:
-        * be/be_visitor_interface/interface_sh.cpp:
-        * be/be_visitor_interface/interface_ss.cpp:
-        * be_include/be_codegen.h:
-        * be_include/be_interface.h:
-        * be_include/be_visitor_interface.h:
-        * be_include/be_visitor_operation.h:
-        * driver/drv_args.cpp:
-        * include/idl_global.h:
-        * util/utl_global.cpp: TAO_IDL internal needs to know which
-          visitor to use and when to use it.  TAO_IDL now support 4 more
-          switches,  -Gp, -Gd, -Sp, -Sd which control what kind of
-          collocated stubs the generated code uses.  Maybe these flags
-          should somehow merge together.  Otherwise, we'll exhaust the
-          available letter (for -G and -S) very soon.
-
-Sun Jun 27 20:29:38 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/POA_CORBA.h (POA_CORBA): Added a no-op constructor for
-          the _tao_collocated_Current class to work around a bug with
-          IBM's VisualAge C++ compiler.  Thanks to Rene Matteau
-          <matteau@ca.ibm.com> for reporting this.
-
-        * tao/encode.cpp (encode): Borland's C++ Builder 4.0 doesn't seem
-          to align caught exceptions along the correct boundaries!
-          Therefore we will assume that the data pointer passed in is
-          already correctly aligned and we will calculate member
-          alignments relative to this pointer.  Thanks to Christopher
-          Kohlhoff <chris@kohlhoff.com> for this fix.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp: Removed the
-          hacked up coding for MAX_SIGNED_INTEGER, MAX_UNSIGNED_INTEGER,
-          and MIN_SIGNED_INTEGER and replaced them with the corresponding
-          #defines from $ACE_ROOT/Basic_Types.h.
-
-        * tao/orbconf.h: By default generate a no-op macro for
-          TAO_EXPORT_NESTED_MACRO.  This can be overridden if
-          ACE_EXPORT_NESTED_CLASSES is enabled in the
-          $ACE_ROOT/ace/config.h file.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp,
-          tao/Sequence.i: Updated all ACE_TEMPLATE_SPECIALIZATION
-          macros that are used for *methods* to be
-          ACE_TEMPLATE_METHOD_SPECIALIZATION to make certain compilers
-          like SunC++ 5.0 happy.
-
-        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp: Reformatted a lot of this
-          file so it'll conform to the ACE+TAO programming guidelines.
-
-        * tao/Object_Adapter.cpp: Cleanedup the programming style to make
-          it conform to ACE.
-
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp (next_n): Fixed
-          an error by returning 0 if we get an exception.  Thanks to David
-          Levine for reporting this.
-
-Sun Jun 27 21:33:00 1999  Chris Gill  <cdgill@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/RtecScheduler.idl,
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.{cpp, h},
-          orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h}: Added use of
-          dependency graph visitors for topological ordering, cycle checking,
-          and graph reset during schedule computation.
-
-Sun Jun 27 20:02:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-          Fixed minor syntax errors and typos in these files.
-
-        * tao/IIOP_Connect.cpp:
-        * tao/UIOP_Connect.cpp:
-          Do not return 1 from a handle_input() call
-
-        * tao/default_resource.cpp:
-          Cleanup ACE_LOG_MSG->errnum() before creating Reactor.
-
-        * tests/Makefile:
-        * tests/Faults/Makefile:
-        * tests/Faults/README:
-        * tests/Faults/client.cpp:
-        * tests/Faults/run_test.pl:
-        * tests/Faults/server.cpp:
-        * tests/Faults/test.idl:
-        * tests/Faults/test_i.cpp:
-        * tests/Faults/test_i.h:
-        * tests/Faults/test_i.i:
-          Added a new test to check that the ORB can handle a crash on the
-          server and/or the client; it doesn't cover all the possible
-          cases, but at least it is a start.
-
-        * orbsvcs/orbsvcs/Event/RT_Task.cpp:
-          Fixed misuse of ACE_TRY_ENV, thanks to Doug and David for
-          pointing it out.
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-          Fixed type mismatch, it wasn't obvious except on NT, thanks to
-          Marina for reporting this one.
-
-Sun Jun 27 18:30:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-          Added all the necessary ACE_CHECK stuff.
-          DynUnion_i.cpp is left to do.
-
-        * TAO/tests/Param_Test/any.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_short_seq.cpp:
-        * TAO/tests/Param_Test/bd_str_seq.cpp:
-        * TAO/tests/Param_Test/bd_string.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_struct_seq.cpp:
-        * TAO/tests/Param_Test/complex_any.cpp:
-        * TAO/tests/Param_Test/except.cpp:
-        * TAO/tests/Param_Test/fixed_array.cpp:
-        * TAO/tests/Param_Test/fixed_struct.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/big_union.cpp:
-        * TAO/tests/Param_Test/ub_string.cpp:
-        * TAO/tests/Param_Test/objref_struct.cpp:
-        * TAO/tests/Param_Test/short.cpp:
-        * TAO/tests/Param_Test/ulonglong.cpp:
-        * TAO/tests/Param_Test/typecode.cpp:
-        * TAO/tests/Param_Test/ub_any_seq.cpp:
-        * TAO/tests/Param_Test/ub_long_seq.cpp:
-        * TAO/tests/Param_Test/ub_objref_seq.cpp:
-        * TAO/tests/Param_Test/ub_short_seq.cpp:
-        * TAO/tests/Param_Test/ub_str_seq.cpp:
-        * TAO/tests/Param_Test/var_struct.cpp:
-        * TAO/tests/Param_Test/var_array.cpp:
-        * TAO/tests/Param_Test/recursive_struct.cpp:
-        * TAO/performance-tests/Pluggable/server.cpp:
-        * TAO/performance-tests/Pluggable/PP_Test_Client.cpp:
-        * tao/Any.cpp:
-          Changed ACE_NOTREACHED (return foo); to ACE_NOTREACHED (return
-          foo;)
-
-Sun Jun 27 17:10:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/TAO-Tests.dsw:
-        * tests/Faults/Faults.dsw:
-        * tests/Faults/client.dsp:
-        * tests/Faults/server.dsp: Added new workspace/projects and
-          updated test workspace.
-
-Sun Jun 27 17:15:45 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-          Replaced ACE_TRY_ENV.print_exceptions with
-          ACE_PRINT_EXCEPTION. Thanks to Carlos for reporting these.
-
-Sun Jun 27 17:18:29 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_type.cpp (gen_nested_typename): Fixed a bug where
-          we were generating incorrect relative path in a specific
-          scenario where the "use" scope of a type shares only a few
-          ancestors of the scope in which the type is defined.  Our code
-          would work only when either of the "use" scope or the "defined"
-          scope was a subset of the other.
-
-          Thanks to Brian Peterson <bpeterson@globalmt.com> for sending
-          the bug report and fixes. We have used a slightly different
-          solution than his suggested fixes.
-
-Sun Jun 27 09:17:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/DynAny_i.cpp: added ACE_Auto_Basic_Ptr explicit template
-          instantiations.  Thanks to Alex for reporting that they're
-          necessary without __ACE_INLINE__.
-
-Sat Jun 26 19:47:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: changed TAO try
-          macros to ACE try macros.
-
-Sat Jun 26 18:38:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/{IIOP,UIOP}_Connect.cpp:
-
-          Clarified connection handler output.
-
-        * tao/UIOP_Connect.cpp (enum):
-
-          Fixed duplicate starting enumeration value (for use with
-          timeprobes).
-
-        * tao/UIOP_Connect.cpp (open):
-
-          Fixed incorrect array size used when making call to
-          addr_to_string().
-
-        * tao/UIOP_Transport.h:
-
-          Comment updates.
-
-Sat Jun 26 16:24:39 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp
-          Updated to reflect Changes in orbsvcs/orbsvcs/Naming.
-
-Sat Jun 26 15:13:59 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/Makefile.am:
-
-          Synchronized with latest version of TAO.
-
-        * tao/Pluggable.cpp (start_locate, start_request):
-
-          Fixed unused argument warnings when native exception handling is
-          enabled.
-
-        * tao/Pluggable.h (TAO_Transport):
-
-          Exception handling update.
-
-Sat Jun 26 14:23:25 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.cpp
-        Clean up of the remaining old exception code.
-
-        * TAO/docs/releasenotes/index.html
-        Updated the Naming Service section.
-
-        * orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.{h, cpp}
-        Removed these files. (They were modified and moved up into the
-        ACE_wrappers/ace dicrectory.  See ACE ChangeLog for more info: tag
-        Sat Jun 26 14:41:31 1999  Marina Spivak).
-
-        * orbsvcs/orbsvcs/Makefile
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.{h, cpp}
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Index.{h, cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h, cpp}
-        Updated the files to reflect the removal of
-        Shared_Hash_Map_T.{h,cpp} from this directory.
-
-Sat Jun 26 13:10:37 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/POA/Default_Servant/File_i.h: Fixed the exception spec
-          for destroy.  Thanks to David for reporting this.
-
-        * orbsvcs/orbsvcs/Trader: Removed all vestiges of the Locking.h
-          file, which has been subsumed into other parts of ACE+TAO.
-
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp,
-          orbsvcs/orbsvcs/Trader/Constraint_Visitors,
-          orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp,
-          orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp,
-          orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp: Fixed exception
-          handling to be compliant with the ACE macros.
-
-Sat Jun 26 12:45:26 1999  Jody Hagins <jody@atdesk.com>
-
-        This is a change log for the modifications made to support
-        Borland C++Builder 4.0, Patch 1.  Thanks to
-        Christopher Kohlhoff <chris@kohlhoff.com> and Chris Uzdavinis
-        <chris@uzdavinis.com> for helping with this.
-
-        * TAO/TAO_IDL/be/be_args.cpp: Added new back end (-Wb) option
-          'pch_include' which allows you to specify a common include to be
-          added at the top of all idl generated files. This can be used
-          with a precompiled header mechanism (such as that provided by
-          C++Builder or MSVC++). It takes a *very* long time to compile
-          GUI programs without this.
-
-        * TAO/TAO_IDL/be/be_codegen.cpp: Added support for
-          TAO_EXPORT_NESTED_CLASSES macro.
-
-        * Added support for new back end (-Wb) option 'pch_include'.
-
-        * TAO/TAO_IDL/be/be_helper.cpp: Target of sprintf function should
-          not also be used as an insertion argument.
-
-        * TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:
-          Added support for TAO_EXPORT_NESTED_CLASSES macro.
-
-        * TAO/TAO_IDL/driver/drv_preproc.cpp: Added command line options
-          for use with Borland C++Builder preprocessor.
-
-        * TAO/TAO_IDL/include/idl_global.h: Added support for new back end
-          (-Wb) option 'pch_include'.
-
-        * TAO/TAO_IDL/util/utl_global.h: Added support for new back end
-          (-Wb) option 'pch_include'.
-
-        * TAO/examples/Callback_Quoter/Consumer_Handler.cpp: Member
-          variable use_naming_service_ was not initialised.
-
-        * TAO/examples/Callback_Quoter/Supplier_i.cpp: Member variable
-          f_ptr_ was not initialised.  Cmd line option string was missing
-          ':' required for parameter to 'f'.
-
-        * TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp: Workaround for BCB4
-          internal compiler error
-
-        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h: Need
-          ACE_TEMPLATE_SPECIALIZE on specializations.
-
-        * TAO/tao/Active_Object_Map.cpp: BCB4 doesn't accept constructor
-          syntax for static member variables.
-
-        * TAO/tao/Object_Adapter.cpp: BCB4 doesn't accept constructor
-          syntax for static member variables.
-
-        * TAO/tao/Sequence.i Need ACE_TEMPLATE_METHOD_SPECIALIZE on
-          specializations.
-
-        * TAO/tao/orbconf.h: Added TAO_EXPORT_NESTED_CLASSES macro to
-          allow nested classes to be exported (see also change in
-          ace\config-win32-borland.h). Borland C++Builder (unlike MSVC++)
-          does not automatically export nested classes when the outer
-          class is exported.
-
-Sat Jun 26 13:20:57 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/sfp.cpp :
-          Replaced ACE_TRY_ENV.print_exceptions with
-          ACE_PRINT_EXCEPTION. Thanks to Doug Schmidt for reporting these
-          errors.
-
-Sat Jun 26 11:58:01 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/{IIOP,UIOP}_Connect.cpp:
-
-          Fixed incorrect enumeration used in ACE timeprobe macro.
-
-Sat Jun 26 11:55:46 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/UIOP_Transport.cpp:
-
-          Fixed duplicate enum starting value for UIOP time probes.
-
-        * tao/{IIOP,UIOP}_Transport.cpp:
-
-          Spelling correction in time probe character string array.
-
-Sat Jun 26 12:43:26 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/DynAny_i.cpp:
-
-          Fixed the following compile errors.
-          copy: Used ACE_CHECK_RETURN instead of ACE_CHECK because the operation
-                required a return value.
-
-          get_any: Return value expected is an Any_ptr and not DynAny_ptr.
-
-Sat Jun 26 09:35:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile: on LynxOS/ppc only, for POA.cpp only,
-          with optimization only, replaced -O2 with -O to
-          avoid internal compiler error.
-
-Sat Jun 26 08:58:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Sequence_T.{i,cpp}: replaced a bunch of CORBA::ULong
-          template parameters with size_t.
-
-Fri Jun 25 21:53:10 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/server.cpp:
-        * TAO/performance-tests/Pluggable/PP_Test_Client.cpp:
-          Changed ACE_CHECK_RETURN to ACE_NOTREACHED when
-          it comes after ACE_ENDTRY in a non-void function.
-
-Fri Jun 25 21:27:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynAny_i.cpp:
-          Made full use of exception macros everywhere
-          ACE_TRY_ENV was used, made other enhancements
-          and cosmetic changes.
-
-Fri Jun 25 20:59:08 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/any.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_short_seq.cpp:
-        * TAO/tests/Param_Test/bd_str_seq.cpp:
-        * TAO/tests/Param_Test/bd_string.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_struct_seq.cpp:
-        * TAO/tests/Param_Test/complex_any.cpp:
-        * TAO/tests/Param_Test/except.cpp:
-        * TAO/tests/Param_Test/fixed_array.cpp:
-        * TAO/tests/Param_Test/fixed_struct.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/big_union.cpp:
-        * TAO/tests/Param_Test/ub_string.cpp:
-        * TAO/tests/Param_Test/objref_struct.cpp:
-        * TAO/tests/Param_Test/short.cpp:
-        * TAO/tests/Param_Test/ulonglong.cpp:
-        * TAO/tests/Param_Test/typecode.cpp:
-        * TAO/tests/Param_Test/ub_any_seq.cpp:
-        * TAO/tests/Param_Test/ub_long_seq.cpp:
-        * TAO/tests/Param_Test/ub_objref_seq.cpp:
-        * TAO/tests/Param_Test/ub_short_seq.cpp:
-        * TAO/tests/Param_Test/ub_str_seq.cpp:
-        * TAO/tests/Param_Test/var_struct.cpp:
-        * TAO/tests/Param_Test/var_array.cpp:
-        * TAO/tests/Param_Test/recursive_struct.cpp:
-          Changed ACE_CHECK_RETURN to ACE_NOTREACHED when
-          it comes after ACE_ENDTRY in a non-void function.
-          We'll see if this make everybody happy.
-
-Fri Jun 25 20:31:05 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp:
-          Added some ACE_NOTREACHED macros. These were in
-          response to some warnings about ACE_CHECK_RETURN (...)
-          after ACE_ENDTRY in non-void functions. We'll see if
-          this make all the compilers happy.
-
-Fri Jun 25 18:09:07 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/any.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_short_seq.cpp:
-        * TAO/tests/Param_Test/bd_str_seq.cpp:
-        * TAO/tests/Param_Test/bd_string.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_struct_seq.cpp:
-        * TAO/tests/Param_Test/complex_any.cpp:
-        * TAO/tests/Param_Test/except.cpp:
-        * TAO/tests/Param_Test/fixed_array.cpp:
-        * TAO/tests/Param_Test/fixed_struct.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests?Param_Test/ub_struct_seq.cpp:
-          Added ACE_TRY block to add_args(). This
-          was not causing a warning, but there
-          were many unchecked calls using ACE_TRY_ENV.
-
-Fri Jun 25 17:28:58 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/default_resource.cpp (get_reactor): Made sure the reactor
-          get cleaned up if any error occured (ACE_LOG_MSG->errnum () !=
-          0) during initialization.
-
-        * tao/ORB_Core.cpp (init): Return -1 if we failed to initialize
-          the reactor.
-
-          Thanks to Irfan for helping this out and Oleg Orlov
-          <orlov@diasoft.ru> for reporting the problem.
-
-Fri Jun 25 16:30:41 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (find_entry): Fixed a
-          mistaken exception -- it should be Not_Found rather than
-          Unknown_Key.  Thanks to Steve Huston for reporting this.  Also
-          tidied up the code and added proper exception checking for
-          memory allocation failures.
-
-        * tao/Sequence_T: Removed all uses of CORBA::ULong as parameters
-          to a template and replaced them with size_t since this is
-          breaking the AIX C++ compiler.  Thanks to Steve Huston for
-          reporting this.
-
-Fri Jun 25 17:01:23 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
-          Fixed silly typos in my last commit.
-
-Fri Jun 25 16:43:47 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/NestedUpcall/Reactor/NestedUpCalls_i.h: Removed old file.
-
-        * examples/POA/DSI/Database_i.cpp (find_entry):
-        * examples/POA/Default_Servant/File_i.cpp (destroy):
-
-          Fixed the throwing of an exception that is not in the throw
-          spec.
-
-Fri Jun 25 13:37:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp: Changed TAO_TRY
-          macros to ACE_TRY macros
-
-Fri Jun 25 16:03:32 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * TAO/performance-tests/Pluggable/PP_Test_Client.h:
-        * TAO/performance-tests/Pluggable/PP_Test_Client.cpp:
-        * TAO/performance-tests/Pluggable/server.cpp:
-        * TAO/tests/DynAny_Test/data.cpp:
-        * TAO/tests/Param_Test/nested_struct.cpp:
-        * TAO/tests/Param_Test/big_union.cpp:
-        * TAO/tests/Param_Test/objref.cpp:
-        * TAO/tests/Param_Test/ub_string.cpp:
-        * TAO/tests/Param_Test/objref_struct.cpp:
-        * TAO/tests/Param_Test/short.cpp:
-        * TAO/tests/Param_Test/ulonglong.cpp:
-        * TAO/tests/Param_Test/typecode.cpp:
-        * TAO/tests/Param_Test/ub_any_seq.cpp:
-        * TAO/tests/Param_Test/ub_long_seq.cpp:
-        * TAO/tests/Param_Test/ub_objref_seq.cpp:
-        * TAO/tests/Param_Test/ub_short_seq.cpp:
-        * TAO/tests/Param_Test/ub_str_seq.cpp:
-        * TAO/tests/Param_Test/fixed_array.cpp:
-        * TAO/tests/Param_Test/fixed_struct.cpp:
-        * TAO/tests/Param_Test/var_struct.cpp:
-        * TAO/tests/Param_Test/var_array.cpp:
-        * TAO/tests/Param_Test/recursive_struct.cpp:
-        * TAO/tests/Param_Test/bd_long_seq.cpp:
-        * TAO/tests/Param_Test/bd_short_seq.cpp:
-        * TAO/tests/Param_Test/bd_str_seq.cpp:
-        * TAO/tests/Param_Test/bd_string.cpp:
-        * TAO/tests/Param_Test/bd_struct_seq.cpp:
-        * TAO/tests/Param_Test/ub_struct_seq.cpp:
-          Fixed exception warnings, ACE_TRY macro stuff
-          and made some cosmetic changes.
-
-Fri Jun 25 13:37:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Environment.h:
-        * tao/Environment.i: Added two methods _duplicate () and _nil ()
-          to the class Environment so that they will conformant with v2.2.
-
-Fri Jun 25 14:28:59 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/CurrentC.cpp:
-          Simplified exit path to avoid warnings about unreachable code
-          and/or exit without return.
-
-        * tao/append.cpp:
-          Added .in() calls for some T_var objects.
-
-        * tao/skip.cpp:
-          Added .in() calls for some T_var objects.
-          My last change broken the default case for unions.
-
-Fri Jun 25 13:37:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Exception.cpp :
-        * tao/Exception.h :Added default constructors for
-          CORBA_UserException & CORBA_SystemException. These have been
-          implemented as no-op's. In v2.3 of the CORBA spec, these two
-          classes are going to be abstract data types. But for the present
-          we want to keep vsOrb happy about these classes.
-
-Fri Jun 25 14:19:48 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-        * orbsvcs/tests/AVStreams/sfp/server.cpp (main):
-        * orbsvcs/tests/AVStreams/sfp/client.cpp (main):
-        * orbsvcs/tests/AVStreams/sfp/common.h:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp (create_B):
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp (remove_fep):
-          Fixed SunCC 5.0 warnings thanks to Carlos O' Ryan.
-
-Fri Jun 25 14:06:54 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/RT_Task.cpp:
-        * orbsvcs/orbsvcs/Event/ReactorTask.cpp:
-        * orbsvcs/tests/EC_Basic/EC_Basic.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/Event/Basic/Reconnect.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * tests/CDR/basic_types.cpp:
-        * tests/CDR/tc.cpp:
-        * tests/NestedUpcall/MT_Client_Test/client.cpp:
-        * tests/NestedUpcall/MT_Client_Test/local_server.cpp:
-        * tests/NestedUpcall/MT_Client_Test/server.cpp:
-        * tests/NestedUpcall/Reactor/reactor_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Initiator_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
-        * tests/NestedUpcall/Triangle_Test/server_A.cpp:
-        * tests/NestedUpcall/Triangle_Test/server_B.cpp:
-        * utils/catior/catior.cpp:
-          More exception handling fixes, changed these files to use the
-          new exception handling macros.
-
-Fri Jun 25 13:53:23 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * examples/Logging/Makefile
-          Oy. Added " -Ge 1" flag to guarantee that the IDL generated
-          skeletons are the same regardless of platform (DU wasn't
-          happy). Thanks to Mad Dog Carlos!
-
-Fri Jun 25 13:37:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Context.i:
-        * tao/Context.cpp:
-        * tao/Context.h:
-        * tao/Exception.i:
-        * tao/Exception.h:
-        * tao/Exception.cpp: Added _duplicate () methods to pseudo objects
-          ContextList & ExceptionList with the signature 'static T
-          *_duplicate (T *) ' to make them compliant with the 2.2
-          spec. This was found when we were trying to run the 'api' module
-          of the vsOrb test suite.
-
-Fri Jun 25 12:38:43 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * examples/Logging/Logger_i.cpp,h
-          Added default argument values for ACE_TRY_ENV to reflect tao_idl
-          generated code. Also removed a vestigal method (verbosity ())
-          which was never declared in IDL (since its name would have
-          clashed with the other verbosity method). Hopefully DU will be
-          pleased now, since this messed up its compile.
-
-Fri Jun 25 11:45:18 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Loader/Servant_Locator.cpp (ServantLocator_i):
-          Fixed function pointer casting problem.
-
-        * examples/POA/DSI/server.cpp
-        * examples/POA/Default_Servant/server.cpp
-        * examples/POA/Loader/Server_Manager.cpp
-        * examples/POA/NewPOA/NewPOA.cpp
-        * examples/POA/On_Demand_Activation/server.cpp
-        * examples/POA/On_Demand_Loading/Server_Manager.cpp
-
-          Fixed simple exception handling related problems.
-
-Fri Jun 25 10:01:20 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp:
-          Added an ACE_CHECK to the type() set method.
-          Also fixed some DU warnings.
-
-        * tao/CurrentC.cpp:
-        * tao/DynAny_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-          Fixed some DU warnings.
-
-        * tao/DynAnyS.cpp:
-          Fixed ACE_CHECK related stuff.
-
-Fri Jun 25 07:31:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/Makefile: added
-          -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV, so that DU cxx 6.2
-          can find Endpoint_Strategy_T.cpp for template instantiation.
-
-Thu Jun 24 21:51:10 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.{h,cpp}
-        * orbsvcs/tests/Simple_Naming/README
-        Added persistent naming test.  Cleaned up the perl script and
-        added the persistent test to it.  Updated
-        README and added examples for how to run the tests.
-
-        * orbsvc/orbsvcs/Naming/Persistent_Naming_Context.{h,cpp}
-        * orbsvc/orbsvcs/Naming/Hash_Naming_Context.{h,cpp}
-        * orbsvc/orbsvcs/Naming/Transient_Naming_Context.cpp
-        * orbsvc/orbsvcs/Naming/Persistent_Context_Index.{h,cpp}
-        * orbsvc/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvc/orbsvcs/Naming/Binding_Iterators.{h,cpp}
-        Updated the code so after <destroy> method is invoked on a Naming
-        Context, all of its BindingIterators become invalid.  When
-        <destroy> is invoked on a Naming Context, the context deregisters from POA,
-        but is not deleted until all of its iterators are destroyed.  This
-        is implemented through the reference counting on Naming Contexts.
-        Iterators are destroyed in the "lazy evaluation" fashion.  When a
-        user invokes an operation on an iterator, that iterator check its
-        own validity, and, if appropriate, self-destroys.  This appoach is
-        harder on resources, but is a lot easier and cleaner to implement
-        than explicitely keeping track of collections. Plus this use-case
-        is not on the critical path.
-
-Thu Jun 24 22:13:42 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/CurrentC.cpp:
-        * tao/CurrentS.cpp:
-        * tao/PolicyS.cpp:
-
-          Changed "IDL:CORBA" to "IDL:omg.org/CORBA".  However, the
-          typecodes in Typecode_Constants.cpp still need to be fixed by
-          regenerating them through the IDL compiler.
-
-Thu Jun 24 22:22:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Trading/run_test.pl:
-          New script to run the trading service test.
-
-Thu Jun 24 22:18:52 1999  Doug Anderson  <doug@clark.net>
-
-        * TAO/tao/orbconf.h,TAO/tao/DynAnyC.{h,cpp}:
-          updates for Cray UNICOS port.
-
-Thu Jun 24 21:43:59 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POAC.cpp (_narrow): Fixed use of try macros.
-
-        * tao/ORB.cpp: Even though MSVC has support for standard C++
-          library, the set_unexpected() function is not in the std
-          namespace.
-
-Thu Jun 24 17:48:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Repository.cpp: Added an explicit
-          template instantiation parameter for ACE_Equal_To<>.
-
-Thu Jun 24 21:30:21 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Any.cpp:
-        * tao/Context.cpp:
-        * tao/CurrentC.cpp:
-        * tao/CurrentS.cpp:
-        * tao/Exception.cpp:
-        * tao/GIOP_Server_Request.cpp:
-        * tao/Invocation.cpp:
-        * tao/NVList.cpp:
-        * tao/ORB.cpp:
-        * tao/PolicyS.cpp:
-          More exception handling changes and some cosmetic changes.
-
-Thu Jun 24 21:03:40 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/try_macros.h: Guarded the definition of all TAO try macros
-          with TAO_USES_DEPRECATED_TAO_TRY_MACROS.  This is now defined in
-          the file.  After we depricate the use of TAO try macros, one
-          will need to define TAO_USES_DEPRECATED_TAO_TRY_MACROS
-          explicitly in order to compile their code.
-
-        * Exception.cpp:
-        * Forwarding_Servant.cpp:
-        * GIOP_Server_Request.cpp:
-        * Invocation.cpp:
-        * NVList.cpp:
-        * ORB.cpp:
-        * POAC.cpp:
-        * Request.cpp:
-        * Stub.cpp:
-        * TAO.cpp: Fixed the use of TAO_IN_ENV, and native exception
-          support.
-
-Thu Jun 24 20:02:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp:
-          The IDL compiler was not generating exception safe code in a
-          couple of places.
-
-        * tao/poa_macros.h:
-        * tao/Object_Adapter.i:
-        * tao/POA.cpp:
-        * tao/POA.i:
-        * tao/POAManager.i:
-          The POA was implicitly using the obsolete TAO_TRY macros through
-          its TAO_POA_GUARD_* stuff, updated to use ACE_GUARD_* and
-          friends.
-
-        * tao/DomainC.cpp:
-        * tao/IORC.cpp:
-        * tao/MessagingC.cpp:
-        * tao/PolicyC.cpp:
-        * tao/PollableC.cpp:
-          More exception handling fixes.
-
-Thu Jun 24 17:48:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/releasenotes/TODO.html (pseudo-object): Added a todo item
-
-Thu Jun 24 19:41:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Any.cpp:
-        * tao/CDR_Interpreter.cpp:
-        * tao/CurrentC.cpp:
-        * tao/CurrentS.cpp:
-        * tao/DynAny_i.cpp:
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.cpp:
-        * tao/append.cpp:
-        * tao/deep_free.cpp:
-        * tao/encode.cpp:
-        * tao/skip.cpp:
-          Another pass fixing exception handling problems
-
-Thu Jun 24 18:27:22 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.h:
-        * tao/Any.i:
-        * tao/Any.cpp:
-        * tao/CDR_Interpreter.h:
-        * tao/CDR_Interpreter.cpp:
-        * tao/DynAny_i.h:
-        * tao/DynAny_i.cpp:
-        * tao/DynArray_i.h:
-        * tao/DynArray_i.cpp:
-        * tao/DynSequence_i.h:
-        * tao/DynSequence_i.cpp:
-        * tao/DynEnum_i.h:
-        * tao/DynEnum_i.cpp:
-        * tao/DynStruct_i.h:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.h:
-        * tao/DynUnion_i.cpp:
-          Fixed much of the ACE_TRY stuff. There are still some
-          ACE_CHECK-related things to add and some code to
-          rearrange.
-
-Thu Jun 24 17:48:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/ORB.h (CORBA_ORB): Made the method
-          CORBA::ORB::InvalidName::_narrow static as needed by the spec.
-
-Thu Jun 24 17:44:39 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Fixed a few nested calls with ACE_TRY_ENV. Added appropriate
-          ACE_TRY_CHECK after these statements. Thanks to Paul Calabrese
-          <calabrese_p@ociweb.com> for reporting these problems.
-
-Thu Jun 24 17:29:59 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp:
-          Fixed problems with exception handling, thanks to Paul Calabrese
-          <calabrese_p@ociweb.com> for pointing this out.
-
-Thu Jun 24 17:26:53 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * orbsvcs/Makefile
-        * orbsvcs/orbsvcs/Makefile
-        * orbsvcs/tests/Makefile
-          Removed all references to the Logging service or Logging tests
-
-        * examples/Makefile
-          Added entry for the new Logging example directory
-
-        * orbsvcs/Logging_Service/Logging_Service.cpp
-        * orbsvcs/Logging_Service/Logging_Service_i.cpp,h
-        * orbsvcs/Logging_Service/Makefile
-        * orbsvcs/Logging_Service/Makefile.am
-        * orbsvcs/orbsvcs/Logger.idl
-        * orbsvcs/orbsvcs/Log/Logger_i.cpp,h
-        * orbsvcs/orbsvcs/Log/Makefile.am
-        * orbsvcs/tests/Logger/Logger.dsw
-        * orbsvcs/tests/Logger/Logging_Test.cpp
-        * orbsvcs/tests/Logger/Logging_Test_i.cpp,h
-        * orbsvcs/tests/Logger/Makefile
-        * orbsvcs/tests/Logger/README
-        * orbsvcs/tests/Logger/client.cpp,h
-        * orbsvcs/tests/Logger/client.dsp
-        * orbsvcs/tests/Logger/client_i.cpp,h
-        * orbsvcs/tests/Logger/run_test.pl
-        * orbsvcs/tests/Logger/server.cpp
-        * orbsvcs/tests/Logger/server.dsp
-        * orbsvcs/tests/Logger/server_i.cpp,h
-          Removed all these files. They were the Logging_Service and all
-          related tests.
-        * orbsvcs/orbsvcs/Log
-        * orbsvcs/Logging_Service
-        * orbsvcs/tests/Logger
-          Removed these directories
-
-        * examples/Logging
-          Added this directory to hold the moved logging service
-
-        * examples/Logging/Logger.idl
-        * examples/Logging/Logger_i.cpp,h
-        * examples/Logging/Logging_Service.cpp
-        * examples/Logging/Logging_Service_i.cpp,h
-        * examples/Logging/Logging_Test.cpp
-        * examples/Logging/Logging_Test_i.cpp,h
-        * examples/Logging/Makefile
-        * examples/Logging/README
-        * examples/Logging/run_test.pl
-          These files are the modified versions of the original
-          Logging_Service and Logger test files. I've removed the old
-          TAO_THROW macros and added a POA_Manager activation. Also, I've
-          adjusted the README and Makefiles accordingly.
-
-        I fear that this may break things, but I've tried to keep it safe
-        and I've tested my changes. Let us hope.
-
-Thu Jun 24 17:22:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/MT_Client/orb_creation.cpp:
-        * tests/NestedUpcall/Reactor/client.cpp:
-        * tests/NestedUpcall/Reactor/client.h:
-        * tests/NestedUpcall/Reactor/mt_client.h:
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * performance-tests/Thruput/TAO/client.cpp:
-        * performance-tests/Thruput/TAO/server.cpp:
-        * performance-tests/Thruput/TAO/ttcp_decl.h:
-        * performance-tests/Thruput/TAO/utils.cpp:
-        * examples/OBV/Typed_Events/Client_i.h:
-        * examples/OBV/Typed_Events/Client_i.cpp:
-          Fixed several Sun/CC 5.0 warnings and errors.
-
-Thu Jun 24 17:01:48 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/MProfile.cpp:
-          Fixed syntax errors, thanks to Ossama for pointing them out.
-
-Thu Jun 24 16:38:09 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * tao/Any.i:
-          Changed all references to the deprecated "ACE_TRY_NEW_ENV" to
-          "ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY"
-
-Thu Jun 24 15:25:55 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-
-          Added '-*- C++ -*-' line so that Emacs will be in C++ mode when
-          editing the file in it.
-
-        * tao/ORB.h:
-
-          Changed inclusion of "IORManipulation.h" to
-          "tao/IORManipulation.h".
-
-        * tao/{IIOP,UIOP}*:
-
-          Fixed old style of exception handling.
-
-        * tao/UIOP_Profile.h:
-
-          Comment updates.
-
-Thu Jun 24 16:03:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/DomainS_T.i:
-        * tao/MProfile.cpp:
-        * tao/Makefile:
-        * tao/MessagingC.cpp:
-          More exception managment changes.
-
-Thu Jun 24 14:53:32 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Invocation.cpp (TAO_GIOP_Invocation::invoke and
-          TAO_GIOP_Locate_Request_Invocation::invoke):  Now that
-          GIOP::send_message() is not closing the transport on error, we
-          have do so here.
-
-        * tao/Stub: Added an extra ORB_var to the Stub.  This extra
-          ORB_var is required for reference counting.  It will help us
-          keep the ORB that created us around until the CORBA::Object we
-          represent dies.  This will eliminate the need for making sure
-          that all CORBA objects dies before the ORB dies.
-
-        * tao/UIOP_Connect.cpp (handle_input):
-        * tao/IIOP_Connect.cpp (handle_input):
-
-          Only reset the message state of the transport on success. On
-          failures, the transport will be closed anyway.
-
-        * tao/GIOP.cpp: Many of the GIOP functions were closing the
-          transport on failure.  In addition, -1 was also being returned
-          to the Reactor, which further called handle_close() on the
-          transport.  This would typically result in a double delete.
-
-          The solution was to not close the transport on failure but
-          return the error result to the caller.  If the caller was the
-          Reactor, it will call handle_close() and clean up the
-          transport. If the caller was the client-side, it will have to do
-          the correct cleanup.
-
-          Thanks to Gildo Medeiros Junior <gildo@siemens.com.br> for
-          pointing out this problem.
-
-        * tao/POAS.cpp:
-        * tao/POAS.i:
-        * tao/Forwarding_Servant.cpp:
-
-          Fixed old style of exception handling.
-
-Thu Jun 24 13:46:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          Added an unexpected() function to transform unexpected
-          exceptions into CORBA::UNKNOWN
-
-        * tests/Param_Test/client.cpp:
-        * tests/Param_Test/except.cpp:
-        * tests/Param_Test/param_test_i.h:
-        * tests/Param_Test/param_test_i.cpp:
-          The test was broken but SII and DII (!) exceptions where ok.
-
-Thu Jun 24 12:20:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-          Use the new Event Service by default.
-          Activate the POA before doing anything else, thanks to Byron
-          Harris <harris_b@ociweb.com> for figuring this out.
-
-        * tao/IORC.cpp:
-        * tao/MessagingS_T.cpp:
-        * tao/PolicyC.cpp:
-        * tao/PollableC.cpp:
-        * tao/Sequence_T.cpp:
-        * tao/Typecode.cpp:
-        * tao/varout.cpp:
-          Fixed several exception handling problems.
-
-Thu Jun 24 10:12:56 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IR_Helper.cpp:
-          Removed syntax error, probably a typo.
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-          Removed the unused arguments altogether.
-
-        * orbsvcs/Time_Service/Makefile:
-        * orbsvcs/tests/AVStreams/sfp/Makefile:
-        * orbsvcs/tests/ImplRepo/Makefile:
-        * examples/Simple/time-date/Makefile:
-          Several minor fixes, such as outdated dependencies and
-          typos. Things are happy now.
-
-Thu Jun 24 07:44:07 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IR_Helper.cpp:
-          Fixed unused arg warnings.
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_{Consumer,Supplier}.cpp:
-          Fixed unused arg warnings.
-
-Thu Jun 24 06:43:00 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Reply_Dispatcher.cpp (dispatch_reply): added
-          ACE_UNUSED_ARG (message_state), only with ACE_NDEBUG.
-
-Thu Jun 24 03:30:11 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/Repository.cpp:
-          Added template instantiation declarations.
-
-        * orbsvcs/ImplRepo_Service/tao_ir.dsp:
-          Output file spelled wrong.
-
-        * orbsvcs/Time_Service/Server_i.cpp:
-          Now uses a more specific (and unique) POA name, so it will
-          work better with the IR.
-
-        * orbsvcs/Time_Service/Time_Service_Clerk.dsp:
-        * orbsvcs/Time_Service/Time_Service_Server.dsp:
-        * orbsvcs/Time_Service/IR_Helper.cpp: (REMOVED)
-        * orbsvcs/Time_Service/IR_Helper.h: (REMOVED)
-        * orbsvcs/Time_Service/Server_i.h:
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp: (REMOVED)
-        * orbsvcs/tests/ImplRepo/IR_Helper.h: (REMOVED)
-        * orbsvcs/orbsvcs/IR_Helper.cpp: (ADDED)
-        * orbsvcs/orbsvcs/IR_Helper.h: (ADDED)
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/tests/ImplRepo/airplane_server.dsp:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_server.dsp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h:
-        * orbsvcs/Time_Service/Makefile:
-        * orbsvcs/tests/ImplRepo/Makefile:
-          Moved IR_Helper to orbsvcs library for now.
-
-        * orbsvcs/tests/Time/implrepo.conf:
-          IR doesn't require this anymore.
-
-        * orbsvcs/tests/Time/run_test.pl:
-          Works with new IR.
-
-Wed Jun 23 23:36:22 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/Makefile: Removed Repository_Test.
-
-Wed Jun 23 21:27:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO-INSTALL.html: removed space from "resource requirements"
-          tag to avoid problems with web browers.
-
-Wed Jun 23 20:40:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Environment.cpp:
-          Print out the user provided info, even if there is no
-          exception.
-
-        * tao/corbafwd.h:
-          Minor cosmetic fixes
-
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-          Some non-inline functions where declared inline, fixed.
-
-        * docs/Options.html:
-          The -ORBResources option is not going away, the current behavior
-          is exactly what we want.
-
-        * examples/Simple/time-date/Makefile:
-          The Makefile was not installing the shared library in
-          $ACE_ROOT/ace
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          Trap and ignore exceptions raised by the consumer, to isolate
-          the suppliers from them, thanks to Paul Calabrese
-          <calabrese_p@ociweb.com> for pointing this out.
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-          They don't use the scheduling service anymore (the data was fake
-          anyway).
-          We use perform_work() to wait for events, that way we don't have
-          to shutdown the ORB and we can cleanup the servants, POA,
-          etc. afterwads.
-
-        * orbsvcs/tests/CosEC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Mcast/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-          Use the new real-time event channel to run the tests.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/server.cpp:
-          Several exceptions were not printed correctly.
-
-Wed Jun 23 20:23:01 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl:
-
-          Increased the client time-out value from 60 seconds to 120
-          seconds since the client may take longer to finish on heavily
-          loaded machines.
-
-          Minor cosmetic update (-ORBgioplite --> -ORBGIOPlite) to be more
-          consistent with the "published" TAO ORB options.  Both will
-          work, however.
-
-Wed Jun 23 17:38:52 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp: Fixed warnings in the build.
-
-Wed Jun 23 19:15:48 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * docs/implrepo/index.html: Added persistence to future work
-          list.
-
-Wed Jun 23 17:53:15 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/collocated_sh.cpp: We should
-          generate code using ACE_TRY_ENV instead of TAO_IN_ENV.
-
-        * Any.h:
-        * CDR.h:
-        * CDR_Interpreter.h:
-        * CurrentC.h:
-        * DomainC.h:
-        * DynAnyC.h:
-        * Environment.h:
-        * Exception.h:
-        * Forwarding_Servant.h:
-        * GIOP.h:
-        * GIOP_Server_Request.h:
-        * IIOP_Profile.h:
-        * IORC.h:
-        * Invocation.h:
-        * MProfile.h:
-        * Marshal.h:
-        * MessagingC.h:
-        * MessagingS.h:
-        * NVList.h:
-        * ORB.h:
-        * ORB_Core.h:
-        * Object.h:
-        * POAS.h:
-        * POA_CORBA.h:
-        * Pluggable.h:
-        * PolicyC.h:
-        * PollableC.h:
-        * PollableS.h:
-        * Request.h:
-        * Sequence.h:
-        * Server_Request.h:
-        * Stub.h:
-        * Typecode.h:
-        * UIOP_Profile.h:
-        * corbafwd.h: Replaced all occurences of TAO_TRY_ENV, env, and
-          _tao_env with ACE_TRY_ENV.
-
-Wed Jun 23 17:38:52 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Quoter/Generic_Factory.cpp:
-        * examples/Quoter/Quoter_i.cpp :
-        * examples/Simple/grid/Grid_i.cpp:
-        * examples/Simple/Time/Time_i.cpp: Fixed unused arguments warnings
-          in these files.
-
-Wed Jun 23 17:35:00 1999  Chris Gill <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.{cpp, h, i}
-          orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.{cpp, h, i} (new):
-
-        Hacked apart and am in the process of revamping how the DFS based
-        passes over the dependency graph are done.  This code is in a
-        state of flux and does not yet compile - please do not attempt
-        to add it to any make or project files until it is cleaned up.
-
-Wed Jun 23 17:19:52 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/tao_ir_i.cpp: Fixed some errors on
-          g++.
-
-Wed Jun 23 16:38:54 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * examples/Quoter/run_test.pl:
-        * examples/POA/TIE/run_test.pl:
-        * examples/Forwarding/run_test.pl:
-        * orbsvcs/tests/Time/run_test.pl:
-        * orbsvcs/tests/Logger/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test.pl:
-          Rather that kill(), the servers now terminate();
-
-        * examples/POA/TIE/run_test.pl:
-          Now conforms to the new style.
-
-Wed Jun 23 15:54:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp :
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (destroy): Fixed
-          warnings by remving an extra argument.
-
-Wed Jun 23 15:50:53 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
-
-          Added a '-*- C++ -*-' to force C++ mode when editing in Emacs.
-
-        * tao/UIOP_Acceptor.cpp:
-
-          Cosmetic updates.
-
-        * tao/IIOP_Connector.cpp (make_profile):
-        * tao/UIOP_Connector.cpp (make_profile):
-
-          Comment updates.  No code changes.
-
-Wed Jun 23 15:08:04 1999  Mike Moran  <mm4@cs.wustl.edu>
-
-        * orbsvcs/tests/Trading/Simple_Dynamic.cpp:
-          Fixed warnings by removing unused parameters to method evalDP().
-
-Wed Jun 23 14:42:27 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-          Eliminated optimized generated code for CDR operators for
-          bounded octet sequences. The bounded class does not contain
-          or use message blocks. This undoes a change made earlier
-          today. Thanks to Doug Anderson <doug@clark.net> for
-          pointing out this problem.
-
-Wed Jun 23 14:42:01 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Simple/echo/run_test.pl: Modified it to have the
-          timedout feature.
-
-Wed Jun 23 14:25:09 1999  Mike Moran  <mm4@cs.wustl.edu>
-
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
-        fixed warning in register_factory, removed unused parameter
-
-Wed Jun 23 14:22:04 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Simple/echo/Echo_i.cpp (echo_list): Added
-          ACE_UNUSED_ARG for <message> to ward off warnings.
-
-Wed Jun 23 13:56:52 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * tests/NestedUpcall/Triangle_Test/run_test.pl:
-        * tests/Multiple_Inheritance/run_test.pl:
-          Was timing out too soon, increased the wait time to compensate.
-
-Wed Jun 23 12:33:31 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/child.cpp:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp :
-        * orbsvcs/orbsvcs/AV/sfp.cpp:
-          Fixed a few warnings for unused args. Thanks to Carlos for
-          reporting these.
-
-        * orbsvcs/tests/AVStreams/sfp/run_test.pl:
-          Added a new run_test.pl for the sfp tests.
-        * orbsvcs/tests/AVStreams/sfp/client.cpp:
-          Added a new option -a to specify the server address.
-          Also fixed some warnings. Thanks to Carlos and David for
-          reporting these.
-        * orbsvcs/tests/AVStreams/sfp/common.h:
-          Made the default server address as localhost:10000.
-
-Wed Jun 23 11:32:29 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * /TAO/tests/InterOp-Naming/INS_i.cpp:
-          Fixed a warning for an unused argument.
-
-Wed Jun 23 10:09:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO-INSTALL.html: added link to ACE-INSTALL.html's resource
-          requirements discussion.  Thanks to Gilbert Roulot
-          <gilbert.roulot@tts.thomson-csf.com> for this suggestion.
-
-Wed Jun 23 10:00:16 1999  Pradeep Gore  <pradeep@danzon.cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Multiple.cpp:
-        * examples/Event_Comm/Event_Comm_i.cpp:
-        * examples/Event_Comm/Supplier_Input_Handler.cpp:
-          Fixed unused arg warnings.
-
-Wed Jun 23 09:49:40 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/complex_any.cpp:
-        * TAO/tests/Param_Test/results.cpp:
-        * TAO/tests/Param_Test/typecode.cpp:
-        * TAO/tests/Param_Test/ub_any_seq.cpp:
-        * TAO/tests/Param_Test/ub_short_seq.cpp:
-          Fixed unused arg warnings.
-
-Wed Jun 23 09:26:39 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-          Changed a couple of instances of ACE_dynamic_cast
-          to ACE_reinterpret_cast in generated code. I had earlier
-          changed these from ACE_static_cast mistakenly to
-          ACE_dynamic_cast. Thanks to David for setting me
-          straight.
-
-Wed Jun 23 00:42:05 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/Simple/time-date: Fixed warnings in the code.
-          Thanks to Carlos for reporting this.
-
-Wed Jun 23 00:07:51 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * orbsvcs/tests/Time/run_test.pl: Changed all instances of server
-            and clerk to Time_Service_Server and Time_Service_Clerk.
-
-Tue Jun 22 22:11:40 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/default_resource.cpp:
-          Removed the warning about -ORBresources, the current behavior is
-          acceptable and we decided not to remove the option in the
-          future.
-
-        * orbsvcs/tests/Makefile:
-        * orbsvcs/tests/AVStreams/Makefile:
-        * orbsvcs/tests/AVStreams/benchmark/Makefile:
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl:
-        * orbsvcs/tests/AVStreams/benchmark/svc.conf:
-        * orbsvcs/tests/AVStreams/sfp/Makefile:
-        * orbsvcs/tests/Property/run_test.pl:
-          Updated the Makefiles and scripts on the AV tests, there is some
-          hope of adding them to the nightly builds.
-
-        * orbsvcs/tests/Event/Basic/BCast.cpp:
-          Fixed a warning.
-
-        * tests/POA/Destruction/Makefile:
-          Updated dependencies
-
-Tue Jun 22 21:49:38 1999  Fred Kuhns  <fredk@cs.wustl.edu>
-
-        * IORManipulation.cpp:
-          Fixed usage of type_id, was if (type_id) now if (type_id.in ())
-          This will ensure a const char * is returned for the if.
-
-Tue Jun 22 21:11:56 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Repository.cpp:Added missing template
-          instantiations
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h: Added few missing
-          exceptions in the signature.
-
-Tue Jun 22 20:11:49 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp (locate_servant_i): If incarnate() returns 0, then
-          an OBJ_ADAPTER exception should be raised.  Thanks to Matthew
-          Newhook <matthew@ooc.com> for pointing this out.
-
-Tue Jun 22 20:23:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-          Updated to work in the nightly builds
-
-        * examples/Simple/chat/Broadcaster_i.cpp:
-          Fixed warning
-
-        * tests/Makefile:
-          Added the POA directory
-
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          The POA was not activated
-
-        * examples/Simple/bank/run_test.pl:
-        * examples/Simple/grid/run_test.pl:
-        * examples/Simple/time/run_test.pl:
-        * examples/Simple/time-date/run_test.pl:
-          Minor fixes on the server shutdown
-
-Tue Jun 22 20:10:53 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/echo/server.cpp:
-        * examples/Simple/bank/server.cpp:
-        * examples/Simple/grid/server.cpp:
-        * examples/Simple/time/server.cpp: Made some cosmetic changes.
-
-        * tao/Active_Object_Map.cpp: Removed some statements that were
-          giving compile errors. They were ACE_UNUSED_ARG ()  which were
-          not there.
-
-Tue Jun 22 19:27:21 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Performance/run_test.pl:
-          Make the tests shorter because they were timing out on some
-          platforms.
-
-Tue Jun 22 17:09:45 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Active_Object_Map.cpp
-          (TAO_Multiple_Id_Strategy::is_servant_in_map() and
-          TAO_User_Id_Strategy::bind_using_system_id()): Fixed unused arg
-          warnings.  Thanks to Carlos for pointing these out.
-
-        * tao/Object_Adapter and tao/POA:
-
-          Did some major rework of the POA Current object.  Previously,
-          this object was used for the POA Current as well as the cleanup
-          object. Servant_Upcall has taken over the role of the cleanup
-          object.  Therefore, moved all extra state from POA Current to
-          Servant Upcall.
-
-          The above change allowed me to fix POA::destroy().  Previously,
-          when POA::destroy() was called, the POA object was destroyed
-          immediately.  The problem with this was that there might be
-          outstanding requests being dispatched by this POA.  These
-          outstanding requests access POA state once they complete.  If
-          the POA is already gone by this time, a seg fault will occur.
-          The fix allows the POA destruction to be delayed till all the
-          outstanding requests complete.
-
-        * tests/POA/Destruction/Destruction.cpp: This new test will make
-          sure that the above mentioned change works.
-
-        * test/POA/Identity: Moved this application from examples
-          directory to the test directory.
-
-Tue Jun 22 18:38:35 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/Simple_util.cpp: Made the POA state active
-          before calling the rebind  on the naming service.
-
-Tue Jun 22 17:45:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
-        * orbsvcs/orbsvcs/AV/sfp.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_T.cpp:
-        * tests/Param_Test/param_test_i.cpp:
-          More unused variable/parameter warnings are removed.
-
-Tue Jun 22 17:14:48 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl:
-        * orbsvcs/tests/Time/run_test.pl: Updated the tests to
-          reflect new guidelines concerning timeouts and blocking.
-
-Tue Jun 22 17:07:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Any.h:
-        * tao/Any.cpp:
-          Added the insertion operator for exceptions into anys (copying
-          version).
-
-Tue Jun 22 15:18:46 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * examples/Quoter/run_test.pl:
-        * examples/Simple/bank/run_test.pl:
-        * examples/Simple/grid/run_test.pl:
-        * examples/Simple/time/run_test.pl:
-        * examples/Simple/time-date/run_test.pl:
-        * orbsvcs/tests/AVStreams/benchmarks/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test.pl:
-        * orbsvcs/tests/CosEC_Multiple/run_test2.pl:
-        * orbsvcs/tests/EC_Basic/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl: Updated the tests to
-          reflect new guidelines concerning timeouts and blocking.
-
-Tue Jun 22 15:11:26 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Basic/BCast.cpp:
-          Fixed problems opening and closing the event handler. Thanks to
-          Tom Ziomek for pointing this out.
-
-Tue Jun 22 14:21:41 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp:
-          Methods allocbuf() in *C.i and _allocate_buffer() in *C.cpp
-          always allocate the maximum for the bounded sequence, so the
-          ULong 'length" arg was always unused. Commented it out in the
-          generated code. Warnings reported on Linux builds.
-
-Tue Jun 22 14:02:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/OBV/Typed_Events/Makefile
-          Benchmark/Marshal_Test/Orbix/Makefile,
-          Benchmark/Marshal_Test/TAO/Makefile,
-          Benchmark/Marshal_Test/VisiBroker/Makefile,
-          TAO_IDL/Makefile,
-          performance-tests/Cubit/Hardpack/IDL_Cubit/Makefile,
-          performance-tests/Cubit/VisiBroker/base_server/Makefile,
-          performance-tests/Cubit/VisiBroker/client/Makefile,
-          performance-tests/Thruput/Orbix/Makefile:
-          replaced rm with $(RM).
-
-Tue Jun 22 13:55:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-          Eliminated unused arg in _reset() and added initialization of
-          base class constructor in copy constructor. These were
-          pointed out by Linux warnings in David's build logs.
-
-Tue Jun 22 13:42:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * tao/Active_Object_Map.cpp:
-        * tao/Context.cpp:
-        * tao/GIOP.cpp:
-        * tao/IORC.cpp:
-        * tao/PolicyC.cpp:
-        * tao/Transport_Mux_Strategy.cpp:
-        * tao/UIOP_Transport.cpp:
-        * tao/ValueBase.cpp:
-        * tests/OctetSeq/OctetSeq.cpp:
-          More unused arg warnings removed..
-
-        * tao/IIOP_Connect.cpp:
-        * tao/IIOP_Transport.cpp:
-          In this case the unused argument was actually a bug.
-
-Tue Jun 22 13:19:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile,TAO_IDL/fe/y.tab.{h,cpp}: removed unused
-          arguments.
-
-Tue Jun 22 11:39:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Latency/Makefile:
-          This directory was missing the -Ge 1 option.
-
-        * examples/OBV/Simple_util.cpp:
-        * examples/OBV/Typed_Events/Server_i.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Fixed some of the new egcs warnings
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp:
-          Don't raise an exception if the supplier is already there, it
-          may be because another thread added, because it was
-          connected/disconnected multiple times while the operations where
-          delayed, etc.
-
-        * orbsvcs/tests/Event/lib/Consumer.h:
-        * orbsvcs/tests/Event/lib/Consumer.cpp:
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/Driver.cpp:
-        * orbsvcs/tests/Event/lib/Supplier.h:
-        * orbsvcs/tests/Event/lib/Supplier.cpp:
-          Be more careful with object deactivation, there is no need to
-          deactivate the consumers and suppliers after each disconnect,
-          only on shutdown, that is not only more efficient, but it avoids
-          problems with the POA:  if an object is deactivated it cannot be
-          deactivated until all its pending requests have finished.  This
-          is specially problematic when the object is deactivated while
-          performing an upcall on the same object....
-
-Tue Jun 22 11:11:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_structure.cpp:
-          Removed error output code for non-field member of struct in
-          method in_recrusion(). There can be legitimate non-field
-          things encountered, like values of an enum declared inside
-          the struct, which will not involve any recursion, so we
-          just advance the iterator.
-
-Tue Jun 22 10:29:54 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-          There is no need to deactivate the gateway every time we modify
-          its QoS parameters, the same object reference is still valid.
-          The UDP gateway case is a little different and requires a closer
-          look.
-
-Tue Jun 22 09:52:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.cpp (lookup_value_factory): removed unused arg ACE_TRY_ENV.
-          Thanks to Carlos for the fix.
-
-Tue Jun 22 08:38:12 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-        * orbsvcs/orbsvcs/Makefile:
-          Updated dependencies.
-
-Tue Jun 22 07:59:11 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/ORB.cpp:
-          Fixed a compile error where we were using "env" whereas the
-          parameter passed ACE_TRY_ENV.
-
-Tue Jun 22 02:22:11 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/ImplRepo_Service/Makefile:
-        * orbsvcs/tests/ImplRepo/Makefile:
-          Updated Dependencies and changed for new IR stuff.
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-          Uses relative path for tao_ir.
-
-        * orbsvcs/tests/ImplRepo/Repository_Test.cpp: (REMOVED)
-        * orbsvcs/tests/ImplRepo/Repository_Test.dsp: (REMOVED)
-          Old test does not work with the new Repository.
-
-        * orbsvcs/tests/ImplRepo/svc.conf: (REMOVED)
-          Don't think we need this anymore.
-
-Tue Jun 22 00:38:58 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        New Implementation Repository stuff, featuring a command line
-        helper application, tao_ir; a new IDL interface; extra commands
-        available for the server, and new docs.
-
-        * orbsvcs/orbsvcs/ImplRepo.idl:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/Ping.idl: (REMOVED)
-          Restructured the IDL for Implementation Repository.
-
-        * docs/releasenotes/index.html:
-          ImplRepo link now goes to main ImplRepo page.
-
-        * docs/implrepo/index.html:
-        * docs/implrepo/status.html: (REMOVED)
-        * docs/implrepo/tao_ir.html: (ADDED)
-        * docs/implrepo/usersguide.html:
-          Updated docs and did a little reorganizing.
-          Note: User's Guide has not been fully updated yet.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo.cpp:
-          Converted TAO_* corba macros to ACE_*.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h:
-          Supported new ImplRepo IDL Interface.
-
-        * orbsvcs/ImplRepo_Service/Options.cpp:
-          Removed extra "*/"
-
-        * orbsvcs/ImplRepo_Service/Repository.cpp:
-        * orbsvcs/ImplRepo_Service/Repository.h:
-          Reorganized and worked minimal support (or at least room) for
-          future inclusion of logical servers and Process information.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo.dsw:
-        * orbsvcs/ImplRepo_Service/tao_ir.cpp: (ADDED)
-        * orbsvcs/ImplRepo_Service/tao_ir.dsp: (ADDED)
-        * orbsvcs/ImplRepo_Service/tao_ir_i.cpp: (ADDED)
-        * orbsvcs/ImplRepo_Service/tao_ir_i.h: (ADDED)
-          Added tao_ir command line application that supports the commands
-          activate, add, list, remove, shutdown, and update.  Please see
-          HTML docs for more info.
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp:
-        * orbsvcs/tests/ImplRepo/IR_Helper.h:
-          IR_Helper works with new IR interfaces.
-
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp:
-          Doesn't sleep anymore in the loop.
-
-        * orbsvcs/tests/ImplRepo/airplane_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_i.h:
-          Removed shutdown flags.  Servers do not shutdown after every
-          call in IR mode anymore.
-
-        * orbsvcs/tests/ImplRepo/airplane_server.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server.cpp:
-          Says goodnight when finished.
-
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h:
-          Removed registration code, since tao_ir now handles that.
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-          Redid structure of ir tests.  Now will start IR, then register
-          server, start server, run client, shutdown server, run client
-          (which should then have the IR restart the server).
-
-        * orbsvcs/tests/ImplRepo/ImplRepo.dsw:
-        * orbsvcs/tests/ImplRepo/airplane_client.dsp:
-        * orbsvcs/tests/ImplRepo/airplane_server.dsp:
-        * orbsvcs/tests/ImplRepo/nestea_client.dsp:
-        * orbsvcs/tests/ImplRepo/nestea_server.dsp:
-          General Updates.
-
-Tue Jun 22 00:29:06 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.cpp (key_to_object): Changed to use ACE try macros.
-          Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
-          for pointing this out.
-
-Mon Jun 21 23:34:48 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        Added two new options to TAO and support for them,
-        -ORBImplRepoPort and -ORBImplRepoIOR.  Also added
-        ImplRepoService to the list of services supported by
-        resolve_initial_references ().
-
-        Note: The IR server doesn't support Multicast yet, just the
-        client is done.
-
-        * tao/orbconf.h:
-          Added the necessary macros for ports for ImplRepo multicast and
-          the resolve_initial_references ("ImplRepoService").
-
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          Added resolve_implrepo_service () method and the member variable
-          implrepo_service_.
-
-        * tao/ORB_Core.cpp:
-          Added support for options ORBImplRepoIOR and ORBImplRepoPort.
-
-        * tao/params.h:
-        * tao/params.cpp:
-        * tao/params.i:
-          Added member variables implrepo_service_ior_ and
-          implrepo_service_port_ and accessors for them.
-
-        * docs/Options.html:
-          Updated docs to list the two new ORB options.
-
-Mon Jun 21 23:34:06 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/IORManipulation.h:
-        * tao/IORManipulation.cpp:
-          Fixed throw specs
-
-        * tao/IORS.h:
-        * tao/IORS.cpp:
-          Fixed problems with the _tao_create_collocated()
-          implementation.
-
-Mon Jun 21 22:56:17 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Event.dsw:
-        * orbsvcs/tests/Event/Basic/Basic.dsw:
-        * orbsvcs/tests/Event/Basic/BCast.dsp:
-          Added project for the BCast tests
-
-Mon Jun 21 22:25:30 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/ORB.cpp (resolve_initial_references):
-
-          Added work-around for case when default initial reference ends
-          with forward slash '/' object key delimiter.  The code will soon
-          be updated to work with pluggable protocols that use an object
-          key delimiter other than '/', such as UIOP.
-
-        * tao/ORB_Core.cpp (init):
-
-          Cosmetic updates.
-
-        * tao/Pluggable.cpp (make_mprofile):
-
-          Corrected object key string offset when searching for the object
-          key delimiter in the IOR.  Object keys are, once again, properly
-          appended to endpoints during profile creation (during string to
-          object conversions).
-
-          Fixed error return value mismatch when checking for a full
-          MProfile during MProfile::give_profile() call.  I incorrectly
-          assumed that a return value other than zero was an error.
-
-Mon Jun 21 22:19:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Basic/BCast.h:
-        * orbsvcs/tests/Event/Basic/BCast.cpp:
-          Added a new test for the broadcast based event channel, thanks
-          to Tom Ziomek <tomz@cc.comm.mot.com> for motivating this
-          case.
-
-        * orbsvcs/tests/Event/lib/Supplier.cpp:
-          Changed exception handling to keep sending events even if one of
-          them raises an exceptions.
-
-Mon Jun 21 20:47:46 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * TAO/orbsvcs/tests/Simple_Naming/makefile:
-        * TAO/orbsvcs/tests/Trading/Makefile:
-        * TAO/orbsvcs/tests/ImplRepo/Makefile:
-        * TAO/orbsvcs/examples/CosEC/Factory/Makefile:
-        * TAO/examples/Quoter/Makefile:
-        * TAO/examples/Simple/bank/Makefile:
-        * TAO/examples/Simple/chat/Makefile:
-        * TAO/examples/Simple/echo/Makefile:
-        * TAO/examples/Simple/grid/Makefile:
-        * TAO/examples/Simple/time-date/Makefile: Added -Ge 1 option to
-          these files.
-
-Mon Jun 21 19:41:56 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
-          Removed an unused variable from visit_predefined_type().
-          Caused a CC warning.
-
-Mon Jun 21 19:06:14 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Servant_Base.h (TAO_ServantBase): Change reference count
-          (again) from ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> to
-          ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>.  This way we can utilize
-          the InterlockedIncrement / InterlockedDecrement specializations
-          for Atomic_Op on NT.  Not sure why Nanbor had reverted this
-          change earlier.
-
-Mon Jun 21 19:07:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_union.cpp:
-          Fixed an ACE_ERROR cut-and-paste typo.
-
-        * TAO_IDL/be_include/be_enum_val.h:
-        * TAO_IDL/be/be_enum_val.cpp:
-          Added a virtual compute_size_type(). method. Even though the
-          implementation is trivial, it's necessary because this gets
-          called for all types from be_decl. Be_decl's own version of
-          this function is a no-op, so it must be overridden for all
-          other types. This gets rid of an ACE_ASSERT error when
-          declaring an enum inside a structure.
-
-        * TAO_IDL/be/be_structure.cpp:
-          Removed ACE_ERROR message in in_recursion() method when
-          a null field pointer is found by field::narrow_from_decl().
-          Not everything iside a structure is a field, so this
-          could be a legitimate return value.
-
-Mon Jun 21 18:57:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/POA.cpp:
-          Fixed several places where the return value was checked for -1
-          but actually any value != 0 was an error. Thanks to Irfan for
-          helping me track this down.
-
-Mon Jun 21 18:52:55 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * performance-tests/Cubit/COOL/IDL_Cubit/Makefile:
-        * performance-tests/Cubit/COOL/MT_Cubit/Makefile:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile:
-        * performance-tests/POA/Demux/Makefile:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile:
-        * performance-tests/Pluggable/Makefile:
-        * performance-tests/Thruput/TAO/Makefile:Added -Ge 1 option to
-          the TAO_IDLFLAGS in these Makefile's
-
-Mon Jun 21 18:35:53 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Basic/Observer.cpp: Added initialization of
-          <gwys_>.
-
-        * tests/TAO_Tests.dsw
-        * tests/MT_Server/MT_Server.dsw
-        * tests/MT_Server/client.dsp
-        * tests/MT_Server/server.dsp
-        * tests/OctetSeq/OctetSeq.dsp
-        * tests/OctetSeq/OctetSeq.dsw
-        * tests/OctetSeq/client.dsp
-        * tests/OctetSeq/server.dsp
-
-          New MSVC project files.
-
-Mon Jun 21 17:06:32 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * utils/IOR-parser/Makefile:
-        * utils/catior/Makefile:
-        * utils/nslist/Makefile:
-        * tests/CDR/Makefile:
-        * tests/FL_Cube/Makefile:
-        * tests/InterOp-Naming/Makefile:
-        * tests/MT_Client/Makefile:
-        * tests/MT_Server/Makefile:
-        * tests/Multiple_Inheritance/Makefile:
-        * tests/Native_Exceptions/Makefile:
-        * tests/NestedUpcall/MT_Client_Test/Makefile:
-        * tests/NestedUpcall/Reactor/Makefile:
-        * tests/NestedUpcall/Triangle_Test/Makefile:
-        * tests/OctetSeq/Makefile:
-        * tests/Param_Test/Makefile:
-        * examples/Callback_Quoter/Makefile:
-        * examples/Event_Comm/Makefile:
-        * examples/OBV/Typed_Events/Makefile:
-        * examples/POA/Adapter_Activator/Makefile:
-        * examples/POA/DSI/Makefile:
-        * examples/POA/Default_Servant/Makefile:
-        * examples/POA/Explicit_Activation/Makefile:
-        * examples/POA/FindPOA/Makefile:
-        * examples/POA/Forwarding/Makefile:
-        * examples/POA/Generic_Servant/Makefile:
-        * examples/POA/TIE/Makefile: Added -Ge 1 to these Makefiles.
-
-Mon Jun 21 16:11:02 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * tao/IORManipultion.cpp
-          Added workaround for the MS C++ lib which does not
-          implement the auto_ptr::reset () method.
-
-Mon Jun 21 15:44:16 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * tao/IORManipultion.cpp
-          added template instantion for auto_ptr
-
-Mon Jun 21 14:50:58 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface):  Added ACE_UNUSED_ARG for the <type> argument
-          in _create_collocated_objref.  Thanks to Carlos for pointing
-          this out.
-
-Mon Jun 21 14:54:24 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: Added the option -Ge 1.
-        * rules.tao.GNU : Removed the addition of default variable -Ge 1
-          from this file.
-
-Mon Jun 21 14:15:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Makefile:
-        * performance-tests/Latency/Makefile:
-        * performance-tests/Latency/README:
-        * performance-tests/Latency/client.conf:
-        * performance-tests/Latency/client.cpp:
-        * performance-tests/Latency/run_test.pl:
-        * performance-tests/Latency/server.conf:
-        * performance-tests/Latency/server.cpp:
-        * performance-tests/Latency/test.idl:
-        * performance-tests/Latency/test_i.cpp:
-        * performance-tests/Latency/test_i.h:
-        * performance-tests/Latency/test_i.i:
-          Added new test to measure latency (and throughput) in the ORB,
-          using different configurations (thread-pool,
-          thread-per-connection, etc.)
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-          Fixed close() method, thanks to J. Russell Noseworthy
-          <rnosewor@objectsciences.com> for pointing this
-
-Mon Jun 21 12:10:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-          Updated dependencies
-
-        * tao/Object.h:
-        * tao/Object.cpp:
-          The CORBA::Object::_is_equivalent method *requires* the extra
-          environment parameter.
-
-Mon Jun 21 11:56:03 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO_Static.dsp:
-        * tao/TAO.dsp: Added IORC, IORS, and IORManipulation.
-
-Mon Jun 21 11:52:10 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Fixed problem with Makefile - removed POAS.h from PUB_HDRS
-
-Mon Jun 21 11:32:12 1999  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/Makefile: The platform_macros.GNU file can now set a
-          CPP_LOCATION to override the default, $(CXX).
-
-Mon Jun 21 11:07:03 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/AST_Expression.cpp:
-          Eliminated dependency on <limits.h> and <float.h> by using
-          values defined in Basic_Types.h and deleting a broken
-          #define of MAXCHAR. Thanks to Hata Yoshiaki <hatay@alpha.co.jp>
-          for pointing out that setting signed short and long
-          constants to their minimum values was broken.
-
-Mon Jun 21 11:04:03 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/{IORC, IORS, IORManipulation}.cpp:
-
-          Fixed problem with the ACE_RCSID call.
-
-Mon Jun 21 08:07:46 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Implemented an IOR Manipulation interface (IOR.pidl).
-          Added new files
-              IORC.{h,i,cpp}
-              IORS.{h,i,cpp}
-              IORManipulation.{h,cpp}
-          IOR{C,S} are the usual IDL generated files although the
-          IOR Manipulation object is constrained to be local.  The new
-          class (TAO_IOR_Manipulaiton) is implemted in IORManipultion.
-
-        * Enhanced MProfile to facilitate the new IOR Manipulation
-          class.  MProfile objects can now grow dynamically, that is
-          if you try to add a profile to an already full MProfile,
-          the internal buffer will be increased in size rather then
-          returning an error.
-
-        * Added the default per ORB IOR manipulation object to the ORB
-          class.
-
-        * Updated the Makefile
-
-        * Addressed comments in IIOP_factory.
-
-        * Removed CORBA::Environment arg from TAO_XX_Profile::is_equivalent ()
-          and CORBA_Object::is_equivalent () and TAO_Stub::is_equivalent ()
-
-        * Added the following macro to orbconf.h
-             #define TAO_OBJID_IORMANIPULATION "IORManipulation"
-
-Sun Jun 20 19:35:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-          Changed the private section of TAO_EC_Basic_ObserverStrategy to
-          protected to help implementors of alternative strategies.
-
-Sun Jun 20 16:33:44 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/IIOP_Transport.cpp:
-        * tao/UIOP_Transport.cpp:
-          Avoid crashes if the server dies when we are not expecting a
-          response. Thanks to J. Russell Noseworthy
-          <rnosewor@objectsciences.com> for reporting this problem.
-
-        * tao/GIOP.cpp:
-          Fixed error messages.
-
-        * tests/Multiple_Inheritance/run_test.pl:
-          The test was reporting spurious faults: the server is shutdown
-          using a signal to its exit status is never 0.
-
-        * tests/NestedUpcall/Reactor/run_test.pl:
-          The test was too aggresive, it was using too many file
-          descriptors.
-
-        * tests/InterOp-Naming/INS_test_client.cpp:
-        * tests/InterOp-Naming/Server_i.cpp:
-        * tests/InterOp-Naming/Server_i.h:
-        * tests/InterOp-Naming/run_test.pl:
-          The test is more "standard" now, and the script works in many
-          cases, but it needs more work.
-
-        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
-          Updated the test, it was not activating the POA. But it still
-          fails due to memory managment problems.
-
-Sun Jun 20 14:39:23 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h: Reformatted the documentation
-          so it'll conform to the "ACE+TAO style."
-
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h: Added a definition for
-          TAO_Dynamic_Property::operator=(TAO_Dynamic_Property const &) so
-          that the code will compile with G++.  Thanks to Jean-Marc
-          Strauss <jms97@club-internet.fr> for reporting this.
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp (startup): Make sure to
-          use .in() to work around broken G++ compilers...  Thanks to
-          Jean-Marc Strauss <jms97@club-internet.fr> for reporting this.
-
+Wed Jul  7 18:13:40 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tao/Invocation.cpp: Removed the loop around the wait_for_reply. 
+
+	* TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: Fixed CC5
+	  warnings.  
+  
+	* TAO/tao/Invocation.cpp
+	* TAO/tao/Invocation.i
+	* TAO/tao/Reply_Dispatcher.cpp
+	* TAO/tao/Reply_Dispatcher.h: Integrated the CDR changes done in
+	  ACE_CDR. Stealing the CDR content is coded here now.
+  
+	* TAO/tests/AMI/orb_creation.cpp: Fixed CC5 warnings. 
+
+Wed Jul  7 10:55:06 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* Asynch_Invocation.cpp
+	* Asynch_Invocation.h
+	* MessagingC.h
+	* PollableC.cpp
+	* PollableC.h
+	* PollableS.cpp
+	* PollableS.h
+	* Reply_Dispatcher.cpp
+	* Reply_Dispatcher.h: Guarded the AMI specific classes etc with
+	  TAO_HAS_CORBA_MESSAGING && TAO_POLLER.
+
+Tue Jul  6 22:10:00 1999  Michael Kircher  <mk1@cs.wustl.edu>
+
+	* tao/PollableS.cpp:
+	  Replaced three ACE_BASE_CLASS macros with ACE_CORBA_1 macros to
+	  get VC to compile it.  
+
+	* tao/TAO.dsp
+	* tao/TAO_Static.dsp:
+          Added the files Pollable{C,S}.{h,cpp} and Asynch_Invocation.{h,cpp}.
+
+	* TAO_IDL/be_include/be_decl.h
+	* TAO_IDL/be/be_decl.cpp
+  	* TAO_IDL/be_include/be_interface.h
+  	* TAO_IDL/be/be_interface.cpp:
+  	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+  	* TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+  	* TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp:
+	  Added code to generate ami_handler_ names. The generated names
+	  are held in the corresponding classes, which is then also
+	  responsible for deleting it.
+
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp
+  	* TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h
+  	* TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h:
+          Added these files for code generation of the AMI Handler
+	  skeleton. 
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
+  	* TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h
+  	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
+          Made changes to generate skeleton code for the AMI handler.
+
+  	* TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp:
+	  Added these files for code generation of the AMI handler
+	  servant. 
+
+  	* TAO_IDL/be/be_codegen.h
+	* TAO_IDL/be/be_visitor_factory.cpp
+  	* TAO_IDL/be/be_visitor_interface.cpp
+  	* TAO_IDL/be_include/be_visitor_interface.h
+  	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+    	  Made changes to generate servant code for the AMI handler. 
+
+Tue Jul  6 09:55:42 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* tao/Invocation.cpp
+	* tao/Wait_Strategy.cpp:Commented out the call to
+	  <sending_request> in Invocation class.  
+  
+	* client.muxed.conf: Added this file. This enables MT wait
+	  strategy and MUXED TMS. 
+  
+	* tests/AMI/client.cpp: Addes sendc method.
+  	
+  	
+  
+	* tests/AMI/Makefile
+	* tests/AMI/run_test.pl
+	* tests/AMI/simple-client.conf
+	* tests/AMI/simple-client.cpp
+	* tests/AMI/test-handC.cpp
+	* tests/AMI/test_i.cpp
+	* tests/AMI/test_i.h
+	* tests/AMI/test_i.i:  
+	  Cosmetic changes to print usefull debug messages with thread id
+	  etc.         	  
+
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	  Changes to these files again for making it MT safe. Added
+	  SYNCH_MUTEX to the Hash Table. and protected the
+	  request_id_generator with a lock.		
+    
+
+	* tao/GIOP.cpp
+	* tao/IIOP_Transport.cpp
+	* tao/Invocation.cpp
+	* tao/Invocation.i
+	* tao/Pluggable.cpp
+	* tao/Pluggable.h
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	* tao/Wait_Strategy.cpp
+  	  
+    	  Ooooh!!!. Got the Muxed TMS to work. I havent taken care of the
+	  MT case yet. Need to make the Hash Table with SYNCH
+	  MUTEX. Things should be ok then.
+  
+Sun Jul  4 13:00:38 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu> 
+
+	* Transport_Mux_Strategy.cpp
+	* Transport_Mux_Strategy.h
+	* default_client.cpp: Implemented Muxed TMS. But have nt got to
+	  working yet. It is just there not burting anything.  
+
+	* tao/Asynch_Invocation.cpp
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Client_Strategy_Factory.cpp
+	* tao/Client_Strategy_Factory.h
+	* tao/Invocation.cpp
+	* tao/Invocation.h
+	* tao/Invocation.i
+	* tao/Pluggable.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+	* tao/Transport_Mux_Strategy.cpp
+	* tao/Transport_Mux_Strategy.h
+	* tao/default_client.cpp
+	* tao/default_client.h
+
+	  Moved the message state from <Invocation> classes to the
+	  Transport Mux Strategy. This makes it  to have the behavior of
+	  Transport object acccesing the messaging state uniform, across
+	  Muxed and Exclusive TMS. I have not done Muxed TMS yet. 
+  
+Sat Jul  3 10:54:00 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be_include/be_codegen.h
+	* tao/Asynch_Invocation.cpp
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Invocation.cpp
+	* tao/Invocation.h
+  
+  	  Moved the transport_->idle () to the derived class'
+	  constructors.  
+  
+	* tests/AMI/test.idl
+	  
+  	  Just commented out the other methods. Left only get_number. 
+    	  
+	* Makefile
+	* client.tss.conf
+        * server.dsp
+	* test_i.cpp
+	* README
+	* orb_creation.cpp
+	* simple-client.conf
+	* test_i.h
+	* client.conf
+	* orb_creation.dsp
+	* simple-client.cpp
+	* test_i.i
+	* client.cpp
+	* run_test.pl*
+	* simple_client.dsp
+	* update.log
+	* client.dsp
+	* server.conf
+	* test-handC.cpp
+  	
+  	  Files for the simple test. But you actually need server and
+	  simple-client test files right now.
+  
+
+	* tests/AMI/simple-client.cpp: Removed the iteration part from the
+	  test. Let us keep it really simple.
+
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+	  Changes for generating Reply Handler skeletons. 	  
+
+	* TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp:
+	  Added this file. This file generates the demarshalling skeletons
+	  for the Reply Handler and then calls the Reply Handler's call
+	  back hook methods. This file is not fully done yet. But this
+	  visitor is not used for the time being.
+
+	* tao/Transport_Mux_Strategy.cpp: Fixed the explicit template
+	  instantiation problems.
+
+Fri Jul  2 16:28:08 1999 Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	  Another big step generating code for AMI. Done with sendc
+	  methods and Reply Handler call back methods. Both header files
+	  and cpp files contents. 
+  	 
+  	  TO-DO: Reply Handler skeletons. Reply Handler servants. 
+  
+	* tao/Asynch_Invocation.h
+	* tao/Asynch_Invocation.i
+	* tao/Makefile
+	* tao/MessagingC.h
+	* tao/MessagingS.cpp
+	* tao/Reply_Dispatcher.cpp
+	* tao/Reply_Dispatcher.h
+  
+	* TAO_IDL/Makefile
+	* TAO_IDL/ast/ast_decl.cpp
+	* TAO_IDL/be/be_codegen.cpp
+	* TAO_IDL/be/be_decl.cpp
+	* TAO_IDL/be/be_interface.cpp
+	* TAO_IDL/be/be_type.cpp
+	* TAO_IDL/be/be_visitor_argument.cpp
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_interface.cpp
+	* TAO_IDL/be/be_visitor_operation.cpp
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.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_operation/ami_arglist.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/argument.cpp
+	* TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+	* TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/rettype.cpp
+	* TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+	* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+	* TAO_IDL/be_include/be_codegen.h
+	* TAO_IDL/be_include/be_decl.h
+	* TAO_IDL/be_include/be_interface.h
+	* TAO_IDL/be_include/be_type.h
+	* TAO_IDL/be_include/be_visitor_argument.h
+	* TAO_IDL/be_include/be_visitor_interface.h
+	* TAO_IDL/be_include/be_visitor_operation.h
+	* TAO_IDL/include/ast_decl.h
+  
+  	  Added the following files for the changes mentioned above.
+  
+	* TAO_IDL/be/be_visitor_rettype.cpp
+	* TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
+	* TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp
+	* TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h
+	* TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h
+
+Wed Jun 23 23:19:34 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+	   Added Asynch Invocation class. It makes invocations without 
+	   waiting for the reply. Implemented a portion of Asynch Reply
+	   Dispatcher and Muxed TMS. Not complete yet. 
+  
+  	 * tao/IIOP_Transport.cpp:
+	 * tao/Invocation.cpp:
+	 * tao/Invocation.p:
+	 * tao/Makefilp:
+	 * tao/Reply_Dispatcher.cpp:
+	 * tao/Reply_Dispatcher.p:
+	 * tao/Transport_Mux_Strategy.cpp:
+	 * tao/Transport_Mux_Strategy.p:
+  	
+  	Added the following files. 
+  
+	 * tao/Asynch_Invocation.cpp:
+	 * tao/Asynch_Invocation.h:
+	 * tao/Asynch_Invocation.i:
+  	
+Tue Jun 22 11:59:06 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+  
+  	One more big step on generating AMI call back code. If I get rid
+	of the references to the ReplyHandler from the generated files,
+	I could get things to compile.
+  
+	* TAO_IDL/Makefile:
+	* TAO_IDL/be/be_codegen.cpp:
+	* TAO_IDL/be/be_interface.cpp:
+	* TAO_IDL/be/be_visitor_factory.cpp:
+	* TAO_IDL/be/be_visitor_interface.cpp:
+	* TAO_IDL/be/be_visitor_scope.cpp:
+	* TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_ch.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_operation/ami_arglist.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
+	* TAO_IDL/be_include/be_codegen.h:
+	* TAO_IDL/be_include/be_visitor_interface.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h:
+  
+  	Changes for the above.
+  
+  	* TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h:
+  
+  	Added these files.
+      
 Sun Jun 20 07:40:02 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
 
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.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_union_branch/public_reset_cs.cpp:
+	* TAO_IDL/be/be_visitor_field/field_ch.cpp:
+	  TAO_IDL/be/be_visitor_union_branch/private_ch.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_union_branch/public_reset_cs.cpp:
 
-          In the visit_predefined_type method for all the above, we were
-          generating incorrect mapping for typedef to CORBA::Object. In
-          the earlier buggy version we were checking if the local name of
-          the typedef node is "Object". However, the correct way to do
-          this is to check if the local name of the most primitive type
-          node of the typedef node is "Object".
+	  In the visit_predefined_type method for all the above, we were generating 
+	  incorrect mapping for typedef to CORBA::Object. In the earlier buggy version
+	  we were checking if the local name of the typedef node is "Object". However,
+	  the correct way to do this is to check if the local name of the most primitive
+	  type node of the typedef node is "Object".
 
 Sat Jun 19 22:27:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/Multiple_Inheritance/run_test.pl:
-          Made this test safe for nightly builds.
+	* tests/Multiple_Inheritance/run_test.pl:
+	  Made this test safe for nightly builds.
 
 Sat Jun 19 22:22:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-        * tao/Wait_Strategy.cpp:
-          The thread pool changes had some problems with nested upcalls
-          and the client-side leader follower: they did not keep track of
-          the number of followers properly. This has been fixed.
-
-        * tests/MT_Server/client.cpp:
-        * tests/MT_Server/run_test.pl:
-          Only shutdown the server if the -x option is used.
-          The script uses this feature to pass cleanly all the time.
-
-        * tests/NestedUpcall/Reactor/client.cpp:
-        * tests/NestedUpcall/Reactor/client.h:
-        * tests/NestedUpcall/Reactor/eh_i.cpp:
-        * tests/NestedUpcall/Reactor/eh_i.h:
-        * tests/NestedUpcall/Reactor/mt_client.cpp:
-        * tests/NestedUpcall/Reactor/mt_client.h:
-        * tests/NestedUpcall/Reactor/reactor_i.cpp:
-        * tests/NestedUpcall/Reactor/reactor_i.h:
-        * tests/NestedUpcall/Reactor/run_test.pl:
-        * tests/NestedUpcall/Reactor/server.cpp:
-        * tests/NestedUpcall/Reactor/server.h:
-          The -q option can be used to turn the test silent. This is used
-          to run a high number of iterations in the mt client test.
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.i:
+	* tao/ORB_Core.cpp:
+	* tao/Wait_Strategy.cpp:
+	  The thread pool changes had some problems with nested upcalls
+	  and the client-side leader follower: they did not keep track of
+	  the number of followers properly. This has been fixed.
+
+	* tests/MT_Server/client.cpp:
+	* tests/MT_Server/run_test.pl:
+	  Only shutdown the server if the -x option is used.
+	  The script uses this feature to pass cleanly all the time.
+
+	* tests/NestedUpcall/Reactor/client.cpp:
+	* tests/NestedUpcall/Reactor/client.h:
+	* tests/NestedUpcall/Reactor/eh_i.cpp:
+	* tests/NestedUpcall/Reactor/eh_i.h:
+	* tests/NestedUpcall/Reactor/mt_client.cpp:
+	* tests/NestedUpcall/Reactor/mt_client.h:
+	* tests/NestedUpcall/Reactor/reactor_i.cpp:
+	* tests/NestedUpcall/Reactor/reactor_i.h:
+	* tests/NestedUpcall/Reactor/run_test.pl:
+	* tests/NestedUpcall/Reactor/server.cpp:
+	* tests/NestedUpcall/Reactor/server.h:
+	  The -q option can be used to turn the test silent. This is used
+	  to run a high number of iterations in the mt client test.
 
 Sat Jun 19 17:38:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
-          Fixed code generation for unions with generic
-          CORBA::Object member. TAO IDL compiler classifies
-          CORBA::Object member as a predefined type PT_pseudo,
-          but generated code must be like that for interface.
-          Someday we should make a special type for CORBA::Object
-          in the IDL compiler.
+	* TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
+	  Fixed code generation for unions with generic
+	  CORBA::Object member. TAO IDL compiler classifies
+	  CORBA::Object member as a predefined type PT_pseudo,
+	  but generated code must be like that for interface.
+	  Someday we should make a special type for CORBA::Object
+	  in the IDL compiler.
 
 Sat Jun 19 17:19:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-        * tao/Wait_Strategy.cpp:
-          Added support for thread pools.
-          Moved the Leader_Follower data structure into the ORB_Core and
-          all the methods from ORB_Core into the Leader_Follower class.
-
-        * tests/Makefile:
-        * tests/MT_Server/Makefile:
-        * tests/MT_Server/README:
-        * tests/MT_Server/client.cpp:
-        * tests/MT_Server/run_test.pl:
-        * tests/MT_Server/server.conf:
-        * tests/MT_Server/server.cpp:
-        * tests/MT_Server/test.idl:
-        * tests/MT_Server/test_i.h:
-        * tests/MT_Server/test_i.i:
-        * tests/MT_Server/test_i.cpp:
-          New test for the leader follower implementation.
-
-        * tests/MT_Client/README:
-          Updated
-
-        * tao/UIOP_Profile.cpp:
-          Removed sperious debug message
+	* tao/ORB.h:
+	* tao/ORB.cpp:
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.i:
+	* tao/ORB_Core.cpp:
+	* tao/Wait_Strategy.cpp:
+	  Added support for thread pools.
+	  Moved the Leader_Follower data structure into the ORB_Core and
+	  all the methods from ORB_Core into the Leader_Follower class.
+
+	* tests/Makefile:
+	* tests/MT_Server/Makefile:
+	* tests/MT_Server/README:
+	* tests/MT_Server/client.cpp:
+	* tests/MT_Server/run_test.pl:
+	* tests/MT_Server/server.conf:
+	* tests/MT_Server/server.cpp:
+	* tests/MT_Server/test.idl:
+	* tests/MT_Server/test_i.h:
+	* tests/MT_Server/test_i.i:
+	* tests/MT_Server/test_i.cpp:
+	  New test for the leader follower implementation.
+
+	* tests/MT_Client/README:
+	  Updated
+
+	* tao/UIOP_Profile.cpp:
+	  Removed sperious debug message
 
 Sat Jun 19 15:46:22 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        One more step Generating Reply Handler skeleton code in the client
-        header file. Again, this will get enabled only when the TAO_IDL is
-        called with the -GC flag.
-
-        * TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp:
-        * TAO_IDL/be/be_visitor_argument/ami_arglist.cpp:
-
-        * TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp:
-
-        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_arglist_ch.cpp:
-
-        * TAO_IDL/be_include/be_visitor_argument/ami_arglist.h:
-        * TAO_IDL/be_include/be_visitor_argument/ami_handler_arglist.h:
-
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_ch.h:
-
-        * TAO_IDL/be_include/be_visitor_operation/ami_ch.h:
-        * TAO_IDL/be_include/be_visitor_operation/ami_arglist.h:
-        * TAO_IDL/be_include/be_visitor_operation/ami_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h:
-        * TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_ch.h:
-
-        Added all these files.
-
-        Rename the arglist_* to meaningful *_arglist unformly with
-        meaningful names.
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_visitor_argument.cpp:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_operation.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist_ami.cpp:
-        * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_visitor_argument.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be_include/be_visitor_operation.h:
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h:
-        * TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h:
-
-        Changes for the above work.
-
-        * TAO_IDL/be/be_visitor_argument/arglist_ami.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist_ami.cpp:
-        * be_include/be_visitor_argument/arglist_ami.h:
-        * be_include/be_visitor_operation/arglist_ami.h:
-
-        Removed these files since they have been renamed already.
-
+	One more step Generating Reply Handler skeleton code in the client
+	header file. Again, this will get enabled only when the TAO_IDL is
+	called with the -GC flag.  
+
+	* TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp:
+	* TAO_IDL/be/be_visitor_argument/ami_arglist.cpp:
+
+	* TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp:
+
+	* TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_arglist.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_handler_arglist_ch.cpp:
+
+	* TAO_IDL/be_include/be_visitor_argument/ami_arglist.h:
+	* TAO_IDL/be_include/be_visitor_argument/ami_handler_arglist.h:
+
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_ch.h:
+
+	* TAO_IDL/be_include/be_visitor_operation/ami_ch.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_arglist.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_cs.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h:
+	* TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_ch.h:
+
+	Added all these files. 
+
+	Rename the arglist_* to meaningful *_arglist unformly with
+	meaningful names. 
+  
+	* TAO_IDL/Makefile:
+	* TAO_IDL/be/be_visitor_argument.cpp:
+	* TAO_IDL/be/be_visitor_factory.cpp:
+	* TAO_IDL/be/be_visitor_interface.cpp:
+	* TAO_IDL/be/be_visitor_operation.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/arglist_ami.cpp:
+	* TAO_IDL/be/be_visitor_operation/collocated_ss.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp:
+	* TAO_IDL/be_include/be_codegen.h:
+	* TAO_IDL/be_include/be_visitor_argument.h:
+	* TAO_IDL/be_include/be_visitor_interface.h:
+	* TAO_IDL/be_include/be_visitor_operation.h:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h:
+
+	Changes for the above work.
+  
+	* TAO_IDL/be/be_visitor_argument/arglist_ami.cpp:
+   	* TAO_IDL/be/be_visitor_operation/arglist_ami.cpp:
+	* be_include/be_visitor_argument/arglist_ami.h:
+   	* be_include/be_visitor_operation/arglist_ami.h:
+  
+  	Removed these files since they have been renamed already. 
+  
 Sat Jun 19 15:43:38 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * Cubit/TAO/DII_Cubit/client.dsp:
-        * Cubit/TAO/IDL_Cubit/client.dsp:
-        * Cubit/TAO/IDL_Cubit/server.dsp:
-        * Cubit/TAO/IDL_Cubit/collocation_test.dsp:
-        * Cubit/TAO/MT_Cubit/client.dsp:
-        * Cubit/TAO/MT_Cubit/server.dsp:
-        * POA/Object_Creation_And_Registration/registration.dsp:
-        * Pluggable/client.dsp:
-        * Pluggable/server.dsp: Changed the tao_idl invocation options.
-
-        * docs/compiler.html: Updated documentation.
+	* Cubit/TAO/DII_Cubit/client.dsp:
+	* Cubit/TAO/IDL_Cubit/client.dsp:
+	* Cubit/TAO/IDL_Cubit/server.dsp:
+	* Cubit/TAO/IDL_Cubit/collocation_test.dsp:
+	* Cubit/TAO/MT_Cubit/client.dsp:
+	* Cubit/TAO/MT_Cubit/server.dsp:
+	* POA/Object_Creation_And_Registration/registration.dsp:
+	* Pluggable/client.dsp:
+	* Pluggable/server.dsp: Changed the tao_idl invocation options.
+	
+	* docs/compiler.html: Updated documentation.
 
 Sat Jun 19 14:54:38 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/DynUnion_i_T.h:
-        * tao/DynUnion_i_T.cpp:
-          Cosmetic changes.
-
-        * tao/DynUnion_i.h:
-        * tao/DynUnion_i.cpp:
-          Class DynUnion_i contains a functor class DU_Extractor to
-          check for a match in TypeCode::member-label when
-          constructing or assigning from an Any. DU_Extractor is a
-          template class containing one function check_match(). The
-          cases where the discriminator is a wchar or an enum caused
-          resolution problems with 16 and 32 bit types respectively,
-          so they had been specialized classes inheriting from a
-          non-template base class. The cases for char and boolean,
-          however, needed only the template function check_match()
-          specialized, in order to use to_char and to_boolean. This
-          kept all the compilers happy until recently, when AIX/egcs
-          complained about char and boolean, so they have also been
-          subclassed.
+	* tao/DynUnion_i_T.h:
+	* tao/DynUnion_i_T.cpp:
+	  Cosmetic changes.
+
+	* tao/DynUnion_i.h:
+	* tao/DynUnion_i.cpp:
+	  Class DynUnion_i contains a functor class DU_Extractor to
+	  check for a match in TypeCode::member-label when 
+	  constructing or assigning from an Any. DU_Extractor is a
+	  template class containing one function check_match(). The
+	  cases where the discriminator is a wchar or an enum caused
+	  resolution problems with 16 and 32 bit types respectively,
+	  so they had been specialized classes inheriting from a
+	  non-template base class. The cases for char and boolean,
+	  however, needed only the template function check_match()
+	  specialized, in order to use to_char and to_boolean. This
+	  kept all the compilers happy until recently, when AIX/egcs
+	  complained about char and boolean, so they have also been
+	  subclassed.
 
 Sat Jun 19 12:59:28 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * rules.tao.GNU : Added the default argument ie. -Ge 1 to be used
-          with the IDL compiler. This will take care of most of the
-          flavours of UNIX. Also added a command line rule called
-          tao_native_exception to override the default from the command
-          line. If the application developer wants to change the default
-          through his make file he can override them by using the rule
-          TAO_IDLFLAGS.
-
-        * TAO_IDL/util/utl_global.cpp :
-        * TAO_IDL/driver/drv_args.cpp: Made changes to generate code
-          according to the following rules.
-
-          - If the compilation is on a platform with native C++ exceptions
-          like NT, we may not want the ACE_TRY_ENV variables by default.
-
-          - If the compilation is on a platform with NO native C++
-          exceptions like say g++, the compiler  generates the environment
-          variables.
-
-          - cross platform compilation wherein one may compile on SUN CC
-          with native exceptions but for VxWorks which does not have that
-          capability.. In which case a handle is needed to generate the
-          environment variables. This handle is denoted as a command line
-          option to IDL as -Ge 1
-
-          - A case that is vice-versa to the above. The option for such a
-          case is -Ge 0
-
-        * docs/compiler.html: Added documentation for the -u option in the
-          IDL compiler.
-
-        * DynAny_Test/basic_test.dsp:
-        * InterOp-Naming/client.dsp:
-        * InterOp-Naming/server.dsp:
-        * MT_Client/client.dsp:
-        * MT_Client/server.dsp:
-        * MT_Client/orb_creation.dsp:
-        * MT_Client/simple_client.dsp:
-        * Multiple_Inheritance/client.dsp:
-        * Multiple_Inheritance/server.dsp:
-        * NestedUpcall/Reactor/client.dsp:
-        * NestedUpcall/Reactor/mt-client.dsp:
-        * NestedUpcall/MT_Client_Test/client.dsp:
-        * NestedUpcall/MT_Client_Test/server.dsp:
-        * NestedUpcall/Triangle_Test/initiator.dsp:
-        * NestedUpcall/Triangle_Test/server_A.dsp:
-        * NestedUpcall/Triangle_Test/server_B.dsp:
-        * Param_Test/client.dsp:
-        * Param_Test/server.dsp:
-        * OctetSeq/OctetSeq.dsp:
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Changed the tao_idl
-          invocation parameter in all these NT related project files.  The
-          command line parameter is set to '-Ge 1'.
-
-        * Native_Exceptions/client.dsp:
-        * Native_Exceptions/server.dsp: Here the command line parameters
-          where changed from '-Ge' to '-Ge 0'.
-
-        * examples/Callback_Quoter/Consumer.dsp:
-        * examples/Callback_Quoter/Notifier.dsp:
-        * examples/Callback_Quoter/Supplier.dsp:
-        * examples/Event_Comm/Consumer.dsp:
-        * examples/Event_Comm/Notifier.dsp:
-        * examples/Event_Comm/Supplier.dsp:
-        * examples/OBV/Typed_Events/client.dsp:
-        * examples/OBV/Typed_Events/server.dsp:
-        * examples/POA/DSI/client.dsp:
-        * examples/POA/DSI/server.dsp:
-        * examples/POA/Default_Servant/client.dsp:
-        * examples/POA/Default_Servant/server.dsp:
-        * examples/POA/Forwarding/server.dsp:
-        * examples/POA/Forwarding/client.dsp:
-        * examples/POA/Generic_Servant/client.dsp:
-        * examples/POA/Generic_Servant/server.dsp:
-        * examples/POA/Identity/Identity.dsp:
-        * examples/POA/TIE/client.dsp:
-        * examples/POA/TIE/server.dsp:
-        * examples/Quoter/Factory_Finder.dsp:
-        * examples/Quoter/Generic_Factory.dsp:
-        * examples/Quoter/client.dsp:
-        * examples/Quoter/server.dsp:
-        * examples/Simple/bank/client.dsp:
-        * examples/Simple/bank/server.dsp:
-        * examples/Simple/chat/client.dsp:
-        * examples/Simple/chat/server.dsp:
-        * examples/Simple/echo/server.dsp:
-        * examples/Simple/echo/client.dsp:
-        * examples/Simple/grid/client.dsp:
-        * examples/Simple/grid/server.dsp:
-        * examples/Simple/time/client.dsp:
-        * examples/Simple/time/server.dsp:
-        * examples/Simple/time-date/Time_Date.dsp:
-        * examples//Simulator/DOVEMIB/DOVEMIBx.dsp
-        * examples//Simulator/DOVEMIB/TestClient.dsp:
-        * examples/Simulator/Event_Supplier/DualEC_Sup.dsp:
-        * examples/Simulator/Event_Supplier/Event_Sup.dsp:
-        * examples/Simulator/Event_Supplier/Logging_Sup.dsp:Changed the tao_idl
-          invocation parameter in all these NT related project files.  The
-          command line parameter is set to '-Ge 1'.
+	* rules.tao.GNU : Added the default argument ie. -Ge 1 to be used
+	  with the IDL compiler. This will take care of most of the
+	  flavours of UNIX. Also added a command line rule called
+	  tao_native_exception to override the default from the command
+	  line. If the application developer wants to change the default
+	  through his make file he can override them by using the rule
+	  TAO_IDLFLAGS.
+	
+	* TAO_IDL/util/utl_global.cpp : 
+	* TAO_IDL/driver/drv_args.cpp: Made changes to generate code
+	  according to the following rules.
+	  
+	  - If the compilation is on a platform with native C++ exceptions
+	  like NT, we may not want the ACE_TRY_ENV variables by default. 
+	  
+	  - If the compilation is on a platform with NO native C++
+	  exceptions like say g++, the compiler  generates the environment
+	  variables.
+
+	  - cross platform compilation wherein one may compile on SUN CC
+	  with native exceptions but for VxWorks which does not have that
+	  capability.. In which case a handle is needed to generate the
+	  environment variables. This handle is denoted as a command line
+	  option to IDL as -Ge 1
+
+	  - A case that is vice-versa to the above. The option for such a
+	  case is -Ge 0
+	
+	* docs/compiler.html: Added documentation for the -u option in the
+	  IDL compiler.
+
+	* DynAny_Test/basic_test.dsp:
+	* InterOp-Naming/client.dsp:
+	* InterOp-Naming/server.dsp:
+	* MT_Client/client.dsp:
+	* MT_Client/server.dsp:
+	* MT_Client/orb_creation.dsp:
+	* MT_Client/simple_client.dsp:
+	* Multiple_Inheritance/client.dsp:
+	* Multiple_Inheritance/server.dsp:
+	* NestedUpcall/Reactor/client.dsp:
+	* NestedUpcall/Reactor/mt-client.dsp:
+	* NestedUpcall/MT_Client_Test/client.dsp:
+	* NestedUpcall/MT_Client_Test/server.dsp:
+	* NestedUpcall/Triangle_Test/initiator.dsp:
+	* NestedUpcall/Triangle_Test/server_A.dsp:
+	* NestedUpcall/Triangle_Test/server_B.dsp:
+	* Param_Test/client.dsp:
+	* Param_Test/server.dsp:
+	* OctetSeq/OctetSeq.dsp:
+	* orbsvcs/orbsvcs/orbsvcs.dsp:
+	* orbsvcs/orbsvcs/orbsvcs_static.dsp: Changed the tao_idl
+	  invocation parameter in all these NT related project files.  The
+	  command line parameter is set to '-Ge 1'.
+
+	* Native_Exceptions/client.dsp:
+	* Native_Exceptions/server.dsp: Here the command line parameters
+	  where changed from '-Ge' to '-Ge 0'.
+
+	* examples/Callback_Quoter/Consumer.dsp:
+	* examples/Callback_Quoter/Notifier.dsp:
+	* examples/Callback_Quoter/Supplier.dsp:
+	* examples/Event_Comm/Consumer.dsp:
+	* examples/Event_Comm/Notifier.dsp:
+	* examples/Event_Comm/Supplier.dsp:
+	* examples/OBV/Typed_Events/client.dsp:
+	* examples/OBV/Typed_Events/server.dsp:
+	* examples/POA/DSI/client.dsp:
+	* examples/POA/DSI/server.dsp:
+	* examples/POA/Default_Servant/client.dsp:
+	* examples/POA/Default_Servant/server.dsp:
+	* examples/POA/Forwarding/server.dsp:
+	* examples/POA/Forwarding/client.dsp:
+	* examples/POA/Generic_Servant/client.dsp:
+	* examples/POA/Generic_Servant/server.dsp:
+	* examples/POA/Identity/Identity.dsp:
+	* examples/POA/TIE/client.dsp:
+	* examples/POA/TIE/server.dsp:
+	* examples/Quoter/Factory_Finder.dsp:
+	* examples/Quoter/Generic_Factory.dsp:
+	* examples/Quoter/client.dsp:
+	* examples/Quoter/server.dsp:
+	* examples/Simple/bank/client.dsp:
+	* examples/Simple/bank/server.dsp:
+	* examples/Simple/chat/client.dsp:
+	* examples/Simple/chat/server.dsp:
+	* examples/Simple/echo/server.dsp:
+	* examples/Simple/echo/client.dsp:
+	* examples/Simple/grid/client.dsp:
+	* examples/Simple/grid/server.dsp:
+	* examples/Simple/time/client.dsp:
+	* examples/Simple/time/server.dsp:
+	* examples/Simple/time-date/Time_Date.dsp:
+	* examples//Simulator/DOVEMIB/DOVEMIBx.dsp 
+	* examples//Simulator/DOVEMIB/TestClient.dsp:
+	* examples/Simulator/Event_Supplier/DualEC_Sup.dsp:
+	* examples/Simulator/Event_Supplier/Event_Sup.dsp:
+	* examples/Simulator/Event_Supplier/Logging_Sup.dsp:Changed the tao_idl
+	  invocation parameter in all these NT related project files.  The
+	  command line parameter is set to '-Ge 1'.
 
 Fri Jun 18 21:00:18 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-          Added new token for unsigned integer and new line to
-          grammar to create AST_Expression of that type.
-
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/y.tab.h:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/y.tab.cpp.diff:
-          Added cases to lex for dec, hex and oct integers
-          so that those integer literals with and without
-          leading '-' are differentiated.
-
-          We were having a problem with constants of type
-          unsigned long assigned a value that was
-          > LONG_MAX and < ULONG_MAX. Since all integer
-          literals were read as one case (signed longs)
-          these assignments were viewed as negative
-          numbers and so would cause a coercion error.
-          Now integer literals without a leading - sign
-          are read as unsigned longs, and the existing
-          coercion code will catch legitimate out of
-          bounds errors.
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Moved the check for char printout of value '\'
-          to come before check for isprint(). Char value
-          that's read in as '\\' is stored in an
-          AST_Expression as '\'. isprint() sees this as a
-          printable character, so the case below it testing
-          for '\\' was never reached, and char consts
-          assigned the value of '\\' were getting output as
-          '\', causing a C++ compile error. Thanks to
-          Hata Yoshiaki <hatay@alpha.co.jp> for pointing
-          out this problem.
+	* TAO_IDL/fe/idl.ll:
+	* TAO_IDL/fe/idl.ll:
+	* TAO_IDL/fe/lex.yy.cpp:
+	* TAO_IDL/fe/lex.yy.cpp.diff:
+	  Added new token for unsigned integer and new line to
+	  grammar to create AST_Expression of that type.
+
+	* TAO_IDL/fe/idl.yy:
+	* TAO_IDL/fe/y.tab.h:
+	* TAO_IDL/fe/y.tab.cpp:
+	* TAO_IDL/fe/y.tab.cpp.diff:
+ 	  Added cases to lex for dec, hex and oct integers
+	  so that those integer literals with and without
+	  leading '-' are differentiated.
+
+	  We were having a problem with constants of type
+	  unsigned long assigned a value that was
+	  > LONG_MAX and < ULONG_MAX. Since all integer
+   	  literals were read as one case (signed longs)
+	  these assignments were viewed as negative
+	  numbers and so would cause a coercion error.
+	  Now integer literals without a leading - sign
+	  are read as unsigned longs, and the existing
+ 	  coercion code will catch legitimate out of
+	  bounds errors.
+
+	* TAO_IDL/be/be_sunsoft.cpp:
+	  Moved the check for char printout of value '\'
+	  to come before check for isprint(). Char value
+	  that's read in as '\\' is stored in an
+	  AST_Expression as '\'. isprint() sees this as a
+	  printable character, so the case below it testing
+	  for '\\' was never reached, and char consts 
+	  assigned the value of '\\' were getting output as
+	  '\', causing a C++ compile error. Thanks to 
+	  Hata Yoshiaki <hatay@alpha.co.jp> for pointing
+	  out this problem.
 
 Fri Jun 18 19:37:32 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -4431,996 +672,996 @@ Fri Jun 18 19:37:32 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Fri Jun 18 18:00:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
-          Fixed old g++ warnings
+	* orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+	* orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
+	  Fixed old g++ warnings 
 
 Fri Jun 18 16:22:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/InterOp-Naming/INS_i.cpp:
-          Fixed warning (and semantic error) in INS_i.cpp, strings
-          returned from a servant should be duplicated.
+	* tests/InterOp-Naming/INS_i.cpp:
+	  Fixed warning (and semantic error) in INS_i.cpp, strings
+	  returned from a servant should be duplicated.
 
-        * TAO/orbsvcs/Time_Service/IR_Helper.cpp:
-        * TAO/orbsvcs/Time_Service/IR_Helper.h:
-        * TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h:
-        * TAO/tests/CDR/octet_sequence.cpp:
-          More char* to const char* conversions, but this time they were
-          harmless.
+	* TAO/orbsvcs/Time_Service/IR_Helper.cpp:
+	* TAO/orbsvcs/Time_Service/IR_Helper.h:
+	* TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h:
+	* TAO/tests/CDR/octet_sequence.cpp:
+	  More char* to const char* conversions, but this time they were
+	  harmless.
 
 Fri Jun 18 15:35:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp (visit_array): Moved
-          the generation of the *_array_alloc and *_array_free functions
-          from the i file to the cpp file.  This is because of the
-          lameness of namespaces and MSVC export madness.
+	* TAO_IDL/be/be_visitor_array/array_cs.cpp (visit_array): Moved
+	  the generation of the *_array_alloc and *_array_free functions
+	  from the i file to the cpp file.  This is because of the
+	  lameness of namespaces and MSVC export madness.
 
-        * tao/GIOP.cpp (process_server_request): Removed extra
-          ACE_UNUSED_ARG (response_required) and initialized <request_id>
-          to zero in process_server_request().
+	* tao/GIOP.cpp (process_server_request): Removed extra
+	  ACE_UNUSED_ARG (response_required) and initialized <request_id>
+	  to zero in process_server_request().
 
-        * examples/POA/Forwarding/MyFooServant.cpp (handle_input): Removed
-          extra semi-colon.
+	* examples/POA/Forwarding/MyFooServant.cpp (handle_input): Removed
+	  extra semi-colon.
 
 Fri Jun 18 14:26:27 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp (init):
-          Released the servant pointer before returning.  Actually, Carlos
-          and Marina fixed this.
+	* orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp (init):
+	  Released the servant pointer before returning.  Actually, Carlos
+	  and Marina fixed this.
 
-        * *.{mdp,mak}: Removed all MSVC 4 workspaces and makefiles.  We
-          are no longer supporting this version of MSVC++.  If you need
-          support for MSVC++ 4.x please contact Steve Huston
-          <shuston@riverace.com> of Riverace to arrange a support
-          contract.
+	* *.{mdp,mak}: Removed all MSVC 4 workspaces and makefiles.  We
+ 	  are no longer supporting this version of MSVC++.  If you need
+ 	  support for MSVC++ 4.x please contact Steve Huston
+ 	  <shuston@riverace.com> of Riverace to arrange a support
+ 	  contract.
 
-        * tests/Native_Exceptions/client.cpp (main): Caught exception
-          <fail> is not used.
+	* tests/Native_Exceptions/client.cpp (main): Caught exception
+ 	  <fail> is not used.
 
-        * tests/Native_Exceptions/Native_Exception.dsw:
-        * tests/Native_Exceptions/client.dsp:
-        * tests/Native_Exceptions/server.dsp: New files.
+	* tests/Native_Exceptions/Native_Exception.dsw:
+	* tests/Native_Exceptions/client.dsp:
+	* tests/Native_Exceptions/server.dsp: New files.
 
 Fri Jun 18 11:50:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/Native_Exceptions/Makefile:
-        * tests/Native_Exceptions/README:
-        * tests/Native_Exceptions/run_test.pl:
-        * tests/Native_Exceptions/client.cpp:
-        * tests/Native_Exceptions/server.cpp:
-        * tests/Native_Exceptions/test.idl:
-        * tests/Native_Exceptions/test_i.h:
-        * tests/Native_Exceptions/test_i.i:
-        * tests/Native_Exceptions/test_i.cpp:
-          Added new test that shows how to write applications using native
-          C++ exceptions, without any of the ACE_TRY macros.
+	* tests/Native_Exceptions/Makefile:
+	* tests/Native_Exceptions/README:
+	* tests/Native_Exceptions/run_test.pl:
+	* tests/Native_Exceptions/client.cpp:
+	* tests/Native_Exceptions/server.cpp:
+	* tests/Native_Exceptions/test.idl:
+	* tests/Native_Exceptions/test_i.h:
+	* tests/Native_Exceptions/test_i.i:
+	* tests/Native_Exceptions/test_i.cpp:
+	  Added new test that shows how to write applications using native
+	  C++ exceptions, without any of the ACE_TRY macros.
 
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
-          Added missing template instantiations.
+	* orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+	  Added missing template instantiations.
 
-        * tests/CDR/basic_types.cpp:
-          Fixed const char* warnings...
+	* tests/CDR/basic_types.cpp:
+	  Fixed const char* warnings...
 
 Fri Jun 18 11:32:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/Object_Adapter.h (prepare_for_upcall): Added default
-          environment argument value so it would work fine with IDL
-          generated code when using native exception support.
+	* tao/Object_Adapter.h (prepare_for_upcall): Added default
+	  environment argument value so it would work fine with IDL
+	  generated code when using native exception support.
 
-        * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
-          (visit_operation): Fixed native exception support.
+	* TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
+	  (visit_operation): Fixed native exception support.
 
-        * TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
-          (visit_interface): Some Cosmetic changes.
+	* TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
+	  (visit_interface): Some Cosmetic changes.
 
 Fri Jun 18 11:19:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.cpp:
-          Put the output CDR alllocators in TSS storage *all* the time.
+	* tao/ORB_Core.cpp:
+	  Put the output CDR alllocators in TSS storage *all* the time.
 
 Fri Jun 18 10:07:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * examples/POA/Adapter_Activator/server.cpp:
-        * tests/OctetSeq/test_i.cpp:
-          Fixed minor syntax errors.
+	* examples/POA/Adapter_Activator/server.cpp:
+	* tests/OctetSeq/test_i.cpp:
+	  Fixed minor syntax errors.
 
 Thu Jun 17 23:43:25 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * examples/POA/Adapter_Activator/server.cpp: Fixed servant leak by
-          reference counting it.
+	* examples/POA/Adapter_Activator/server.cpp: Fixed servant leak by
+	  reference counting it.
 
-        * examples/POA/Adapter_Activator/run_test.pl
-        * examples/POA/Explicit_Activation/run_test.pl
-        * examples/POA/Loader/run_test.pl
-        * examples/POA/On_Demand_Activation/run_test.pl
-        * examples/POA/On_Demand_Loading/run_test.pl
+	* examples/POA/Adapter_Activator/run_test.pl
+	* examples/POA/Explicit_Activation/run_test.pl
+	* examples/POA/Loader/run_test.pl
+	* examples/POA/On_Demand_Activation/run_test.pl
+	* examples/POA/On_Demand_Loading/run_test.pl
 
-          Scripts should create one servant at a time.  Otherwise, output
-          is difficult to read.
+	  Scripts should create one servant at a time.  Otherwise, output
+	  is difficult to read.
 
 Thu Jun 17 22:41:17 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp:
-          Fixed dead-lock during startup, it worked on NT thanks to the
-          recursive mutexes in that land.
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.cpp:
+	  Fixed dead-lock during startup, it worked on NT thanks to the
+	  recursive mutexes in that land.
 
-        * TAO_IDL/be/be_visitor_interface/collocated_ss.cpp:
-          Nanbor's changes and ours (Irfan's and mine) did not mix well,
-          fixed.
+	* TAO_IDL/be/be_visitor_interface/collocated_ss.cpp:
+	  Nanbor's changes and ours (Irfan's and mine) did not mix well,
+	  fixed.
 
 Thu Jun 17 22:44:04 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-        * examples/Simple/echo/Echo_i.{h,cpp}: Added throw specs.
-        * examples/Simple/grid/Grid_i.{h,cpp}: Modified throw specs to
-          have double paranthesis.
+	* examples/Simple/echo/Echo_i.{h,cpp}: Added throw specs.
+	* examples/Simple/grid/Grid_i.{h,cpp}: Modified throw specs to
+	  have double paranthesis.
 
 Thu Jun 17 21:45:11 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * performance-tests/Thruput/TAO: Added the ACE_THROW macros.
+	* performance-tests/Thruput/TAO: Added the ACE_THROW macros.
 
-        * examples/Event_Comm: Added the ACE_THROW macros.
+	* examples/Event_Comm: Added the ACE_THROW macros.
 
-        * examples/Simple/time/Time_i: Fixed the ACE_THROW macros to work
-          correctly.
+	* examples/Simple/time/Time_i: Fixed the ACE_THROW macros to work
+ 	  correctly.
 
-        * examples/Simple/bank: Added all the ACE_THROW specs.
+	* examples/Simple/bank: Added all the ACE_THROW specs.
 
-        * ChangeLog: Split the ChangeLog to make a ChangeLog-99a since we
-          were already up to 700k of ChangeLog entries for '99!
+	* ChangeLog: Split the ChangeLog to make a ChangeLog-99a since we
+ 	  were already up to 700k of ChangeLog entries for '99!
 
 Thu Jun 17 20:40:56 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * performance-tests/POA/Object_Creation_And_Registration/run_test.pl:
-          Fixed include path
+	* performance-tests/POA/Object_Creation_And_Registration/run_test.pl:
+	  Fixed include path
 
 Thu Jun 17 21:47:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * be/be_visitor_interface/collocated_sh.cpp:
-        * be/be_visitor_interface/collocated_ss.cpp: Added code for
-          generating collocated _is_a and _non_existent methods.
+	* be/be_visitor_interface/collocated_sh.cpp:
+	* be/be_visitor_interface/collocated_ss.cpp: Added code for
+	  generating collocated _is_a and _non_existent methods.
 
 Thu Jun 17 19:38:57 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-        * tao/Resource_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/default_resource.h:
-        * tao/default_resource.cpp:
-        * docs/Options.html:
-        * docs/configurations.html:
-          Moved the CDR allocators from the resource factory to the
-          ORB_Core resources. They are stored in either per-ORB-per-thread
-          storage or in per-ORB storage.  Notice that the control on the
-          allocators location is left for the -ORBResources flag, but the
-          control of the *type* of allocator is still in the resource
-          factory class.  This completes the separation of roles between
-          the resource factory (that only allocates resources), and the
-          ORB_Core (who manage their lifetime).
-
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/Servant_Base.cpp:
-        * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp:
-          Added new fast accessors to the ORB_Core that do not require a
-          duplicate on every call.
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.i:
+	* tao/ORB_Core.cpp:
+	* tao/Resource_Factory.h:
+	* tao/Resource_Factory.cpp:
+	* tao/default_resource.h:
+	* tao/default_resource.cpp:
+	* docs/Options.html:
+	* docs/configurations.html:
+	  Moved the CDR allocators from the resource factory to the
+	  ORB_Core resources. They are stored in either per-ORB-per-thread
+	  storage or in per-ORB storage.  Notice that the control on the
+	  allocators location is left for the -ORBResources flag, but the
+	  control of the *type* of allocator is still in the resource
+	  factory class.  This completes the separation of roles between
+	  the resource factory (that only allocates resources), and the
+	  ORB_Core (who manage their lifetime).
+
+	* tao/Stub.h:
+	* tao/Stub.i:
+	* tao/Servant_Base.cpp:
+	* TAO_IDL/be/be_visitor_operation/collocated_ss.cpp:
+	  Added new fast accessors to the ORB_Core that do not require a
+	  duplicate on every call.
 
 Thu Jun 17 15:31:17 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * examples/Callback_Quoter/Consumer_i.cpp:
-        * examples/Callback_Quoter/Consumer_i.h:
-        * examples/Callback_Quoter/Notifier_i.cpp:
-        * examples/Callback_Quoter/Notifier_i.h:
-        * examples/OBV/Typed_Events/Server_i.cpp:
-        * examples/OBV/Typed_Events/Server_i.h:
-        * examples/Quoter/Factory_Finder_i.cpp:
-        * examples/Quoter/Factory_Finder_i.h:
-        * examples/Quoter/Generic_Factory_i.cpp:
-        * examples/Quoter/Generic_Factory_i.h:
-        * examples/Quoter/Quoter_i.cpp:
-        * examples/Quoter/Quoter_i.h:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_i.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * performance-tests/Thruput/TAO/ttcp_i.cpp:
-        * performance-tests/Thruput/TAO/ttcp_i.h:
-          More throw spec stuff.
-          Also added several fixes to compile on single threaded
-          environments.
+	* examples/Callback_Quoter/Consumer_i.cpp:
+	* examples/Callback_Quoter/Consumer_i.h:
+	* examples/Callback_Quoter/Notifier_i.cpp:
+	* examples/Callback_Quoter/Notifier_i.h:
+	* examples/OBV/Typed_Events/Server_i.cpp:
+	* examples/OBV/Typed_Events/Server_i.h:
+	* examples/Quoter/Factory_Finder_i.cpp:
+	* examples/Quoter/Factory_Finder_i.h:
+	* examples/Quoter/Generic_Factory_i.cpp:
+	* examples/Quoter/Generic_Factory_i.h:
+	* examples/Quoter/Quoter_i.cpp:
+	* examples/Quoter/Quoter_i.h:
+	* orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+	* orbsvcs/ImplRepo_Service/ImplRepo_i.h:
+	* orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
+	* orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+	* orbsvcs/tests/ImplRepo/IR_Helper.cpp:
+	* orbsvcs/tests/ImplRepo/airplane_i.cpp:
+	* orbsvcs/tests/ImplRepo/airplane_i.h:
+	* orbsvcs/tests/ImplRepo/nestea_i.cpp:
+	* orbsvcs/tests/ImplRepo/nestea_i.h:
+	* performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
+	* performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
+	* performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
+	* performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
+	* performance-tests/Thruput/TAO/ttcp_i.cpp:
+	* performance-tests/Thruput/TAO/ttcp_i.h:
+	  More throw spec stuff.
+	  Also added several fixes to compile on single threaded
+	  environments.
 
 Thu Jun 17 14:21:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): The collocated factory should have used
-          static_cast to downcast the collocated stubs.  Thanks to Carlos
-          for pointing this out.
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+	  (visit_interface): The collocated factory should have used
+	  static_cast to downcast the collocated stubs.  Thanks to Carlos
+	  for pointing this out.
 
 Thu Jun 17 14:05:10 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * examples/POA/Forwarding/MyFooServant.cpp (MyFirstFooServant):
-          Since we are using the NULL_MASK (whose value is zero), some
-          compilers cannot figure out which
-          register_handler/remove_handler I wanted to use.  Fixed by
-          creating a separate variable for the mask and feeding it in.
+	* examples/POA/Forwarding/MyFooServant.cpp (MyFirstFooServant):
+	  Since we are using the NULL_MASK (whose value is zero), some
+	  compilers cannot figure out which
+	  register_handler/remove_handler I wanted to use.  Fixed by
+	  creating a separate variable for the mask and feeding it in.
 
-        * TAO_IDL/fe/fe_lookup.cpp (lookup): Changed {"",} to {"",0} to
-          keep the HP compiler happy.
+	* TAO_IDL/fe/fe_lookup.cpp (lookup): Changed {"",} to {"",0} to
+	  keep the HP compiler happy.
 
-        * TAO_IDL/fe/Makefile.am (fe_lookup.cpp): Fixed the makefile so
-          that the next time fe_lookup.cpp is generated, 0 is used as the
-          fill option.  Thanks to Carlos for pointing this out.
+	* TAO_IDL/fe/Makefile.am (fe_lookup.cpp): Fixed the makefile so
+	  that the next time fe_lookup.cpp is generated, 0 is used as the
+	  fill option.  Thanks to Carlos for pointing this out.
 
 Thu Jun 17 12:58:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/GIOP_Server_Request.cpp: Fixed operation demarshaling for
-          non-ASCII platforms.  Thanks to Jim Rogers <jrogers@viasoft.com>
-          for motivating these fixes.
+	* tao/GIOP_Server_Request.cpp: Fixed operation demarshaling for
+ 	  non-ASCII platforms.  Thanks to Jim Rogers <jrogers@viasoft.com>
+ 	  for motivating these fixes.
 
-        * examples/POA/RootPOA/run_test.pl:
-        * examples/POA/Identity/run_test.pl:
-          Fixed include path
+	* examples/POA/RootPOA/run_test.pl:
+	* examples/POA/Identity/run_test.pl:
+	  Fixed include path
 
 Thu Jun 17 12:33:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/GIOP.cpp:
-        * tao/IIOP_Factory.cpp:
-        * tao/UIOP_Factory.cpp:
-        * tao/Protocol_Factory.cpp:
-          Fixed typo in the last commit.
+	* tao/GIOP.cpp:
+	* tao/IIOP_Factory.cpp:
+	* tao/UIOP_Factory.cpp:
+	* tao/Protocol_Factory.cpp:
+	  Fixed typo in the last commit.
 
 Thu Jun 17 12:04:50 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_valuetype_fwd.cpp:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_valuetype.h:
-        * TAO_IDL/be_include/be_valuetype_fwd.h:
+	* TAO_IDL/be/be_interface_fwd.cpp:
+	* TAO_IDL/be/be_structure.cpp:
+	* TAO_IDL/be/be_union.cpp:
+	* TAO_IDL/be/be_valuetype.cpp:
+	* TAO_IDL/be/be_valuetype_fwd.cpp:
+	* TAO_IDL/be_include/be_interface_fwd.h:
+	* TAO_IDL/be_include/be_structure.h:
+	* TAO_IDL/be_include/be_type.h:
+	* TAO_IDL/be_include/be_union.h:
+	* TAO_IDL/be_include/be_valuetype.h:
+	* TAO_IDL/be_include/be_valuetype_fwd.h:
 
-        Changed the signature of various "gen_out_impl", "gen_out_defn",
-        "gen_var_impl" and "gen_var_defn" signatures from "void" to char
-        *'s with default values 0.
+	Changed the signature of various "gen_out_impl", "gen_out_defn",
+	"gen_var_impl" and "gen_var_defn" signatures from "void" to char
+	*'s with default values 0.
 
-        Thanks to Carlos again for reporting the warnings from IRIX.
+	Thanks to Carlos again for reporting the warnings from IRIX.
 
 Thu Jun 17 11:54:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.cpp:
-          Fixed problem with the ORB reactor initialization on
-          multi-threaded programs with global resources.
+	* tao/ORB_Core.cpp:
+	  Fixed problem with the ORB reactor initialization on
+	  multi-threaded programs with global resources.
 
 Thu Jun 17 11:17:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/ast/ast_generator.cpp:
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
-        * TAO_IDL/be/be_visitor_typecodet/typecode_defn.cpp:
-          Removed unused arg warnings from AIX 4.3 w/ egcs 1.1.2.
+	* TAO_IDL/ast/ast_generator.cpp:
+	* TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+	* TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
+	* TAO_IDL/be/be_visitor_typecodet/typecode_defn.cpp:
+	  Removed unused arg warnings from AIX 4.3 w/ egcs 1.1.2.
 
 Thu Jun 17 10:48:15 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/default_server.cpp:
-        * tao/CDR_Interpreter.cpp:
-        * tao/Operation_Table.cpp:
-        * tao/ORB.cpp:
-        * tao/Stub.cpp:
-        * tao/Typecode.cpp:
-        * tao/ValueBase.cpp:
-        * tao/GIOP.cpp:
-        * tao/Resource_Factory.cpp:
-        * tao/Transport_mux_Strategy.cpp:
-        * tao/Context.cpp:
-        * tao/Messaging_Policy_i.cpp:
-        * tao/Pluggable.cpp:
-        * tao/Protocol_Factory.cpp:
-        * tao/IIOP_Transport.cpp:
-        * tao/UIOP_Factory.cpp:
-        * tao/UIOP_Connect.cpp:
-          Removed unused arg warnings from AIX 4.3 w/ egcs 1.1.2.
+	* tao/default_server.cpp:
+	* tao/CDR_Interpreter.cpp:
+	* tao/Operation_Table.cpp:
+	* tao/ORB.cpp:
+	* tao/Stub.cpp:
+	* tao/Typecode.cpp:
+	* tao/ValueBase.cpp:
+	* tao/GIOP.cpp:
+	* tao/Resource_Factory.cpp:
+	* tao/Transport_mux_Strategy.cpp:
+	* tao/Context.cpp:
+	* tao/Messaging_Policy_i.cpp:
+	* tao/Pluggable.cpp:
+	* tao/Protocol_Factory.cpp:
+	* tao/IIOP_Transport.cpp:
+	* tao/UIOP_Factory.cpp:
+	* tao/UIOP_Connect.cpp:
+	  Removed unused arg warnings from AIX 4.3 w/ egcs 1.1.2.
 
 Thu Jun 17 10:05:53 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * */run_test.pl:
-          Fixed several problems with the EXE_EXT variable.
+	* */run_test.pl:
+	  Fixed several problems with the EXE_EXT variable.
 
 Thu Jun 17 00:47:30 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * TAO_IDL/include/ast_decl.h:
+	* TAO_IDL/ast/ast_decl.cpp:
+	* TAO_IDL/be/be_interface.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
+	* TAO_IDL/include/ast_decl.h:
 
-        Fixed the warnings in IRIX. Thanks to Carlos for reporting this.
+	Fixed the warnings in IRIX. Thanks to Carlos for reporting this.
 
 Thu Jun 17 00:13:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-          Fixed generation of skeletons that require the _cxx_ prefix.
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
+	* TAO_IDL/be/be_interface.cpp:
+	  Fixed generation of skeletons that require the _cxx_ prefix.
 
 Wed Jun 16 23:59:17 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/default_resource.cpp (get_reactor): Must instruct Reactor to
-          delete implementation.
+	* tao/default_resource.cpp (get_reactor): Must instruct Reactor to
+	  delete implementation.
 
-        * tao/TAO.cpp (~TAO_ORB_Manager): Fixed reversed logic in if
-          statement.
+	* tao/TAO.cpp (~TAO_ORB_Manager): Fixed reversed logic in if
+	  statement.
 
-        * tao/ORB_Core.cpp (init): Must setup flags before creating the
-          reactor.  In ~TAO_ORB_Core_TSS_Resources(), must remove()
-          allocators in addition to deleting them.
+	* tao/ORB_Core.cpp (init): Must setup flags before creating the
+	  reactor.  In ~TAO_ORB_Core_TSS_Resources(), must remove()
+	  allocators in addition to deleting them.
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp (init):
-          ORB Manager duplicates before returning. Must assign return
-          value to PortableServer::POA_var.
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp (init):
+	  ORB Manager duplicates before returning. Must assign return
+	  value to PortableServer::POA_var.
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
-          (_default_POA): Must duplicate before return poa.
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+	  (_default_POA): Must duplicate before return poa.
 
-        * orbsvcs/orbsvcs/Log/Logger_i.cpp (Logger_Factory_i): Removed
-          template specialization.  ACE_CString already has a hash()
-          method.
+	* orbsvcs/orbsvcs/Log/Logger_i.cpp (Logger_Factory_i): Removed
+	  template specialization.  ACE_CString already has a hash()
+	  method.
 
 Wed Jun 16 22:49:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * examples/Callback_Quoter/Makefile:
-        * examples/Callback_Quoter/Consumer.idl:
-        * examples/Callback_Quoter/Consumer_Handler.cpp:
-        * examples/Callback_Quoter/Consumer_Handler.h:
-        * examples/Callback_Quoter/Consumer_Input_Handler.cpp:
-        * examples/Callback_Quoter/Consumer_i.cpp:
-        * examples/Callback_Quoter/Notifier_Input_Handler.cpp:
-        * examples/Callback_Quoter/example.stocks:
-        * examples/Callback_Quoter/run_test.pl:
-          Added a run_test.pl to automate this test.
-          Had to modify it so the programs will take options to work in
-          non-interactive mode.
+	* examples/Callback_Quoter/Makefile:
+	* examples/Callback_Quoter/Consumer.idl:
+	* examples/Callback_Quoter/Consumer_Handler.cpp:
+	* examples/Callback_Quoter/Consumer_Handler.h:
+	* examples/Callback_Quoter/Consumer_Input_Handler.cpp:
+	* examples/Callback_Quoter/Consumer_i.cpp:
+	* examples/Callback_Quoter/Notifier_Input_Handler.cpp:
+	* examples/Callback_Quoter/example.stocks:
+	* examples/Callback_Quoter/run_test.pl:
+	  Added a run_test.pl to automate this test.
+	  Had to modify it so the programs will take options to work in
+	  non-interactive mode.
 
 Wed Jun 16 21:08:58 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp
-          (visit_operation): If the operation is oneway and has no "in"
-          parameters, don't generate the <_tao_server_request> argument
-          since it will not be used.
-
-        * tao: The following files were updated to remove "unused
-          argument" warnings.  Thanks to Steve Huston for reporting these
-          warnings.
-
-          - Active_Object_Map.cpp
-          - DomainC.cpp
-          - Key_Adapters.cpp
-          - MessagingC.cpp
-          - MessagingS.cpp
-          - POA.cpp
-          - PolicyC.cpp
-          - Sequence_T.cpp
-          - Servant_Base.cpp
+	* TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+	  (visit_operation): If the operation is oneway and has no "in"
+	  parameters, don't generate the <_tao_server_request> argument
+	  since it will not be used.
+
+	* tao: The following files were updated to remove "unused
+	  argument" warnings.  Thanks to Steve Huston for reporting these
+	  warnings.
+
+	  - Active_Object_Map.cpp
+	  - DomainC.cpp
+	  - Key_Adapters.cpp
+	  - MessagingC.cpp
+	  - MessagingS.cpp
+	  - POA.cpp
+	  - PolicyC.cpp
+	  - Sequence_T.cpp
+	  - Servant_Base.cpp
 
 Wed Jun 16 21:15:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
-          Removed bogus ACE_INLINE declarations, thanks to Dave Meyer
-          <dmeyer@std.saic.com> for pointing this out.
+	* orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+	* orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
+	  Removed bogus ACE_INLINE declarations, thanks to Dave Meyer
+	  <dmeyer@std.saic.com> for pointing this out.
 
 Wed Jun 16 20:14:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.cpp:
-          Added missing initializations
+	* tao/ORB_Core.cpp:
+	  Added missing initializations
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp:
-          Fixed error messages, they were crashing the application
-          (incorrect usage of %p), they were misleading and hard to read.
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp:
+	  Fixed error messages, they were crashing the application
+	  (incorrect usage of %p), they were misleading and hard to read.
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-          Minor fixes for NT.
+	* performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
+	  Minor fixes for NT.
 
-        * tao/varout.i:
-          A minor change to keep HP/aCC happy, thanks to Steve Huston for
-          reporting this problem.
+	* tao/varout.i:
+	  A minor change to keep HP/aCC happy, thanks to Steve Huston for
+	  reporting this problem.
 
-        * tao/TAO.cpp:
-          Catch any exceptions in the destructor so they won't get
-          propagated.
+	* tao/TAO.cpp:
+	  Catch any exceptions in the destructor so they won't get
+	  propagated.
 
 Wed Jun 16 19:59:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.cpp:
-          Fixed reactor initialization problem, thanks to Jeff for
-          reporting this problem.
+	* tao/ORB_Core.cpp:
+	  Fixed reactor initialization problem, thanks to Jeff for
+	  reporting this problem.
 
 Wed Jun 16 19:24:30 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-          (visit_interface): Added an ACE_UNUSED_ARG (ACE_TRY_ENV) for the
-          _unchecked_narrow method.
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+	  (visit_interface): Added an ACE_UNUSED_ARG (ACE_TRY_ENV) for the
+	  _unchecked_narrow method.
 
 Wed Jun 16 19:11:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * examples/POA/Forwarding/run_test.pl:
-          Fixed run-time errors, thanks to Irfan for helping out with
-          this.
+	* examples/POA/Forwarding/run_test.pl:
+	  Fixed run-time errors, thanks to Irfan for helping out with
+	  this.
 
 Wed Jun 16 19:08:47 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/time/Time_i.h:
-        * examples/Simple/time/Time_i.cpp:Added ACE_THROW_SPEC
+	* examples/Simple/time/Time_i.h:
+	* examples/Simple/time/Time_i.cpp:Added ACE_THROW_SPEC
 
 Wed Jun 16 18:54:32 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: If there is
-          _cxx_ in the beginning of an IDL operation or attribute, we will
-          remove that and keep a copy of the original name. TAO IDL's
-          front end adds _cxx_ prefix to the all the reserved
-          keywords. But when we invoke the operation remotely, we should
-          be sending only the name with out "_cxx_" prefix. Similarly, the
-          look up table should be generated with the names without
-          "_cxx_".
-
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/ast/ast_decl.cpp: Added a new method
-          "original_local_name" to return the operation/attribute name
-          without "_cxx_" prefix.
-
-          Thanks to Sean Landis <seanl@rsch.comm.mot.com> for reporting
-          this problem.
-
-          Also, added "-F 0" to the options list given to the gperf by the
-          IDL compiler. This was needed to get rid of the warnings in some
-          platforms.
+	* TAO_IDL/be/be_interface.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp: If there is
+ 	  _cxx_ in the beginning of an IDL operation or attribute, we will
+ 	  remove that and keep a copy of the original name. TAO IDL's
+ 	  front end adds _cxx_ prefix to the all the reserved
+ 	  keywords. But when we invoke the operation remotely, we should
+ 	  be sending only the name with out "_cxx_" prefix. Similarly, the
+ 	  look up table should be generated with the names without
+ 	  "_cxx_".
+
+	* TAO_IDL/include/ast_decl.h:
+	* TAO_IDL/ast/ast_decl.cpp: Added a new method
+ 	  "original_local_name" to return the operation/attribute name
+ 	  without "_cxx_" prefix.
+
+	  Thanks to Sean Landis <seanl@rsch.comm.mot.com> for reporting
+ 	  this problem.
+
+	  Also, added "-F 0" to the options list given to the gperf by the
+ 	  IDL compiler. This was needed to get rid of the warnings in some
+ 	  platforms.
 
-          Thanks to Irfan and Naga for helping in this.
+	  Thanks to Irfan and Naga for helping in this.
 
 Wed Jun 16 18:48:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/ORB_Core.cpp: Removed bogus template instantiations.
+	* tao/ORB_Core.cpp: Removed bogus template instantiations.
 
-        * tao/UIOP_Connector.cpp:
-        * tao/IIOP_Connector.cpp: Removed duplicate template
-          instantiations when compiling in single threaded environments.
+	* tao/UIOP_Connector.cpp:
+	* tao/IIOP_Connector.cpp: Removed duplicate template
+ 	  instantiations when compiling in single threaded environments.
 
 Wed Jun 16 18:26:06 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
-        * examples/Simple/chat/Broadcaster_i.h:
-        * examples/Simple/chat/Broadcaster_i.cpp:
-        * examples/Simple/chat/Receiver_i.h:
-        * examples/Simple/chat/Receiver_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-        * orbsvcs/tests/CosEC_Basic/CosECConsumer.h:
-        * orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp:
-        * orbsvcs/tests/CosEC_Basic/CosECSupplier.h:
-        * orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.h:
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECSupplier.h:
-        * orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp: Added the
-          ACE_THROW spec.
+	* examples/Simple/chat/Broadcaster_i.h:
+	* examples/Simple/chat/Broadcaster_i.cpp:
+	* examples/Simple/chat/Receiver_i.h:
+	* examples/Simple/chat/Receiver_i.cpp:
+	* orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
+	* orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
+	* orbsvcs/tests/CosEC_Basic/CosECConsumer.h:
+	* orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp:
+	* orbsvcs/tests/CosEC_Basic/CosECSupplier.h:
+	* orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp:
+	* orbsvcs/tests/CosEC_Multiple/CosECConsumer.h:
+ 	* orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
+	* orbsvcs/tests/CosEC_Multiple/CosECSupplier.h:
+	* orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp: Added the
+ 	  ACE_THROW spec.
 
 Wed Jun 16 18:17:24 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/DomainS.cpp
-        * tao/MessagingS.cpp
-        * tao/POAS.cpp
-        * tao/PolicyS.cpp
-        * tao/PollableS.cpp Fixed initialization of <skel_ptr_> in
-          TAO_operation_db_entry by changing the nothing initialization to
-          a zero initialization.
+	* tao/DomainS.cpp
+	* tao/MessagingS.cpp
+	* tao/POAS.cpp
+	* tao/PolicyS.cpp
+	* tao/PollableS.cpp Fixed initialization of <skel_ptr_> in
+ 	  TAO_operation_db_entry by changing the nothing initialization to
+ 	  a zero initialization.
 
 Wed Jun 16 18:17:24 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/grid/Grid_i.h:
-        * examples/Simple/grid/Grid_i.cpp:Added the ACE_THROW_SPEC
+	* examples/Simple/grid/Grid_i.h:
+	* examples/Simple/grid/Grid_i.cpp:Added the ACE_THROW_SPEC
 
 Wed Jun 16 17:50:10 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/Simple/time-date/Time_Date_i: Added the ACE_THROW
-          specs.
+	* examples/Simple/time-date/Time_Date_i: Added the ACE_THROW
+	  specs.
 
 Wed Jun 16 17:35:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Fixed warning due to misplaced comment.
+	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+	  Fixed warning due to misplaced comment.
 
 Wed Jun 16 16:54:11 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/Object.cpp (CORBA_Object): Check for a non-zero
-          <protocol_proxy_> before accessing it.  Thanks to Mark
-          L. Boriack <mboriack@sito.saic.com> for this suggestion.
+	* tao/Object.cpp (CORBA_Object): Check for a non-zero
+	  <protocol_proxy_> before accessing it.  Thanks to Mark
+	  L. Boriack <mboriack@sito.saic.com> for this suggestion.
 
 Wed Jun 16 16:05:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * performance-tests/POA/Object_Creation_And_Registration/run_test.pl:
-        * examples/POA/Identity/run_test.pl:
-        * examples/POA/RootPOA/run_test.pl:
-          Added scripts to timeout the test in case of failure
+	* performance-tests/POA/Object_Creation_And_Registration/run_test.pl:
+	* examples/POA/Identity/run_test.pl:
+	* examples/POA/RootPOA/run_test.pl:
+	  Added scripts to timeout the test in case of failure
 
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-          New test for the collocated and remote event channel
+	* orbsvcs/tests/EC_Throughput/run_test.pl:
+	  New test for the collocated and remote event channel
 
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Fixed event channel shutdown
+	* orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+	  Fixed event channel shutdown
 
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
-          Fixed multi-threaded dispatching strategy.
+	* orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+	* orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
+	  Fixed multi-threaded dispatching strategy.
 
-        * tests/MT_Client/Makefile:
-          Use the IDL_EXT macro for the .PRECIOUS and realclean targets.
+	* tests/MT_Client/Makefile:
+	  Use the IDL_EXT macro for the .PRECIOUS and realclean targets.
 
 Wed Jun 16 15:59:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO/tests/Param_Test/client.dsp:
-        * TAO/tests/Param_Test/Makefile:
-        * TAO/performance-tests/Pluggable/client.dsp:
-        * TAO/performance-tests/Pluggable/Makefile:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile:
-          Modified files to reflect the new independence of
-          client code from generated *S.* files.
+	* TAO/tests/Param_Test/client.dsp:
+	* TAO/tests/Param_Test/Makefile:
+	* TAO/performance-tests/Pluggable/client.dsp:
+	* TAO/performance-tests/Pluggable/Makefile:
+	* TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp:
+	* TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile:
+	* TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp:
+	* TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile:
+	  Modified files to reflect the new independence of
+	  client code from generated *S.* files.
 
 Wed Jun 16 13:41:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * Incorporated the changes in the second phase for the
-          asynchronous messaging support.  This time Alex changed the IDL
-          compiler to generate the ReplyHandler and the sendc_ methods.
-          The merge includes all the changes from ami_phase2_start to
-          ami_phase2_end.
+	* Incorporated the changes in the second phase for the
+	  asynchronous messaging support.  This time Alex changed the IDL
+	  compiler to generate the ReplyHandler and the sendc_ methods.
+	  The merge includes all the changes from ami_phase2_start to
+	  ami_phase2_end.
 
 Wed Jun 16 15:31:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
-          Fixed code that was adding the scope twice when setting the
+	* TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
+	  Fixed code that was adding the scope twice when setting the
           discriminant to a default (unused) enum value.
 
 Wed Jun 16 15:10:17 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * examples/POA/Forwarding/MyFooServant.cpp (handle_input): Changed
-          ACE_CHECK to ACE_TRY_CHECK.  Thanks to Carlos for reporting this
-          warning.
+	* examples/POA/Forwarding/MyFooServant.cpp (handle_input): Changed
+	  ACE_CHECK to ACE_TRY_CHECK.  Thanks to Carlos for reporting this
+	  warning.
 
 Wed Jun 16 14:57:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/DynUnion_i.h:
-        * tao/DynUnion_i.cpp:
-        * tao/DynUnion_i_T.h:
-        * tao/DynUnion_i_T.cpp: Removed the 'const' from the Any args of
-          the DynUnion extractor functions, both template and specialized
-          versions. Thanks to Steve Huston <shuston@riverace.com> for
-          reporting the errors with AIX 4.3 w/ IBM C/C++ 3.6.4.
+	* tao/DynUnion_i.h:
+	* tao/DynUnion_i.cpp:
+	* tao/DynUnion_i_T.h:
+	* tao/DynUnion_i_T.cpp: Removed the 'const' from the Any args of
+ 	  the DynUnion extractor functions, both template and specialized
+ 	  versions. Thanks to Steve Huston <shuston@riverace.com> for
+ 	  reporting the errors with AIX 4.3 w/ IBM C/C++ 3.6.4.
 
 Wed Jun 16 14:00:53 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: Commented out
-          an unused variable that was causing a compiler warning reported
-          by Carlos.
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp: Commented out
+ 	  an unused variable that was causing a compiler warning reported
+ 	  by Carlos.
 
 Wed Jun 16 13:47:54 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/AV/sfp.cpp: Fixed the THROW_SPEC warnings on
-          HP-UX. Thanks to Steve Huston for reporting these.
+	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+	* orbsvcs/orbsvcs/AV/sfp.cpp: Fixed the THROW_SPEC warnings on
+ 	  HP-UX. Thanks to Steve Huston for reporting these.
 
 Wed Jun 16 13:23:57 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
 
-        * orbsvcs/Time_Service/IR_Helper.cpp:
-          Fixed ACE_THROW_SPEC
+	* orbsvcs/Time_Service/IR_Helper.cpp:
+	  Fixed ACE_THROW_SPEC
 
-        * tests/InterOp-Naming/INS_i.cpp,
-        * tests/InterOp-Naming/INS_i.h:
-          Fixed ACE_THROW_SPEC.
+	* tests/InterOp-Naming/INS_i.cpp,
+	* tests/InterOp-Naming/INS_i.h:
+	  Fixed ACE_THROW_SPEC.
 
 Wed Jun 16 12:30:21 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/Makefile:
-        * docs/Options.html:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-        * tao/Object_Adapter.cpp:
-        * tao/POA.cpp:
-        * tao/Policy_Manager.cpp:
-        * tao/Servant_Base.cpp:
-        * tao/IIOP_Connect.cpp:
-        * tao/UIOP_Connect.cpp:
-        * tao/Resource_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/default_resource.h:
-        * tao/default_resource.i:
-        * tao/default_resource.cpp: Added new per-ORB-per-thread
-          resources, they only include the reactor and the output CDR
-          allocators at this point. This eliminates some of the problems
-          at shutdown because now the reactor goes down *after* the ORB
-          shutdowns, not before.  Also added a new option to the ORB (not
-          the resource factory) to control if the resources are TSS or
-          global, the old option in the resource factory is maintained for
-          backwards compatibility
-
-        * tests/OctetSeq/Makefile:
-        * tests/OctetSeq/README:
-        * tests/OctetSeq/client.cpp:
-        * tests/OctetSeq/run_test.pl:
-        * tests/OctetSeq/server.cpp:
-        * tests/OctetSeq/test.idl:
-        * tests/OctetSeq/test_i.cpp:
-        * tests/OctetSeq/test_i.h:
-        * tests/OctetSeq/test_i.i:
-        * tests/OctetSeq/OctetSeq.cpp: Added a new test to check the octet
-          sequence optimizations have no side effects across multiple
-          calls.
+	* tao/Makefile:
+	* docs/Options.html:
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.i:
+	* tao/ORB_Core.cpp:
+	* tao/Object_Adapter.cpp:
+	* tao/POA.cpp:
+	* tao/Policy_Manager.cpp:
+	* tao/Servant_Base.cpp:
+	* tao/IIOP_Connect.cpp:
+	* tao/UIOP_Connect.cpp:
+	* tao/Resource_Factory.h:
+	* tao/Resource_Factory.cpp:
+	* tao/default_resource.h:
+	* tao/default_resource.i:
+	* tao/default_resource.cpp: Added new per-ORB-per-thread
+ 	  resources, they only include the reactor and the output CDR
+ 	  allocators at this point. This eliminates some of the problems
+ 	  at shutdown because now the reactor goes down *after* the ORB
+ 	  shutdowns, not before.  Also added a new option to the ORB (not
+ 	  the resource factory) to control if the resources are TSS or
+ 	  global, the old option in the resource factory is maintained for
+ 	  backwards compatibility
+
+	* tests/OctetSeq/Makefile:
+	* tests/OctetSeq/README:
+	* tests/OctetSeq/client.cpp:
+	* tests/OctetSeq/run_test.pl:
+	* tests/OctetSeq/server.cpp:
+	* tests/OctetSeq/test.idl:
+	* tests/OctetSeq/test_i.cpp:
+	* tests/OctetSeq/test_i.h:
+	* tests/OctetSeq/test_i.i:
+	* tests/OctetSeq/OctetSeq.cpp: Added a new test to check the octet
+ 	  sequence optimizations have no side effects across multiple
+ 	  calls.
 
 Wed Jun 16 03:13:22 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * TAO_IDL/ast/ast_expression.cpp (eval_un_op): Fixed an obscure
-          bug in TAO's IDL compiler whereby negative constants weren't
-          being evaluated correctly.  Thanks to Hata Yoshiaki
-          <hatay@alpha.co.jp> for reporting this.
+	* TAO_IDL/ast/ast_expression.cpp (eval_un_op): Fixed an obscure
+ 	  bug in TAO's IDL compiler whereby negative constants weren't
+ 	  being evaluated correctly.  Thanks to Hata Yoshiaki
+ 	  <hatay@alpha.co.jp> for reporting this.
 
 Wed Jun 16 01:12:55 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * docs/releasenotes/orbcore.html: Updated information wrt
-          collocation support.
+	* docs/releasenotes/orbcore.html: Updated information wrt
+ 	  collocation support.
 
-        * docs/poa_migration.html:
-        * docs/compiler.html: Removed section about having to include both
-          stubs and skeletons in the client side and how to generate "pure
-          client" code.
+	* docs/poa_migration.html:
+	* docs/compiler.html: Removed section about having to include both
+ 	  stubs and skeletons in the client side and how to generate "pure
+ 	  client" code.
 
-        * TAO-INSTALL.html: Updated intructions on creating MSVC projects.
-          Removed VC 4.2 section.
+	* TAO-INSTALL.html: Updated intructions on creating MSVC projects.
+  	  Removed VC 4.2 section.
 
 Tue Jun 15 22:16:57 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
 
-        * orbsvcs/tests/Concurrency/CC_command.cpp
-        * orbsvcs/tests/Concurrency/CC_test_utils.cpp
-        * orbsvcs/tests/Concurrency/CC_tests.cpp
-        * orbsvcs/Logging_Service/Logging_Service_i.h,cpp: Added
-          ACE_const_cast statements. Those should have been checked in a
-          while ago, but I screwed up. Also, I migrated the TAO_THROW
-          macros to ACE_THROW macros in the Concurrency files.
+	* orbsvcs/tests/Concurrency/CC_command.cpp
+	* orbsvcs/tests/Concurrency/CC_test_utils.cpp
+	* orbsvcs/tests/Concurrency/CC_tests.cpp
+	* orbsvcs/Logging_Service/Logging_Service_i.h,cpp: Added
+ 	  ACE_const_cast statements. Those should have been checked in a
+ 	  while ago, but I screwed up. Also, I migrated the TAO_THROW
+ 	  macros to ACE_THROW macros in the Concurrency files.
 
 Tue Jun 15 20:19:43 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/Any.cpp: Removed a comment to me that I had left after
-          fixing what the comment referred to.
+	* tao/Any.cpp: Removed a comment to me that I had left after
+ 	  fixing what the comment referred to.
 
-        * TAO/performance-tests/Pluggable/PP_Test_Server.cpp:
-        * TAO/performace-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp: Added
-          a check of the return value of parse_args().
+	* TAO/performance-tests/Pluggable/PP_Test_Server.cpp:
+	* TAO/performace-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp: Added
+ 	  a check of the return value of parse_args().
 
 Tue Jun 15 20:15:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/tests/Trading/Offer_Exporter.cpp:
-        * orbsvcs/tests/Trading/Offer_Exporter.h:
-        * orbsvcs/tests/Trading/Offer_Importer.cpp:
-        * orbsvcs/tests/Trading/Offer_Importer.h:
-        * orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
-        * orbsvcs/tests/Trading/Service_Type_Exporter.h:
-        * orbsvcs/tests/Trading/Simple_Dynamic.cpp:
-        * orbsvcs/tests/Trading/Simple_Dynamic.h:
-        * orbsvcs/tests/Trading/TT_Info.h: More TAO_THROW_SPEC converted
-          to ACE_THROW_SPEC, easy job thanks to Seth foresight...
+	* orbsvcs/tests/Trading/Offer_Exporter.cpp:
+	* orbsvcs/tests/Trading/Offer_Exporter.h:
+	* orbsvcs/tests/Trading/Offer_Importer.cpp:
+	* orbsvcs/tests/Trading/Offer_Importer.h:
+	* orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
+	* orbsvcs/tests/Trading/Service_Type_Exporter.h:
+	* orbsvcs/tests/Trading/Simple_Dynamic.cpp:
+	* orbsvcs/tests/Trading/Simple_Dynamic.h:
+	* orbsvcs/tests/Trading/TT_Info.h: More TAO_THROW_SPEC converted
+ 	  to ACE_THROW_SPEC, easy job thanks to Seth foresight...
 
 Tue Jun 15 18:49:56 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao: Fixed simple miscellaneous stuff marked by Dr. Schmidt.
-          - Active_Object_Map.h
-          - Active_Object_Map.i
-          - Forwarding_Servant.cpp
+	* tao: Fixed simple miscellaneous stuff marked by Dr. Schmidt.
+	  - Active_Object_Map.h
+	  - Active_Object_Map.i
+	  - Forwarding_Servant.cpp
 
 Tue Jun 15 18:04:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Added new file for the event
-          channel implementation.
+	* orbsvcs/orbsvcs/orbsvcs.dsp:
+	* orbsvcs/orbsvcs/orbsvcs_static.dsp: Added new file for the event
+ 	  channel implementation.
 
 Tue Jun 15 17:44:45 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * examples/POA: Fixed the throw spec.
+	* examples/POA: Fixed the throw spec.
 
-        * examples/POA/Forwarding/MyFooServant.h
-          (MyFirstFooServant::forward): Added a *hack* (but it's the only
-          one in TAO so that's ok ;-))!  We cannot ask the POA to forward
-          us while the upcall is still in progress.  So we ask the Reactor
-          to wake us up as soon as this upcall completes.  At that time
-          (in handle_input), we ask the POA to forward us.
+	* examples/POA/Forwarding/MyFooServant.h
+ 	  (MyFirstFooServant::forward): Added a *hack* (but it's the only
+ 	  one in TAO so that's ok ;-))!  We cannot ask the POA to forward
+ 	  us while the upcall is still in progress.  So we ask the Reactor
+ 	  to wake us up as soon as this upcall completes.  At that time
+	  (in handle_input), we ask the POA to forward us.
 
-          The politically correct way to handle this is to use a separate
-          object (probably a separate interface, e.g., a forwarding agent)
-          to do the forwarding.
+	  The politically correct way to handle this is to use a separate
+ 	  object (probably a separate interface, e.g., a forwarding agent)
+ 	  to do the forwarding.
 
-          Also fixed some ACE_DEBUG usage errors.
+	  Also fixed some ACE_DEBUG usage errors.
 
-        * tao/Invocation.cpp (TAO_GIOP_Twoway_Invocation::start and
-          TAO_GIOP_Locate_Request_Invocation::start): If there was a
-          previous reply, cleanup its state first.  Thanks to Carlos for
-          helping with this.
+	* tao/Invocation.cpp (TAO_GIOP_Twoway_Invocation::start and
+ 	  TAO_GIOP_Locate_Request_Invocation::start): If there was a
+ 	  previous reply, cleanup its state first.  Thanks to Carlos for
+ 	  helping with this.
 
 Tue Jun 15 16:42:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/Exception.h:
-        * tao/Exception.cpp: Added the _raise() method to the system
-          exceptions
+	* tao/Exception.h:
+	* tao/Exception.cpp: Added the _raise() method to the system
+ 	  exceptions
 
 Tue Jun 15 16:16:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * TAO_IDL/be_include/be_visitor_operation/collocated_ss.h:
-        * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
-          (void_return_type): Added a helper method to determine whether
-          the generated function returns void or not.  Replaced several
-          places that can use the method.
+	* TAO_IDL/be_include/be_visitor_operation/collocated_ss.h:
+	* TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
+	  (void_return_type): Added a helper method to determine whether
+ 	  the generated function returns void or not.  Replaced several
+ 	  places that can use the method.
 
-          (visit_operation): Added ACE_UNUSED_ARG for _tao_retval to avoid
-          warngings on some platforms.
+	  (visit_operation): Added ACE_UNUSED_ARG for _tao_retval to avoid
+	  warngings on some platforms.
 
-          The following changes decouple the generated skeletons from the
-          generated stubs.  Therefore, there's no need to include *S.*
-          files on client side anymore.
+	  The following changes decouple the generated skeletons from the
+ 	  generated stubs.  Therefore, there's no need to include *S.*
+ 	  files on client side anymore.
 
-        * TAO_IDL/be_include/be_visitor_interface/interface_ss.h:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): Fixed the code to generate
-          <_create_collocated_objref.>
+	* TAO_IDL/be_include/be_visitor_interface/interface_ss.h:
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+	  (visit_interface): Fixed the code to generate
+	  <_create_collocated_objref.>
 
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-          (visit_interface): Changed to use the _create_collocated_objref
-          of ServantBase to get the collocated object from the servant.
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+	  (visit_interface): Changed to use the _create_collocated_objref
+	  of ServantBase to get the collocated object from the servant.
 
-        * TAO_IDL/be/be_codegen.cpp (start_client_stubs): There's no need
-          to include the server header file in client side anymore.
+	* TAO_IDL/be/be_codegen.cpp (start_client_stubs): There's no need
+	  to include the server header file in client side anymore.
 
-        * tao/Servant_Base.{h,cpp} (_create_collocated_objref): This
-          function now takes an extra argument <repository_id> so we can
-          check whether we are asking for the right collocated object
-          reference.
+	* tao/Servant_Base.{h,cpp} (_create_collocated_objref): This
+	  function now takes an extra argument <repository_id> so we can
+	  check whether we are asking for the right collocated object
+	  reference.
 
 Tue Jun 15 16:18:12 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/decode.cpp: Put back a couple of lines that got cut out
-          accidently in TAO_Marshal_Sequence::decode(). Thanks to Carlos
-          for reporting the Param_Test DII error and to Nanbor for his
-          help in navigating through the extensive change he recently made
-          to this file.
+	* tao/decode.cpp: Put back a couple of lines that got cut out
+ 	  accidently in TAO_Marshal_Sequence::decode(). Thanks to Carlos
+ 	  for reporting the Param_Test DII error and to Nanbor for his
+ 	  help in navigating through the extensive change he recently made
+ 	  to this file.
 
 Tue Jun 15 15:08:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO-INSTALL.html: Updated NT installation notes because the
-          ACE_ROOT and/or TAO_ROOT variable is required.
+	* TAO-INSTALL.html: Updated NT installation notes because the
+ 	  ACE_ROOT and/or TAO_ROOT variable is required.
 
-        * orbsvcs/tests/Event/Basic/run_test.pl:
-        * orbsvcs/tests/Event/Performance/run_test.pl: Use the new
-          features in the Process perl class to timeout any of the tests.
+	* orbsvcs/tests/Event/Basic/run_test.pl:
+	* orbsvcs/tests/Event/Performance/run_test.pl: Use the new
+ 	  features in the Process perl class to timeout any of the tests.
 
 Tue Jun 15 14:50:29 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO/performance-tests/Pluggable/PP_Test_i.h:
-        * TAO/performance-tests/Pluggable/PP_Test_i.cpp: Added
-          ACE_THROW_SPEC code to member functions.
+	* TAO/performance-tests/Pluggable/PP_Test_i.h:
+	* TAO/performance-tests/Pluggable/PP_Test_i.cpp: Added
+ 	  ACE_THROW_SPEC code to member functions.
 
 Tue Jun 15 13:24:30 1999  Marina Spivak  <marina@cs.wustl.edu>
 
-        * orbsvcs/tests/Simple_Naming/client.cpp: Added ACE_THROW_SPEC
-          macros.
+	* orbsvcs/tests/Simple_Naming/client.cpp: Added ACE_THROW_SPEC
+ 	  macros.
 
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: Added
-          missing template instantiations, workarounds for g++ template
-          problems.
+	* orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+	* orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+	* orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: Added
+ 	  missing template instantiations, workarounds for g++ template
+ 	  problems.
 
 Tue Jun 15 12:23:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/ORB.h (CORBA_ORB): Removed old comments about perform_work()
-          and work_pending() not being supported -- they are actually
-          supported now.  Thanks to Pradeep Gore for pointing this out.
+	* tao/ORB.h (CORBA_ORB): Removed old comments about perform_work()
+ 	  and work_pending() not being supported -- they are actually
+ 	  supported now.  Thanks to Pradeep Gore for pointing this out.
 
 Tue Jun 15 10:57:08 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * docs/compiler.html: Improved the TAO IDL compiler documentation.
+	* docs/compiler.html: Improved the TAO IDL compiler documentation.
 
 Tue Jun 15 11:51:38 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl: Fixed the
-          run_test.pl so that the first line doesn't start with a # and
-          also appended . to the executable PATH in the script.
+	* orbsvcs/tests/AVStreams/benchmark/run_test.pl: Fixed the
+ 	  run_test.pl so that the first line doesn't start with a # and
+ 	  also appended . to the executable PATH in the script.
 
 Tue Jun 15 11:06:13 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Log/Logger_i.cpp:
-        * orbsvcs/orbsvcs/Log/Logger_i.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
-        * orbsvcs/orbsvcs/Trader/Trader.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
-        * orbsvcs/orbsvcs/Trader/Trader_T.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_T.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
-          More ACE_THROW_SPEC fixes, finally the orbsvcs library compile
-          on IRIX!
+	* orbsvcs/orbsvcs/Log/Logger_i.cpp:
+	* orbsvcs/orbsvcs/Log/Logger_i.h:
+	* orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+	* orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+	* orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
+	* orbsvcs/orbsvcs/Trader/Offer_Database.h:
+	* orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
+	* orbsvcs/orbsvcs/Trader/Offer_Iterators.h:
+	* orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
+	* orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h:
+	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
+	* orbsvcs/orbsvcs/Trader/Trader.cpp:
+	* orbsvcs/orbsvcs/Trader/Trader.h:
+	* orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+	* orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+	* orbsvcs/orbsvcs/Trader/Trader_T.cpp:
+	* orbsvcs/orbsvcs/Trader/Trader_T.h:
+	* orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+	* orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+	  More ACE_THROW_SPEC fixes, finally the orbsvcs library compile
+	  on IRIX!
 
 Mon Jun 14 22:58:34 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed
-          ACE_THROW_SPEC issues again. Included the
-          CORBA::SystemException.
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed
+ 	  ACE_THROW_SPEC issues again. Included the
+ 	  CORBA::SystemException.
 
 Mon Jun 14 22:02:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i:
-        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp: Added new
-          dispatching strategy that uses several dispatching threads.
-          Thanks to Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
-          motivating this use case.
+	* orbsvcs/orbsvcs/Makefile:
+	* orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
+	* orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i:
+	* orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp: Added new
+ 	  dispatching strategy that uses several dispatching threads.
+  	  Thanks to Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
+ 	  motivating this use case.
 
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: Added support for
-          the new dispatching strategy.
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: Added support for
+ 	  the new dispatching strategy.
 
-        * orbsvcs/orbsvcs/Event/EC_Command.h:
-        * orbsvcs/orbsvcs/Event/EC_Command.i:
-        * orbsvcs/orbsvcs/Event/EC_Command.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp: Fixed name
-          conflict between two classes.
+	* orbsvcs/orbsvcs/Event/EC_Command.h:
+	* orbsvcs/orbsvcs/Event/EC_Command.i:
+	* orbsvcs/orbsvcs/Event/EC_Command.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
+	* orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp: Fixed name
+ 	  conflict between two classes.
 
-        * orbsvcs/tests/EC_Throughput/ec.mt.conf: New config file for the
-          MT dispatching strategy
+	* orbsvcs/tests/EC_Throughput/ec.mt.conf: New config file for the
+ 	  MT dispatching strategy
 
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: We don't use the
-          naming service anymore.
+	* orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: We don't use the
+ 	  naming service anymore.
 
 Mon Jun 14 22:10:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tao/GIOP.cpp (process_server_request): Make sure to initialize
-          response_required to 0 to keep G++ from complaining.  Thanks to
-          Marina for reporting this.
+	* tao/GIOP.cpp (process_server_request): Make sure to initialize
+ 	  response_required to 0 to keep G++ from complaining.  Thanks to
+ 	  Marina for reporting this.
 
 Mon Jun 14 21:04:53 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
-        * orbsvcs/orbsvcs/CosEvent_Utilities.h:
-        * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h:
-        * orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/EventChannel_i.h:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h:
-        * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h: More ACE_THROW_SPEC
-          stuff
-
-        * tao/Object.h: Fixed warning in method declaration, it included
-          the class name!
+	* orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
+	* orbsvcs/orbsvcs/CosEvent_Utilities.h:
+	* orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp:
+	* orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h:
+	* orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp:
+	* orbsvcs/orbsvcs/CosEvent/EventChannel_i.h:
+	* orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp:
+	* orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h:
+	* orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp:
+	* orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h:
+	* orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp:
+	* orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h: More ACE_THROW_SPEC
+ 	  stuff
+
+	* tao/Object.h: Fixed warning in method declaration, it included
+ 	  the class name!
 
 Mon Jun 14 20:53:44 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: Fixed a few more
-          ACE_THROW_SPEC errors. Thanks to Carlos for pointing these.
+	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: Fixed a few more
+ 	  ACE_THROW_SPEC errors. Thanks to Carlos for pointing these.
 
 Mon Jun 14 19:38:47 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed the
-          problems with the ACE_THROW_SPEC.
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed the
+ 	  problems with the ACE_THROW_SPEC.
 
 Mon Jun 14 19:36:32 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tao/GIOP.cpp (process_server_request): Fixed a couple of
-          "unused" arg warnings caused by various #ifdef paths through the
-          code.  Thanks to Marina for reporting this.
+	* tao/GIOP.cpp (process_server_request): Fixed a couple of
+ 	  "unused" arg warnings caused by various #ifdef paths through the
+ 	  code.  Thanks to Marina for reporting this.
 
 Mon Jun 14 16:55:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/Server_Strategy_Factory.cpp (create_servant_lock):
-        * tao/default_server.cpp (create_servant_lock): Removed
-          create_servant_lock(). It is not used and is *very* TAO specific
-          and difficult to get right in the new architecture.
+	* tao/Server_Strategy_Factory.cpp (create_servant_lock):
+	* tao/default_server.cpp (create_servant_lock): Removed
+ 	  create_servant_lock(). It is not used and is *very* TAO specific
+ 	  and difficult to get right in the new architecture.
 
 Mon Jun 14 16:07:47 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * tao/default_client.cpp: Creating Exclusive TMS always, since
-          Muxed TMS is not available yet.
+	* tao/default_client.cpp: Creating Exclusive TMS always, since
+ 	  Muxed TMS is not available yet.
 
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Added
-          ACE_THROW_SPEC to the relevant methods.
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Added
+ 	  ACE_THROW_SPEC to the relevant methods.
 
 Mon Jun 14 15:34:21 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl:
-        * TAO/tests/DynAny_Test/run_test.pl: Added timeout features
-          similar to that in IDL_Cubit/run_test.pl:
+	* TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl:
+	* TAO/tests/DynAny_Test/run_test.pl: Added timeout features
+ 	  similar to that in IDL_Cubit/run_test.pl:
 
 Mon Jun 14 14:37:00 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: Fixed the throw
-          specifications for all the CORBA methods.
+	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: Fixed the throw
+ 	  specifications for all the CORBA methods.
 
 Mon Jun 14 13:45:41 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.{h,cpp},
-          Task_Client.h,server.cpp: fixed const char * warnings by
-          replacing CORBA::String with const char *, and adding a few
-          casts for objects that are passed to ACE_ARGV constructors.  The
-          casts aren't good: the proper fix would be to fix ACE_ARGV to
-          take const ASYS_TCHAR * arguments.
+ 	  Task_Client.h,server.cpp: fixed const char * warnings by
+ 	  replacing CORBA::String with const char *, and adding a few
+ 	  casts for objects that are passed to ACE_ARGV constructors.  The
+ 	  casts aren't good: the proper fix would be to fix ACE_ARGV to
+ 	  take const ASYS_TCHAR * arguments.
 
 Mon Jun 14 12:29:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
         * tao/Context.cpp:
         * tao/Environment.cpp:
         * tao/Principal.cpp: Made sure the <refcount_> is initialized
-          properly.  Thanks to <Rebecca.A.Sanford@gd-is.com> for pointing
-          this out.
+ 	  properly.  Thanks to <Rebecca.A.Sanford@gd-is.com> for pointing
+ 	  this out.
 
         * tao/Object_KeyC.h: TAO_ObjectKey_var needs to be exported on
-          Win32.
+ 	  Win32.
 
 Mon Jun 14 11:04:05 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
         * examples/OBV/Simple_util.cpp: Added a #include. The problem was
-          that HP_UX compiler reported that TAO_debug_level was not
-          found. Hence the #include as a solution. This was reported by
-          Bill Tovrea <gwtovrea@west.raytheon.com>. Thanks to him for
-          reporting this.
+ 	  that HP_UX compiler reported that TAO_debug_level was not
+ 	  found. Hence the #include as a solution. This was reported by
+ 	  Bill Tovrea <gwtovrea@west.raytheon.com>. Thanks to him for
+ 	  reporting this.
 
 Mon Jun 14 10:32:04 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * TAO/docs/releasenotes/TODO.html: Added item for Dynamic Any
-          overhaul in the 'pending' section.
+ 	  overhaul in the 'pending' section.
 
 Mon Jun 14 09:59:45 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp: Fixed code
-          for void functions, the collocated version was calling through
-          the POA and directly (yikes!)
+ 	  for void functions, the collocated version was calling through
+ 	  the POA and directly (yikes!)
 
         * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
         * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp: Minor
-          cosmetic fixes.
+ 	  cosmetic fixes.
 
 Mon Jun 14 09:58:47 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
@@ -5430,93 +1671,93 @@ Mon Jun 14 08:56:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
         * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp: Added
-          missing template instantiations
+ 	  missing template instantiations
 
 Mon Jun 14 03:57:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
         * TAO_IDL/be_include/be_visitor_operation/collocated_ss.h:
         * TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
           (visit_operation): Added code to generate the implementation
-          that supports Thru_POA collocation strategy.  The implementtion
-          for Direct collocation strategy is still here.  The generated
-          code query the calling thread's ORB Core to determine the
-          collocation strategy to use.  Currently, we don't handle the
-          case in Thru_POA implementation when _downcast fails, i.e., if
-          the servant is a DSI, we'll die a horrible death.  That need to
-          be fixed to at least, throw an exception, we may add support for
-          collocated DII/DSI call later.
+ 	  that supports Thru_POA collocation strategy.  The implementtion
+ 	  for Direct collocation strategy is still here.  The generated
+ 	  code query the calling thread's ORB Core to determine the
+ 	  collocation strategy to use.  Currently, we don't handle the
+ 	  case in Thru_POA implementation when _downcast fails, i.e., if
+ 	  the servant is a DSI, we'll die a horrible death.  That need to
+ 	  be fixed to at least, throw an exception, we may add support for
+ 	  collocated DII/DSI call later.
 
           (gen_invoke):
           (gen_check_exception): Added two helper methods to generate
-          collocated forwarding code and the "ACE_CHECK" macro if the
-          native c++ exception is not supported.
+ 	  collocated forwarding code and the "ACE_CHECK" macro if the
+ 	  native c++ exception is not supported.
 
         * TAO_IDL/be/be_visitor_interface/interface_sh.cpp
         * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
           (visit_interface): Added code to generate the declaration and
-          the default implementation of <_create_collocated_objref>
-          method.  The default implementation only returns a
-          _tao_collocated_* object because I didn't separate the
-          implementation of Thru_POA and Direct collocated object
-          implementation.  Users are allowed to overwrite this method to
-          provide more nifty collocated objects.  However, this method is
-          not CORBA compliant.
+ 	  the default implementation of <_create_collocated_objref>
+ 	  method.  The default implementation only returns a
+ 	  _tao_collocated_* object because I didn't separate the
+ 	  implementation of Thru_POA and Direct collocated object
+ 	  implementation.  Users are allowed to overwrite this method to
+ 	  provide more nifty collocated objects.  However, this method is
+ 	  not CORBA compliant.
 
         * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
           (visit_interface): First attemp to decouple stubs from skeleton
-          files.  Since we still need to reinterpret the servant pointer
-          returned by the _create_collocated_objref, we still need the
-          skeleton files for now.  But it should be fixed real soon.
+ 	  files.  Since we still need to reinterpret the servant pointer
+ 	  returned by the _create_collocated_objref, we still need the
+ 	  skeleton files for now.  But it should be fixed real soon.
 
         * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.{h,cpp}
           (_default_POA): We need to overwrite the <_default_POA> method
-          because we use two different ORBs in collocation_test.
+ 	  because we use two different ORBs in collocation_test.
 
           (set_default_poa): Added the method to both Cubit_Factory and
-          Cubit to propage and set the default POA down to Cubit.
+ 	  Cubit to propage and set the default POA down to Cubit.
 
         * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp (init):
-          Default_POA must be set correctly for collocation to work.
+ 	  Default_POA must be set correctly for collocation to work.
 
         * tao/Servant_Base.{h,cpp} (_create_collocated_objref): This
-          method was intended to decouple the dependency of generated
-          skeletons in stubs.  But it is not fully functional yet.
-          Therefore, we still need to include skeletons in client side.
+ 	  method was intended to decouple the dependency of generated
+ 	  skeletons in stubs.  But it is not fully functional yet.
+  	  Therefore, we still need to include skeletons in client side.
 
         * tao/Servant_Base.cpp (_create_stub): We must record the
-          servant_orb when creating a new stub.  Stub objects now alway
-          carry a pointer to servant_orb.
+ 	  servant_orb when creating a new stub.  Stub objects now alway
+ 	  carry a pointer to servant_orb.
 
           *Very important*: If it is possible for a servant to be
-          collocated with clients and the clients are using a different
-          ORB from the servant, it is necessary for the servant to
-          *overwrite* the _default_POA method.
+ 	  collocated with clients and the clients are using a different
+ 	  ORB from the servant, it is necessary for the servant to
+ 	  *overwrite* the _default_POA method.
 
         * tao/Object_Adapter.h (Servant_Upcall): Added TAO_Export to this
-          class.  Also added not-implemented copy ctor and operator=.
+ 	  class.  Also added not-implemented copy ctor and operator=.
 
         * tao/Object.cpp (_object_key): Added a TAO extension to support
-          Thru_POA collocation strategy.  This function returns a
-          reference of object key of the object reference without copying.
-          Since the use of an object key during a collocated upcall never
-          outlives the object reference' lifetime, we don't need to copy
-          the object key.  Thanks to Irfan for helping this out.
+ 	  Thru_POA collocation strategy.  This function returns a
+ 	  reference of object key of the object reference without copying.
+  	  Since the use of an object key during a collocated upcall never
+ 	  outlives the object reference' lifetime, we don't need to copy
+ 	  the object key.  Thanks to Irfan for helping this out.
 
         * tao/ORB.cpp (_get_collocated_servant): Set the servant_orb once
-          a collocated servant is found.  Notice that at this moment, the
-          method doesn't consider the collocation strategy being used by
-          the orb and record both servant_orb and servant in the stub
-          objects.  The consequence of this is, only object that already
-          has a servant available at the time _get_collocated_servant is
-          called will be treated as collocated object.  The advantage of
-          this is, we can switch collocation strategy at run-time, but
-          there doesn't seem to be a use case for this.  AT any rate.
-          this will be fixed in the future so that if Thru-POA collocation
-          strategy is used, only servant_orb is recorded.  Otherwise, only
-          servant is carried by the stub object of the collocated objects.
+ 	  a collocated servant is found.  Notice that at this moment, the
+ 	  method doesn't consider the collocation strategy being used by
+ 	  the orb and record both servant_orb and servant in the stub
+ 	  objects.  The consequence of this is, only object that already
+ 	  has a servant available at the time _get_collocated_servant is
+ 	  called will be treated as collocated object.  The advantage of
+ 	  this is, we can switch collocation strategy at run-time, but
+ 	  there doesn't seem to be a use case for this.  AT any rate.
+  	  this will be fixed in the future so that if Thru-POA collocation
+ 	  strategy is used, only servant_orb is recorded.  Otherwise, only
+ 	  servant is carried by the stub object of the collocated objects.
 
         * tao/GIOP.h (TAO_GIOP_Message_State): Added TAO_Export to the
-          class TAO_GIOP_Message_State.
+ 	  class TAO_GIOP_Message_State.
 
 Sun Jun 13 23:38:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
@@ -5526,8 +1767,8 @@ Sun Jun 13 23:38:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
         * tao/decode.cpp:
         * tao/Typecode.{i,cpp}:
         * tao/Object.cpp: Commented out calls to ACE_TRY_ENV.clear ().  We
-          shouldn't depend on them for correct execution of programs.
-          Changed the use of env to ACE try macros.
+ 	  shouldn't depend on them for correct execution of programs.
+  	  Changed the use of env to ACE try macros.
 
         * tao/Marshal.cpp (make_marshal_object): Changed to use ACE try
           macros.
diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor
deleted file mode 100644
index 39f05f039d5..00000000000
--- a/TAO/Makefile.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#
-# Makefile for building ACE and TAO 
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-ace_tao:
-	cd $(ACE_ROOT)\ace
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\tao
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\tao_idl
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\apps\gperf\src
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\orbsvcs\orbsvcs
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\orbsvcs\Naming_Service
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\orbsvcs\Trading_Service
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
-examples:
-	cd $(ACE_ROOT)\TAO\examples\simple\echo
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\examples\simple\chat
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\examples\simple\bank
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\examples\simple\grid
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\examples\simple\time
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\TAO\examples\Callback_Quoter
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
-utils:
-	cd $(ACE_ROOT)\tao\utils\catior
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\tao\utils\IOR-parser
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\tao\utils\nslist
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index ddc8bf017c4..0ca2b9b738c 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -25,8 +25,8 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 0.4
-    ACE VERSION: 4.6.43
+    TAO VERSION: 0.3.25
+    ACE VERSION: 4.6.42
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 10cbae294a0..8fe09d2c668 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -2,14 +2,9 @@
 
 <HTML>
 <HEAD>
-  <TITLE>Building and Installing TAO</TITLE>
-  <link rev=made href="mailto:schmidt@cs.wustl.edu">
+<TITLE>Building and Installing TAO</TITLE>
 </HEAD>
-
-<BODY text    = "#000000"
-      link    = "#000fff"
-      vlink   = "#ff0f0f"
-      bgcolor = "#ffffff">
+<BODY text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
 
 <HR>
 <H3>Building and Installing TAO</H3>
@@ -79,9 +74,10 @@ likely unpredictable and erroneous results. <P>
       </UL>
 
   <LI>Set <CODE>TAO_ROOT</CODE> environment variable to
-      <CODE>$ACE_ROOT/TAO</CODE>.<P>
+      <CODE>$ACE_ROOT/TAO</CODE>. <P>
 
-  <LI>Build and install the TAO release under <CODE>$TAO_ROOT</CODE>.
+  <LI>Build and install the TAO release under
+        <CODE>$TAO_ROOT</CODE>.<P>
 
         <P>The easiest and recommended way to compile the
           <B>complete</B> TAO distribution by simply simply executing
@@ -164,9 +160,7 @@ To build on the host:
 
 For NT hosts, please see the detailed instructions for building and
 installing ACE and TAO in <a
-href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>.  For
-NT hosts, see <a href="../ACE-INSTALL.html#VxWorks/NT">Building
-ACE on Tornado/NT hosts for VxWorks targets</a><p>
+href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>.<p>
 
 Please note that dynamic loading of libraries is not supported by TAO
 for any cross-compiled target.  Therefore, dynamic service
@@ -190,7 +184,8 @@ and set it to the compiler you want to use.  This variable will
 override the default.  </P>
 
 <P>Set <CODE>ACE_ROOT</CODE> environment variable as outlined in the
-    <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">ACE installation notes</A>.
+    <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">
+	ACE installation notes</A>.
       This is only required if you are planning to use the
       &lt;orb.idl&gt; standard include in your IDL code.
       Notice that some of the TAO services use this feature, so you
@@ -373,14 +368,6 @@ by using <CODE>make minimum_corba=1</CODE> when you compile TAO.</P>
 <HR>
 <P>
 
-<HR><P>
-<H3><A NAME="resource_requirements">System Resource Requirements</A></H3>
-Please see the
-<a href="../ACE-INSTALL.html#resource_requirements">ACE-INSTALL.html System
-Resource Requirements discussion</a> for information on system resources
-required to build ACE and TAO.<p>
-
-
 Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 343640f8e6e..7884ff2f764 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE DLL"=..\ace\ace_dll.dsp - Package Owner=<4>

+Project: "ACE dynamic library"=..\ace\ace_dll.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -24,13 +24,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

+    Project_Dep_Name orbsvcs

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "ORB Services DLL"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>

+Project: "TAO"=.\tao\TAO.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,19 +39,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

+    Project_Dep_Name ACE dynamic library

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "TAO DLL"=.\tao\TAO.dsp - Package Owner=<4>

+Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -60,13 +54,16 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name ACE DLL

+    Project_Dep_Name ACE dynamic library

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name gperf

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

+Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,16 +72,16 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name gperf

+    Project_Dep_Name ACE dynamic library

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name ACE DLL

+    Project_Dep_Name gperf_lib

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>

+Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -93,13 +90,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name gperf_lib

+    Project_Dep_Name ACE dynamic library

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

+Project: "orbsvcs"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -108,7 +105,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name ACE DLL

+    Project_Dep_Name TAO

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name tao_idl

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

     End Project Dependency

 }}}

 

diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index a45a8865a4b..f18dc05ea5b 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE LIB"=..\ace\ace_lib.dsp - Package Owner=<4>

+Project: "ACE static library"=..\ace\ace_lib.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -36,7 +36,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO LIB"=.\tao\TAO_Static.dsp - Package Owner=<4>

+Project: "TAO Static"=.\tao\TAO_Static.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -45,7 +45,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name ACE LIB

+    Project_Dep_Name ACE static library

     End Project Dependency

 }}}

 

@@ -62,9 +62,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name ACE static library

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ACE LIB

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -80,4 +77,3 @@ Package=<3>
 }}}

 

 ###############################################################################

-

diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index d99bdfbcc6e..3e841a98d6b 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -177,19 +177,15 @@ else  # ! CROSS-COMPILE
     CCFLAGS += -Wno-switch
   endif # g++
 
-  CPPFLAGS += -Iinclude -Ibe_include -Ife
-  ifeq ($(CPP_LOCATION),)
-    CPPFLAGS += -DCPP_LOCATION=\"$(strip $(CXX))\"
-  else
-    CPPFLAGS += -DCPP_LOCATION=\"$(CPP_LOCATION)\"
-  endif # !def CPP_LOCATION
+  CPPFLAGS += -Iinclude -Ibe_include -Ife \
+              -DCPP_LOCATION=\"$(strip $(CXX))\"
 
   realclean:
-	$(RM) tao_idl TAGS
+	$(RM) -f tao_idl TAGS
 endif # ! CROSS-COMPILE
 
 fe/fe_lookup.cpp: fe/keywords.dat
-	$(RM) fe/fe_lookup.cpp
+	$(RM) -f fe/fe_lookup.cpp
 	echo "// \$$Id\$$" > fe/fe_lookup.cpp
 	echo "#include	\"idl.h\"" >> fe/fe_lookup.cpp
 	echo "#include	\"idl_extern.h\"" >> fe/fe_lookup.cpp
@@ -229,28 +225,24 @@ fe/y.tab.cpp:	fe/idl.yy
 
 y.tab: fe/idl.yy
 		$(YACC) -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/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
+		sed -e "s/char \*getenv/char *ace_foo/g" \
+		    -e "s/= getenv/= ACE_OS::getenv/g" \
+		    -e "s/yynewerror://g" \
+		    -e "s/yy/tao_yy/g" \
+		    -e "s/YY/TAO_YY/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
+		$(RM) -f /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h
 		(cd fe ; patch < y.tab.cpp.diff)
 
 tags:
-	$(RM) TAGS
+	$(RM) -f TAGS
 	find . -name "*.h" -print | etags -a --c++ -
 	find . -name "*.cpp" -print | etags -a -
 
@@ -873,9 +865,7 @@ tags:
  $(ACE_ROOT)/ace/Process_Manager.i \
  $(ACE_ROOT)/ace/Env_Value_T.h \
  $(ACE_ROOT)/ace/Env_Value_T.i \
- $(ACE_ROOT)/ace/Env_Value_T.cpp \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i
+ $(ACE_ROOT)/ace/Env_Value_T.cpp
 .obj/fe_declarator.o .obj/fe_declarator.so .shobj/fe_declarator.o .shobj/fe_declarator.so: fe/fe_declarator.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -6340,10 +6330,6 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  be_include/be_visitor_interface.h be_include/be_visitor_scope.h \
  be_include/be_visitor.h be_include/be_visitor_decl.h \
- be_include/be_codegen.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  be_include/be_visitor_interface/interface.h \
  be_include/be_visitor_interface/interface_ch.h \
  be_include/be_visitor_interface/interface_ci.h \
@@ -6353,10 +6339,8 @@ tags:
  be_include/be_visitor_interface/interface_si.h \
  be_include/be_visitor_interface/interface_ss.h \
  be_include/be_visitor_interface/interface_is.h \
- be_include/be_visitor_interface/thru_poa_collocated_sh.h \
- be_include/be_visitor_interface/thru_poa_collocated_ss.h \
- be_include/be_visitor_interface/direct_collocated_sh.h \
- be_include/be_visitor_interface/direct_collocated_ss.h \
+ be_include/be_visitor_interface/collocated_sh.h \
+ be_include/be_visitor_interface/collocated_ss.h \
  be_include/be_visitor_interface/any_op_ch.h \
  be_include/be_visitor_interface/any_op_cs.h \
  be_include/be_visitor_interface/cdr_op_ch.h \
@@ -6366,7 +6350,14 @@ tags:
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
  be_include/be_visitor_interface/ami_handler_fwd_ci.h \
- be_include/be_visitor_interface/ami_handler_ch.h be_include/be.h \
+ be_include/be_visitor_interface/ami_handler_servant_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_cs.h \
+ be_include/be_visitor_interface/collocated_ami_handler_ch.h \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
@@ -6382,8 +6373,9 @@ tags:
  be_include/be_enum_val.h be_include/be_array.h \
  be_include/be_sequence.h be_include/be_string.h \
  be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_stream_factory.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h
+ be_include/be_helper.h be_include/be_codegen.h \
+ be_include/be_stream_factory.h be_include/be_visitor_factory.h \
+ be_include/be_visitor_context.h
 .obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be/be_interface_fwd.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -9226,6 +9218,7 @@ tags:
  be_include/be_visitor_argument/pre_invoke_cs.h \
  be_include/be_visitor_argument/ami_arglist.h \
  be_include/be_visitor_argument/ami_handler_arglist.h \
+ be_include/be_visitor_argument/ami_handler_result_arg.h \
  be_include/be_visitor_array.h be_include/be_visitor_array/array.h \
  be_include/be_visitor_array/array_ch.h \
  be_include/be_visitor_array/array_ci.h \
@@ -9273,10 +9266,8 @@ tags:
  be_include/be_visitor_interface/interface_si.h \
  be_include/be_visitor_interface/interface_ss.h \
  be_include/be_visitor_interface/interface_is.h \
- be_include/be_visitor_interface/thru_poa_collocated_sh.h \
- be_include/be_visitor_interface/thru_poa_collocated_ss.h \
- be_include/be_visitor_interface/direct_collocated_sh.h \
- be_include/be_visitor_interface/direct_collocated_ss.h \
+ be_include/be_visitor_interface/collocated_sh.h \
+ be_include/be_visitor_interface/collocated_ss.h \
  be_include/be_visitor_interface/any_op_ch.h \
  be_include/be_visitor_interface/any_op_cs.h \
  be_include/be_visitor_interface/cdr_op_ch.h \
@@ -9286,7 +9277,10 @@ tags:
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
  be_include/be_visitor_interface/ami_handler_fwd_ci.h \
- be_include/be_visitor_interface/ami_handler_ch.h \
+ be_include/be_visitor_interface/ami_handler_servant_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_cs.h \
+ be_include/be_visitor_interface/collocated_ami_handler_ch.h \
  be_include/be_visitor_interface_fwd.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
@@ -9327,10 +9321,8 @@ tags:
  be_include/be_visitor_operation/operation_is.h \
  be_include/be_visitor_operation/tie_sh.h \
  be_include/be_visitor_operation/tie_si.h \
- be_include/be_visitor_operation/thru_poa_collocated_sh.h \
- be_include/be_visitor_operation/thru_poa_collocated_ss.h \
- be_include/be_visitor_operation/direct_collocated_sh.h \
- be_include/be_visitor_operation/direct_collocated_ss.h \
+ be_include/be_visitor_operation/collocated_sh.h \
+ be_include/be_visitor_operation/collocated_ss.h \
  be_include/be_visitor_operation/arglist.h \
  be_include/be_visitor_operation/rettype.h \
  be_include/be_visitor_operation/rettype_is.h \
@@ -9354,6 +9346,7 @@ tags:
  be_include/be_visitor_operation/ami_arglist.h \
  be_include/be_visitor_operation/ami_handler_operation_ch.h \
  be_include/be_visitor_operation/ami_handler_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_cs.h \
  be_include/be_visitor_root.h be_include/be_visitor_root/root.h \
  be_include/be_visitor_root/root_ch.h \
  be_include/be_visitor_root/root_ci.h \
@@ -9643,6 +9636,7 @@ tags:
  be_include/be_visitor_argument/pre_invoke_cs.h \
  be_include/be_visitor_argument/ami_arglist.h \
  be_include/be_visitor_argument/ami_handler_arglist.h \
+ be_include/be_visitor_argument/ami_handler_result_arg.h \
  be/be_visitor_argument/arglist.cpp \
  be/be_visitor_argument/argument.cpp \
  be/be_visitor_argument/docall_cs.cpp \
@@ -9659,7 +9653,8 @@ tags:
  be/be_visitor_argument/compiled_marshal_ss.cpp \
  be/be_visitor_argument/pre_invoke_cs.cpp \
  be/be_visitor_argument/ami_arglist.cpp \
- be/be_visitor_argument/ami_handler_arglist.cpp
+ be/be_visitor_argument/ami_handler_arglist.cpp \
+ be/be_visitor_argument/ami_handler_result_arg.cpp
 .obj/be_visitor_array.o .obj/be_visitor_array.so .shobj/be_visitor_array.o .shobj/be_visitor_array.so: be/be_visitor_array.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -10681,10 +10676,8 @@ tags:
  be_include/be_visitor_interface/interface_si.h \
  be_include/be_visitor_interface/interface_ss.h \
  be_include/be_visitor_interface/interface_is.h \
- be_include/be_visitor_interface/thru_poa_collocated_sh.h \
- be_include/be_visitor_interface/thru_poa_collocated_ss.h \
- be_include/be_visitor_interface/direct_collocated_sh.h \
- be_include/be_visitor_interface/direct_collocated_ss.h \
+ be_include/be_visitor_interface/collocated_sh.h \
+ be_include/be_visitor_interface/collocated_ss.h \
  be_include/be_visitor_interface/any_op_ch.h \
  be_include/be_visitor_interface/any_op_cs.h \
  be_include/be_visitor_interface/cdr_op_ch.h \
@@ -10694,7 +10687,10 @@ tags:
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
  be_include/be_visitor_interface/ami_handler_fwd_ci.h \
- be_include/be_visitor_interface/ami_handler_ch.h \
+ be_include/be_visitor_interface/ami_handler_servant_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_ch.h \
+ be_include/be_visitor_interface/ami_handler_stub_cs.h \
+ be_include/be_visitor_interface/collocated_ami_handler_ch.h \
  be/be_visitor_interface/interface.cpp \
  be/be_visitor_interface/interface_ch.cpp \
  be/be_visitor_interface/interface_ci.cpp \
@@ -10704,10 +10700,8 @@ tags:
  be/be_visitor_interface/interface_si.cpp \
  be/be_visitor_interface/interface_ss.cpp \
  be/be_visitor_interface/interface_is.cpp \
- be/be_visitor_interface/thru_poa_collocated_sh.cpp \
- be/be_visitor_interface/thru_poa_collocated_ss.cpp \
- be/be_visitor_interface/direct_collocated_sh.cpp \
- be/be_visitor_interface/direct_collocated_ss.cpp \
+ be/be_visitor_interface/collocated_sh.cpp \
+ be/be_visitor_interface/collocated_ss.cpp \
  be/be_visitor_interface/tie_sh.cpp be/be_visitor_interface/tie_si.cpp \
  be/be_visitor_interface/any_op_ch.cpp \
  be/be_visitor_interface/any_op_cs.cpp \
@@ -10720,10 +10714,12 @@ tags:
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
  be_include/be_visitor_interface_fwd/cdr_op_ci.h \
  be/be_visitor_interface/ami_handler_fwd_ci.cpp \
- be/be_visitor_interface/ami_handler_ch.cpp
+ be/be_visitor_interface/ami_handler_servant_ch.cpp \
+ be/be_visitor_interface/ami_handler_stub_ch.cpp \
+ be/be_visitor_interface/ami_handler_stub_cs.cpp \
+ be/be_visitor_interface/collocated_ami_handler_ch.cpp
 .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \
- include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
+ include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -10975,10 +10971,8 @@ tags:
  be_include/be_visitor_operation/operation_is.h \
  be_include/be_visitor_operation/tie_sh.h \
  be_include/be_visitor_operation/tie_si.h \
- be_include/be_visitor_operation/thru_poa_collocated_sh.h \
- be_include/be_visitor_operation/thru_poa_collocated_ss.h \
- be_include/be_visitor_operation/direct_collocated_sh.h \
- be_include/be_visitor_operation/direct_collocated_ss.h \
+ be_include/be_visitor_operation/collocated_sh.h \
+ be_include/be_visitor_operation/collocated_ss.h \
  be_include/be_visitor_operation/arglist.h \
  be_include/be_visitor_operation/rettype.h \
  be_include/be_visitor_operation/rettype_is.h \
@@ -11002,6 +10996,7 @@ tags:
  be_include/be_visitor_operation/ami_arglist.h \
  be_include/be_visitor_operation/ami_handler_operation_ch.h \
  be_include/be_visitor_operation/ami_handler_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_cs.h \
  be/be_visitor_valuetype/field_ch.cpp \
  be/be_visitor_valuetype/field_cs.cpp \
  be/be_visitor_valuetype/field_cdr_ci.cpp \
@@ -11013,8 +11008,7 @@ tags:
  be_include/be_visitor_field/cdr_op_cs.h \
  be/be_visitor_valuetype/obv_module.cpp
 .obj/be_visitor_valuetype_fwd.o .obj/be_visitor_valuetype_fwd.so .shobj/be_visitor_valuetype_fwd.o .shobj/be_visitor_valuetype_fwd.so: be/be_visitor_valuetype_fwd.cpp \
- include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
+ include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -11351,10 +11345,8 @@ tags:
  be_include/be_visitor_operation/operation_is.h \
  be_include/be_visitor_operation/tie_sh.h \
  be_include/be_visitor_operation/tie_si.h \
- be_include/be_visitor_operation/thru_poa_collocated_sh.h \
- be_include/be_visitor_operation/thru_poa_collocated_ss.h \
- be_include/be_visitor_operation/direct_collocated_sh.h \
- be_include/be_visitor_operation/direct_collocated_ss.h \
+ be_include/be_visitor_operation/collocated_sh.h \
+ be_include/be_visitor_operation/collocated_ss.h \
  be_include/be_visitor_operation/arglist.h \
  be_include/be_visitor_operation/rettype.h \
  be_include/be_visitor_operation/rettype_is.h \
@@ -11378,15 +11370,14 @@ tags:
  be_include/be_visitor_operation/ami_arglist.h \
  be_include/be_visitor_operation/ami_handler_operation_ch.h \
  be_include/be_visitor_operation/ami_handler_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_cs.h \
  be/be_visitor_operation/operation.cpp \
  be/be_visitor_operation/arglist.cpp \
  be/be_visitor_operation/argument.cpp \
  be/be_visitor_operation/argument_invoke.cpp \
  be/be_visitor_operation/argument_marshal.cpp \
- be/be_visitor_operation/thru_poa_collocated_sh.cpp \
- be/be_visitor_operation/thru_poa_collocated_ss.cpp \
- be/be_visitor_operation/direct_collocated_sh.cpp \
- be/be_visitor_operation/direct_collocated_ss.cpp \
+ be/be_visitor_operation/collocated_sh.cpp \
+ be/be_visitor_operation/collocated_ss.cpp \
  be/be_visitor_operation/exceptlist_cs.cpp \
  be/be_visitor_operation/operation_ch.cpp \
  be/be_visitor_operation/operation_cs.cpp \
@@ -11411,6 +11402,7 @@ tags:
  be_include/be_visitor_argument/pre_invoke_cs.h \
  be_include/be_visitor_argument/ami_arglist.h \
  be_include/be_visitor_argument/ami_handler_arglist.h \
+ be_include/be_visitor_argument/ami_handler_result_arg.h \
  be/be_visitor_operation/operation_is.cpp \
  be/be_visitor_operation/rettype.cpp \
  be/be_visitor_operation/rettype_is.cpp \
@@ -11429,7 +11421,8 @@ tags:
  be/be_visitor_operation/ami_ch.cpp be/be_visitor_operation/ami_cs.cpp \
  be/be_visitor_operation/ami_arglist.cpp \
  be/be_visitor_operation/ami_handler_operation_ch.cpp \
- be/be_visitor_operation/ami_handler_arglist.cpp
+ be/be_visitor_operation/ami_handler_arglist.cpp \
+ be/be_visitor_operation/ami_handler_operation_cs.cpp
 .obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be/be_visitor_root.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -11788,11 +11781,15 @@ tags:
  be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp \
  be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp \
  be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp \
+ be/be_visitor_sequence/gen_object_manager_ch.cpp \
+ be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp \
  be/be_visitor_sequence/gen_bounded_sequence_ci.cpp \
  be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp \
  be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp \
  be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp \
+ be/be_visitor_sequence/gen_object_manager_ci.cpp \
  be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp \
+ be/be_visitor_sequence/gen_bounded_sequence_cs.cpp \
  be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp \
  be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp \
  be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
@@ -12284,8 +12281,7 @@ tags:
  be/be_visitor_union/any_op_cs.cpp be/be_visitor_union/cdr_op_ch.cpp \
  be/be_visitor_union/cdr_op_ci.cpp be/be_visitor_union/cdr_op_cs.cpp
 .obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be/be_visitor_union_branch.cpp \
- include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
+ include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
diff --git a/TAO/TAO_IDL/Makefile.bor b/TAO/TAO_IDL/Makefile.bor
deleted file mode 100644
index 55e53f91b20..00000000000
--- a/TAO/TAO_IDL/Makefile.bor
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# Makefile for building the TAO IDL compiler
-#
-
-NAME = tao_idl
-
-OBJFILES = \
-	$(OBJDIR)\tao_idl.obj \
-	$(OBJDIR)\ast_argument.obj \
-	$(OBJDIR)\ast_array.obj \
-	$(OBJDIR)\ast_attribute.obj \
-	$(OBJDIR)\ast_check.obj \
-	$(OBJDIR)\ast_concrete_type.obj \
-	$(OBJDIR)\ast_constant.obj \
-	$(OBJDIR)\ast_decl.obj \
-	$(OBJDIR)\ast_enum.obj \
-	$(OBJDIR)\ast_enum_val.obj \
-	$(OBJDIR)\ast_exception.obj \
-	$(OBJDIR)\ast_expression.obj \
-	$(OBJDIR)\ast_field.obj \
-	$(OBJDIR)\ast_generator.obj \
-	$(OBJDIR)\ast_interface.obj \
-	$(OBJDIR)\ast_interface_fwd.obj \
-	$(OBJDIR)\ast_module.obj \
-	$(OBJDIR)\ast_native.obj \
-	$(OBJDIR)\ast_operation.obj \
-	$(OBJDIR)\ast_predefined_type.obj \
-	$(OBJDIR)\ast_recursive.obj \
-	$(OBJDIR)\ast_redef.obj \
-	$(OBJDIR)\ast_root.obj \
-	$(OBJDIR)\ast_sequence.obj \
-	$(OBJDIR)\ast_string.obj \
-	$(OBJDIR)\ast_structure.obj \
-	$(OBJDIR)\ast_type.obj \
-	$(OBJDIR)\ast_typedef.obj \
-	$(OBJDIR)\ast_union.obj \
-	$(OBJDIR)\ast_union_branch.obj \
-	$(OBJDIR)\ast_union_label.obj \
-	$(OBJDIR)\be_args.obj \
-	$(OBJDIR)\be_argument.obj \
-	$(OBJDIR)\be_array.obj \
-	$(OBJDIR)\be_attribute.obj \
-	$(OBJDIR)\be_codegen.obj \
-	$(OBJDIR)\be_constant.obj \
-	$(OBJDIR)\be_decl.obj \
-	$(OBJDIR)\be_enum.obj \
-	$(OBJDIR)\be_enum_val.obj \
-	$(OBJDIR)\be_exception.obj \
-	$(OBJDIR)\be_expression.obj \
-	$(OBJDIR)\be_field.obj \
-	$(OBJDIR)\be_generator.obj \
-	$(OBJDIR)\be_helper.obj \
-	$(OBJDIR)\be_init.obj \
-	$(OBJDIR)\be_interface.obj \
-	$(OBJDIR)\be_interface_fwd.obj \
-	$(OBJDIR)\be_module.obj \
-	$(OBJDIR)\be_native.obj \
-	$(OBJDIR)\be_operation.obj \
-	$(OBJDIR)\be_predefined_type.obj \
-	$(OBJDIR)\be_produce.obj \
-	$(OBJDIR)\be_root.obj \
-	$(OBJDIR)\be_scope.obj \
-	$(OBJDIR)\be_sequence.obj \
-	$(OBJDIR)\be_stream_factory.obj \
-	$(OBJDIR)\be_string.obj \
-	$(OBJDIR)\be_structure.obj \
-	$(OBJDIR)\be_sunsoft.obj \
-	$(OBJDIR)\be_type.obj \
-	$(OBJDIR)\be_typedef.obj \
-	$(OBJDIR)\be_union.obj \
-	$(OBJDIR)\be_union_branch.obj \
-	$(OBJDIR)\be_union_label.obj \
-	$(OBJDIR)\be_valuetype.obj \
-	$(OBJDIR)\be_valuetype_fwd.obj \
-	$(OBJDIR)\be_visitor.obj \
-	$(OBJDIR)\be_visitor_argument.obj \
-	$(OBJDIR)\be_visitor_array.obj \
-	$(OBJDIR)\be_visitor_attribute.obj \
-	$(OBJDIR)\be_visitor_constant.obj \
-	$(OBJDIR)\be_visitor_context.obj \
-	$(OBJDIR)\be_visitor_decl.obj \
-	$(OBJDIR)\be_visitor_enum.obj \
-	$(OBJDIR)\be_visitor_exception.obj \
-	$(OBJDIR)\be_visitor_factory.obj \
-	$(OBJDIR)\be_visitor_field.obj \
-	$(OBJDIR)\be_visitor_interface.obj \
-	$(OBJDIR)\be_visitor_interface_fwd.obj \
-	$(OBJDIR)\be_visitor_module.obj \
-	$(OBJDIR)\be_visitor_operation.obj \
-	$(OBJDIR)\be_visitor_root.obj \
-	$(OBJDIR)\be_visitor_scope.obj \
-	$(OBJDIR)\be_visitor_sequence.obj \
-	$(OBJDIR)\be_visitor_structure.obj \
-	$(OBJDIR)\be_visitor_typecode.obj \
-	$(OBJDIR)\be_visitor_typedef.obj \
-	$(OBJDIR)\be_visitor_union.obj \
-	$(OBJDIR)\be_visitor_union_branch.obj \
-	$(OBJDIR)\be_visitor_valuetype.obj \
-	$(OBJDIR)\be_visitor_valuetype_fwd.obj \
-	$(OBJDIR)\drv_args.obj \
-	$(OBJDIR)\drv_fork.obj \
-	$(OBJDIR)\drv_init.obj \
-	$(OBJDIR)\drv_link.obj \
-	$(OBJDIR)\drv_preproc.obj \
-	$(OBJDIR)\drv_private.obj \
-	$(OBJDIR)\fe_declarator.obj \
-	$(OBJDIR)\fe_extern.obj \
-	$(OBJDIR)\fe_init.obj \
-	$(OBJDIR)\fe_interface_header.obj \
-	$(OBJDIR)\fe_lookup.obj \
-	$(OBJDIR)\fe_private.obj \
-	$(OBJDIR)\lex.yy.obj \
-	$(OBJDIR)\y.tab.obj \
-	$(OBJDIR)\narrow.obj \
-	$(OBJDIR)\utl_decllist.obj \
-	$(OBJDIR)\utl_error.obj \
-	$(OBJDIR)\utl_exceptlist.obj \
-	$(OBJDIR)\utl_exprlist.obj \
-	$(OBJDIR)\utl_global.obj \
-	$(OBJDIR)\utl_identifier.obj \
-	$(OBJDIR)\utl_idlist.obj \
-	$(OBJDIR)\utl_indenter.obj \
-	$(OBJDIR)\utl_labellist.obj \
-	$(OBJDIR)\utl_list.obj \
-	$(OBJDIR)\utl_namelist.obj \
-	$(OBJDIR)\utl_scope.obj \
-	$(OBJDIR)\utl_stack.obj \
-	$(OBJDIR)\utl_string.obj \
-	$(OBJDIR)\utl_strlist.obj \
-	$(OBJDIR)\utl_decllist.obj \
-	$(OBJDIR)\utl_exceptlist.obj \
-	$(OBJDIR)\utl_exprlist.obj \
-	$(OBJDIR)\utl_idlist.obj \
-	$(OBJDIR)\utl_labellist.obj \
-	$(OBJDIR)\utl_list.obj \
-	$(OBJDIR)\utl_namelist.obj \
-	$(OBJDIR)\utl_strlist.obj
-
-CFLAGS = -I.. -Ibe_include -Ife -Iinclude -Iutil \
-	-DIDL_CFE_VERSION=\"1.3.0\" -DCPP_LOCATION=\"cpp32\" $(ACE_CFLAGS)
-
-LIBFILES = $(ACE_LIB)
-
-CPPDIR = .;ast;be;driver;fe;narrow;util
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 19d22a688bb..cde4aee0e50 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -76,8 +76,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * main file or an #include'd file.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(ast, ast_decl, "$Id$")
 
@@ -104,8 +104,8 @@ AST_Decl::AST_Decl(NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
   : pd_imported(idl_global->imported()),
     pd_in_main_file(idl_global->in_main_file()),
     pd_defined_in(idl_global->scopes()->depth() > 0
-		  ? idl_global->scopes()->top()
-		  : 0),
+                  ? idl_global->scopes()->top()
+                  : 0),
     pd_node_type(nt),
     pd_line(idl_global->lineno()),
     pd_file_name(idl_global->filename()),
@@ -132,8 +132,8 @@ AST_Decl::AST_Decl(NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
 void
 AST_Decl::compute_full_name(UTL_ScopedName *n)
 {
-  UTL_ScopedName	*cn = NULL;
-  AST_Decl		*d  = NULL;
+  UTL_ScopedName        *cn = NULL;
+  AST_Decl              *d  = NULL;
 
   /*
    * Initialize this name to NULL
@@ -280,6 +280,74 @@ AST_Decl::name()
   return pd_name;
 }
 
+
+// @@ Wherever compute_* are called, we should remember to delete them
+//    after use.  
+
+// Variation of the <name>. Computes scoped name string, applying
+// prefix and suffix to the local name component. 
+UTL_ScopedName *
+AST_Decl::compute_name (const char *prefix, const char *suffix)
+{
+  if (prefix == 0 || suffix == 0)
+    return 0;
+
+  UTL_ScopedName *result_name = NULL;
+
+  // Prepare prefix_<local_name>_suffix string.
+
+  ACE_CString suffix_str (suffix);
+  ACE_CString local_str (this->local_name ()->get_string ());
+  
+  ACE_CString result_local_str (prefix);
+  result_local_str += local_str;
+  result_local_str += suffix_str;
+
+  // Identifier for the resulting local name.
+  Identifier *result_local_id = new Identifier (result_local_str.c_str (),
+                                                1,
+                                                0,
+                                                I_FALSE);
+  
+  // UTL_Scoped name for the resulting local name.
+  UTL_ScopedName *result_local_name = new UTL_ScopedName (result_local_id,
+                                                          NULL);
+  
+  // Global scope?
+  if (this->defined_in () == NULL) 
+    {
+      result_name = result_local_name;
+    }
+  else
+    {
+      // OK, not global. So copy name of containing scope, then 
+      // smash last cdr of copy with new component.
+      
+      AST_Decl *d = ScopeAsDecl(defined_in());
+      if (d != NULL)
+        {
+          UTL_ScopedName *cn = d->name();
+          if (cn != NULL) 
+            {
+              result_name = (UTL_ScopedName *) cn->copy();
+              if (result_name == NULL)
+                {
+                  result_name = result_local_name;
+                }
+              else
+                result_name->nconc(result_local_name);
+            }
+        }
+    }
+  
+  return result_name;
+  
+}
+
+
+
+
+
 void
 AST_Decl::set_name(UTL_ScopedName *n)
 {
@@ -299,6 +367,29 @@ AST_Decl::local_name()
   return pd_local_name;
 }
 
+Identifier *
+AST_Decl::compute_local_name (const char *prefix, const char *suffix)
+{
+  if (prefix == 0 || suffix == 0)
+    return 0;
+
+  // Init the result with prefix.
+  ACE_CString result_str (prefix);
+  
+  // Put local.
+  result_str += ACE_CString (this->local_name ()->get_string ());
+
+  // Put suffix.
+  result_str += ACE_CString (suffix);
+
+  // Identifier for the resulting local name.
+  Identifier *result_id = new Identifier (result_str.c_str (),
+                                          1,
+                                          0,
+                                          I_FALSE);
+  return result_id;
+}
+
 // If there is _cxx_ in the beginning, we will remove that and keep
 // a copy of the original name. TAO IDL's front end adds _cxx_
 // prefix to the all the reserved keywords. But when we invoke the
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index dedaf87aa4c..3a57e842b2a 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -72,8 +72,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include	"idl.h"
 #include	"idl_extern.h"
 
+#include	<limits.h>
+#include	<float.h>
+
 ACE_RCSID(ast, ast_expression, "$Id$")
 
+#undef	MAXCHAR
+#define MAXCHAR	128
+
 // Helper function to fill out the details of where this expression
 // is defined
 void
@@ -339,28 +345,26 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_short:
       return ev;
     case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) ACE_INT16_MAX)
+      if (ev->u.usval > (unsigned short) SHRT_MAX)
 	      return NULL;
       ev->u.sval = (short) ev->u.usval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_long:
-      if (ev->u.lval > (long) ACE_INT16_MAX 
-          || ev->u.lval < (long) ACE_INT16_MIN)
+      if (ev->u.lval > (long) SHRT_MAX || ev->u.lval < (long) -(SHRT_MAX))
 	      return NULL;
       ev->u.sval = (short) ev->u.lval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) ACE_INT16_MAX)
+      if (ev->u.ulval > (unsigned long) SHRT_MAX)
 	      return NULL;
       ev->u.sval = (short) ev->u.ulval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_INT16_MAX 
-          || ev->u.llval < (ACE_CDR::LongLong) ACE_INT16_MIN)
+      if (ev->u.llval > (ACE_CDR::LongLong) SHRT_MAX || ev->u.llval < (ACE_CDR::LongLong) - (SHRT_MAX))
 	      return NULL;
       ev->u.sval = (short) ev->u.llval;
       ev->et = AST_Expression::EV_short;
@@ -370,7 +374,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_INT16_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) SHRT_MAX)
 	      return NULL;
       ev->u.sval = (short) ev->u.ullval;
       ev->et = AST_Expression::EV_short;
@@ -383,15 +387,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval > (float) ACE_INT16_MAX 
-          || ev->u.fval < (float) ACE_INT16_MIN)
+      if (ev->u.fval > (float) SHRT_MAX || ev->u.fval < (float) -(SHRT_MAX))
 	      return NULL;
       ev->u.sval = (short) ev->u.fval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval > (double) ACE_INT16_MAX 
-          || ev->u.dval < (double) ACE_INT16_MIN)
+      if (ev->u.dval > (double) SHRT_MAX || ev->u.dval < (double) -(SHRT_MAX))
 	      return NULL;
       ev->u.sval = (short) ev->u.dval;
       ev->et = AST_Expression::EV_short;
@@ -401,7 +403,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) ACE_INT16_MAX)
+      if (ev->u.wcval > (ACE_CDR::WChar) SHRT_MAX)
         return NULL;
       ev->u.sval = (short) ev->u.wcval;
       ev->et = AST_Expression::EV_short;
@@ -429,22 +431,20 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_ushort:
       return ev;
     case AST_Expression::EV_long:
-      if (ev->u.lval > (long) ACE_UINT16_MAX 
-          || ev->u.lval < 0)
+      if (ev->u.lval > (long) USHRT_MAX || ev->u.lval < 0)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.lval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) ACE_UINT16_MAX)
+      if (ev->u.ulval > (unsigned long) USHRT_MAX)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.ulval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_UINT16_MAX 
-          || ev->u.llval < 0)
+      if (ev->u.llval > (ACE_CDR::LongLong) USHRT_MAX || ev->u.llval < 0)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.llval;
       ev->et = AST_Expression::EV_ushort;
@@ -454,7 +454,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_UINT16_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) USHRT_MAX)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.ullval;
       ev->et = AST_Expression::EV_ushort;
@@ -467,15 +467,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 
-          || ev->u.fval > (float) ACE_UINT16_MAX)
+      if (ev->u.fval < 0.0 || ev->u.fval > (float) USHRT_MAX)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.fval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 
-          || ev->u.dval > (double) ACE_UINT16_MAX)
+      if (ev->u.dval < 0.0 || ev->u.dval > (double) USHRT_MAX)
 	      return NULL;
       ev->u.usval = (unsigned short) ev->u.dval;
       ev->et = AST_Expression::EV_ushort;
@@ -487,7 +485,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) ACE_UINT16_MAX)
+      if (ev->u.wcval > (ACE_CDR::WChar) USHRT_MAX)
         return NULL;
       ev->u.usval = (short) ev->u.wcval;
       ev->et = AST_Expression::EV_ushort;
@@ -517,15 +515,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_long:
       return ev;
     case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) ACE_INT32_MAX)
+      if (ev->u.ulval > (unsigned long) LONG_MAX)
 	      return NULL;
       ev->u.lval = (long) ev->u.ulval;
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_INT32_MAX 
-          || ev->u.llval < (ACE_CDR::LongLong) ACE_INT32_MIN)
+      if (ev->u.llval > (ACE_CDR::LongLong) LONG_MAX || ev->u.llval < (ACE_CDR::LongLong) -(LONG_MAX))
 	      return NULL;
       ev->u.lval = (long) ev->u.llval;
       ev->et = AST_Expression::EV_long;
@@ -535,7 +532,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_INT32_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) LONG_MAX)
 	      return NULL;
       ev->u.lval = (long) ev->u.ullval;
       ev->et = AST_Expression::EV_long;
@@ -548,15 +545,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval > (float) LONG_MAX 
-          || ev->u.fval < (float) ACE_INT32_MIN)
+      if (ev->u.fval > (float) LONG_MAX || ev->u.fval < (float) -(LONG_MAX))
 	      return NULL;
       ev->u.lval = (long) ev->u.fval;
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval > (double) LONG_MAX 
-          || ev->u.dval < (double) ACE_INT32_MIN)
+      if (ev->u.dval > (double) LONG_MAX || ev->u.dval < (double) -(LONG_MAX))
 	      return NULL;
       ev->u.lval = (long) ev->u.dval;
       ev->et = AST_Expression::EV_long;
@@ -566,7 +561,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) ACE_INT32_MAX)
+      if (ev->u.wcval > (ACE_CDR::WChar) LONG_MAX)
         return NULL;
       ev->u.lval = (long) ev->u.wcval;
       ev->et = AST_Expression::EV_long;
@@ -605,8 +600,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_UINT32_MAX 
-          || ev->u.llval < 0)
+      if (ev->u.llval > (ACE_CDR::LongLong) ULONG_MAX || ev->u.llval < 0)
 	      return NULL;
       ev->u.ulval = (unsigned long) ev->u.llval;
       ev->et = AST_Expression::EV_ulong;
@@ -616,7 +610,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_UINT32_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) ULONG_MAX)
 	      return NULL;
       ev->u.ulval = (unsigned long) ev->u.ullval;
       ev->et = AST_Expression::EV_ulong;
@@ -629,15 +623,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 
-          || ev->u.fval > (float) ACE_UINT32_MAX)
+      if (ev->u.fval < 0.0 || ev->u.fval > (float) ULONG_MAX)
 	      return NULL;
       ev->u.ulval = (unsigned long) ev->u.fval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 
-          || ev->u.dval > (double) ACE_UINT32_MAX)
+      if (ev->u.dval < 0.0 || ev->u.dval > (double) ULONG_MAX)
 	      return NULL;
       ev->u.ulval = (unsigned long) ev->u.dval;
       ev->et = AST_Expression::EV_ulong;
@@ -888,8 +880,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > FLT_MAX 
-          || ev->u.llval < -(ACE_FLT_MAX))
+      if (ev->u.llval > FLT_MAX || ev->u.llval < -(FLT_MAX))
        return NULL;
       ev->u.fval = (float) ev->u.llval;
       ev->et = AST_Expression::EV_float;
@@ -917,8 +908,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_float:
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval > ACE_FLT_MAX 
-          || ev->u.dval < -(ACE_FLT_MAX))
+      if (ev->u.dval > FLT_MAX || ev->u.dval < -FLT_MAX)
 	      return NULL;
       ev->u.fval = (float) ev->u.dval;
       ev->et = AST_Expression::EV_float;
@@ -1014,35 +1004,32 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
   case AST_Expression::EV_char:
     switch (ev->et) {
     case AST_Expression::EV_short:
-      if (ev->u.sval > (short) ACE_CHAR_MAX 
-          || ev->u.sval < (short) ACE_CHAR_MIN)
+      if (ev->u.sval > (short) MAXCHAR || ev->u.sval < (short) -(MAXCHAR))
 	      return NULL;
       ev->u.cval = (char) ev->u.sval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) ACE_CHAR_MAX)
+      if (ev->u.usval > (unsigned short) MAXCHAR)
 	      return NULL;
       ev->u.cval = (char) ev->u.usval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_long:
-      if (ev->u.lval > (long) ACE_CHAR_MAX 
-          || ev->u.lval < (long) ACE_CHAR_MIN)
+      if (ev->u.lval > (long) MAXCHAR || ev->u.lval < (long) -(MAXCHAR))
 	      return NULL;
       ev->u.cval = (char) ev->u.lval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) ACE_CHAR_MAX)
+      if (ev->u.ulval > (unsigned long) MAXCHAR)
 	      return NULL;
       ev->u.cval = (char) ev->u.ulval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_CHAR_MAX 
-          || ev->u.llval < (ACE_CDR::LongLong) ACE_CHAR_MIN)
+      if (ev->u.llval > (ACE_CDR::LongLong) MAXCHAR || ev->u.llval < (ACE_CDR::LongLong) -(MAXCHAR))
 	      return NULL;
       ev->u.cval = (char) ev->u.llval;
       ev->et = AST_Expression::EV_char;
@@ -1052,7 +1039,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_CHAR_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) MAXCHAR)
 	      return NULL;
       ev->u.cval = (char) ev->u.ullval;
       ev->et = AST_Expression::EV_char;
@@ -1065,15 +1052,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval > (float) ACE_CHAR_MAX 
-          || ev->u.fval < (float) ACE_CHAR_MIN)
+      if (ev->u.fval > (float) MAXCHAR || ev->u.fval < (float) -(MAXCHAR))
 	      return NULL;
       ev->u.cval = (char) ev->u.fval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval > (double) ACE_CHAR_MAX 
-          || ev->u.dval < (double) ACE_CHAR_MIN)
+      if (ev->u.dval > (double) MAXCHAR || ev->u.dval < (double) -(MAXCHAR))
 	      return NULL;
       ev->u.cval = (char) ev->u.dval;
       ev->et = AST_Expression::EV_char;
@@ -1081,13 +1066,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_char:
       return ev;
     case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) ACE_CHAR_MAX)
+      if (ev->u.wcval > (ACE_CDR::WChar) MAXCHAR)
         return NULL;
       ev->u.cval = (char) ev->u.wcval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_octet:
-      if (ev->u.oval > (unsigned char) ACE_CHAR_MAX)
+      if (ev->u.oval > (unsigned char) MAXCHAR)
 	      return NULL;
       ev->u.cval = (char) ev->u.oval;
       ev->et = AST_Expression::EV_char;
@@ -1124,8 +1109,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ACE_WCHAR_MAX 
-          || ev->u.llval < 0)
+      if (ev->u.llval > (ACE_CDR::LongLong) ULONG_MAX || ev->u.llval < 0)
 	      return NULL;
       ev->u.wcval = (ACE_CDR::WChar) ev->u.llval;
       ev->et = AST_Expression::EV_wchar;
@@ -1135,7 +1119,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_WCHAR_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) ULONG_MAX)
 	      return NULL;
       ev->u.wcval = (ACE_CDR::WChar) ev->u.ullval;
       ev->et = AST_Expression::EV_wchar;
@@ -1148,15 +1132,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_wchar;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval > (float) ACE_WCHAR_MAX 
-          || ev->u.fval < 0)
+      if (ev->u.fval > (float) ULONG_MAX || ev->u.fval < 0)
 	      return NULL;
       ev->u.wcval = (ACE_CDR::WChar) ev->u.fval;
       ev->et = AST_Expression::EV_wchar;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval > (double) ACE_WCHAR_MAX 
-          || ev->u.dval < 0)
+      if (ev->u.dval > (double) ULONG_MAX || ev->u.dval < 0)
 	      return NULL;
       ev->u.wcval = (ACE_CDR::WChar) ev->u.dval;
       ev->et = AST_Expression::EV_wchar;
@@ -1184,34 +1166,32 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
   case AST_Expression::EV_octet:
     switch (ev->et) {
     case AST_Expression::EV_short:
-      if (ev->u.sval < 0 || ev->u.sval > (short) ACE_OCTET_MAX)
+      if (ev->u.sval < 0 || ev->u.sval > (short) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.sval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) ACE_OCTET_MAX)
+      if (ev->u.usval > (unsigned short) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.usval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_long:
-      if (ev->u.lval < 0 
-          || ev->u.lval > (long) ACE_OCTET_MAX)
+      if (ev->u.lval < 0 || ev->u.lval > (long) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.lval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) ACE_OCTET_MAX)
+      if (ev->u.ulval > (unsigned long) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.ulval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval < 0 
-          || ev->u.llval > (ACE_CDR::LongLong) ACE_OCTET_MAX)
+      if (ev->u.llval < 0 || ev->u.llval > (ACE_CDR::LongLong) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.llval;
       ev->et = AST_Expression::EV_octet;
@@ -1221,7 +1201,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ACE_OCTET_MAX)
+      if (ev->u.ullval > (ACE_CDR::ULongLong) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.ullval;
       ev->et = AST_Expression::EV_octet;
@@ -1234,15 +1214,13 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 
-          || ev->u.fval > (float) ACE_OCTET_MAX)
+      if (ev->u.fval < 0.0 || ev->u.fval > (float) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.fval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 
-          || ev->u.dval > (double) ACE_OCTET_MAX)
+      if (ev->u.dval < 0.0 || ev->u.dval > (double) (MAXCHAR << 1))
 	      return NULL;
       ev->u.oval = (unsigned char) ev->u.dval;
       ev->et = AST_Expression::EV_octet;
@@ -1254,7 +1232,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) ACE_OCTET_MAX)
+      if (ev->u.wcval > (ACE_CDR::WChar) (MAXCHAR << 1))
         return NULL;
       ev->u.oval = (unsigned char) ev->u.wcval;
       ev->et = AST_Expression::EV_octet;
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
index 67bcd83d2b9..a0df642dbe2 100644
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ b/TAO/TAO_IDL/be/be_args.cpp
@@ -82,7 +82,6 @@ BE_prep_arg(char *s, idl_bool)
 {
   const char arg_macro[]="export_macro=";
   const char arg_include[]="export_include=";
-  const char arg_pch_include[]="pch_include=";
 #ifdef IDL_HAS_VALUETYPE
   const char obv_opt_accessor[]="obv_opt_accessor";
 #endif /* IDL_HAS_VALUETYPE */
@@ -102,11 +101,6 @@ BE_prep_arg(char *s, idl_bool)
           char* val = arg + sizeof (arg_include) - 1;
           idl_global->export_include (val);
         }
-      else if (ACE_OS::strstr (arg, arg_pch_include) == arg)
-        {
-          char* val = arg + sizeof (arg_pch_include) - 1;
-          idl_global->pch_include (val);
-        }
 #  ifdef IDL_HAS_VALUETYPE
       else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg)
         {
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index ffc3af9ab26..b3fc77bbb20 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -184,15 +184,49 @@ TAO_CodeGen::start_client_header (const char *fname)
                             << "# pragma once\n"
                             << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
 
-      // Other include files
+      // Other include files.
 
       if (idl_global->export_include () != 0)
         {
           *this->client_header_ << "#include \""
-                                    << idl_global->export_include ()
+                                << idl_global->export_include ()
                                 << "\"\n";
         }
 
+      // Include the Messaging files if AMI is enabled. 
+      if (idl_global->ami_call_back () == I_TRUE)
+        {
+          // Include Messaging skeleton file.
+          *this->client_header_ << "#include ";
+          
+          if (idl_global->changing_standard_include_files () == 1)
+            *this->client_header_ << "\"";
+          else
+            *this->client_header_ << "<";
+          
+          *this->client_header_ << "tao/MessagingS.h";
+          
+          if (idl_global->changing_standard_include_files () == 1)
+            *this->client_header_ << "\"\n";
+          else
+            *this->client_header_ << ">\n";
+
+          // Including Asynch Invocation file.
+          *this->client_header_ << "#include ";
+          
+          if (idl_global->changing_standard_include_files () == 1)
+            *this->client_header_ << "\"";
+          else
+            *this->client_header_ << "<";
+          
+          *this->client_header_ << "tao/Asynch_Invocation.h";
+          
+          if (idl_global->changing_standard_include_files () == 1)
+            *this->client_header_ << "\"\n";
+          else
+            *this->client_header_ << ">\n";
+        }
+
       // We must include all the skeleton headers corresponding to
       // IDL files included by the current IDL file.
       // We will use the included IDL file names as they appeared
@@ -239,17 +273,6 @@ TAO_CodeGen::start_client_header (const char *fname)
                             << idl_global->export_macro ()
                             << be_nl;
 
-      // Generate export macro for nested classes
-      *this->client_header_
-        << "#if defined (TAO_EXPORT_NESTED_CLASSES)\n"
-        << "#  if defined (TAO_EXPORT_NESTED_MACRO)\n"
-        << "#    undef TAO_EXPORT_NESTED_MACRO\n"
-        << "#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */\n"
-        << "#  define TAO_EXPORT_NESTED_MACRO "
-        << idl_global->export_macro ()
-        << be_nl
-        << "#endif /* TAO_EXPORT_NESTED_CLASSES */\n";
-
       *this->client_header_ << "#if defined(_MSC_VER)\n"
                             << "#pragma warning(disable:4250)\n"
                             << "#endif /* _MSC_VER */\n\n";
@@ -284,11 +307,6 @@ TAO_CodeGen::start_client_stubs (const char *fname)
       return -1;
     }
 
-  // generate the include statement for the precompiled header file.
-  if (idl_global->pch_include ())
-    *this->client_stubs_ << "#include \""
-      << idl_global->pch_include () << "\"\n\n";
-
   // generate the include statement for the client header. We just
   // need to put only the base names. Path info is not required.
   *this->client_stubs_ << "#include \"" <<
@@ -521,11 +539,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
       return -1;
     }
 
-  // generate the include statement for the precompiled header file.
-  if (idl_global->pch_include ())
-    *this->server_skeletons_ << "#include \""
-      << idl_global->pch_include () << "\"\n\n";
-
   // generate the include statement for the server header
   *this->server_skeletons_ << "#include \"" <<
     idl_global->be_get_server_hdr_fname (1) << "\"\n\n";
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index fc25927940d..b510a4c5b3a 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -41,8 +41,11 @@ be_decl::be_decl (void)
     cli_stub_cdr_op_gen_ (I_FALSE),
     cli_inline_cdr_op_gen_ (I_FALSE),
     fullname_ (0),
+    ami_handler_fullname_ (0),
     flatname_ (0),
+    ami_handler_flatname_ (0),
     repoID_ (0),
+    ami_handler_repoID_ (0),
     prefix_ (0),
     size_type_ (be_decl::SIZE_UNKNOWN)
 {
@@ -66,8 +69,11 @@ be_decl::be_decl (AST_Decl::NodeType type,
     cli_hdr_cdr_op_gen_ (I_FALSE),
     cli_stub_cdr_op_gen_ (I_FALSE),
     fullname_ (0),
+    ami_handler_fullname_ (0),
     flatname_ (0),
+    ami_handler_flatname_ (0),
     repoID_ (0),
+    ami_handler_repoID_ (0),
     prefix_ (0),
     size_type_ (be_decl::SIZE_UNKNOWN)
 {
@@ -76,6 +82,41 @@ be_decl::be_decl (AST_Decl::NodeType type,
 //destructor
 be_decl::~be_decl (void)
 {
+  if (this->fullname_ != 0)
+    {
+      delete[] this->fullname_;
+      this->fullname_ = 0;
+    }
+  if (this->ami_handler_fullname_ != 0)
+    {
+      delete[] this->ami_handler_fullname_;
+      this->ami_handler_fullname_ = 0;
+    }
+  if (this->flatname_ != 0)
+    {
+      delete[] this->flatname_;
+      this->flatname_ = 0;
+    }
+  if (this->ami_handler_flatname_ != 0)
+    {
+      delete[] this->ami_handler_flatname_;
+      this->ami_handler_flatname_ = 0;
+    }
+  if (this->repoID_ != 0)
+    {
+      delete[] this->repoID_;
+      this->repoID_ = 0;
+    }
+  if (this->ami_handler_repoID_ != 0)
+    {
+      delete[] this->ami_handler_repoID_;
+      this->ami_handler_repoID_ = 0;
+    }
+  if (this->prefix_ != 0)
+    {
+      delete[] this->prefix_;
+      this->prefix_ = 0;
+    }
 }
 
 // return our size type
@@ -105,6 +146,26 @@ be_decl::size_type (be_decl::SIZE_TYPE st)
     this->size_type_ = st;
 }
 
+const char*
+be_decl::fullname (void)
+{
+  if (!this->fullname_)
+    compute_fullname ();
+
+  return this->fullname_;
+}
+
+const char*
+be_decl::ami_handler_fullname (void)
+{
+  if (!this->ami_handler_fullname_)
+    compute_ami_handler_name (this->fullname (),
+                              this->ami_handler_fullname_);
+
+  return this->ami_handler_fullname_;
+}
+
+
 // compute stringified fully scoped name
 void
 be_decl::compute_fullname (void)
@@ -170,14 +231,24 @@ be_decl::compute_fullname (void)
 }
 
 const char*
-be_decl::fullname (void)
+be_decl::flatname (void)
 {
-  if (!this->fullname_)
-    compute_fullname ();
+  if (!this->flatname_)
+    this->compute_flatname ();
 
-  return this->fullname_;
+  return this->flatname_;
 }
 
+const char*
+be_decl::ami_handler_flatname (void)
+{
+  if (!this->ami_handler_flatname_)
+    this->compute_flatname ("AMI_","_Handler");
+
+  return this->ami_handler_flatname_;
+}
+
+
 // compute stringified flattened fully scoped name
 void
 be_decl::compute_flatname (void)
@@ -245,17 +316,83 @@ be_decl::compute_flatname (void)
 
 
 
+char *
+be_decl::compute_flatname  (const char *prefix, const char *suffix)
+{
+  if (prefix == 0 || suffix == 0)
+    return 0;
 
-const char*
-be_decl::flatname (void)
+  ACE_CString prefix_str (prefix);
+  ACE_CString suffix_str (suffix);
+
+  ACE_CString result_str;
+
+  // Get parent.
+  if (this->defined_in () == 0)
+    {
+      // Global scope.
+
+      // Prefix.
+      result_str = prefix_str;
+
+      // Local name.
+      result_str += ACE_CString (this->local_name ()->get_string ());
+
+      // Suffix.
+      result_str += suffix_str;
+    }
+  else
+    {
+      // Get scope name.
+      be_decl *parent = be_scope::narrow_from_scope (this->defined_in ())->decl ();
+      if (parent == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_decl::"
+                             "compute_flat_name - "
+                             "scope name is nil\n"),
+                            0);
+        }
+
+      // Parent name.
+      result_str = ACE_CString (parent->fullname ());
+
+      // _
+      if (ACE_OS::strcmp (parent->fullname (), "") != 0)
+        result_str += ACE_CString ("_");
+
+      // Prefix.
+      result_str += ACE_CString ("AMI_");
+
+      // Local name.
+      result_str += ACE_CString (this->local_name ()->get_string ());
+
+      // Suffix.
+      result_str += suffix_str;
+    }
+
+  this->ami_handler_flatname_ = result_str.rep ();
+  return this->ami_handler_flatname_;
+}
+
+const char *
+be_decl::repoID (void)
 {
-  if (!this->flatname_)
-    compute_flatname ();
+  if (!this->repoID_)
+    this->compute_repoID ();
 
-  return this->flatname_;
+  return this->repoID_;
 }
 
 
+const char *
+be_decl::ami_handler_repoID (void)
+{
+  if (!this->ami_handler_repoID_)
+    this->compute_repoID ("AMI_","_Handler");
+
+  return this->ami_handler_repoID_;
+}
 
 
 // compute stringified repository ID
@@ -331,15 +468,197 @@ be_decl::compute_repoID (void)
   return;
 }
 
-const char *
-be_decl::repoID (void)
+// Apply the prefix and suffix to the local name and compute the
+// repoID.  Both the parameters should be non-null.
+char *
+be_decl::compute_repoID (const char *prefix, const char *suffix)
 {
-  if (!this->repoID_)
-    compute_repoID ();
+  // Prefix and suffix should be valid.
+  if (prefix == 0 || suffix == 0)
+    return 0;
 
-  return this->repoID_;
+  // First prepare the result without IDL: and  :1.0 strings.
+
+  // repoID without IDL: and :1.0 strings.
+  char *result = 0;
+
+  long namelen;
+  UTL_IdListActiveIterator *i;
+  long first = I_TRUE;
+  long second = I_FALSE;
+
+  // In the first loop compute the total length.
+  namelen = 8; // for the prefix "IDL:" and suffix ":1.0"
+  namelen += ACE_OS::strlen (this->prefix ()) + 1;
+  i = new UTL_IdListActiveIterator (this->name ());
+  while (!(i->is_done ()))
+    {
+      if (!first)
+        namelen += 1; // for "/"
+      else if (second)
+        first = second = I_FALSE;
+      // print the identifier
+      namelen += ACE_OS::strlen (i->item ()->get_string ());
+      if (first)
+        {
+          if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
+            // does not start with a ""
+            first = I_FALSE;
+          else
+            second = I_TRUE;
+        }
+      i->next ();
+    }
+  delete i;
+
+  // Get the result.
+
+  result = new char [namelen+1];
+  result[0] = '\0';
+
+  // Start the result with prefix.
+  ACE_OS::sprintf (result, "%s", this->prefix ());
+
+  // Add the "/" only if there is a prefix
+  if (ACE_OS::strcmp (this->prefix (), "") != 0)
+    ACE_OS::strcat (result, "/");
+
+  i = new UTL_IdListActiveIterator (this->name ());
+  first = I_TRUE;
+  second = I_FALSE;
+  while (!(i->is_done ()))
+    {
+      if (!first)
+        ACE_OS::strcat (result, "/");
+      else if (second)
+        first = second = I_FALSE;
+      // print the identifier
+      ACE_OS::strcat (result, i->item ()->get_string ());
+      if (first)
+        {
+          if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
+            // does not start with a ""
+            first = I_FALSE;
+          else
+            second = I_TRUE;
+        }
+      i->next ();
+    }
+  delete i;
+
+  // Add prefix and suffix.
+
+  // Search where the last / is. If it is not there put AMI_ right
+  // after IDL: and _Handler after that and then the :1.0 string.
+  // Otherwise put AMI after the last / and _Handler at the end and
+  // then the 1.0 string.
+
+  // CStrings are cool.
+
+  ACE_CString result_str (result);
+
+  // Return val. Release = 0 so that we can return the <c_str>.
+  ACE_CString repoID ("IDL:", 0, 0);
+
+  // Useful CStrings.
+  ACE_CString prefix_str (prefix);
+  ACE_CString suffix_str (suffix);
+  ACE_CString version_str (":1.0");
+
+  // Find the last /.
+  int last_name_pos = result_str.rfind ('/');
+
+  if (last_name_pos == ACE_CString::npos)
+    {
+      // '/' not present.
+
+      // Add prefix + result.
+      repoID += prefix_str;
+
+      repoID += result_str;
+
+      // Add suffix.
+      repoID += suffix_str;
+    }
+  else
+    {
+      // '/' present.
+
+      // IDl:<result except the last name>'/'. Watch get the last /
+      // also.
+      repoID += result_str.substring (0, last_name_pos+1);
+
+      // Put prefix.
+      repoID += prefix_str;
+
+      // Put the last name.
+      repoID += result_str.substr (last_name_pos + 1);
+
+      // Add suffix.
+      repoID += suffix_str;
+    }
+
+  // Add 1.0.
+  repoID += version_str;
+
+  // Delete result.
+  delete result;
+  result = 0;
+
+  this->ami_handler_repoID_ = repoID.rep ();
+
+  return this->ami_handler_repoID_;
+}
+
+
+int
+be_decl::compute_ami_handler_name (const char *name,
+                                        char *&ami_handler_name)
+{
+  int name_length = ACE_OS::strlen (name);
+  int ami_handler_length = ACE_OS::strlen ("AMI__HANDLER");
+
+  ACE_NEW_RETURN (ami_handler_name,
+                  char[name_length + ami_handler_length+1],
+                  -1);
+
+  // copy it in
+  ACE_OS::strcpy (ami_handler_name, name);
+
+  const char *interface_name = 0;
+  int i = ACE_OS::strlen (name);
+  for (;i >= 1; i--)
+    {
+      if (name[i-1] == ':' && name[i] == ':')
+        {
+          interface_name = &name[i+1];
+          break;
+        }
+      else if (i >= 3)
+        if (name[i-3] == 'P' &&
+            name[i-2] == 'O' &&
+            name[i-1] == 'A' &&
+            name[i] == '_')
+          {
+            interface_name = &name[i+1];
+            break;
+          }
+  }
+
+  if (interface_name == 0)
+    interface_name = name;
+
+  ACE_OS::strcpy(&ami_handler_name[name_length-ACE_OS::strlen(interface_name)],"AMI_");
+  ACE_OS::strcpy(&ami_handler_name[name_length-ACE_OS::strlen(interface_name)+4],
+                 interface_name);
+  ACE_OS::strcpy(&ami_handler_name[name_length+4],
+                 "_Handler");
+
+  return 0;
 }
 
+
+
 void
 be_decl::compute_prefix ()
 {
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 83404d97343..3fcd99fdd6f 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -45,13 +45,6 @@ be_enum_val::accept (be_visitor *visitor)
   return visitor->visit_enum_val (this);
 }
 
-int
-be_enum_val::compute_size_type (void)
-{
-  this->size_type_ = be_decl::FIXED;
-  return 0;
-}
-
 // Narrowing
 IMPL_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl)
 IMPL_NARROW_FROM_DECL (be_enum_val)
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 9483cac3d19..3a039fcfb30 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -194,14 +194,7 @@ TAO_OutStream::gen_ifdef_macro (const char *flatname, const char *suffix)
   ACE_OS::sprintf (macro, "_%s_", cg->upcase (flatname));
   if (suffix)
     {
-      //ACE_OS::sprintf (macro, "%s_%s_", macro, cg->upcase (suffix));
-      // Can't have macro on both sides of sprintf
-      // I'm not sure if the first strcat of "_" should be here or
-      // not, but having it gives the same functionality as the old
-      // sprintf call...
-      ACE_OS::strcat (macro, "_");
-      ACE_OS::strcat (macro, cg->upcase (suffix));
-      ACE_OS::strcat (macro, "_");
+      ACE_OS::sprintf (macro, "%s_%s_", macro, cg->upcase (suffix));
     }
 
   // append a suffix representing the stream type
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index ccd862f77b8..e7c36b58f9f 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -33,9 +33,13 @@ ACE_RCSID(be, be_interface, "$Id$")
 // default constructor
 be_interface::be_interface (void)
   : full_skel_name_ (0),
+    ami_handler_full_skel_name_ (0),
     skel_count_ (0),
     full_coll_name_ (0),
+    ami_handler_full_coll_name_ (0),
     local_coll_name_ (0),
+    ami_handler_local_coll_name_ (0),
+    ami_handler_local_name_ (0),
     in_mult_inheritance_ (-1)
 {
   this->size_type (be_decl::VARIABLE); // always the case
@@ -48,9 +52,13 @@ be_interface::be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
     AST_Decl (AST_Decl::NT_interface, n, p),
     UTL_Scope (AST_Decl::NT_interface),
     full_skel_name_ (0),
+    ami_handler_full_skel_name_ (0),
     skel_count_ (0),
     full_coll_name_ (0),
+    ami_handler_full_coll_name_ (0),
     local_coll_name_ (0),
+    ami_handler_local_coll_name_ (0),
+    ami_handler_local_name_ (0),
     in_mult_inheritance_ (-1)
 {
   this->size_type (be_decl::VARIABLE); // always the case
@@ -63,41 +71,50 @@ be_interface::~be_interface (void)
       delete[] this->full_skel_name_;
       this->full_skel_name_ = 0;
     }
+  if (this->ami_handler_full_skel_name_ != 0)
+    {
+      delete[] this->ami_handler_full_skel_name_;
+      this->ami_handler_full_skel_name_ = 0;
+    }
   if (this->full_coll_name_ != 0)
     {
       delete[] this->full_coll_name_;
       this->full_coll_name_ = 0;
     }
+  if (this->ami_handler_full_coll_name_ != 0)
+    {
+      delete[] this->ami_handler_full_coll_name_;
+      this->ami_handler_full_coll_name_ = 0;
+    }
   if (this->local_coll_name_ != 0)
     {
       delete[] this->local_coll_name_;
       this->local_coll_name_ = 0;
     }
+  if (this->ami_handler_local_coll_name_ != 0)
+    {
+      delete[] this->ami_handler_local_coll_name_;
+      this->ami_handler_local_coll_name_ = 0;
+    }
+  if (this->ami_handler_local_name_ != 0)
+    {
+      delete[] this->ami_handler_local_name_;
+      this->ami_handler_local_name_ = 0;
+    }
 }
 
 // compute stringified fully qualified collocated class name.
 void
-be_interface::compute_coll_name (int type)
+be_interface::compute_coll_name (void)
 {
-// @@ not thread safe.
-  static int cached_type = -1;
-  if (type == cached_type && this->full_coll_name_ != 0)
+  if (this->full_coll_name_ != 0)
     return;
-  else
-    {
-      cached_type = type;
-      delete this->full_coll_name_;
-      delete this->local_coll_name_;
-    }
 
-  static const char *collocated_names[] = { "_tao_thru_poa_collocated_",
-                                            "_tao_direct_collocated_" };
+  const char collocated[] = "_tao_collocated_";
   const char poa[] = "POA_";
   // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
   // prefix and the local name and the (optional) "::"
-  const char *collocated = collocated_names[type];
-
-  int namelen = ACE_OS::strlen (collocated) + sizeof (poa) + 1;
+  int namelen = sizeof (collocated) + sizeof (poa);
 
   UTL_IdListActiveIterator *i;
   ACE_NEW (i, UTL_IdListActiveIterator (this->name ()));
@@ -153,7 +170,7 @@ be_interface::compute_coll_name (int type)
   delete i;
 
   // Compute the local name for the collocated class.
-  int localen = ACE_OS::strlen (collocated) + 1;
+  int localen = sizeof (collocated);
   localen += ACE_OS::strlen (this->local_name ()->get_string ());
   ACE_NEW (this->local_coll_name_, char[localen]);
   ACE_OS::strcpy(this->local_coll_name_, collocated);
@@ -162,21 +179,136 @@ be_interface::compute_coll_name (int type)
 }
 
 const char *
-be_interface::full_coll_name (int type)
+be_interface::full_coll_name (void)
 {
-  this->compute_coll_name (type);
+  if (this->full_coll_name_ == 0)
+    this->compute_coll_name ();
 
   return this->full_coll_name_;
 }
 
 const char*
-be_interface::local_coll_name (int type) const
+be_interface::local_coll_name (void) const
 {
-  ACE_const_cast (be_interface*, this)->compute_coll_name (type);
+
+  if (this->local_coll_name_ == 0)
+    ACE_const_cast (be_interface*, this)->compute_coll_name ();
 
   return this->local_coll_name_;
 }
 
+
+const char*
+be_interface::ami_handler_full_coll_name (void)
+{
+  if (this->ami_handler_full_coll_name_ == 0)
+    compute_ami_handler_name (this->full_coll_name(),
+                               this->ami_handler_full_coll_name_);
+
+  return this->ami_handler_full_coll_name_;
+}
+
+const char*
+be_interface::ami_handler_local_coll_name (void)
+{
+  if (this->ami_handler_local_coll_name_ == 0)
+    compute_ami_handler_name (this->local_coll_name(),
+                              this->ami_handler_local_coll_name_);
+
+  return this->ami_handler_local_coll_name_;
+}
+
+const char*
+be_interface::ami_handler_local_name (void)
+{
+  if (this->ami_handler_local_name_ == 0)
+    compute_ami_handler_name (this->local_name()->get_string (),
+                              this->ami_handler_local_name_);
+
+  return this->ami_handler_local_name_;
+}
+
+// Generate collocated local and full names for the arbitrary local
+// name under the scope of this interface. Usefull to generate AMI
+// Handlers.
+int
+be_interface::compute_coll_names (const char *local_name,
+                                  char *&coll_local_name,
+                                  char *&coll_full_name)
+
+{
+  const char collocated[] = "_tao_collocated_";
+  const char poa[] = "POA_";
+
+  // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
+  // prefix and the local name and the (optional) "::"
+  int namelen = sizeof (collocated) + sizeof (poa);
+
+  UTL_IdListActiveIterator *i;
+  ACE_NEW_RETURN (i, UTL_IdListActiveIterator (this->name ()), -1);
+  while (!i->is_done ())
+    {
+      // reserve 2 characters for "::".
+      namelen += ACE_OS::strlen (i->item ()->get_string ()) + 2;
+      i->next ();
+    }
+  delete i;
+
+  ACE_NEW_RETURN (coll_full_name,
+                  char[namelen+1],
+                  -1);
+  coll_full_name[0] = 0; // null terminate the string...
+
+  // Iterate again....
+  ACE_NEW_RETURN (i, UTL_IdListActiveIterator (this->name ()), -1);
+
+  // Only the first component get the "POA_" preffix.
+  int poa_added = 0;
+  while (!i->is_done ())
+    {
+      const char* item = i->item ()->get_string ();
+
+      // Increase right away, so we can test for the final component
+      // in the loop.
+      i->next ();
+
+      // We add the POA_ preffix only if the first component is not
+      // the global scope...
+      if (ACE_OS::strcmp (item, "") != 0)
+        {
+          if (!i->is_done ())
+            {
+              // We only add the POA_ preffix if there are more than
+              // two components in the name, in other words, if the
+              // class is inside some scope.
+              if (!poa_added)
+                {
+                  ACE_OS::strcat (coll_full_name, poa);
+                  poa_added = 1;
+                }
+              ACE_OS::strcat (coll_full_name, item);
+              ACE_OS::strcat (coll_full_name, "::");
+            }
+          else
+            {
+              ACE_OS::strcat (coll_full_name, collocated);
+              ACE_OS::strcat (coll_full_name, item);
+            }
+        }
+    }
+  delete i;
+
+  // Compute the local name for the collocated class.
+  int localen = sizeof (collocated);
+  localen += ACE_OS::strlen (local_name);
+  ACE_NEW_RETURN (coll_local_name, char[localen], -1);
+  ACE_OS::strcpy(coll_local_name, collocated);
+  ACE_OS::strcat(coll_local_name,
+                 local_name);
+
+  return 0;
+}
+
 // compute stringified fully scoped skel name
 void
 be_interface::compute_fullskelname (void)
@@ -259,6 +391,17 @@ be_interface::full_skel_name (void)
   return this->full_skel_name_;
 }
 
+const char*
+be_interface::ami_handler_full_skel_name (void)
+{
+  if (this->ami_handler_full_skel_name_ == 0)
+    compute_ami_handler_name (this->full_skel_name(),
+                              this->ami_handler_full_skel_name_);
+
+  return this->ami_handler_full_skel_name_;
+}
+
+
 // Am I in some kind of a multiple inheritance
 int be_interface::in_mult_inheritance (void)
 {
@@ -562,7 +705,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
+  *ci << "this->ptr_ = " << interface_full_name << "::_duplicate (p.ptr ());\n";
   ci->decr_indent ();
   *ci << "}" << nl;
   *ci << "return *this;\n";
@@ -1905,6 +2048,31 @@ be_interface::gen_skel_helper (be_interface *derived,
 }
 
 int
+be_interface::collocated_ctor_helper (be_interface *derived,
+                                      be_interface *base,
+                                      TAO_OutStream *os)
+{
+  if (derived == base)
+    // we are the same. Don't do anything, otherwise we will end up calling
+    // ourself
+    return 0;
+
+  if (base->is_nested ())
+    {
+      be_decl *scope;
+      scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
+      *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ","
+          << base->local_coll_name () << ") (servant, stub)," << be_nl;
+    }
+  else
+    {
+      *os << "  " << base->full_coll_name () << " (servant, stub)," << be_nl;
+    }
+
+  return 0;
+}
+
+int
 be_interface::copy_ctor_helper (be_interface *derived,
                                 be_interface *base,
                                 TAO_OutStream *os)
@@ -1955,6 +2123,13 @@ be_interface::in_mult_inheritance_helper (be_interface *derived,
   return 0;
 }
 
+const char*
+be_interface::relative_coll_name (const char *collname)
+{
+  return be_interface::relative_name (this->full_coll_name (),
+                                      collname);
+}
+
 // return the relative skeleton name (needed due to NT compiler insanity)
 const char *
 be_interface::relative_skel_name (const char *skelname)
@@ -2055,6 +2230,8 @@ be_interface::accept (be_visitor *visitor)
   return visitor->visit_interface (this);
 }
 
+
+
 // Narrowing
 IMPL_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type)
 IMPL_NARROW_FROM_DECL (be_interface)
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 5d88dabd8ac..5cbb7686b39 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -195,7 +195,7 @@ be_sequence::managed_type (void)
                 // if this pseudo is a CORBA::Object, then the managed type is
                 // an objref
                 if (!ACE_OS::strcmp (bpd->local_name ()->get_string (),
-                                     "Object"))
+                                     "Object")) 
                   this->mt_ = be_sequence::MNG_OBJREF;
                 else
                   this->mt_ = be_sequence::MNG_PSEUDO;
@@ -274,21 +274,21 @@ be_sequence::instance_name ()
     case be_sequence::MNG_PSEUDO:
     case be_sequence::MNG_OBJREF:
       if (this->unbounded ())
-        ACE_OS::sprintf (namebuf,
+        ACE_OS::sprintf (namebuf, 
                          "_TAO_Unbounded_Object_Sequence_%s",
                          this->flatname());
       else
-        ACE_OS::sprintf (namebuf,
+        ACE_OS::sprintf (namebuf, 
                          "_TAO_Bounded_Object_Sequence_%s_%d",
                          this->flatname(),
                          this->max_size ()->ev()->u.ulval);
       break;
     case be_sequence::MNG_STRING: // sequence of strings
       if (this->unbounded ())
-        ACE_OS::sprintf (namebuf,
+        ACE_OS::sprintf (namebuf, 
                          "TAO_Unbounded_String_Sequence");
       else
-        ACE_OS::sprintf (namebuf,
+        ACE_OS::sprintf (namebuf, 
                          "_TAO_Bounded_String_Sequence_%s",
                          this->flatname());
       break;
@@ -299,20 +299,20 @@ be_sequence::instance_name ()
 	  // if the base type is an octet (or an alias for octet)
 	  be_predefined_type *predef =
 	    be_predefined_type::narrow_from_decl (prim_type);
-	  if (predef != 0 &&
+	  if (predef != 0 && 
 	      predef->pt() == AST_PredefinedType::PT_octet)
-	    ACE_OS::sprintf (namebuf,
+	    ACE_OS::sprintf (namebuf, 
 			     "TAO_Unbounded_Sequence<CORBA::Octet>");
 	  else
-            ACE_OS::sprintf (namebuf,
+            ACE_OS::sprintf (namebuf, 
                              "_TAO_Unbounded_Sequence_%s",
                              this->flatname());
                              // or prim_type->flatname ());
 	  // ACE_DEBUG ((LM_DEBUG, "testing.... %d, %d = <%s>\n",
 	  // predef, predef->pt (), namebuf));
-	}
+	}        
       else
-        ACE_OS::sprintf (namebuf,
+        ACE_OS::sprintf (namebuf, 
                          "_TAO_Bounded_Sequence_%s_%d",
                           this->flatname(),
                           //prim_type->flatname (),
@@ -320,9 +320,48 @@ be_sequence::instance_name ()
       break;
     }
 
-  return namebuf;
+  return namebuf; 
 }
 
+
+const char *
+be_sequence::object_manager_name ()
+{
+  static char namebuf[NAMEBUFSIZE];
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+
+  be_type *bt;
+  bt = be_type::narrow_from_decl (this->base_type ());
+  if (!bt)
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "(%N:%l) be_visitor_sequence_ch::"
+                  "gen_instantiate_name - "
+                  "Bad element type\n"));
+      return namebuf;
+    }
+
+  be_scope * bs = be_scope::narrow_from_scope (this->defined_in());
+
+  if (!bs)
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "(%N:%l) be_visitor_sequence_ch::"
+                  "gen_instantiate_name - "
+                  "Bad element type\n"));
+      return namebuf;
+    }
+
+  ACE_OS::sprintf (namebuf, 
+                   "_TAO_Object_Manager_%s_%s",
+                   bs->decl()->flatname(),
+                   bt->flatname());  
+
+
+  return namebuf; 
+}
+
+
 idl_bool
 be_sequence::in_recursion (be_type *node)
 {
@@ -345,7 +384,7 @@ be_sequence::in_recursion (be_type *node)
                          ASYS_TEXT ("bad base type\n")),
                         0);
     }
-
+  
   if (!ACE_OS::strcmp (node->fullname (), type->fullname ()))
     // they match
     return 1;
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index a926adf8fcd..6393a21a343 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -629,11 +629,13 @@ be_structure::in_recursion (be_type *node)
         {
           be_field *field = be_field::narrow_from_decl (si->item ());
           if (!field)
-          // This will be an enum value or other legitimate non-field
-          // member - in any case, no recursion.
             {
-              si->next ();
-              continue;
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ASYS_TEXT ("(%N:%l) be_structure::")
+                                 ASYS_TEXT ("in_recursion - ")
+                                 ASYS_TEXT ("bad field node\n")),
+                                0);
             }
           be_type *type = be_type::narrow_from_decl (field->field_type ());
           if (!type)
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
index 1724402c556..39aa7e7a866 100644
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ b/TAO/TAO_IDL/be/be_sunsoft.cpp
@@ -92,18 +92,10 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
         case AST_Expression::EV_longdouble:
           break;
         case AST_Expression::EV_char:
-          // isprint() sees \ and ' as printable characters
-          // so we have to test for them first.
+          // isprint() sees '\' as a printable character
+          // so we have to test for it first.
           if (ev->u.cval == '\\')
             this->TAO_OutStream::print ("'\\\\'");
-          else if (ev->u.cval == '\'')
-            this->TAO_OutStream::print ("'\\''");
-
-          // This handles hex and octal escape sequences
-          // that would print out either as weird characters
-          // or as an unsigned number too large for a char.
-          else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX)
-            this->TAO_OutStream::print ("%hd", ev->u.cval);
           else if (isprint (ev->u.cval))
 	          this->TAO_OutStream::print ("'%c'", ev->u.cval);
 	        else if (iscntrl (ev->u.cval))
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 899b2360a40..3d03b0bf6be 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 ACE_RCSID(be, be_type, "$Id$")
 
@@ -94,13 +94,70 @@ be_type::compute_tc_name (void)
                                                                  (namebuf), 1,
                                                                  0, I_FALSE), NULL));
     }
+
   return;
 }
 
+UTL_ScopedName *
+be_type::compute_tc_name (const char *prefix, const char *suffix)
+{
+  // Both prefix and suffix has to be valid. Else return. 
+  if (prefix == 0 || suffix == 0)
+    return 0;
+    
+  static char namebuf [NAMEBUFSIZE];
+  UTL_ScopedName *n;
+
+  UTL_ScopedName *result = NULL;
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  n = this->name ();
+  while (n->tail () != NULL)
+    {
+      if (!result)
+        {
+          // does not exist
+          result = new UTL_ScopedName (n->head (), NULL);
+        }
+      else
+        {
+          result->nconc (new UTL_ScopedName (n->head (), NULL));
+        }
+      n = (UTL_ScopedName *)n->tail ();
+    }
+
+  ACE_OS::sprintf (namebuf,
+                   "_tc_%s%s%s",
+                   prefix,
+                   n->last_component ()->get_string (),
+                   suffix);
+  
+  if (!result)
+    {
+      // does not exist
+      result = new UTL_ScopedName (new Identifier (ACE_OS::strdup
+                                                           (namebuf), 1, 0, I_FALSE), NULL);
+    }
+  else
+    {
+      result->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
+                                                                 (namebuf), 1,
+                                                                 0, I_FALSE), NULL));
+    }
+
+  return result;
+}
+
 // retrieve typecode name
 UTL_ScopedName *
-be_type::tc_name (void)
+be_type::tc_name (const char *prefix, const char *suffix)
 {
+  if (prefix != 0 && suffix != 0)
+    {
+      // Just compute and return the name.
+      return compute_tc_name (prefix, suffix);
+    }
+
+  // Compute and init the member.
   if (!this->tc_name_)
     compute_tc_name ();
 
@@ -135,15 +192,12 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
   char // hold the fully scoped name
     def_name [NAMEBUFSIZE],
     use_name [NAMEBUFSIZE];
-  char // these point to the prev, curr and next component in the scope
+  char // these point to the curr and next component in the scope
     *def_curr = def_name,
-    *def_next = 0,
+    *def_next,
     *use_curr = use_name,
-    *use_next = 0;
+    *use_next;
 
-  int len_to_match = 0; // how many chars to compare
-
-  // initialize the buffers
   ACE_OS::memset (this->nested_type_name_, '\0', NAMEBUFSIZE);
   ACE_OS::memset (def_name, '\0', NAMEBUFSIZE);
   ACE_OS::memset (use_name, '\0', NAMEBUFSIZE);
@@ -153,7 +207,7 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
   // match. Continue until there is a match and keep accumulating the path
   // traversed. This forms the first argument to the ACE_NESTED_CLASS
   // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument.
+  // def_scope form the second argument
 
   def_scope = ((this->defined_in ())?
                (be_scope::narrow_from_scope (this->defined_in ())->decl ()):
@@ -170,37 +224,21 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
       use_next = ACE_OS::strstr (use_curr, "::");
 
       if (def_next)
-        len_to_match = ACE_OS::strlen (def_curr) 
-          - ACE_OS::strlen (def_next);
-      else
-        len_to_match = ACE_OS::strlen (def_curr);
+        *def_next = 0;
 
       if (use_next)
-        {
-          int len  = ACE_OS::strlen (use_curr) 
-            - ACE_OS::strlen (use_next);
-          if (len > len_to_match)
-            len_to_match = len;
-        }
-      else
-        {
-          int len = ACE_OS::strlen (def_curr);
-          if (len > len_to_match)
-            len_to_match = len;
-        }
-      
-      if (!ACE_OS::strncmp (def_curr, use_curr, len_to_match))
+        *use_next = 0;
+
+      if (!ACE_OS::strcmp (def_curr, use_curr))
         {
           // initial prefix matches i.e., they have a common root
           // start by initializing the macro
 
           //@@          ACE_OS::sprintf (this->nested_type_name_, "ACE_NESTED_CLASS (");
-          //@@          ACE_OS::strcat (this->nested_type_name_, def_curr,
-          //len_to_match); // initialize the first argument 
+          //@@          ACE_OS::strcat (this->nested_type_name_, def_curr); // initialize the first argument
 
-          // shift the curr scopes to the next level
-          def_curr = (def_next ? (def_next + 2) : 0); // skip the ::
-          use_curr = (use_next ? (use_next + 2) : 0); // skip the ::
+          def_curr = (def_next ? (def_next+2) : 0); // skip the ::
+          use_curr = (use_next ? (use_next+2) : 0); // skip the ::
 
           while (def_curr && use_curr)
             {
@@ -209,33 +247,18 @@ be_type::nested_type_name (be_decl *use_scope, const char *suffix, const char *p
               use_next = ACE_OS::strstr (use_curr, "::");
 
               if (def_next)
-                len_to_match = ACE_OS::strlen (def_curr) 
-                  - ACE_OS::strlen (def_next);
-              else
-                len_to_match = ACE_OS::strlen (def_curr);
+                *def_next = 0;
 
               if (use_next)
-                {
-                  int len  = ACE_OS::strlen (use_curr) 
-                    - ACE_OS::strlen (use_next);
-                  if (len > len_to_match)
-                    len_to_match = len;
-                }
-              else
-                {
-                  int len = ACE_OS::strlen (def_curr);
-                  if (len > len_to_match)
-                    len_to_match = len;
-                }
-      
-              if (!ACE_OS::strncmp (def_curr, use_curr, len_to_match))
+                *use_next = 0;
+
+              if (!ACE_OS::strcmp (def_curr, use_curr))
                 {
                   // they have same prefix, append to arg1
                   //@@    ACE_OS::strcat (this->nested_type_name_, "::");
-                  //@@ ACE_OS::strncat (this->nested_type_name_, def_curr,
-                  //len_to_match); 
-                  def_curr = (def_next ? (def_next + 2) : 0); // skip the ::
-                  use_curr = (use_next ? (use_next + 2) : 0); // skip the ::
+                  //@@ ACE_OS::strcat (this->nested_type_name_, def_curr);
+                  def_curr = (def_next ? (def_next+2) : 0); // skip the ::
+                  use_curr = (use_next ? (use_next+2) : 0); // skip the ::
                 }
               else
                 {
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 4aa4baa22fe..ee19169565e 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -654,7 +654,7 @@ be_union::compute_size_type (void)
           else
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l) be_union::compute_size_type - "
+                          "WARNING (%N:%l) be_structure::compute_size_type - "
                           "narrow_from_decl returned 0\n"));
             }
           si->next ();
diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp
index f839202185b..b6c726568ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp
@@ -40,5 +40,10 @@
 #include "be_visitor_argument/pre_invoke_cs.cpp"
 #include "be_visitor_argument/ami_arglist.cpp"
 #include "be_visitor_argument/ami_handler_arglist.cpp"
+#include "be_visitor_argument/ami_handler_result_arg.cpp"
+#include "be_visitor_argument/ami_handler_compiled_marshal_cs.cpp"
+#include "be_visitor_argument/ami_handler_upcall_cs.cpp"
+#include "be_visitor_argument/ami_handler_vardecl_cs.cpp"
+
 ACE_RCSID(be, be_visitor_argument, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp
index 8ccbe559bb4..7eed73d1933 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_arglist.cpp
@@ -72,6 +72,7 @@ be_visitor_args_ami_handler_arglist::visit_argument (be_argument *node)
                          "cannot accept visitor\n"),
                         -1);
     }
+  
   // Print the variable name only if the type was printed already. 
   if (result)
     *os << " " << node->local_name () << ",\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp
new file mode 100644
index 00000000000..973c3dcd2cf
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_compiled_marshal_cs.cpp
@@ -0,0 +1,694 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_compiled_marshal_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the code that passes arguments to the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_argument, ami_handler_compiled_marshal_cs, "$Id$")
+
+
+// ****************************************************************************
+// visitor for arguments passing to the CDR operators.
+// ****************************************************************************
+
+be_visitor_args_ami_handler_compiled_marshal_cs::
+be_visitor_args_ami_handler_compiled_marshal_cs (be_visitor_context *ctx)
+  : be_visitor_args (ctx)
+{
+}
+
+be_visitor_args_ami_handler_compiled_marshal_cs::
+~be_visitor_args_ami_handler_compiled_marshal_cs (void)
+{
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_argument (be_argument *node)
+{
+  this->ctx_->node (node); // save the argument node
+
+  // retrieve the type of the argument
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  // Different types have different mappings when used as in/out or
+  // inout parameters. Let this visitor deal with the type
+
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  //TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGS_DEMARSHAL_CS)
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+          *os << "(_tao_in >> ";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+          *os << "(_tao_out << ";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_argument - "
+                         "Bad substate\n"),
+                        -1);
+    }
+
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_argument - "
+                         "cannot accept visitor\n"),
+                        -1);
+    }
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << ")";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << ")";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_argument - "
+                         "Bad substate\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << "_tao_forany_" << arg->local_name ();
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << node->name () << "_forany ("
+              << "(" << node->name () << "_slice *)"
+              << arg->local_name () << ")";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_array - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_enum (be_enum *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_enum - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_interface (be_interface *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".out ()";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_interface_fwd (be_interface_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << "out ()";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".out ()";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << "out ()";
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_valuetype_fwd - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get argument node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          switch (node->pt ())
+            {
+            case AST_PredefinedType::PT_pseudo:
+              *os << arg->local_name () << ".out ()";
+              break;
+            case AST_PredefinedType::PT_any:
+            case AST_PredefinedType::PT_long:
+            case AST_PredefinedType::PT_ulong:
+            case AST_PredefinedType::PT_longlong:
+            case AST_PredefinedType::PT_ulonglong:
+            case AST_PredefinedType::PT_short:
+            case AST_PredefinedType::PT_ushort:
+            case AST_PredefinedType::PT_float:
+            case AST_PredefinedType::PT_double:
+            case AST_PredefinedType::PT_longdouble:
+              *os << arg->local_name ();
+              break;
+            case AST_PredefinedType::PT_char:
+              *os << "CORBA::Any::to_char (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_wchar:
+              *os << "CORBA::Any::to_wchar (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_boolean:
+              *os << "CORBA::Any::to_boolean (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_octet:
+              *os << "CORBA::Any::to_octet (" << arg->local_name () << ")";
+              break;
+            default:
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "be_visitor_args_compiled_marshal_ss::"
+                                 "visit_predefined_type - "
+                                 "Bad predefined type\n"),
+                                -1);
+            }
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          switch (node->pt ())
+            {
+            case AST_PredefinedType::PT_pseudo:
+            case AST_PredefinedType::PT_any:
+            case AST_PredefinedType::PT_long:
+            case AST_PredefinedType::PT_ulong:
+            case AST_PredefinedType::PT_longlong:
+            case AST_PredefinedType::PT_ulonglong:
+            case AST_PredefinedType::PT_short:
+            case AST_PredefinedType::PT_ushort:
+            case AST_PredefinedType::PT_float:
+            case AST_PredefinedType::PT_double:
+            case AST_PredefinedType::PT_longdouble:
+              *os << arg->local_name ();
+              break;
+            case AST_PredefinedType::PT_char:
+              *os << "CORBA::Any::from_char (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_wchar:
+              *os << "CORBA::Any::from_wchar (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_boolean:
+              *os << "CORBA::Any::from_boolean (" << arg->local_name () << ")";
+              break;
+            case AST_PredefinedType::PT_octet:
+              *os << "CORBA::Any::from_octet (" << arg->local_name () << ")";
+              break;
+            default:
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "be_visitor_args_compiled_marshal_cs::"
+                                 "visit_predefined_type - "
+                                 "Bad predefined type\n"),
+                                -1);
+            }
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_array - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_sequence (be_sequence *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_string (be_string *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          // we need to make a distinction between bounded and unbounded strings
+          if (node->max_size ()->ev ()->u.ulval == 0)
+            {
+              *os << arg->local_name () << ".out ()";
+            }
+          else
+            {
+              *os << "CORBA::Any::to_string ("
+                  << arg->local_name () << ".out (), "
+                  << node->max_size ()->ev ()->u.ulval - 1
+                  << ")";
+            }
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name ();
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_interface - "
+                         "Bad substate\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_compiled_marshal_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_compiled_marshal_cs::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp
new file mode 100644
index 00000000000..9a2b8872e9a
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_result_arg.cpp
@@ -0,0 +1,179 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_result_arg.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the result argument in a call back method
+//    of a Reply Handler.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_args, ami_handler_result_arg, "$Id$")
+
+
+// ************************************************************
+// Visitor for parameter list in AMI Handler call back declarations
+// and definitions.
+// ************************************************************
+
+be_visitor_args_ami_handler_result_arg::be_visitor_args_ami_handler_result_arg (be_visitor_context *ctx)
+  : be_visitor_args (ctx)
+{
+}
+
+be_visitor_args_ami_handler_result_arg::~be_visitor_args_ami_handler_result_arg (void)
+{
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << "const " << this->type_name (node) << " _tao_retval, ";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node) << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node, "_ptr") << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node, "_ptr") << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_native (be_native *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node) << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_predefined_type (be_predefined_type *node)
+{
+
+  // Nothing to do if the return type is void.
+  if (node->pt () == AST_PredefinedType::PT_void)
+    return 0;
+
+  // Get output stream.
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Check if the type is an any.
+  if (node->pt () == AST_PredefinedType::PT_any)
+    {
+      *os << "const " << this->type_name (node) << " &" << " _tao_retval";
+    }
+  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
+    {
+      *os << this->type_name (node, "_ptr") << " _tao_retval";
+    }
+  else
+    {
+      *os << this->type_name (node) << " _tao_retval";
+    }
+
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_string (be_string *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const char *" << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_result_arg::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 1;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_args_ami_handler_result_arg::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << this->type_name (node) << " *" << " _tao_retval";
+  return 1;
+}
+
+int
+be_visitor_args_ami_handler_result_arg::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " *" << " _tao_retval";
+  return 1;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp
new file mode 100644
index 00000000000..344d2a61ce0
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_upcall_cs.cpp
@@ -0,0 +1,382 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_upcall_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates code that passes argument variables to the
+//    upcall.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_argument, upcall_cs, "$Id$")
+
+
+// ************************************************************************
+// visitor for passing arguments to the upcall
+// ************************************************************************
+
+be_visitor_args_ami_handler_upcall_cs::be_visitor_args_ami_handler_upcall_cs (be_visitor_context *ctx)
+  : be_visitor_args (ctx)
+{
+}
+
+be_visitor_args_ami_handler_upcall_cs::~be_visitor_args_ami_handler_upcall_cs (void)
+{
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_argument (be_argument *node)
+{
+  this->ctx_->node (node); // save the argument node
+
+  // retrieve the type
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_upcall_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  // Different types have different mappings when used as in/out or
+  // inout parameters. Let this visitor deal with the type
+
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_upcall_cs::"
+                         "visit_argument - "
+                         "cannot accept visitor\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_OUT:
+    case AST_Argument::dir_INOUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      if (node->size_type () == be_decl::VARIABLE)
+        *os << arg->local_name () << ".in ()";
+      else
+        *os << arg->local_name ();
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_enum (be_enum *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << arg->local_name ();
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_interface (be_interface *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_interface_fwd (be_interface_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+      break;
+    }
+  return 0;
+}
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_ami_handler_upcall_cs::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+      break;
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
+
+int be_visitor_args_ami_handler_upcall_cs::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // check if the type is an any
+  if (node->pt () == AST_PredefinedType::PT_any)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          /*
+          if (this->ctx_->state ()
+              == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+            *os << arg->local_name ();
+          else
+          */
+          os->indent ();
+          *os << arg->local_name () << ".in ()";
+          break;
+        } // end switch direction
+    } // end of if
+  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          /*if (this->ctx_->state ()
+              == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+            *os << arg->local_name ();
+          else
+          */
+          os->indent ();
+          *os << arg->local_name () << ".in ()";
+          break;
+        } // end switch direction
+    } // end else if
+  else // simple predefined types
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+          *os << arg->local_name ();
+          break;
+        } // end switch direction
+    } // end of else
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_sequence (be_sequence *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_string (be_string *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // If we use it in conjunction with AMI Reply Handlers we do
+  // not want to generate declarations for IN arguments
+  if (this->direction () == AST_Argument::dir_IN
+      && this->ctx_->state() == TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS)
+    return 0;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      /*
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_upcall_cs)
+        *os << arg->local_name ();
+      else
+      */
+      os->indent ();
+      *os << arg->local_name () << ".in ()";
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      if (node->size_type () == be_decl::VARIABLE)
+        *os << arg->local_name () << ".in ()";
+      else
+        *os << arg->local_name ();
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      if (node->size_type () == be_decl::VARIABLE)
+        *os << arg->local_name () << ".in ()";
+      else
+        *os << arg->local_name ();
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_upcall_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_upcall_cs::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp
new file mode 100644
index 00000000000..8592d1d5e81
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_argument/ami_handler_vardecl_cs.cpp
@@ -0,0 +1,525 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_vardecl_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the variable declaration in the skeleton
+//    corresponding to the Argument node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_argument, ami_handler_vardecl_cs, "$Id$")
+
+
+// ************************************************************************
+// Visitor to generate code for argument variable declaration
+// ************************************************************************
+
+be_visitor_args_ami_handler_vardecl_cs::be_visitor_args_ami_handler_vardecl_cs (be_visitor_context *ctx)
+  : be_visitor_args (ctx)
+{
+}
+
+be_visitor_args_ami_handler_vardecl_cs::~be_visitor_args_ami_handler_vardecl_cs (void)
+{
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_argument (be_argument *node)
+{
+  this->ctx_->node (node); // save the argument node
+
+  // retrieve the type
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_vardecl_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  // Different types have different mappings when used as in/out or
+  // inout parameters. Let this visitor deal with the type
+
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_vardecl_cs::"
+                         "visit_argument - "
+                         "cannot accept visitor\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";" << be_nl
+          << bt->name () << "_forany _tao_forany_"
+          << arg->local_name () << " (" << be_idt << be_idt_nl
+          << arg->local_name () << be_uidt_nl
+          << ");\n" << be_uidt;
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";" << be_nl
+          << bt->name () << "_forany _tao_forany_"
+          << arg->local_name () << " (" << be_idt << be_idt_nl
+          << arg->local_name () << be_uidt_nl
+          << ");\n" << be_uidt;
+      break;
+    }
+  return 0;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+#if 0 /* ASG */
+      *os << bt->name () << "_var " << arg->local_name () << ";" << be_nl;
+      *os << "CORBA::Object_var _tao_base_var_" << arg->local_name ()
+          << ";" << be_nl;
+      *os << "CORBA::Object_ptr &_tao_base_ptr_" << arg->local_name ()
+          << " = _tao_base_var_" << arg->local_name () << ".out ();\n";
+#endif
+      *os << bt->name () << "_var " << arg->local_name () << ";" << be_nl;
+      *os << "CORBA::Object_var _tao_base_var_" << arg->local_name ()
+          << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+#if 0 /* ASG */
+      *os << bt->name () << "_var " << arg->local_name () << ";" << be_nl;
+      *os << "CORBA::Object_var _tao_base_var_" << arg->local_name ()
+          << ";" << be_nl;
+      *os << "CORBA::Object_ptr &_tao_base_ptr_" << arg->local_name ()
+          << " = _tao_base_var_" << arg->local_name () << ".out ();\n";
+#endif
+      *os << bt->name () << "_var " << arg->local_name () << ";" << be_nl;
+      *os << "CORBA::Object_var _tao_base_var_" << arg->local_name ()
+          << ";\n";
+      break;
+    }
+  return 0;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_valuetype (be_valuetype *)
+{
+  return -1;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  return -1;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  // check if the type is an any
+  if (node->pt () == AST_PredefinedType::PT_any)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+          *os << bt->name () << " " << arg->local_name () << ";\n";
+          break;
+        } // end switch direction
+    } // end of if
+  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+#if 0 /* ASG */
+          *os << bt->name () << "_var " << arg->local_name ()
+              << ";" << be_nl;
+          *os << bt->name () << "_ptr &_tao_ptr_" << arg->local_name ()
+              << " = " << arg->local_name () << ".out ();\n";
+#endif
+          *os << bt->name () << "_var " << arg->local_name ()
+              << ";\n";
+          break;
+        } // end switch direction
+    } // end else if
+  else // simple predefined types
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          os->indent ();
+          *os << bt->name () << " " << arg->local_name () << ";\n";
+          break;
+        } // end switch direction
+    } // end of else
+
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_string (be_string *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+#if 0 /* ASG */
+      *os << "CORBA::String_var _tao_var_"
+          << arg->local_name () << ";" << be_nl;
+      *os << "char *&" << arg->local_name () << " = _tao_var_"
+          << arg->local_name () << ".out ();" << be_nl;
+#endif
+      *os << "CORBA::String_var "
+          << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << " " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_ami_handler_vardecl_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_ami_handler_vardecl_cs::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
+
+
+// ************************************************************************
+// Visitor to generate code for argument variable declaration for compiled
+// marshaling. This provides only the overriden methods. The rest is handled by
+// the base class that works for interpretiveskeletons.
+// ************************************************************************
+
+be_compiled_visitor_args_ami_handler_vardecl_cs::
+be_compiled_visitor_args_ami_handler_vardecl_cs (be_visitor_context *ctx)
+  : be_visitor_args_ami_handler_vardecl_cs (ctx)
+{
+}
+
+be_compiled_visitor_args_ami_handler_vardecl_cs::~be_compiled_visitor_args_ami_handler_vardecl_cs (void)
+{
+}
+
+int be_compiled_visitor_args_ami_handler_vardecl_cs::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int be_compiled_visitor_args_ami_handler_vardecl_cs::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_compiled_visitor_args_ami_handler_vardecl_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int
+be_compiled_visitor_args_ami_handler_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      break;
+    case AST_Argument::dir_INOUT:
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
index e8105746d40..18cae73c4c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
@@ -60,16 +60,17 @@ int be_visitor_args_compiled_marshal_cs::visit_argument (be_argument *node)
 
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
+  os->indent ();
+
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
         case AST_Argument::dir_INOUT:
-          os->indent ();
           *os << "(_tao_out << ";
           break;
-        case AST_Argument::dir_OUT:
+       case AST_Argument::dir_OUT:
           break;
         }
     }
@@ -81,7 +82,6 @@ int be_visitor_args_compiled_marshal_cs::visit_argument (be_argument *node)
           break;
         case AST_Argument::dir_INOUT:
         case AST_Argument::dir_OUT:
-          os->indent ();
           *os << "(_tao_in >> ";
           break;
         }
@@ -158,7 +158,7 @@ int be_visitor_args_compiled_marshal_cs::visit_array (be_array *node)
         case AST_Argument::dir_INOUT:
           *os << node->name () << "_forany ("
               << arg->local_name () << ")";
-          break;
+      break;
         case AST_Argument::dir_OUT:
           break;
         }
@@ -676,15 +676,15 @@ int be_visitor_args_compiled_marshal_cs::visit_structure (be_structure *node)
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        }
+        switch (this->direction ())
+          {
+          case AST_Argument::dir_IN:
+          case AST_Argument::dir_INOUT:
+            *os << arg->local_name ();
+            break;
+          case AST_Argument::dir_OUT:
+            break;
+          }
     }
   else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
index 510a89d3328..012dc96724f 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
@@ -363,13 +363,13 @@ int be_visitor_args_compiled_marshal_ss::visit_valuetype_fwd (be_valuetype_fwd *
         {
         case AST_Argument::dir_IN:
         case AST_Argument::dir_INOUT:
-          *os << arg->local_name () << "out ()";
+          *os << arg->local_name () << ".out ()";
           break;
         case AST_Argument::dir_OUT:
           break;
         }
     }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
       switch (this->direction ())
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 57702ecd178..1e270712ea9 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -260,7 +260,6 @@ int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   os->indent ();
   // check if the type is an any
   if (node->pt () == AST_PredefinedType::PT_any)
@@ -328,7 +327,6 @@ int be_visitor_args_upcall_ss::visit_sequence (be_sequence *)
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   os->indent ();
   switch (this->direction ())
     {
@@ -352,7 +350,6 @@ int be_visitor_args_upcall_ss::visit_string (be_string *)
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   os->indent ();
   switch (this->direction ())
     {
@@ -386,7 +383,6 @@ int be_visitor_args_upcall_ss::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   os->indent ();
   switch (this->direction ())
     {
@@ -413,7 +409,6 @@ int be_visitor_args_upcall_ss::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   os->indent ();
   switch (this->direction ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index b07cbd35be4..c5829ca7f92 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -368,7 +368,6 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *)
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
   be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
                                                          // node
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index c38780bdfdb..de712189b3a 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -57,31 +57,15 @@ int be_visitor_array_ch::visit_array (be_array *node)
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_ch::"
+                         "be_visitor_array_ch::"
                          "visit_array - "
-                         "bad base type\n"),
+                         "Bad base type\n"),
                         -1);
     }
 
   // generate the ifdefined macro
   os->gen_ifdef_macro (node->flatname ());
 
-  // If we contain an anonymous sequence, 
-  // generate code for the sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt, 
-                                         TAO_CodeGen::TAO_SEQUENCE_CH) 
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_ch::"
-                             "visit_array - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }              
-    }
-
   os->indent ();
   *os << "typedef ";
   if (bt->accept (this) == -1)
@@ -222,8 +206,12 @@ int be_visitor_array_ch::visit_array (be_array *node)
   if (this->ctx_->tdef ())
     {
       // typedefed array
+      if (!node->is_nested ())
+        *os << "ACE_INLINE ";
       *os << storage_class << node->nested_type_name (scope, "_slice") << " *";
       *os << node->nested_type_name (scope, "_alloc") << " (void);" << be_nl;
+      if (!node->is_nested ())
+        *os << "ACE_INLINE ";
       *os << storage_class << "void " << node->nested_type_name (scope, "_free") << " (";
       *os << node->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
       *os << storage_class << node->nested_type_name (scope, "_slice") << " *";
@@ -236,15 +224,19 @@ int be_visitor_array_ch::visit_array (be_array *node)
   else
     {
       // anonymous array
+      if (!node->is_nested ())
+        *os << "ACE_INLINE ";
       *os << storage_class << node->nested_type_name (scope, "_slice", "_") << " *";
       *os << node->nested_type_name (scope, "_alloc", "_") << " (void);" << be_nl;
-      *os << storage_class << "void "
+      if (!node->is_nested ())
+        *os << "ACE_INLINE ";
+      *os << storage_class << "void " 
           << node->nested_type_name (scope, "_free", "_") << " (";
       *os << node->nested_type_name (scope, "_slice", "_") << " *_tao_slice);" << be_nl;
       *os << storage_class << node->nested_type_name (scope, "_slice", "_") << " *";
       *os << node->nested_type_name (scope, "_dup", "_") << " (const ";
       *os << node->nested_type_name (scope, "_slice", "_") << " *_tao_slice);" << be_nl;
-      *os << storage_class << "void "
+      *os << storage_class << "void " 
           << node->nested_type_name (scope, "_copy", "_") << " (";
       *os << node->nested_type_name (scope, "_slice", "_") << " *_tao_to, const ";
       *os << node->nested_type_name (scope, "_slice", "_") << " *_tao_from);" << be_nl;
@@ -252,7 +244,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   *os << "\n";
 
-#if 0
+#if 0 
   // Typecode for an anonymous array will not be required anywhere since we do
   // not generate the Any operators for anonymous types
 
@@ -327,7 +319,7 @@ be_visitor_array_ch::gen_var_defn (be_array *node)
   *os << "~" << varnamebuf << " (void); // destructor" << be_nl;
   *os << be_nl;
   // assignment operator from a pointer to slice
-  *os << varnamebuf << " &operator= (" << namebuf << "_slice *);"
+  *os << varnamebuf << " &operator= (" << namebuf << "_slice *);" 
       << be_nl;
   // assignment from _var
   *os << varnamebuf << " &operator= (const " << varnamebuf << " &);" << be_nl;
@@ -338,13 +330,13 @@ be_visitor_array_ch::gen_var_defn (be_array *node)
 
   // other extra types (cast operators, [] operator, and others)
   // overloaded [] operator
-  *os << namebuf << "_slice &operator[] (CORBA::ULong index);"
+  *os << namebuf << "_slice &operator[] (CORBA::ULong index);" 
       << be_nl;
-  *os << "const " << namebuf
+  *os << "const " << namebuf 
       << "_slice &operator[] (CORBA::ULong index) const;" << be_nl;
 
   // cast operators
-  *os << "operator " << namebuf << "_slice * const &() const;"
+  *os << "operator " << namebuf << "_slice * const &() const;" 
       << be_nl;
   *os << "operator " << namebuf << "_slice *&();" << be_nl;
 
@@ -407,7 +399,7 @@ be_visitor_array_ch::gen_out_defn (be_array *node)
   // assignment operator from a _out &
   *os << outnamebuf << " &operator= (const " << outnamebuf << " &);" << be_nl;
   // assignment from slice *
-  *os << outnamebuf << " &operator= (" << namebuf << "_slice *);"
+  *os << outnamebuf << " &operator= (" << namebuf << "_slice *);" 
       << be_nl;
   // cast
   *os << "operator " << namebuf << "_slice *&();" << be_nl;
@@ -415,7 +407,7 @@ be_visitor_array_ch::gen_out_defn (be_array *node)
   *os << namebuf << "_slice *&ptr (void);" << be_nl;
   // operator [] instead of ->
   *os << namebuf << "_slice &operator[] (CORBA::ULong index);" << be_nl;
-  *os << "const " << namebuf << "_slice &operator[] "
+  *os << "const " << namebuf << "_slice &operator[] " 
       << "(CORBA::ULong index) const;" << be_uidt_nl;
 
   *os << "private:" << be_idt_nl;
@@ -446,7 +438,7 @@ be_visitor_array_ch::gen_forany_defn (be_array *node)
     {
       // anonymous array case
       ACE_OS::sprintf (namebuf, "_%s", node->local_name ()->get_string ());
-      ACE_OS::sprintf (foranyname, "_%s_forany",
+      ACE_OS::sprintf (foranyname, "_%s_forany", 
                        node->local_name ()->get_string ());
     }
 
@@ -463,16 +455,16 @@ be_visitor_array_ch::gen_forany_defn (be_array *node)
   // default constr
   *os << foranyname << " (void); // default constructor" << be_nl;
   // constr from pointer to slice
-  *os << foranyname << " (" << namebuf << "_slice *, "
+  *os << foranyname << " (" << namebuf << "_slice *, " 
       << "CORBA::Boolean nocopy=0);" << be_nl;
   // copy constructor
-  *os << foranyname << " (const " << foranyname
+  *os << foranyname << " (const " << foranyname 
       << " &); // copy constructor" << be_nl;
   // destructor
   *os << "~" << foranyname << " (void); // destructor" << be_nl;
   *os << be_nl;
   // assignment operator from a pointer to slice
-  *os << foranyname << " &operator= (" << namebuf << "_slice *);"
+  *os << foranyname << " &operator= (" << namebuf << "_slice *);" 
       << be_nl;
   // assignment from _var
   *os << foranyname << " &operator= (const " << foranyname << " &);" << be_nl;
@@ -483,13 +475,13 @@ be_visitor_array_ch::gen_forany_defn (be_array *node)
 
   // other extra types (cast operators, [] operator, and others)
   // overloaded [] operator
-  *os << namebuf << "_slice &operator[] (CORBA::ULong index);"
+  *os << namebuf << "_slice &operator[] (CORBA::ULong index);" 
       << be_nl;
-  *os << "const " << namebuf
+  *os << "const " << namebuf 
       << "_slice &operator[] (CORBA::ULong index) const;" << be_nl;
 
   // cast operators
-  *os << "operator " << namebuf << "_slice * const &() const;"
+  *os << "operator " << namebuf << "_slice * const &() const;" 
       << be_nl;
   *os << "operator " << namebuf << "_slice *&();" << be_nl;
 
@@ -515,3 +507,4 @@ be_visitor_array_ch::gen_forany_defn (be_array *node)
 
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index b08c960285d..493ac9aa0cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -48,32 +48,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   this->ctx_->node (node); // save the array node
 
-  // If we contain an anonymous sequence, generate code for it here.
-
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cdr_op_ch::"
-                         "visit_array - "
-                         "bad base type\n"),
-                        -1);
-    }
-
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt, 
-                                         TAO_CodeGen::TAO_SEQUENCE_CI) 
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_ci::"
-                             "visit_array - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }              
-    }
-
   // generate code for the _var, _out, and _forany types
   if (this->gen_var_impl (node) == -1)
     {
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 70dc9205344..bfb15e7af9e 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -251,22 +251,6 @@ int be_visitor_array_cs::visit_array (be_array *node)
     }
   *os << be_uidt_nl << "}\n\n";
 
-  // If we contain an anonymous sequence, 
-  // generate code for the seuqence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt, 
-                                         TAO_CodeGen::TAO_SEQUENCE_CS) 
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cs::"
-                             "visit_array - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }              
-    }
-
 #if 0
   // typecode for anonymous arrays is not required since we do not generate the
   // Any operators for it and it cannot be used as a type
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index 3af1abc3abd..776217da5d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -82,34 +82,6 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node)
       *os << node->name () << "_forany &);" << be_nl;
     }
 
-      // If we contain an anonymous sequence, 
-      // generate code for the sequence here.
-
-      // retrieve the type
-      be_type *bt = be_type::narrow_from_decl (node->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_ch::"
-                             "visit_array - "
-                             "bad base type\n"),
-                            -1);
-        }
-
-      if (bt->node_type () == AST_Decl::NT_sequence)
-        {
-          if (this->gen_anonymous_base_type (bt, 
-                                             TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CH) 
-              == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_array_cdr_op_ch::"
-                                 "visit_array - "
-                                 "gen_anonymous_base_type failed\n"),
-                                -1);
-            }              
-        }
-
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
index 5995c25313b..808646a479d 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
@@ -72,25 +72,6 @@ be_visitor_array_cdr_op_ci::visit_array (be_array *node)
                             -1);
         }
 
-      // If we contain an anonymous sequence, 
-      // generate code for the sequence here.
-
-      if (bt->node_type () == AST_Decl::NT_sequence)
-        {
-          // @@ (JP) TODO - change state arg to _CI when the rest of
-          // the cdr_op files get unhacked.
-          if (this->gen_anonymous_base_type (bt, 
-                                             TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CS) 
-              == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_field_cdr_op_ch::"
-                                 "visit_array - "
-                                 "gen_anonymous_base_type failed\n"),
-                                -1);
-            }              
-        }
-
       // for anonymous arrays, the type name has a _ prepended. We compute the
       // fullname with or without the underscore and use it later on.
       char fname [NAMEBUFSIZE];  // to hold the full and
@@ -301,91 +282,45 @@ be_visitor_array_cdr_op_ci::visit_predefined_type (be_predefined_type *node)
     }
 
   // handle special case to avoid compiler errors
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " ((";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << " ((const ";
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_cdr_op_ci::"
-                         "visit_predefined_type - "
-                         "bad substate in context\n"),
-                        -1);
-    }
-
   switch (node->pt ())
     {
-    case AST_PredefinedType::PT_long:
-      *os << "ACE_CDR::Long *)";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "ACE_CDR::ULong *)";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "ACE_CDR::Short *)";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "ACE_CDR::UShort *)";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "ACE_CDR::Octet *)";
-      break;
     case AST_PredefinedType::PT_char:
-      *os << "ACE_CDR::Char *)";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "ACE_CDR::WChar *)";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "ACE_CDR::Float *)";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "ACE_CDR::Double *)";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "ACE_CDR::LongLong *)";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "ACE_CDR::ULongLong *)";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "ACE_CDR::LongDouble *)";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "ACE_CDR::Boolean *)";
+      switch (this->ctx_->sub_state ())
+        {
+        case TAO_CodeGen::TAO_CDR_INPUT:
+          *os << " ((char *)_tao_array.inout (), ";
+          break;
+        case TAO_CodeGen::TAO_CDR_OUTPUT:
+          *os << " ((const char *)_tao_array.in (), ";
+          break;
+        default:
+          // error
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_array_cdr_op_ci::"
+                             "visit_predefined_type - "
+                             "bad substate in context\n"),
+                            -1);
+        }
       break;
     default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_cdr_op_ci::"
-                         "visit_predefined_type - "
-                         "bad primitive type for optimized code gen\n"),
-                        -1);
-    }
-
-  // handle special case to avoid compiler errors
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " _tao_array.out (), ";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "_tao_array.in (), ";
+      switch (this->ctx_->sub_state ())
+        {
+        case TAO_CodeGen::TAO_CDR_INPUT:
+          *os << " (_tao_array.inout (), ";
+          break;
+        case TAO_CodeGen::TAO_CDR_OUTPUT:
+          *os << " (_tao_array.in (), ";
+          break;
+        default:
+          // error
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_array_cdr_op_ci::"
+                             "visit_predefined_type - "
+                             "bad substate in context\n"),
+                            -1);
+        }
       break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_array_cdr_op_ci::"
-                         "visit_predefined_type - "
-                         "bad substate in context\n"),
-                        -1);
     }
-
   // generate a product of all the dimensions. This will be the total length of
   // the "unfolded" single dimensional array.
   for (i = 0; i < array->n_dims (); i++)
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 78c24582e13..719daab6d35 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -98,17 +98,11 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
     case TAO_CodeGen::TAO_ATTRIBUTE_IS:
       ctx.state (TAO_CodeGen::TAO_OPERATION_IS);
       break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SH);
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
       break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS);
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
       break;
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SH:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SH);
@@ -183,17 +177,11 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
     case TAO_CodeGen::TAO_ATTRIBUTE_IS:
       ctx.state (TAO_CodeGen::TAO_OPERATION_IS);
       break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SH);
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
       break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS);
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
       break;
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SH:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SH);
diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp
index 8539de31d30..7658f3e181f 100644
--- a/TAO/TAO_IDL/be/be_visitor_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp
@@ -38,43 +38,3 @@ be_visitor_decl::~be_visitor_decl (void)
 {
   delete this->ctx_;
 }
-
-int
-be_visitor_decl::gen_anonymous_base_type (be_type *bt,
-                                          TAO_CodeGen::CG_STATE cg_state)
-{
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-  
-  if (!tdef)
-    {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (cg_state);
-
-      // In case our container was typedef'd.
-      ctx.tdef (0);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_decl::"
-                             "gen_anonymous_base_type - "
-                             "bad visitor to anonymous abase type\n"),
-                            -1);
-        }
-
-      if (bt->accept (visitor) == -1)
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_decl::"
-                             "gen_anonymous_base_type - "
-                             "anonymous base type codegen failed\n"),
-                            -1);
-        }
-
-      delete visitor;
-    }
-
-  return 0; 
-}
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 5c3bff6388f..72b5f13525f 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -87,37 +87,22 @@ int be_visitor_exception_ctor_assign::visit_field (be_field *node)
   return 0;
 }
 
-int be_visitor_exception_ctor_assign::visit_array (be_array *node)
+int be_visitor_exception_ctor_assign::visit_array (be_array *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
   be_decl *bd = this->ctx_->node ();
 
   os->indent ();
-
-  if (ACE_OS::strcmp (bd->flatname (), node->flatname ()))
-    {
-      // We are typedef'd.
-      *os << node->name ();
-    }
-  else
-    {
-      // We are anonymous.
-      *os << "_" << bd->local_name ();
-    }
-
-  if (this->ctx_->exception ())
+  if (this->ctx_->exception ()) // special ctor
     {
-      // Constructor from member args.
-      *os << "_copy (this->" << bd->local_name ()
-          << ", _tao_" << bd->local_name () << ");\n";
+      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
+          << ";\n";
     }
   else
     {
-      // Copy constructor and assignment operator.
-      *os << "_copy (this->" << bd->local_name ()
-          << ", _tao_excp." << bd->local_name () << ");\n";
+      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
+          << ";\n";
     }
-
   return 0;
 }
 
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 5745089998e..3d78fa5387b 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -48,19 +48,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     {
       os = this->ctx_->stream ();
 
-      os->indent ();
-
-      // generate stub code  required of any anonymous types of members
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception::"
-                             "visit_exception -"
-                             "code for stub failed\n"), 
-                            -1);
-        }
-
       // default constructor
+      os->indent ();
       *os << "// default constructor" << be_nl;
       *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
       *os << "  : CORBA_UserException ("
@@ -78,10 +67,10 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       // copy constructor
       os->indent ();
       *os << "// copy constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (const " 
-          << node->name () << " &_tao_excp)" << be_nl;
-      *os << "  : CORBA_UserException (" 
-          << "_tao_excp._type ())" << be_nl;
+      *os << node->name () << "::" << node->local_name () << " (const " <<
+        node->name () << " &_tao_excp)" << be_nl;
+      *os << "  : CORBA_UserException (" <<
+        "_tao_excp._type ())" << be_nl;
       *os << "{\n";
       os->incr_indent ();
       // assign each individual member
@@ -105,10 +94,10 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "// assignment operator" << be_nl;
       *os << node->name () << "&" << be_nl;
       *os << node->name () << "::operator= (const "
-	        << node->name () << " &_tao_excp)" << be_nl
-	        << "{\n" << be_idt_nl
-	        << "this->CORBA_UserException::operator= "
-	        << "(_tao_excp);\n";
+	  << node->name () << " &_tao_excp)" << be_nl
+	  << "{\n" << be_idt_nl
+	  << "this->CORBA_UserException::operator= "
+	  << "(_tao_excp);\n";
       // assign each individual member
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS);
@@ -124,7 +113,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       delete visitor;
       os->indent ();
       *os << "return *this;" << be_uidt_nl
-	        << "}\n\n";
+	  << "}\n\n";
 
       // narrow method
       os->indent ();
@@ -133,20 +122,20 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << node->name () << "::_narrow (CORBA::Exception *exc)" << be_nl;
       *os << "{\n";
       os->incr_indent ();
-      *os << "if (!ACE_OS::strcmp (\"" << node->repoID () 
-          << "\", exc->_id ())) // same type" << be_nl;
-      *os << "  return ACE_dynamic_cast (" << node->name () << "_ptr, exc);" 
-          << be_nl;
+      *os << "if (!ACE_OS::strcmp (\"" << node->repoID () <<
+        "\", exc->_id ())) // same type" << be_nl;
+      *os << "  return ACE_dynamic_cast (" << node->name () << "_ptr, exc);" <<
+        be_nl;
       *os << "else" << be_nl;
       *os << "  return 0;\n";
       os->decr_indent ();
       *os << "}\n\n";
 
       *os << be_nl
-	        << "void " << node->name () << "::_raise ()" << be_nl
-	        << "{" << be_idt_nl
-	        << "TAO_RAISE(*this);" << be_uidt_nl
-	        << "}\n\n";
+	  << "void " << node->name () << "::_raise ()" << be_nl
+	  << "{" << be_idt_nl
+	  << "TAO_RAISE(*this);" << be_uidt_nl
+	  << "}\n\n";
 
       // generate the _alloc method
       os->indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index 6b3e59fdae6..7793cbff63c 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -120,19 +120,10 @@ int be_visitor_exception_ctor::visit_array (be_array *node)
   else
     bt = node;
 
-  *os << "const ";
-
-  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-
-  if (this->ctx_->state () != TAO_CodeGen::TAO_EXCEPTION_CTOR_CH
-      && !tdef)
-    *os << this->ctx_->scope ()->fullname () << "::";
-
-  if (!tdef)
-    *os << "_";
-
-  *os << bt->nested_type_name (this->ctx_->scope ());
-
+  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
+    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
+  else
+    *os << "const " << bt->name ();
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index 78caefabdfc..9f6bc8907c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -147,6 +147,7 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_interface_ch (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_CI:
       return new be_visitor_interface_ci (new_ctx);
+
     case TAO_CodeGen::TAO_INTERFACE_CS:
       return new be_visitor_interface_cs (new_ctx);
 
@@ -160,14 +161,15 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_interface_ss (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_IS:
       return new be_visitor_interface_is (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-      return new be_visitor_interface_thru_poa_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-      return new be_visitor_interface_thru_poa_collocated_ss (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-      return new be_visitor_interface_direct_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
-      return new be_visitor_interface_direct_collocated_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+      return new be_visitor_interface_collocated_sh (new_ctx);
+
+    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH:
+      return new be_visitor_interface_collocated_ami_handler_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
+      return new be_visitor_interface_collocated_ss (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CH:
       return new be_visitor_interface_any_op_ch (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CS:
@@ -375,13 +377,16 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_typedef_cdr_op_cs (new_ctx);
 
     case TAO_CodeGen::TAO_TYPECODE_DECL:
+    case TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DECL:
       // Do we need TypeCode Support?
       if (idl_global->tc_support ())
         return new be_visitor_typecode_decl (new_ctx);
       else
         // return a NO_OP visitor
         return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_TYPECODE_DEFN:
+    case TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN:
       // Do we need TypeCode Support?
       if (idl_global->tc_support ())
         return new be_visitor_typecode_defn (new_ctx);
@@ -397,10 +402,8 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ATTRIBUTE_IS:
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SH:
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SI:
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
       return new be_visitor_attribute (new_ctx);
 
     case TAO_CodeGen::TAO_EXCEPTION_CH:
@@ -453,11 +456,20 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI:
       return new be_visitor_interface_ami_handler_fwd_ci (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_CH:
-      return new be_visitor_interface_ami_handler_ch (new_ctx);
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH:
+      return new be_visitor_interface_ami_handler_servant_ch (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
-      return new be_visitor_operation_ami_handler_arglist (new_ctx);
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS:
+      return new be_visitor_interface_ami_handler_servant_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CH:
+      return new be_visitor_interface_ami_handler_stub_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CS:
+      return new be_visitor_interface_ami_handler_stub_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RESULT_ARG:
+      return new be_visitor_args_ami_handler_result_arg (new_ctx);
 
     default:
       // an error
@@ -505,38 +517,50 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_interpretive_visitor_operation_ss (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_IS:
       return new be_visitor_operation_is (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SH:
-      return new be_visitor_operation_thru_poa_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SS:
-      return new be_visitor_operation_thru_poa_collocated_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SH:
-      return new be_visitor_operation_direct_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS:
-      return new be_visitor_operation_direct_collocated_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH:
+      return new be_visitor_operation_collocated_sh (new_ctx);
+
+    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH:
+      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS:
+      return new be_visitor_operation_collocated_ss (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_CH:
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS:
       return new be_visitor_operation_rettype (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_IS:
       return new be_visitor_operation_rettype_is (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
       return new be_visitor_operation_rettype_vardecl_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_INVOKE_CS:
       return new be_visitor_operation_rettype_pre_docall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS:
       return new be_visitor_operation_rettype_docall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_INVOKE_CS:
       return new be_visitor_operation_rettype_post_docall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
       return new be_visitor_operation_rettype_return_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS:
       return new be_visitor_operation_exceptlist_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS:
       return new be_visitor_operation_rettype_vardecl_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DEMARSHAL_SS:
     case TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS:
       return new be_visitor_operation_rettype_marshal_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
       return new be_visitor_operation_rettype_assign_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_UPCALL_SS:
       return new be_visitor_operation_rettype_post_upcall_ss (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
@@ -546,8 +570,11 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
       return new be_visitor_operation_arglist (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
+    case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
+    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
@@ -557,7 +584,9 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS:
       return new be_visitor_operation_argument (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_TIE_SH:
       return new be_visitor_operation_tie_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_TIE_SI:
@@ -566,10 +595,15 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH:
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS:
       return new be_visitor_args_arglist (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_PRE_INVOKE_CS:
       return new be_visitor_args_pre_docall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS:
+    case TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS:
+    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS:
       return new be_visitor_args_docall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS:
       return new be_visitor_args_post_docall_cs (new_ctx);
     case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
@@ -593,24 +627,37 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_AMI_CS:
       return new be_interpretive_visitor_operation_ami_cs (new_ctx);
 
-    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST:
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH:
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CS:
       return new be_visitor_operation_ami_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
-      return new be_visitor_operation_argument (new_ctx);
+      // case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+      // return new be_visitor_operation_argument (new_ctx);
+
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CH:
+      return new be_visitor_args_ami_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CS:
       return new be_visitor_args_ami_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_CH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH:
       return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CS:
+      return new be_interpretive_visitor_operation_ami_handler_operation_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS:
       return new be_visitor_operation_ami_handler_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CH:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CS:
       return new be_visitor_args_ami_handler_arglist (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_SKELETON_CS:
+      return new be_interpretive_visitor_operation_ami_handler_skeleton_cs (new_ctx);
+
     default:
       // cannot handle it; delegate it to the common visitor factory
       delete new_ctx;
@@ -656,42 +703,59 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_is (new_ctx);
          case TAO_CodeGen::TAO_OPERATION_IH:
       return new be_visitor_operation_ih (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SH:
-      return new be_visitor_operation_thru_poa_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SS:
-      return new be_visitor_operation_thru_poa_collocated_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SH:
-      return new be_visitor_operation_direct_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS:
-      return new be_visitor_operation_direct_collocated_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH:
+      return new be_visitor_operation_collocated_sh (new_ctx);
+
+    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH:
+      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS:
+      return new be_visitor_operation_collocated_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_CH:
     case TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS:
       return new be_visitor_operation_rettype (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
       return new be_visitor_operation_rettype_vardecl_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_INVOKE_CS:
       return new be_visitor_operation_rettype_pre_invoke_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS:
       return new be_visitor_operation_rettype_compiled_marshal (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_INVOKE_CS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
       return new be_visitor_operation_rettype_return_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS:
       return new be_visitor_operation_exceptlist_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS:
       return new be_compiled_visitor_operation_rettype_vardecl_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_DEMARSHAL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_MARSHAL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS:
       return new be_visitor_operation_rettype_compiled_marshal (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
       return new be_visitor_operation_rettype_assign_ss (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_UPCALL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
@@ -699,6 +763,7 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
       return new be_visitor_operation_arglist (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS:
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
@@ -707,40 +772,73 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_UPCALL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
       return new be_visitor_operation_argument (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
     case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
       return new be_compiled_visitor_operation_argument_marshal (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS:
+      return new be_compiled_visitor_operation_ami_handler_argument_marshal (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
+    case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
+    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
       return new be_compiled_visitor_operation_argument_invoke (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_TIE_SH:
       return new be_visitor_operation_tie_sh (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_TIE_SI:
       return new be_visitor_operation_tie_si (new_ctx);
 
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH:
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS:
       return new be_visitor_args_arglist (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_PRE_INVOKE_CS:
       return new be_visitor_args_pre_invoke_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS:
+    case TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS:
+    // @@ Michael case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS:
       return new be_visitor_args_compiled_marshal_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS:
       return new be_visitor_args_post_docall_compiled_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
       return new be_compiled_visitor_args_vardecl_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS:
+      return new be_compiled_visitor_args_ami_handler_vardecl_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
     case TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS:
       return new be_visitor_args_upcall_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS:
+      return new be_visitor_args_ami_handler_upcall_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_DEMARSHAL_SS:
     case TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS:
       return new be_visitor_args_compiled_marshal_ss (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_DEMARSHAL_CS:
+    case TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_MARSHAL_CS:
+      return new be_visitor_args_ami_handler_compiled_marshal_cs (new_ctx);
+
     case TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS:
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
@@ -751,27 +849,40 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_OPERATION_AMI_CH:
       return new be_visitor_operation_ami_ch (new_ctx);
 
-    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST:
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH:
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CS:
       return new be_visitor_operation_ami_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
-      return new be_visitor_operation_argument (new_ctx);
+      //  case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+      //  return new be_visitor_operation_argument (new_ctx);
 
-    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CH:
       return new be_visitor_args_ami_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_CH:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CS:
+      return new be_visitor_args_ami_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH:
       return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
 
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CS:
+      return new be_compiled_visitor_operation_ami_handler_operation_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS:
       return new be_visitor_operation_ami_handler_arglist (new_ctx);
 
     case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_AMI_HANDLER:
       return new be_visitor_args_ami_handler_arglist (new_ctx);
 
-    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CH:
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CS:
       return new be_visitor_args_ami_handler_arglist (new_ctx);
 
+    case TAO_CodeGen::TAO_AMI_HANDLER_SKELETON_CS:
+      return new be_compiled_visitor_operation_ami_handler_skeleton_cs (new_ctx);
+
     default:
       // cannot handle it; delegate it to the common visitor factory
       delete new_ctx;
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
index 2f0e43155ff..4b5de15442e 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
@@ -132,7 +132,7 @@ be_visitor_field_cdr_op_ci::visit_array (be_array *node)
           << "_tao_aggregate_" << f->local_name () << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
-      // This is done in cdr_op_cs and hacked into *.i.
+      // proceed further
       break;
     default:
       // error
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index af980e349a4..91bb59fb6de 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -211,9 +211,6 @@ be_visitor_field_ch::visit_interface (be_interface *node)
   os->indent ();
   *os << "TAO_Object_Field_T<"
       <<  bt->nested_type_name (this->ctx_->scope (), "")
-      << ",";
-  // Must use another statement, nested_type_name has side effects...
-  *os <<  bt->nested_type_name (this->ctx_->scope (), "_var")
       << ">";
   return 0;
 }
@@ -235,9 +232,8 @@ be_visitor_field_ch::visit_interface_fwd (be_interface_fwd *node)
   // if not a typedef and we are defined in the use scope, we must be defined
   os->indent ();
   *os << "TAO_Object_Field_T<"
-      <<  bt->nested_type_name (this->ctx_->scope (), "") << ",";
-  // Must use another statement, nested_type_name has side effects...
-  *os << bt->nested_type_name (this->ctx_->scope (), "_var") << ">";
+      <<  bt->nested_type_name (this->ctx_->scope (), "")
+      << ">";
   return 0;
 }
 
@@ -308,9 +304,7 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
       // check if we are dealing with a CORBA::Object
       if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
         {
-          *os << "TAO_Object_Field_T<"
-              << bt->name () << ","
-              << bt->name () << "_var>";
+          *os << "TAO_Object_Field_T<" << bt->name () << ">";
         }
       else
         *os << bt->nested_type_name (this->ctx_->scope (), "_var");
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index ff8a4ab8d98..e93b5241bcc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -32,10 +32,8 @@
 #include "be_visitor_interface/interface_si.cpp"
 #include "be_visitor_interface/interface_ss.cpp"
 #include "be_visitor_interface/interface_is.cpp"
-#include "be_visitor_interface/thru_poa_collocated_sh.cpp"
-#include "be_visitor_interface/thru_poa_collocated_ss.cpp"
-#include "be_visitor_interface/direct_collocated_sh.cpp"
-#include "be_visitor_interface/direct_collocated_ss.cpp"
+#include "be_visitor_interface/collocated_sh.cpp"
+#include "be_visitor_interface/collocated_ss.cpp"
 #include "be_visitor_interface/tie_sh.cpp"
 #include "be_visitor_interface/tie_si.cpp"
 #include "be_visitor_interface/any_op_ch.cpp"
@@ -45,5 +43,10 @@
 #include "be_visitor_interface/cdr_op_cs.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ch.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ci.cpp"
-#include "be_visitor_interface/ami_handler_ch.cpp"
+#include "be_visitor_interface/ami_handler_servant_ch.cpp"
+#include "be_visitor_interface/ami_handler_servant_cs.cpp"
+#include "be_visitor_interface/ami_handler_stub_ch.cpp"
+#include "be_visitor_interface/ami_handler_stub_cs.cpp"
+#include "be_visitor_interface/collocated_ami_handler_ch.cpp"
+
 ACE_RCSID(be, be_visitor_interface, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
index 857630cdbe5..678314b2855 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_ch.cpp
@@ -20,9 +20,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -58,7 +58,7 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
   // Generate the skeleton class name.
 
   // Start with whatever indentation level we are at.
-  os->indent (); 
+  os->indent ();
 
   // We shall have a POA_ prefix only if we are at the topmost level. 
   if (!node->is_nested ())
@@ -85,7 +85,7 @@ be_visitor_interface_ami_handler_ch::visit_interface (be_interface *node)
   // This class will inherit from the Messaging::ReplyHandler class. 
   *os << "class " << idl_global->export_macro ()
       << " " << namebuf
-      << " : public POA_Messaging::ReplyHandler" 
+      << " : public POA_Messaging::ReplyHandler"
       << be_nl;
 
   // Body of the class definition.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
new file mode 100644
index 00000000000..62eae6c6da5
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_cs.cpp
@@ -0,0 +1,235 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for AMI Handler class for an Interface.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_interface,  ami_handler_cs, "$Id$")
+
+
+// ************************************************************
+// Interface visitor for client stubs
+// ************************************************************
+
+be_visitor_ ami_handler_cs::be_visitor_ ami_handler_cs (be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_ ami_handler_cs::~be_visitor_ ami_handler_cs (void)
+{
+}
+
+int
+be_visitor_ ami_handler_cs::visit_interface (be_interface *node)
+{
+  // output stream.
+  TAO_OutStream *os;
+
+  if (node->cli_stub_gen () || node->imported ())
+    return 0;
+
+  os = this->ctx_->stream ();
+
+  // Start with whatever indentation level we are at.
+  os->indent ();
+
+  // Create the full name for the AMI_<Interface name>_Handler
+  // interface.  
+  char *full_name = 0;
+
+  // Full name. 
+  // If there exists a scope name for this, then generate
+  // "Scope::AMI_<Local Name>_Handler". 
+
+  size_t scope_len = 0;
+
+  be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+  
+  if (parent != 0 &&
+      parent->fullname () != 0 &&
+      ACE_OS::strlen (parent->fullname ()))
+    scope_len = ACE_OS::strlen (parent->fullname ()) + ACE_OS::strlen ("::");
+  
+  ACE_NEW_RETURN (full_name,
+                  char [scope_len +
+                       ACE_OS::strlen ("AMI_") +
+                       ACE_OS::strlen (node->local_name ()->get_string ()) +
+                       ACE_OS::strlen ("_Handler") +
+                       1],
+                  -1);
+  
+  if (parent != 0 &&
+      parent->fullname () != 0 &&
+      ACE_OS::strlen (parent->fullname ()))
+    ACE_OS::sprintf (full_name,
+                     "%s::AMI_%s_Handler",
+                     parent->fullname (),
+                     node->local_name ()->get_string ());
+  else
+    ACE_OS::sprintf (full_name,
+                     "AMI_%s_Handler",
+                     node->local_name ()->get_string ());
+
+  // First generate the code for the static methods.
+  
+  // The _narrow method
+  *os << full_name << "_ptr " << full_name
+      << "::_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &env" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "if (CORBA::is_nil (obj))" << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl
+      << "if (!obj->_is_a (\"" << node->repoID () << "\", env))"
+      << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl;
+
+  *os << "return " << full_name
+      << "::_unchecked_narrow (obj, env);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // This may be necessary to work around a GCC compiler bug!
+  //  const char *skel_name = node->full_skel_name (); // unused at this time
+  const char *coll_name = node->full_coll_name ();
+  assert (coll_name != 0);
+
+  // The _unchecked_narrow method
+  *os << full_name << "_ptr " << full_name
+      << "::_unchecked_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_nl
+      << "if (CORBA::is_nil (obj))" << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl;
+
+  *os << "TAO_Stub* stub = obj->_stubobj ();" << be_nl
+      << "stub->_incr_refcnt ();" << be_nl;
+  *os << "void* servant = 0;" << be_nl;
+  *os << "if (obj->_is_collocated () "
+      << "&& obj->_servant() != 0)" << be_idt_nl
+      << "servant = obj->_servant()->_downcast (\""
+      << "IDL:omg.org/CORBA/Object:1.0\");" << be_uidt_nl;
+
+  *os << "if (servant != 0)" << be_idt_nl << "{" << be_idt_nl
+    // The collocated object reference factory is not working right (yet)
+      << full_name << "_ptr retv = ACE_reinterpret_cast (" << be_idt << be_idt_nl
+      << full_name << "_ptr," << be_nl
+      << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
+      << "PortableServer::Servant," << be_nl
+      << "servant" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "->_create_collocated_objref (" << be_idt << be_idt_nl
+      << "\"" << node->repoID () << "\"," << be_nl
+      << "TAO_ORB_Core::ORB_CONTROL," << be_nl
+      << "stub" << be_uidt_nl
+      << ")" << be_uidt << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "if (retv != 0)" << be_idt_nl
+      << "return retv;" << be_uidt
+    // So we are still using the old way to create collocated objref.
+      << be_uidt_nl
+      << "}" << be_uidt_nl;
+
+  *os << "return new " << full_name << "(stub);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // The _duplicate method
+  *os << full_name << "_ptr " << be_nl
+      << full_name << "::_duplicate ("
+      << full_name << "_ptr obj)" << be_nl
+      << "{" << be_idt_nl
+      << "if (!CORBA::is_nil (obj))" << be_idt_nl
+      << "obj->_incr_refcnt ();" << be_uidt_nl
+      << "return obj;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // generate code for the elements of the interface
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ ami_handler_cs::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+  // generate the is_a method
+  os->indent ();
+  *os << "CORBA::Boolean " << full_name << "::_is_a (" <<
+    "const CORBA::Char *value, CORBA::Environment &env)" << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "if (\n";
+  os->incr_indent (0);
+  if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ ami_handler_cs::"
+                         "visit_interface - "
+                         "_is_a method codegen failed\n"), -1);
+    }
+
+  os->indent ();
+  *os << "(!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))\n";
+  *os << "  return 1; // success using local knowledge\n";
+  os->decr_indent ();
+  *os << "else" << be_nl;
+  *os << "  return this->CORBA_Object::_is_a (value, env);\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+
+  os->indent ();
+  *os << "const char* " << full_name
+      << "::_interface_repository_id (void) const"
+      << be_nl
+      << "{" << be_idt_nl
+      << "return \"" << node->repoID () << "\";" << be_uidt_nl
+      << "}\n\n";
+
+  // by using a visitor to declare and define the TypeCode, we have the
+  // added advantage to conditionally not generate any code. This will be
+  // based on the command line options. This is still TO-DO
+  be_visitor *visitor;
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
+  ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ ami_handler_cs::"
+                         "visit_interface - "
+                         "TypeCode definition failed\n"
+                         ), -1);
+    }
+  
+  // @@ Alex: Make sure you have done the following in the other ami
+  //    visitors. (Alex).
+  delete full_name;
+  full_name = 0;
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
new file mode 100644
index 00000000000..899412c61fb
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_ch.cpp
@@ -0,0 +1,243 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating AMI Reply Handler code for Interfaces in the
+//    client header. 
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_interface, ami_handler_servant_ch, "$Id$")
+
+
+// ************************************************************
+// Interface visitor for server header
+// ************************************************************
+
+be_visitor_interface_ami_handler_servant_ch::be_visitor_interface_ami_handler_servant_ch (be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_ami_handler_servant_ch::~be_visitor_interface_ami_handler_servant_ch (void)
+{
+}
+
+int
+be_visitor_interface_ami_handler_servant_ch::visit_interface (be_interface *node)
+{
+   // Output stream.
+  TAO_OutStream *os;
+
+  // Holds the class name.
+  static char namebuf [NAMEBUFSIZE];
+
+  // AMI_<Interface_Name>_Handler string.
+  static char ami_handler [NAMEBUFSIZE]; 
+
+  if (node->srv_hdr_gen () || node->imported ())
+    return 0;
+
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::memset (ami_handler, '\0', NAMEBUFSIZE);
+
+  os = this->ctx_->stream ();
+  
+  // Generate the skeleton class name.
+
+  // Start with whatever indentation level we are at.
+  os->indent ();
+
+  // We shall have a POA_ prefix only if we are at the topmost level. 
+  if (!node->is_nested ())
+    {
+      // we are outermost
+      ACE_OS::sprintf (namebuf,
+                       "POA_AMI_%s_Handler",
+                       node->local_name ()->get_string ());
+    }
+  else
+    {
+      ACE_OS::sprintf (namebuf,
+                       "AMI_%s_Handler",
+                       node->local_name ()->get_string ());
+    }
+
+  // AMI Handler object's name.
+  ACE_OS::sprintf (ami_handler,
+                   "AMI_%s_Handler",
+                   node->local_name ()->get_string ());
+  
+  *os << "class " << namebuf << ";" << be_nl;
+
+  // generate the _ptr declaration
+  *os << "typedef " << namebuf << " *" << namebuf
+      << "_ptr;" << be_nl;
+
+  // Now generate the class definition.
+  // This class will inherit from the Messaging::ReplyHandler class. 
+  *os << "class " << idl_global->export_macro ()
+      << " " << namebuf
+      << " : public virtual POA_Messaging::ReplyHandler"
+      << be_nl;
+
+  // Body of the class definition.
+  *os << be_nl
+      << "{" << be_nl;
+
+  // Default constructor.
+  *os << "protected:" << be_idt_nl
+      << namebuf << " (void);\n" << be_uidt_nl;
+  
+  // Public portion starts. 
+  *os << "public:" << be_idt_nl
+    
+    // Copy constructor.
+      << namebuf << " (const " << namebuf << "& rhs);" << be_nl
+    
+    // Destructor.
+      << "virtual ~" << namebuf << " (void);\n\n"
+      
+      << be_nl;
+    
+    // Methods.
+  
+  // _is_a.
+  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char* logical_type_id," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+  
+  // _down_cast.
+  *os << "virtual void* _downcast (" << be_idt << be_idt_nl
+      << "const char* logical_type_id" << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+  
+  // add a skeleton for our _is_a method
+  *os << "static void _is_a_skel (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &req," << be_nl
+      << "void *obj," << be_nl
+      << "void *context," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+
+  // add a skeleton for our _non_existent method
+  *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &req," << be_nl
+      << "void *obj," << be_nl
+      << "void *context," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+
+  // add the dispatch method
+  *os << "virtual void _dispatch (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &_tao_req," << be_nl
+      << "void *_tao_context," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+
+  // Print out the _this() method.
+  *os << ami_handler << " *_this (" << be_idt << be_idt_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");\n" << be_uidt_nl;
+
+  // The _interface_repository_id method.
+  *os << "virtual const char* _interface_repository_id "
+      << "(void) const;\n\n";
+
+  // The _create_collocated_objref method.
+  *os << "virtual void* _create_collocated_objref"
+      << "(const char*, CORBA::ULong type, TAO_Stub *sobj);"
+      << be_nl << be_nl;
+
+  // Generate code for elements in the scope (e.g., operations).
+  if (this->visit_scope (node) ==  -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_ch::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"),
+                        -1);
+    }
+
+  // Generate skeletons for operations of our base classes. These skeletons
+  // just cast the pointer to the appropriate type before invoking the call.
+  if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_ch::"
+                         "visit_interface - "
+                         "inheritance graph traversal failed\n"),
+                        -1);
+    }
+
+  *os << be_uidt_nl << "};\n\n";
+
+  // Generate the collocated class
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_ch::"
+                         "visit_interface - "
+                         "codegen for collocated class failed\n"),
+                        -1);
+    }
+
+#if 0
+  // @@ Do this (Alex).
+  // generate the TIE class.
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_ch::"
+                         "visit_interface - "
+                         "codegen for TIE class failed\n"),
+                        -1);
+    }
+#endif /* 0 */
+
+  *os << "\n";
+
+#if 0
+  ctx.stream (tao_cg->server_template_header ());
+#endif /* 0 */
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
new file mode 100644
index 00000000000..840387019e3
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp
@@ -0,0 +1,340 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server skeletons file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_interface, ami_handler_servant_cs, "$Id$")
+
+
+// ************************************************************
+// Interface visitor for server skeletons
+// ************************************************************
+
+be_visitor_interface_ami_handler_servant_cs::be_visitor_interface_ami_handler_servant_cs (be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_ami_handler_servant_cs::~be_visitor_interface_ami_handler_servant_cs (void)
+{
+}
+
+int
+be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os; // output stream
+
+  if (node->srv_skel_gen () || node->imported ())
+    return 0;
+
+  os = this->ctx_->stream ();
+
+  // generate the skeleton class name
+
+  os->indent (); // start with whatever indentation level we are at
+
+  /* @@ Michael
+  if (node->gen_operation_table () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "codegen for operation table failed\n"),
+                        -1);
+    }
+
+  */
+  // constructor
+  *os << "// skeleton constructor" << be_nl;
+  // find if we are at the top scope or inside some module
+  if (!node->is_nested ())
+    {
+      // we are outermost. So the POA_ prefix is prepended to our name
+      *os << node->ami_handler_full_skel_name () << "::POA_" << node->ami_handler_local_name () <<
+        " (void)" << be_nl;
+    }
+  else
+    {
+      // the POA_ prefix is prepended to our outermost module name
+      *os << node->ami_handler_full_skel_name () << "::" << node->ami_handler_local_name () <<
+        " (void)" << be_nl;
+    }
+
+  *os << "{" << be_idt_nl
+      << "this->optable_ = &tao_" << node->flatname ()
+      << "_optable;" << be_uidt_nl
+      << "}\n\n";
+
+  *os << "// copy ctor" << be_nl;
+  // find if we are at the top scope or inside some module
+  if (!node->is_nested ())
+    {
+      // we are outermost. So the POA_ prefix is prepended to our name
+      *os << node->ami_handler_full_skel_name () << "::POA_"
+          << node->ami_handler_local_name () << " ("
+          << "const POA_" << node->ami_handler_local_name () << "& rhs)";
+    }
+  else
+    {
+      // the POA_ prefix is prepended to our outermost module name
+      *os << node->ami_handler_full_skel_name () << "::"
+          << node->ami_handler_local_name () << " (const "
+          << node->ami_handler_local_name () << "& rhs)";
+    }
+  *os << be_idt_nl
+      << ": ";
+  if (node->traverse_inheritance_graph
+      (be_interface::copy_ctor_helper, os) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "be_visitor_interface_ami_handler_servant_cs::visit_interface - "
+                       " copy ctor generation failed\n"), -1);
+  *os << "  TAO_ServantBase (rhs)" << be_uidt_nl
+      << "{}\n" << be_nl;
+
+  *os << "// skeleton destructor" << be_nl;
+
+  if (!node->is_nested ())
+    {
+      // we are outermost. So the POA_ prefix is prepended to our name
+      *os << node->ami_handler_full_skel_name () << "::~POA_" << node->ami_handler_local_name () <<
+        " (void)" << be_nl;
+    }
+  else
+    {
+      // the POA_ prefix is prepended to our outermost module name
+      *os << node->ami_handler_full_skel_name () << "::~" << node->ami_handler_local_name () <<
+        " (void)" << be_nl;
+    }
+  *os << "{\n";
+  *os << "}\n\n";
+
+
+  // @@ Michael
+  /*
+  // generate code for elements in the scope (e.g., operations)
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"),
+                        -1);
+    }
+  */
+
+  // generate code for the _is_a skeleton
+  os->indent ();
+  *os << "void " << node->ami_handler_full_skel_name ()
+      << "::_is_a_skel (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &_tao_server_request, " << be_nl
+      << "void * _tao_object_reference," << be_nl
+      << "void * /* context */," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl;
+  *os << "{" << be_idt_nl;
+  *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl;
+  *os << node->ami_handler_full_skel_name () << " *_tao_impl = ("
+      << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl;
+  *os << "CORBA::Boolean _tao_retval = 0;" << be_nl;
+  *os << "CORBA::String_var value;" << be_nl;
+  *os << "if (!((_tao_in >> value.out ())))" << be_idt_nl;
+  *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
+  *os << "_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);" << be_nl;
+  *os << "ACE_CHECK;" << be_nl << be_nl;
+  *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl;
+  *os << "ACE_CHECK;" << be_nl;
+  *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
+  *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl;
+  *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl;
+  *os << "}\n\n";
+
+
+  // generate code for the _non_existent skeleton
+  os->indent ();
+  *os << "void " << node->ami_handler_full_skel_name ()
+      << "::_non_existent_skel (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &_tao_server_request, " << be_nl
+      << "void * _tao_object_reference," << be_nl
+      << "void * /* context */," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl;
+  *os << "{" << be_idt_nl;
+  *os << node->ami_handler_full_skel_name () << " *_tao_impl = ("
+      << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl;
+  *os << "CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);" << be_nl;
+  *os << "ACE_CHECK;" << be_nl << be_nl;
+  *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl;
+  *os << "ACE_CHECK;" << be_nl;
+  *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
+  *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl;
+  *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl;
+  *os << "}\n\n";
+
+
+  os->indent ();
+  *os << "CORBA::Boolean " << node->ami_handler_full_skel_name ()
+      << "::_is_a (" << be_idt << be_idt_nl
+      << "const char* value," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "if (\n" << be_idt;
+  if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "traversal of inhertance graph failed\n"),
+                        -1);
+    }
+
+  os->indent ();
+  *os << "(!ACE_OS::strcmp ((char *)value, "
+      << "CORBA::_tc_Object->id (ACE_TRY_ENV))))"
+      << be_idt_nl << "return 1;" << be_uidt_nl
+      << "else" << be_idt_nl
+      << "return 0;" << be_uidt << be_uidt << be_uidt_nl
+      << "}\n\n";
+
+  // the downcast method.
+  os->indent ();
+  *os << "void* " << node->ami_handler_full_skel_name ()
+      << "::_downcast (" << be_idt << be_idt_nl
+      << "const char* logical_type_id" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl;
+
+  if (node->traverse_inheritance_graph (be_interface::downcast_helper, os) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "traversal of inhertance graph failed\n"),
+                        -1);
+    }
+
+  *os << "if (ACE_OS::strcmp (logical_type_id, "
+      << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl
+      << "return ACE_static_cast(PortableServer::Servant, this);"
+      << be_uidt_nl;
+
+  *os << "return 0;" << be_uidt_nl
+      << "}\n\n";
+
+
+  // now the dispatch method
+  os->indent ();
+  *os << "void " << node->ami_handler_full_skel_name () <<
+    "::_dispatch (CORBA::ServerRequest &req, " <<
+    "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "TAO_Skeleton skel; // pointer to skeleton for operation" << be_nl;
+  *os << "const char *opname = req.operation (); // retrieve operation name"
+      << be_nl;
+  *os << "// find the skeleton corresponding to this opname" << be_nl;
+  *os << "if (this->_find (opname, skel, req.operation_length ()) == -1)" << be_nl;
+  *os << "{" << be_idt_nl;
+  *os << "ACE_ERROR ((LM_ERROR, \"Bad operation <%s>\\n\", opname));" << be_nl;
+  *os << "ACE_THROW (CORBA_BAD_OPERATION ());"
+    //<< "ACE_TRY_ENV);" << be_uidt_nl;
+      << be_uidt_nl;
+    //  *os << "env.exception (new CORBA_BAD_OPERATION ());" << be_nl;
+  *os << "}" << be_nl;
+  *os << "else" << be_idt_nl;
+  *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
+  *os << "}\n\n";
+
+  os->indent ();
+  *os << "const char* " << node->ami_handler_full_skel_name ()
+      << "::_interface_repository_id (void) const"
+      << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "return \"" << node->repoID () << "\";\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+
+  *os << "\n";
+
+  // the _this () operation
+  *os << node->name () << "*" << be_nl
+      << node->ami_handler_full_skel_name ()
+      << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
+      << "{" << be_idt_nl
+      << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
+      << "ACE_CHECK_RETURN (0);" << be_nl
+    //      << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl
+    //      << "return 0;" << be_uidt_nl
+      << "return new " << node->full_coll_name ()
+      << " (this, stub);" << be_uidt_nl;
+
+  *os << "}\n\n";
+
+  // the _create_collocated_objref method
+  *os << "void*" << be_nl
+      << node->ami_handler_full_skel_name ()
+      << "::_create_collocated_objref (const char* repository_id, "
+      << "CORBA::ULong type, TAO_Stub *stub)" << be_nl
+      << "{" << be_idt_nl
+      << "if (!ACE_OS::strcmp (\"" << node->repoID ()
+      << "\", repository_id))" << be_idt_nl
+      << "return ACE_static_cast (" << be_idt << be_idt_nl
+      << node->name () << "_ptr," << be_nl
+      << "new " << node->full_coll_name () << " (this, stub)" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "return 0;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // @@ Michael
+  /*
+  // generate the collocated class impl
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "Bad visitor for collocated class\n"),
+                        -1);
+    }
+
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ami_handler_servant_cs::"
+                         "visit_interface - "
+                         "codegen for collocated class failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  *os << "\n\n";
+
+  */
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
new file mode 100644
index 00000000000..c4ee9d201d3
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp
@@ -0,0 +1,198 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_stub_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating default stub class for the AMI Handler in the
+//    client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_interface.h"
+
+
+// ******************************************************
+// Interface visitor for client header
+// ******************************************************
+
+be_visitor_interface_ami_handler_stub_ch::be_visitor_interface_ami_handler_stub_ch (be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_ami_handler_stub_ch::~be_visitor_interface_ami_handler_stub_ch (void)
+{
+}
+
+int
+be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os; // output stream
+
+  // Not already generated and not imported.
+  if (!node->cli_hdr_gen () && !node->imported ())
+    {
+      // Grab the stream.
+      os = this->ctx_->stream ();
+      
+      // Ifdef guard.
+      
+      // Generate AMI_...name..._Handler string.
+      char *ifdef_string = 0;
+      ACE_NEW_RETURN (ifdef_string,
+                      char [ACE_OS::strlen ("AMI_") +
+                           ACE_OS::strlen (node->flatname ()) + 
+                           ACE_OS::strlen ("_Handler") +
+                           // end of string
+                           1],
+                      0);
+      ACE_OS::sprintf (ifdef_string, 
+                       "AMI_%s_Handler",
+                       node->flatname ());
+      
+      os->gen_ifdef_macro (ifdef_string);
+
+      // Prepare the local name for the class.
+      char *local_name = 0;
+      ACE_NEW_RETURN (local_name,
+                      char [ACE_OS::strlen ("AMI_") +
+                           ACE_OS::strlen (node->local_name ()->get_string ()) +
+                           ACE_OS::strlen ("_Handler") +
+                           // end of string
+                           1],
+                      0);
+      ACE_OS::sprintf (local_name, 
+                       "AMI_%s_Handler",
+                       node->local_name ()->get_string ());
+
+      // Now generate the class definition.
+      
+      os->indent ();
+
+      *os << "class " << idl_global->export_macro () << " "
+          << local_name;
+      
+      // Node interface inherits from the Messaging::ReplyHandler
+      // interface. 
+      *os << " : public virtual Messaging::ReplyHandler"  << be_nl; 
+      
+      // Generate the body.
+  
+      *os << "{" << be_nl
+          << "public:" << be_nl
+    
+        // generate the _ptr_type and _var_type typedefs
+        // but we must protect against certain versions of g++
+          << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8"
+          << be_idt_nl
+          << "typedef " << local_name << "_ptr _ptr_type;" << be_nl
+          << "typedef " << local_name << "_var _var_type;" << be_uidt_nl
+          << "#endif /* __GNUC__ */\n" << be_idt_nl
+    
+        // generate the static _duplicate, _narrow, and _nil operations
+          << "// the static operations" << be_nl
+          << "static " << local_name << "_ptr " << "_duplicate ("
+          << local_name << "_ptr obj);" << be_nl
+          << "static " << local_name << "_ptr "
+          << "_narrow (" << be_idt << be_idt_nl
+          << "CORBA::Object_ptr obj," << be_nl
+          << "CORBA::Environment &env = " << be_idt_nl
+          << "TAO_default_environment ()"
+          << be_uidt << be_uidt_nl
+          << ");" << be_uidt_nl
+          << "static " << local_name << "_ptr "
+          << "_unchecked_narrow (" << be_idt << be_idt_nl
+          << "CORBA::Object_ptr obj," << be_nl
+          << "CORBA::Environment &env = " << be_idt_nl
+          << "TAO_default_environment ()"
+          << be_uidt << be_uidt_nl
+          << ");" << be_uidt_nl
+          << "static " << local_name << "_ptr " << "_nil (void);\n\n";
+
+      // Visit the scope to generate the stubs for the call back
+      // methods.   
+      if (this->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_ami_handler_stub_ch::"
+                             "visit_interface - "
+                             "codegen for scope failed\n"),
+                            -1);
+        }
+
+      
+      // the _is_a method
+      os->indent ();
+      *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+          << "const CORBA::Char *type_id, " << be_nl
+          << "CORBA::Environment &env = " << be_idt_nl
+          << "TAO_default_environment ()"
+          << be_uidt << be_uidt_nl
+          << ");" << be_uidt_nl
+          << "virtual const char* "
+          << "_interface_repository_id (void) const;\n" << be_uidt_nl;
+  
+      // generate the "protected" constructor so that users cannot instantiate
+      // us
+      *os << "protected:" << be_idt_nl
+          << local_name << " (void);" << be_nl
+          << local_name
+          << " (TAO_Stub *objref, " << be_idt << be_idt_nl
+          << "TAO_ServantBase *_tao_servant = 0, " << be_nl
+          << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl
+          << ");" << be_uidt_nl
+          << "virtual ~" << local_name << " (void);" << be_uidt_nl;
+      
+      // private copy constructor and assignment operator. These are not
+      // allowed, hence they are private.
+      *os << "private:\n";
+      os->incr_indent ();
+      *os << local_name << " (const " << local_name << " &);"
+          << be_nl
+          << "void operator= (const " << local_name << " &);\n";
+  
+      os->decr_indent ();
+      *os << "};\n\n";
+      os->gen_endif ();
+  
+      // by using a visitor to declare and define the TypeCode, we have the
+      // added advantage to conditionally not generate any code. This will be
+      // based on the command line options. This is still TO-DO
+      be_visitor *visitor;
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DECL);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_ami_handler_stub_ch::"
+                             "visit_interface - "
+                             "TypeCode declaration failed\n"),
+                            -1);
+        }
+
+            
+      // Delete the heap allocated vars.
+      delete ifdef_string;
+      ifdef_string = 0;
+      delete local_name;
+      local_name = 0;
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
new file mode 100644
index 00000000000..e88b7fb391c
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_cs.cpp
@@ -0,0 +1,247 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_stub_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for AMI Handler class for an Interface.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_interface,  ami_handler_stub_cs, "$Id$")
+
+
+// ************************************************************
+// Interface visitor for client stubs
+// ************************************************************
+
+be_visitor_interface_ami_handler_stub_cs::be_visitor_interface_ami_handler_stub_cs (be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_ami_handler_stub_cs::~be_visitor_interface_ami_handler_stub_cs (void)
+{
+}
+
+int
+be_visitor_interface_ami_handler_stub_cs::visit_interface (be_interface *node)
+{
+  // output stream.
+  TAO_OutStream *os;
+
+  if (node->cli_stub_gen () || node->imported ())
+    return 0;
+
+  os = this->ctx_->stream ();
+
+  // Start with whatever indentation level we are at.
+  os->indent ();
+
+  // Create the full name for the AMI_<Interface name>_Handler
+  // interface.  
+  char *full_name = 0;
+
+  // Full name. 
+  // If there exists a scope name for this, then generate
+  // "Scope::AMI_<Local Name>_Handler". 
+
+  size_t scope_len = 0;
+
+  be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+  
+  if (parent != 0 &&
+      parent->fullname () != 0 &&
+      ACE_OS::strlen (parent->fullname ()))
+    scope_len = ACE_OS::strlen (parent->fullname ()) + ACE_OS::strlen ("::");
+  
+  ACE_NEW_RETURN (full_name,
+                  char [scope_len +
+                       ACE_OS::strlen ("AMI_") +
+                       ACE_OS::strlen (node->local_name ()->get_string ()) +
+                       ACE_OS::strlen ("_Handler") +
+                       1],
+                  -1);
+  
+  if (parent != 0 &&
+      parent->fullname () != 0 &&
+      ACE_OS::strlen (parent->fullname ()))
+    ACE_OS::sprintf (full_name,
+                     "%s::AMI_%s_Handler",
+                     parent->fullname (),
+                     node->local_name ()->get_string ());
+  else
+    ACE_OS::sprintf (full_name,
+                     "AMI_%s_Handler",
+                     node->local_name ()->get_string ());
+
+  // First generate the code for the static methods.
+  
+  // The _narrow method
+  *os << full_name << "_ptr " << full_name
+      << "::_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &env" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "if (CORBA::is_nil (obj))" << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl
+      << "if (!obj->_is_a (\""
+      << node->compute_repoID ("AMI_", "_Handler") << "\", env))" 
+      << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl;
+
+  *os << "return " << full_name
+      << "::_unchecked_narrow (obj, env);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // This may be necessary to work around a GCC compiler bug!
+  //  const char *skel_name = node->full_skel_name (); // unused at this time
+  const char *coll_name = node->full_coll_name ();
+  assert (coll_name != 0);
+
+  // The _unchecked_narrow method
+  *os << full_name << "_ptr " << full_name
+      << "::_unchecked_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_nl
+      << "if (CORBA::is_nil (obj))" << be_idt_nl
+      << "return " << full_name << "::_nil ();" << be_uidt_nl;
+
+  *os << "TAO_Stub* stub = obj->_stubobj ();" << be_nl
+      << "stub->_incr_refcnt ();" << be_nl;
+  *os << "void* servant = 0;" << be_nl;
+  *os << "if (obj->_is_collocated () "
+      << "&& obj->_servant() != 0)" << be_idt_nl
+      << "servant = obj->_servant()->_downcast (\""
+      << "IDL:omg.org/CORBA/Object:1.0\");" << be_uidt_nl;
+
+  *os << "if (servant != 0)" << be_idt_nl << "{" << be_idt_nl
+    // The collocated object reference factory is not working right (yet)
+      << full_name << "_ptr retv = ACE_reinterpret_cast (" << be_idt << be_idt_nl
+      << full_name << "_ptr," << be_nl
+      << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
+      << "PortableServer::Servant," << be_nl
+      << "servant" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "->_create_collocated_objref (" << be_idt << be_idt_nl
+      << "\"" << node->compute_repoID ("AMI_", "_Handler") << "\"," << be_nl
+      << "TAO_ORB_Core::ORB_CONTROL," << be_nl
+      << "stub" << be_uidt_nl
+      << ")" << be_uidt << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "if (retv != 0)" << be_idt_nl
+      << "return retv;" << be_uidt
+    // So we are still using the old way to create collocated objref.
+      << be_uidt_nl
+      << "}" << be_uidt_nl;
+
+  *os << "return new " << full_name << "(stub);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // The _duplicate method
+  *os << full_name << "_ptr " << be_nl
+      << full_name << "::_duplicate ("
+      << full_name << "_ptr obj)" << be_nl
+      << "{" << be_idt_nl
+      << "if (!CORBA::is_nil (obj))" << be_idt_nl
+      << "obj->_incr_refcnt ();" << be_uidt_nl
+      << "return obj;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // Generate code for the elements of the interface.
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_ami_handler_stub_cs::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+  // generate the is_a method
+  os->indent ();
+  *os << "CORBA::Boolean " << full_name << "::_is_a (" <<
+    "const CORBA::Char *value, CORBA::Environment &env)" << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "if (\n";
+  os->incr_indent (0);
+  
+  // We know what to generate. We dont have to call traverse graph.
+
+  // Current interface.
+  *os << "(!ACE_OS::strcmp ((char *)value, "
+      << "\""
+      << node->compute_repoID ("AMI_", "_Handler")
+      << "\""
+      << ")) ||"
+      << be_nl;
+
+  // Reply Handler.
+  *os << "(!ACE_OS::strcmp ((char *)value, "
+      << "\""
+      << "IDL:omg.org/Messaging/ReplyHandler:1.0"
+      << "\""
+      << ")) ||"
+      << be_nl;
+
+  os->indent ();
+
+  *os << "(!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))\n";
+  *os << "  return 1; // success using local knowledge\n";
+  os->decr_indent ();
+  *os << "else" << be_nl;
+  *os << "  return this->CORBA_Object::_is_a (value, env);\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+
+  os->indent ();
+
+  *os << "const char* " << full_name
+      << "::_interface_repository_id (void) const"
+      << be_nl
+      << "{" << be_idt_nl
+      << "return \"" << node->compute_repoID ("AMI_", "_Handler") << "\";" << be_uidt_nl
+      << "}\n\n";
+
+  // By using a visitor to declare and define the TypeCode, we have the
+  // added advantage to conditionally not generate any code. This will be
+  // based on the command line options. This is still TO-DO.
+  be_visitor *visitor;
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN);
+  ctx.sub_state (TAO_CodeGen::TAO_AMI_HANDLER_TC_DEFN_TYPECODE);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_ami_handler_stub_cs::"
+                         "visit_interface - "
+                         "TypeCode definition failed\n"),
+                        -1);
+    }
+  
+  delete full_name;
+  full_name = 0;
+
+  return 0;
+}
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 00f1588914a..2b260e2fc39 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
@@ -116,18 +116,10 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)" << be_idt_nl
       << "template class TAO_Object_Field_T<"
-      << node->name () << ","
-      << node->name () << "_var>;" << be_uidt_nl
-      << "template class TAO_Object_Manager<"
-      << node->name () << ","
-      << node->name () << "_var>;" << be_uidt_nl
+      << node->name () << ">;" << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
       << "#  pragma instantiate TAO_Object_Field_T<"
-      << node->name () << ","
-      << node->name () << "_var>" << be_uidt_nl
-      << "#  pragma instantiate TAO_Object_Manager<"
-      << node->name () << ","
-      << node->name () << "_var>" << be_uidt_nl
+      << node->name () << ">" << be_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */\n\n";
 
   // all we have to do is to visit the scope and generate code
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
new file mode 100644
index 00000000000..9f30a1799c1
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ami_handler_ch.cpp
@@ -0,0 +1,174 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    collocated_ami_handler_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for collocated classes for the Interface node
+//    inside the server header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_interface, collocated_ami_handler_ch, "$Id$") 
+
+
+// ************************************************************
+//  collocated class in header
+// ************************************************************
+
+be_visitor_interface_collocated_ami_handler_ch::be_visitor_interface_collocated_ami_handler_ch
+(be_visitor_context *ctx)
+  : be_visitor_interface (ctx)
+{
+}
+
+be_visitor_interface_collocated_ami_handler_ch::~be_visitor_interface_collocated_ami_handler_ch (void)
+{
+}
+
+int
+be_visitor_interface_collocated_ami_handler_ch::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Generate AMI_...name..._Handler string.
+  char *ifdef_string = 0;
+  ACE_NEW_RETURN (ifdef_string,
+                  char [ACE_OS::strlen ("AMI_") +
+                       ACE_OS::strlen (node->flatname ()) + 
+                       ACE_OS::strlen ("_Handler") +
+                       // end of string
+                       1],
+                  0);
+  ACE_OS::sprintf (ifdef_string, 
+                   "AMI_%s_Handler",
+                   node->flatname ());
+  
+  os->gen_ifdef_macro (ifdef_string, "_collocated");
+  
+  // Prepare the local name for the class.
+  char *local_name = 0;
+  ACE_NEW_RETURN (local_name,
+                  char [ACE_OS::strlen ("AMI_") +
+                       ACE_OS::strlen (node->local_name ()->get_string ()) +
+                       ACE_OS::strlen ("_Handler") +
+                       // end of string
+                       1],
+                  0);
+  ACE_OS::sprintf (local_name, 
+                   "AMI_%s_Handler",
+                   node->local_name ()->get_string ());
+
+  // Get the coll names.
+  char *coll_local_name, *coll_full_name;
+  node->compute_coll_names (local_name, coll_local_name, coll_full_name); 
+  
+  // Output the class defn.
+  os->indent ();
+  *os << "class " << idl_global->export_macro ()
+      << " " << coll_local_name;
+  os->incr_indent ();
+  *os << " : public virtual " << local_name;
+
+  *os << "\n";
+  os->decr_indent ();
+  *os << "{" << be_nl;
+  *os << "public:\n";
+  os->incr_indent ();
+
+  *os << coll_local_name << " (\n";
+
+  os->incr_indent (0);
+  os->incr_indent ();
+
+  // XXXASG - can we make this a method to return the right name ??
+  if (!node->is_nested ())
+    {
+      // The skeleton name is the outermost, we need to printout the
+      // POA_ prefix that goes with it.
+      *os << "POA_";
+    }
+
+  *os << local_name << "_ptr "
+      << " servant," << be_nl;
+  
+  *os << "TAO_Stub *stub\n";
+  os->decr_indent ();
+  *os << ");\n";
+  os->decr_indent (0);
+
+  os->indent ();
+
+  // _is_a method.
+  *os << "virtual CORBA::Boolean _is_a" << be_idt
+      << "(" << be_idt_nl
+      << "const CORBA::Char *logical_type_id," << be_nl
+      << "CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()" << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
+  
+  // _get_servant method.
+
+  if (!node->is_nested ())
+    {
+      // The skeleton name is the outermost, we need to printout the
+      // POA_ prefix that goes with it.
+      *os << "POA_";
+    }
+
+  *os << local_name
+      << "_ptr _get_servant (void) const;" << be_nl << be_nl;
+
+  // _non_existent method.
+  *os << "virtual CORBA::Boolean _non_existent" << be_idt
+      << "(" << be_idt_nl
+      << "CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()" << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
+
+  // Visit the scope to generate all the AMI call back hood methods.
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_collocated_ami_handler_ch::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"),
+                        -1);
+    }
+
+  os->decr_indent ();
+  
+  *os << be_nl << "private:\n";
+  os->incr_indent ();
+  if (!node->is_nested ())
+    {
+      // The skeleton name is the outermost, we need to printout the
+      // POA_ prefix that goes with it.
+      *os << "POA_";
+    }
+  *os << local_name << "_ptr servant_;\n";
+  os->decr_indent ();
+  *os << "};\n\n";
+
+  os->gen_endif ();
+
+  delete ifdef_string;
+  delete local_name;
+  delete coll_local_name;
+  delete coll_full_name;
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
index 277da8eece2..a23393731d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    direct_collocated_sh.cpp
+//    collocated_sh.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for direct_collocated classes for the Interface node
+//    Visitor generating code for collocated classes for the Interface node
 //    inside the server header.
 //
 // = AUTHOR
@@ -25,33 +25,33 @@
 
 #include "be_visitor_interface.h"
 
-ACE_RCSID(be_visitor_interface, direct_collocated_sh, "$Id$")
+ACE_RCSID(be_visitor_interface, collocated_sh, "$Id$")
 
 
 // ************************************************************
-//  direct_collocated class in header
+//  collocated class in header
 // ************************************************************
 
-be_visitor_interface_direct_collocated_sh::be_visitor_interface_direct_collocated_sh
+be_visitor_interface_collocated_sh::be_visitor_interface_collocated_sh
 (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
 {
 }
 
-be_visitor_interface_direct_collocated_sh::~be_visitor_interface_direct_collocated_sh (void)
+be_visitor_interface_collocated_sh::~be_visitor_interface_collocated_sh (void)
 {
 }
 
-int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *node)
+int be_visitor_interface_collocated_sh::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  os->gen_ifdef_macro (node->flatname (), "_direct_collocated");
+  os->gen_ifdef_macro (node->flatname (), "_collocated");
 
   // output the class defn
   os->indent ();
   *os << "class " << idl_global->export_macro ()
-      << " " << node->local_coll_name (be_interface::DIRECT);
+      << " " << node->local_coll_name ();
   os->incr_indent ();
   *os << " : public virtual " << node->name ();
 
@@ -64,8 +64,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
           be_interface* parent =
             be_interface::narrow_from_decl (node->inherits()[i]);
           *os << "  public virtual "
-              << be_interface::relative_name (parent->full_coll_name (be_interface::DIRECT),
-                                              node->full_coll_name (be_interface::DIRECT));
+              << parent->relative_coll_name (node->full_coll_name ());
         }
     }
   *os << "\n";
@@ -74,7 +73,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
   *os << "public:\n";
   os->incr_indent ();
 
-  *os << node->local_coll_name (be_interface::DIRECT) << " (\n";
+  *os << node->local_coll_name () << " (\n";
 
   os->incr_indent (0);
   os->incr_indent ();
@@ -100,7 +99,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
   *os << "virtual CORBA::Boolean _is_a" << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (!node->is_nested ())
@@ -115,13 +114,13 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
 
   *os << "virtual CORBA::Boolean _non_existent" << be_idt
       << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_direct_collocated_sh::"
+                         "be_visitor_interface_collocated_sh::"
                          "visit_interface - "
                          "codegen for scope failed\n"),
                         -1);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
index 3029bd75c2d..91ec2bd8705 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    thru_poa_collocated_ss.cpp
+//    collocated_ss.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for thru_poa_collocated classes for an Interface in the
+//    Visitor generating code for collocated classes for an Interface in the
 //    server skeleton file.
 //
 // = AUTHOR
@@ -25,31 +25,31 @@
 
 #include "be_visitor_interface.h"
 
-ACE_RCSID(be_visitor_interface, thru_poa_collocated_ss, "$Id$")
+ACE_RCSID(be_visitor_interface, collocated_ss, "$Id$")
 
 
 // ************************************************************
 //  be_visitor_interface_collacted_ss
 // ************************************************************
 
-be_visitor_interface_thru_poa_collocated_ss::be_visitor_interface_thru_poa_collocated_ss
+be_visitor_interface_collocated_ss::be_visitor_interface_collocated_ss
 (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
 {
 }
 
-be_visitor_interface_thru_poa_collocated_ss::~be_visitor_interface_thru_poa_collocated_ss (void)
+be_visitor_interface_collocated_ss::~be_visitor_interface_collocated_ss (void)
 {
 }
 
-int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *node)
+int be_visitor_interface_collocated_ss::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = tao_cg->server_skeletons ();
 
   this->ctx_->node (node);
 
-  *os << node->full_coll_name (be_interface::THRU_POA) << "::"
-      << node->local_coll_name (be_interface::THRU_POA) << " (\n";
+  *os << node->full_coll_name () << "::"
+      << node->local_coll_name () << " (\n";
 
   os->incr_indent (0);
   os->incr_indent ();
@@ -82,11 +82,11 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
   // @@ We should call the constructor for all base classes, since we
   // are using multiple inheritance.
 
-  if (node->traverse_inheritance_graph (be_visitor_interface_thru_poa_collocated_ss::collocated_ctor_helper, os)
+  if (node->traverse_inheritance_graph (be_interface::collocated_ctor_helper, os)
       == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_thru_poa_collocated_ss::"
+                         "be_visitor_interface_collocated_ss::"
                          "visit_interface - "
                          "codegen for base class ctor init failed\n"),
                         -1);
@@ -103,13 +103,17 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
   os->indent ();
 
   // Generate _is_a implementation.
-  *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
+  *os << "CORBA::Boolean " << node->full_coll_name () << "::"
       << "_is_a"  << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id," << be_nl
       << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt_nl << be_nl
+      << ")" << be_uidt_nl << be_nl;
+  *os << "{" << be_idt_nl
+      << "if (this->_stubobj ()->orb_core ()->get_collocation_strategy ()"
+         " == TAO_ORB_Core::THRU_POA)" << be_idt_nl
       << "{" << be_idt_nl;
+
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "*this->_stubobj ()->"
@@ -127,12 +131,14 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt << be_uidt_nl
+      << ")->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
+  *os << "}" << be_uidt_nl
+      << "return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
   // Generate _get_servant implementation.
   *os << node->full_skel_name () << "_ptr "
-      << node->full_coll_name (be_interface::THRU_POA) << "::"
+      << node->full_coll_name () << "::"
       << "_get_servant (void) const\n"
       << "{\n";
   os->incr_indent ();
@@ -143,12 +149,16 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
   os->indent ();
 
   // Generate _non_existent implementation.
-  *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
+  *os << "CORBA::Boolean " << node->full_coll_name () << "::"
       << "_non_existent"  << be_idt
       << "(" << be_idt_nl
       << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt_nl << be_nl
+      << ")" << be_uidt_nl << be_nl;
+  *os << "{" << be_idt_nl
+      << "if (this->_stubobj ()->orb_core ()->get_collocation_strategy ()"
+         " == TAO_ORB_Core::THRU_POA)" << be_idt_nl
       << "{" << be_idt_nl;
+
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "*this->_stubobj ()->"
@@ -166,13 +176,15 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_non_existent (ACE_TRY_ENV);" << be_uidt << be_uidt_nl
+      << ")->_non_existent (ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
+  *os << "}" << be_uidt_nl
+      << "return this->servant_->_non_existent (ACE_TRY_ENV);" << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_thru_poa_collocated_ss::"
+                         "be_visitor_interface_collocated_ss::"
                          "visit_scope - "
                          "codegen for scope failed\n"),
                         -1);
@@ -180,28 +192,3 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
 
   return 0;
 }
-
-int
-be_visitor_interface_thru_poa_collocated_ss::collocated_ctor_helper (be_interface *derived,
-                                                                     be_interface *base,
-                                                                     TAO_OutStream *os)
-{
-  if (derived == base)
-    // we are the same. Don't do anything, otherwise we will end up calling
-    // ourself
-    return 0;
-
-  if (base->is_nested ())
-    {
-      be_decl *scope;
-      scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
-      *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ","
-          << base->local_coll_name (be_interface::THRU_POA) << ") (servant, stub)," << be_nl;
-    }
-  else
-    {
-      *os << "  " << base->full_coll_name (be_interface::THRU_POA) << " (servant, stub)," << be_nl;
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
deleted file mode 100644
index 46e690ae815..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    direct_collocated_ss.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for direct_collocated classes for an Interface in the
-//    server skeleton file.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_interface.h"
-
-ACE_RCSID(be_visitor_interface, direct_collocated_ss, "$Id$")
-
-
-// ************************************************************
-//  be_visitor_interface_collacted_ss
-// ************************************************************
-
-be_visitor_interface_direct_collocated_ss::be_visitor_interface_direct_collocated_ss
-(be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_direct_collocated_ss::~be_visitor_interface_direct_collocated_ss (void)
-{
-}
-
-int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = tao_cg->server_skeletons ();
-
-  this->ctx_->node (node);
-
-  *os << node->full_coll_name (be_interface::DIRECT) << "::"
-      << node->local_coll_name (be_interface::DIRECT) << " (\n";
-
-  os->incr_indent (0);
-  os->incr_indent ();
-  *os << node->full_skel_name () << "_ptr "
-      << " servant," << be_nl;
-
-  *os << "TAO_Stub *stub\n";
-  os->decr_indent ();
-  *os << ")\n";
-  os->decr_indent (0);
-
-  os->incr_indent ();
-
-  if (node->is_nested ())
-    {
-      be_decl* scope =
-	be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      *os << ": ACE_NESTED_CLASS ("
-	  << scope->name () << ","
-	  << node->local_name ()
-	  << ") ()," << be_nl;
-    }
-  else
-    {
-      *os << ": " << node->name ()
-	  << " ()," << be_nl;
-    }
-
-  // @@ We should call the constructor for all base classes, since we
-  // are using multiple inheritance.
-
-  if (node->traverse_inheritance_graph (be_visitor_interface_direct_collocated_ss::collocated_ctor_helper, os)
-      == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_direct_collocated_ss::"
-                         "visit_interface - "
-                         "codegen for base class ctor init failed\n"),
-                        -1);
-    }
-
-  *os << "  CORBA_Object (stub, servant, 1)," << be_nl
-      << "  servant_ (servant)";
-
-  *os << "\n";
-  os->decr_indent ();
-  *os << "{\n";
-  *os << "}\n\n";
-
-  os->indent ();
-
-  // Generate _is_a implementation.
-  *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::"
-      << "_is_a"  << be_idt
-      << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt_nl << be_nl;
-  *os << "{" << be_idt_nl
-      << "return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt_nl
-      << "}\n\n" << be_uidt_nl;
-
-  // Generate _get_servant implementation.
-  *os << node->full_skel_name () << "_ptr "
-      << node->full_coll_name (be_interface::DIRECT) << "::"
-      << "_get_servant (void) const\n"
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->servant_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-
-  // Generate _non_existent implementation.
-  *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::"
-      << "_non_existent"  << be_idt
-      << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt_nl << be_nl;
-  *os << "{" << be_idt_nl
-      << "return this->servant_->_non_existent (ACE_TRY_ENV);" << be_uidt_nl
-      << "}\n\n" << be_uidt_nl;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_direct_collocated_ss::"
-                         "visit_scope - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_interface_direct_collocated_ss::collocated_ctor_helper (be_interface *derived,
-                                                                   be_interface *base,
-                                                                   TAO_OutStream *os)
-{
-  if (derived == base)
-    // we are the same. Don't do anything, otherwise we will end up calling
-    // ourself
-    return 0;
-
-  if (base->is_nested ())
-    {
-      be_decl *scope;
-      scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
-      *os << "  ACE_NESTED_CLASS (POA_" << scope->name () << ","
-          << base->local_coll_name (be_interface::DIRECT) << ") (servant, stub)," << be_nl;
-    }
-  else
-    {
-      *os << "  " << base->full_coll_name (be_interface::DIRECT) << " (servant, stub)," << be_nl;
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index 03267df4e6b..bc194b8677c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -82,17 +82,11 @@ be_visitor_interface::visit_attribute (be_attribute *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
       ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_IS);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SH);
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS);
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
+      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS);
       break;
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
       ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_TIE_SH);
@@ -167,10 +161,8 @@ be_visitor_interface::visit_constant (be_constant *node)
     case TAO_CodeGen::TAO_INTERFACE_CDR_OP_CH:
     case TAO_CodeGen::TAO_INTERFACE_CDR_OP_CI:
     case TAO_CodeGen::TAO_INTERFACE_CDR_OP_CS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_CI:
     case TAO_CodeGen::TAO_INTERFACE_SH:
     case TAO_CodeGen::TAO_INTERFACE_IH:
@@ -255,10 +247,8 @@ be_visitor_interface::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
     case TAO_CodeGen::TAO_INTERFACE_SI:
     case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       return 0; // nothing to be done
@@ -339,10 +329,8 @@ be_visitor_interface::visit_exception (be_exception *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
     case TAO_CodeGen::TAO_INTERFACE_SI:
     case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       return 0; // nothing to be done
@@ -394,10 +382,6 @@ be_visitor_interface::visit_operation (be_operation *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_AMI_HANDLER_CH:
-      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_CH);
-      break;
-
     case TAO_CodeGen::TAO_INTERFACE_CH:
       ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
       break;
@@ -416,24 +400,35 @@ be_visitor_interface::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
       ctx.state (TAO_CodeGen::TAO_OPERATION_IS);
       break;
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
+      break;
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
+      break;
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SH);
       break;
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SI);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SH);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_COLLOCATED_SS);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CH:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SH);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_STUB_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CS);
       break;
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_COLLOCATED_SS);
+
+    case TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_CH:
+      ctx.state (TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH);
       break;
+
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CH:
     case TAO_CodeGen::TAO_INTERFACE_ANY_OP_CS:
     case TAO_CodeGen::TAO_INTERFACE_CDR_OP_CH:
@@ -447,8 +442,8 @@ be_visitor_interface::visit_operation (be_operation *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_interface::"
                            "visit_operation - "
-                           "Bad context state\n"
-                           ), -1);
+                           "Bad context state\n"),
+                          -1);
       }
     }
 
@@ -474,18 +469,18 @@ be_visitor_interface::visit_operation (be_operation *node)
     }
   delete visitor;
 
-  //
+  // 
   // AMI Call back code generation.
   //
-
+  
   // Return if AMI call back is not enabled.
   if (idl_global->ami_call_back () != I_TRUE)
-    {
+    {  
       return 0;
     }
-
-  // Generate AMI stub for this operation, if you are doing client
-  // side header.
+  
+  // Generate AMI <sendc_> method, for this operation, if you are
+  // doing client header.
 
   switch (this->ctx_->state ())
     {
@@ -501,7 +496,7 @@ be_visitor_interface::visit_operation (be_operation *node)
       // We dont have to do anything for the other cases.
       return 0;
     }
-
+      
   // Grab the appropriate visitor.
   visitor = tao_cg->make_visitor (&ctx);
   if (!visitor)
@@ -512,7 +507,7 @@ be_visitor_interface::visit_operation (be_operation *node)
                          "NUL visitor\n"),
                         -1);
     }
-
+          
   // Visit the node using this visitor
   if (node->accept (visitor) == -1)
     {
@@ -523,7 +518,7 @@ be_visitor_interface::visit_operation (be_operation *node)
                         -1);
     }
   delete visitor;
-
+  
   return 0;
 }
 
@@ -571,10 +566,8 @@ be_visitor_interface::visit_structure (be_structure *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
     case TAO_CodeGen::TAO_INTERFACE_SI:
     case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       return 0; // nothing to be done
@@ -655,10 +648,8 @@ be_visitor_interface::visit_union (be_union *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
     case TAO_CodeGen::TAO_INTERFACE_SI:
     case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       return 0; // nothing to be done
@@ -739,10 +730,8 @@ be_visitor_interface::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_INTERFACE_IS:
     case TAO_CodeGen::TAO_INTERFACE_SI:
     case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SH:
     case TAO_CodeGen::TAO_INTERFACE_TIE_SI:
       return 0; // nothing to be done
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 ea9cb738f5a..92e9a08b01e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -138,7 +138,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // now generate the class definition
       os->indent ();
       *os << "class " << idl_global->export_macro ()
-	        << " " << node->local_name ();
+                << " " << node->local_name ();
 
       if (node->n_inherits () > 0)  // node interface inherits from other
                                     // interfaces
@@ -193,19 +193,19 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << "static " << node->local_name () << "_ptr " << "_duplicate ("
           << node->local_name () << "_ptr obj);" << be_nl
           << "static " << node->local_name () << "_ptr "
-	        << "_narrow (" << be_idt << be_idt_nl
+                << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
-	        << "CORBA::Environment &env = " << be_idt_nl
-	        << "TAO_default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl
+                << "CORBA::Environment &env = " << be_idt_nl
+                << "TAO_default_environment ()"
+                << be_uidt << be_uidt_nl
+                << ");" << be_uidt_nl
           << "static " << node->local_name () << "_ptr "
-	        << "_unchecked_narrow (" << be_idt << be_idt_nl
+                << "_unchecked_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
-	        << "CORBA::Environment &env = " << be_idt_nl
-	        << "TAO_default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl
+                << "CORBA::Environment &env = " << be_idt_nl
+                << "TAO_default_environment ()"
+                << be_uidt << be_uidt_nl
+                << ");" << be_uidt_nl
           << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n";
 
       // generate code for the interface definition by traversing thru the
@@ -234,10 +234,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << "protected:" << be_idt_nl
           << node->local_name () << " (void);" << be_nl
           << node->local_name ()
-	        << " (TAO_Stub *objref, " << be_idt << be_idt_nl
+                << " (TAO_Stub *objref, " << be_idt << be_idt_nl
           << "TAO_ServantBase *_tao_servant = 0, " << be_nl
           << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl
-	        << ");" << be_uidt_nl
+                << ");" << be_uidt_nl
           << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
 
       // private copy constructor and assignment operator. These are not
@@ -268,14 +268,18 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                              ), -1);
         }
       
-      // Generate the Skeleton code for the AMI Reply Handler. 
+      // AMI
+
+      // Generate code for the AMI Reply Handler. 
       if (idl_global->ami_call_back () == I_TRUE)
         {
+          // = Generate the default stub code for Handler.
+
           // Set the context.
           be_visitor_context ctx (*this->ctx_);
           
           // Set the state.
-          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_CH);
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_CH);
           
           // Create the visitor.
           be_visitor *visitor = tao_cg->make_visitor (&ctx);
@@ -288,6 +292,37 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                                 -1);
             }
           
+          // Call the visitor on this interface.
+          if (node->accept (visitor) == -1)
+            {
+              delete visitor;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_interface_ch::"
+                                 "visit_interface - "
+                                 "code gen for ami handler default stub failed\n"),
+                                -1);
+            }
+          delete visitor;
+          
+          //  = Generate the Servant Skeleton code.
+
+          // Set the context.
+          ctx = *this->ctx_;
+          
+          // Set the state.
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CH);
+          
+          // Create the visitor.
+          visitor = tao_cg->make_visitor (&ctx);
+          if (!visitor)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_interface_ch::"
+                                 "visit_interface - "
+                                 "Bad visitor\n"),
+                                -1);
+            }
+          
           // call the visitor on this interface.
           if (node->accept (visitor) == -1)
             {
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 cebf4c53513..d4cb987eb90 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -58,33 +58,32 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << node->name () << "_ptr " << node->name ()
       << "::_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "CORBA::Environment &env" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
       << "return " << node->name () << "::_nil ();" << be_uidt_nl
-      << "CORBA::Boolean is_a = obj->_is_a (\""
-      << node->repoID () << "\", ACE_TRY_ENV);" << be_nl
-      << "ACE_CHECK_RETURN (" << node->name () << "::_nil ());" << be_nl
-      << "if (is_a == 0)" << be_idt_nl
+      << "if (!obj->_is_a (\"" << node->repoID () << "\", env))"
+      << be_idt_nl
       << "return " << node->name () << "::_nil ();" << be_uidt_nl;
 
   *os << "return " << node->name ()
-      << "::_unchecked_narrow (obj, ACE_TRY_ENV);" << be_uidt_nl
+      << "::_unchecked_narrow (obj, env);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // This may be necessary to work around a GCC compiler bug!
 //  const char *skel_name = node->full_skel_name (); // unused at this time
-//    const char *coll_name = node->full_coll_name ();
-//    assert (coll_name != 0);
+  const char *coll_name = node->full_coll_name ();
+  assert (coll_name != 0);
 
   // The _unchecked_narrow method
   *os << node->name () << "_ptr " << node->name ()
       << "::_unchecked_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &" << be_uidt_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
+      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
       << "return " << node->name () << "::_nil ();" << be_uidt_nl;
 
@@ -141,7 +140,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   // generate the is_a method
   os->indent ();
   *os << "CORBA::Boolean " << node->name () << "::_is_a (" <<
-    "const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
+    "const CORBA::Char *value, CORBA::Environment &env)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "if (\n";
@@ -155,11 +154,11 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   os->indent ();
-  *os << "(!ACE_OS::strcmp ((char *)value, \"IDL:omg.org/CORBA/Object:1.0\")))\n";
+  *os << "(!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))\n";
   *os << "  return 1; // success using local knowledge\n";
   os->decr_indent ();
   *os << "else" << be_nl;
-  *os << "  return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);\n";
+  *os << "  return this->CORBA_Object::_is_a (value, env);\n";
   os->decr_indent ();
   *os << "}\n\n";
 
@@ -184,10 +183,76 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cs::"
                          "visit_interface - "
-                         "TypeCode definition failed\n"
-                         ), -1);
+                         "TypeCode definition failed\n"),
+                        -1);
     }
 
+  // AMI
+
+  // Generate code for the AMI Reply Handler.
+  if (idl_global->ami_call_back () == I_TRUE)
+    {
+      // = Generate the default stub code for Handler.
+
+      // Set the context.
+      be_visitor_context ctx (*this->ctx_);
+
+      // Set the state.
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_STUB_CS);
+
+      // Create the visitor.
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "Bad visitor\n"),
+                            -1);
+        }
+
+      // Call the visitor on this interface.
+      if (node->accept (visitor) == -1)
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "code gen for ami handler default stub failed\n"),
+                            -1);
+        }
+      delete visitor;
+
+      // = Generate the Servant Skeleton code.
+      // Set the context.
+      ctx = *this->ctx_;
+
+      // Set the state.
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_CS);
+
+      // Create the visitor.
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "Bad visitor\n"),
+                            -1);
+        }
+
+      // Call the visitor on this interface.
+      if (node->accept (visitor) == -1)
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "code gen for ami handler failed\n"),
+                            -1);
+        }
+      delete visitor;
+    }
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index a579be1839e..c6e2dcdd647 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -188,39 +188,18 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   *os << be_uidt_nl << "};\n\n";
 
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor *visitor = 0;
-
   // generate the collocated class
-  if (idl_global->gen_thru_poa_collocation ())
-    {
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SH);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_sh::"
-                             "visit_interface - "
-                             "codegen for thru_poa_collocated class failed\n"),
-                            -1);
-        }
-    }
-
-  if (idl_global->gen_direct_collocation ())
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
     {
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SH);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_sh::"
-                             "visit_interface - "
-                             "codegen for direct_collocated class failed\n"),
-                            -1);
-        }
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_sh::"
+                         "visit_interface - "
+                         "codegen for collocated class failed\n"),
+                        -1);
     }
 
   // generate the TIE class.
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 130c6ccea50..5a603f78a16 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -280,124 +280,50 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "{" << be_idt_nl
       << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl
-      << "switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())" << be_idt_nl
-      << "{" << be_nl
-      << "case TAO_ORB_Core::THRU_POA:" << be_idt_nl;
-
-  // Thru POA stub
-  if (idl_global->gen_thru_poa_collocation ())
-    *os << "return new "
-        << node->full_coll_name (be_interface::THRU_POA) << " (this, stub);" << be_uidt_nl;
-  else
-    *os << "ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);" << be_uidt_nl;
-
-  // Direct stub
-  *os << "case TAO_ORB_Core::DIRECT:" << be_idt_nl;
-  if (idl_global->gen_direct_collocation ())
-    *os << "return new "
-        << node->full_coll_name (be_interface::DIRECT) << " (this, stub);" << be_uidt_nl;
-  else
-    *os << "ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);" << be_uidt_nl;
-
-  *os << "default:" << be_idt_nl
-      << "ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}\n\n";
+    //      << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl
+    //      << "return 0;" << be_uidt_nl
+      << "return new " << node->full_coll_name ()
+      << " (this, stub);" << be_uidt_nl;
 
-  // the _create_collocated_objref method.  If the idl compiler does
-  // not generate the type of collocated stub but the orb is asking
-  // for it, simply return null so a remote stub will be used.
-  os->indent ();
+  *os << "}\n\n";
 
+  // the _create_collocated_objref method
   *os << "void*" << be_nl
       << node->full_skel_name ()
       << "::_create_collocated_objref (const char* repository_id, "
       << "CORBA::ULong type, TAO_Stub *stub)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_UNUSED_ARG (type);" << be_nl
       << "if (!ACE_OS::strcmp (\"" << node->repoID ()
       << "\", repository_id))" << be_idt_nl
-      << "{" << be_idt_nl
-      << "switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())" << be_idt_nl
-      << "{" << be_nl
-      << "case TAO_ORB_Core::THRU_POA:" << be_idt_nl;
-
-  // Thru POA stub
-  if (idl_global->gen_thru_poa_collocation ())
-    *os << "return ACE_static_cast (" << be_idt << be_idt_nl
-        << node->name () << "_ptr," << be_nl
-        << "new " << node->full_coll_name (be_interface::THRU_POA) << " (this, stub)" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
-  else
-    *os << "return 0;" << be_uidt_nl;
-
-  // Direct stub
-  *os << "case TAO_ORB_Core::DIRECT:" << be_idt_nl;
-  if (idl_global->gen_direct_collocation ())
-    *os << "return ACE_static_cast (" << be_idt << be_idt_nl
-        << node->name () << "_ptr," << be_nl
-        << "new " << node->full_coll_name (be_interface::DIRECT) << " (this, stub)" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
-  else
-    *os << "return 0;" << be_uidt_nl;
-
-  *os << "default:" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
+      << "return ACE_static_cast (" << be_idt << be_idt_nl
+      << node->name () << "_ptr," << be_nl
+      << "new " << node->full_coll_name () << " (this, stub)" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // generate the collocated class impl
-  if (idl_global->gen_thru_poa_collocation ())
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
     {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_COLLOCATED_SS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "Bad visitor for thru_poa collocated class\n"),
-                            -1);
-        }
-
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "codegen for thru_poa collocated class failed\n"),
-                            -1);
-        }
-      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ss::"
+                         "visit_interface - "
+                         "Bad visitor for collocated class\n"),
+                        -1);
     }
 
-  if (idl_global->gen_direct_collocation ())
+  if (node->accept (visitor) == -1)
     {
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_COLLOCATED_SS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "Bad visitor for direct collocated class\n"),
-                            -1);
-        }
-
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "codegen for direct collocated class failed\n"),
-                            -1);
-        }
-      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_ss::"
+                         "visit_interface - "
+                         "codegen for collocated class failed\n"),
+                        -1);
     }
+  delete visitor;
 
   *os << "\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
deleted file mode 100644
index 6ee64e50588..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    thru_poa_collocated_sh.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for thru_poa_collocated classes for the Interface node
-//    inside the server header.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_interface.h"
-
-ACE_RCSID(be_visitor_interface, thru_poa_collocated_sh, "$Id$")
-
-
-// ************************************************************
-//  thru_poa_collocated class in header
-// ************************************************************
-
-be_visitor_interface_thru_poa_collocated_sh::be_visitor_interface_thru_poa_collocated_sh
-(be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_thru_poa_collocated_sh::~be_visitor_interface_thru_poa_collocated_sh (void)
-{
-}
-
-int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->gen_ifdef_macro (node->flatname (), "_thru_poa_collocated");
-
-  // output the class defn
-  os->indent ();
-  *os << "class " << idl_global->export_macro ()
-      << " " << node->local_coll_name (be_interface::THRU_POA);
-  os->incr_indent ();
-  *os << " : public virtual " << node->name ();
-
-  // generate base classes if any
-  if (node->n_inherits () > 0)
-    {
-      for (int i = 0; i < node->n_inherits (); ++i)
-        {
-          *os << "," << be_nl;
-          be_interface* parent =
-            be_interface::narrow_from_decl (node->inherits()[i]);
-          *os << "  public virtual "
-              << be_interface::relative_name (parent->full_coll_name (be_interface::THRU_POA),
-                                              node->full_coll_name (be_interface::THRU_POA));
-        }
-    }
-  *os << "\n";
-  os->decr_indent ();
-  *os << "{" << be_nl;
-  *os << "public:\n";
-  os->incr_indent ();
-
-  *os << node->local_coll_name (be_interface::THRU_POA) << " (\n";
-
-  os->incr_indent (0);
-  os->incr_indent ();
-
-  // XXXASG - can we make this a method to return the right name ??
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-
-  *os << node->local_name () << "_ptr "
-      << " servant," << be_nl;
-
-  *os << "TAO_Stub *stub\n";
-  os->decr_indent ();
-  *os << ");\n";
-  os->decr_indent (0);
-
-  os->indent ();
-
-  *os << "virtual CORBA::Boolean _is_a" << be_idt
-      << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-
-  *os << node->local_name ()
-      << "_ptr _get_servant (void) const;" << be_nl << be_nl;
-
-  *os << "virtual CORBA::Boolean _non_existent" << be_idt
-      << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_thru_poa_collocated_sh::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  os->decr_indent ();
-
-  *os << be_nl << "private:\n";
-  os->incr_indent ();
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-  *os << node->local_name () << "_ptr servant_;\n";
-  os->decr_indent ();
-  *os << "};\n\n";
-
-  os->gen_endif ();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index e29c228642c..01fe9188e69 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -30,10 +30,8 @@
 #include "be_visitor_operation/argument.cpp"
 #include "be_visitor_operation/argument_invoke.cpp"
 #include "be_visitor_operation/argument_marshal.cpp"
-#include "be_visitor_operation/thru_poa_collocated_sh.cpp"
-#include "be_visitor_operation/thru_poa_collocated_ss.cpp"
-#include "be_visitor_operation/direct_collocated_sh.cpp"
-#include "be_visitor_operation/direct_collocated_ss.cpp"
+#include "be_visitor_operation/collocated_sh.cpp"
+#include "be_visitor_operation/collocated_ss.cpp"
 #include "be_visitor_operation/exceptlist_cs.cpp"
 #include "be_visitor_operation/operation_ch.cpp"
 #include "be_visitor_operation/operation_cs.cpp"
@@ -61,5 +59,8 @@
 #include "be_visitor_operation/ami_arglist.cpp"
 #include "be_visitor_operation/ami_handler_operation_ch.cpp"
 #include "be_visitor_operation/ami_handler_arglist.cpp"
+#include "be_visitor_operation/ami_handler_operation_cs.cpp"
+#include "be_visitor_operation/ami_handler_skeleton_cs.cpp"
+#include "be_visitor_operation/ami_handler_argument_marshal.cpp"
 
 ACE_RCSID(be, be_visitor_operation, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
index bda8132715e..17283768469 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -64,8 +64,8 @@ be_visitor_operation_ami_arglist::visit_operation (be_operation *node)
   // AMI Handler argument.
   *os << "AMI_"
       << interface->fullname ()
-      << "_ptr "
-      << "ami_handler"
+      << "_Handler_ptr "
+      << "_tao_ami_handler"
       << ",\n";
   // #endif /* TAO_IDL_HAS_AMI */
 
@@ -79,20 +79,27 @@ be_visitor_operation_ami_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-
-  // @@ When some out arguments are skipped, the indentation seems to
-  //    get messed up. Fix that. (Alex).
-  
   // Last argument - is always CORBA::Environment.
+
   os->indent ();
+
   *os << "CORBA::Environment &ACE_TRY_ENV";
-  *os << " = " << be_idt_nl
-      << "TAO_default_environment ()"
-      << be_uidt;
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH)
+    {
+      *os << " = " << be_idt_nl
+          << "TAO_default_environment ()"
+          << be_uidt;
+    }
   
   // Done with the argument list.
-  *os << be_uidt_nl << ")" << be_uidt << "\n";
+  *os << be_uidt_nl << ")" << be_uidt;
+  
+  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH)
+    *os << ";";
   
+  *os << "\n";
+
   return 0;
 }
 
@@ -137,9 +144,14 @@ be_visitor_operation_ami_arglist::visit_argument (be_argument *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST);
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CH);
       break;
+
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CS:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST_CS);
+      break;
+
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
index a7d21e61502..dc8aa70a9af 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
@@ -44,7 +44,12 @@ be_visitor_operation_ami_ch::~be_visitor_operation_ami_ch (void)
 int
 be_visitor_operation_ami_ch::visit_operation (be_operation *node)
 {
-  TAO_OutStream *os; // output stream
+  // No sendc method for oneway operations.
+  if (node->flags () == AST_Operation::OP_oneway)
+    return 0;
+  
+  // Output stream.
+  TAO_OutStream *os ;
 
   os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
@@ -67,7 +72,7 @@ be_visitor_operation_ami_ch::visit_operation (be_operation *node)
   //         mapping. For these we grab a visitor that generates the
   //         parameter listing.
   be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CH);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
   if (!visitor)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 2abc4ef0f98..76187afbfb5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -15,7 +15,7 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
@@ -42,7 +42,7 @@ be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
 }
 
 // Processing to be done after every element in the scope is
-// processed.
+// processed.  
 int
 be_visitor_operation_ami_cs::post_process (be_decl *bd)
 {
@@ -56,6 +56,10 @@ be_visitor_operation_ami_cs::post_process (be_decl *bd)
 int
 be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 {
+  // No sendc method for oneway operations.
+  if (node->flags () == AST_Operation::OP_oneway)
+    return 0;
+
   TAO_OutStream *os; // output stream
   be_visitor_context ctx;  // visitor context
   be_visitor *visitor; // visitor
@@ -65,13 +69,13 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   os->indent (); // start with the current indentation level
 
-  // Generate the return type mapping. Return type is simply void.
+  // Generate the return type mapping. Return type is simply void. 
   *os << "void" << be_nl;
-
+  
   // Generate the operation name.
 
   // Grab the scope name.
-  be_decl *parent =
+  be_decl *parent = 
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
   if (parent == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +83,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                        "visit_operation - "
                        "scope name is nil\n"),
                       -1);
-
+  
   // Generate the scope::operation name.
   *os << parent->fullname ()
       << "::"
@@ -89,7 +93,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   // Generate the argument list with the appropriate mapping (same as
   // in the header file)
   ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST_CS);
   visitor = tao_cg->make_visitor (&ctx);
   if ((!visitor) || (node->accept (visitor) == -1))
     {
@@ -107,7 +111,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
-  // Create the return type node. Return type is void.
+  // Create the return type node. Return type is void. 
   be_predefined_type *bt = 0;
   ACE_NEW_RETURN (bt,
                   be_predefined_type (AST_PredefinedType::PT_void,
@@ -170,24 +174,11 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
         }
       *os << be_uidt_nl << "\n";
 
-      // do any pre marshal and invoke processing with return type. This
-      // includes allocating memory, initialization.
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_INVOKE_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_ami_cs::"
-                             "visit_operation - "
-                             "codegen for retval pre invoke failed\n"),
-                            -1);
-        }
-
-      // do any pre marshal and invoke stuff with arguments
+#if 0
+      // @@ I am not sure whether we need this.
+      // Do any pre marshal and invoke stuff with arguments
       ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS);
+      ctx.state (TAO_CodeGen::TAO_AMI_OPERATION_ARG_PRE_INVOKE_CS);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
@@ -198,9 +189,10 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                              "codegen for argument pre invoke failed\n"),
                             -1);
         }
+#endif /* 0 */
 
-      // generate the code for marshaling in the parameters and transmitting
-      // them
+      // Generate the code for marshaling in the parameters and transmitting
+      // them.
       if (this->gen_marshal_and_invoke (node, bt) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -628,9 +620,8 @@ be_compiled_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node,
 }
 
 int
-be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
-                                                          *node,
-                                                          be_type *bt)
+be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node,
+                                                              be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_visitor *visitor;
@@ -638,14 +629,15 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
 
   os->indent ();
 
-  // create the GIOP_Invocation and grab the outgoing CDR stream
+  // Create the GIOP_Invocation and grab the outgoing CDR stream.
   switch (node->flags ())
     {
     case AST_Operation::OP_oneway:
-      *os << "TAO_GIOP_Oneway_Invocation _tao_call ";
+      // If it is a oneway, we wouldnt have come here to generate AMI
+      // sendc method.
       break;
     default:
-      *os << "TAO_GIOP_Twoway_Invocation _tao_call ";
+      *os << "TAO_GIOP_Twoway_Asynch_Invocation _tao_call ";
     }
   *os << "(" << be_idt << be_idt_nl
       << "istub," << be_nl;
@@ -660,28 +652,33 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
     }
   *os << "\"" << node->local_name ()
       << "\"," << be_nl
-      << "istub->orb_core ()" << be_uidt_nl
+      << "istub->orb_core ()," << be_nl;
+  
+  // Next argument is the reply handler skeleton for this method.
+  
+  // Get the interface.
+  be_decl *interface = be_interface::narrow_from_scope (node->defined_in ())->decl ();
+
+  *os << "&AMI_" << interface->fullname () << "_Handler" << "::"
+      << node->local_name () << "_skel," << be_nl;
+  
+  // Next argument is the ami handler passed in for this method. 
+  *os << "_tao_ami_handler" << be_uidt_nl
+    
       << ");" << be_uidt_nl;
 
   *os << "\n" << be_nl
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  // *os << "ACE_TRY_ENV.clear ();" << be_nl
-  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
-  // check if there is an exception
-  if (this->gen_check_exception (bt) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ami_cs::"
-                         "gen_marshal_and_invoke - "
-                         "codegen for checking exception failed\n"),
-                        -1);
-
-    }
-
-  // now make sure that we have some in and inout parameters. Otherwise, there
-  // is nothing to be marshaled in
+  *os << "ACE_TRY_ENV.clear ();" << be_nl
+      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  // Check if there is an exception.
+  // Return type is void, so we know what to generate here. 
+  *os << "ACE_CHECK;";
+  
+  // Now make sure that we have some in and inout
+  // parameters. Otherwise, there is nothing to be marshaled in. 
   if (this->has_param_type (node, AST_Argument::dir_IN) ||
       this->has_param_type (node, AST_Argument::dir_INOUT))
     {
@@ -690,9 +687,9 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
           << be_nl
           << "if (!(\n" << be_idt << be_idt << be_idt;
 
-      // marshal each in and inout argument
+      // Marshal each in and inout argument.
       ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS);
+      ctx.state (TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS);
       ctx.sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
@@ -707,7 +704,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       *os << be_uidt << be_uidt_nl
           << "))" << be_nl;
 
-      // if marshaling fails, raise exception
+      // If marshaling fails, raise exception.
       if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
                                      "") == -1)
         {
@@ -722,28 +719,21 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
 
   *os << be_nl
       << "int _invoke_status =" << be_idt_nl;
-  if (node->flags () == AST_Operation::OP_oneway)
+  if (node->exceptions ())
     {
-      // oneway operation
-      *os << "_tao_call.invoke (ACE_TRY_ENV);";
+      *os << "_tao_call.invoke (_tao_" << node->flatname ()
+          << "_exceptiondata, "
+          << node->exceptions ()->length ()
+          << ", ACE_TRY_ENV);";
     }
   else
     {
-      if (node->exceptions ())
-        {
-          *os << "_tao_call.invoke (_tao_" << node->flatname ()
-              << "_exceptiondata, "
-              << node->exceptions ()->length ()
-              << ", ACE_TRY_ENV);";
-        }
-      else
-        {
-          *os << "_tao_call.invoke (0, 0, ACE_TRY_ENV);";
-        }
+      *os << "_tao_call.invoke (0, 0, ACE_TRY_ENV);";
     }
-
+  
   *os << be_uidt_nl;
-  // check if there is an exception
+
+  // Check if there is an exception.
   if (this->gen_check_exception (bt) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -777,125 +767,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       << "break;" << be_nl
       << be_uidt_nl << "}" << be_nl;
 
-  // the code below this is for 2way operations only
-
-  if (this->void_return_type (bt) &&
-      !this->has_param_type (node, AST_Argument::dir_INOUT) &&
-      !this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-      return 0;
-    }
-
-  // Do any post_invoke stuff that might be necessary.
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS);
-  ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                         "gen_marshal_and_invoke - "
-                         "codegen for args in post do_static_call\n"),
-                        -1);
-    }
-
-
-  // Generate any temporary variables to demarshal the arguments
-  ctx = *this->ctx_;
-  be_visitor_compiled_args_decl vis1 (new be_visitor_context (ctx));
-  if (node->accept (&vis1) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                         "gen_pre_stub_info - "
-                         "codegen for pre args failed\n"),
-                        -1);
-    }
-
-  if (!this->void_return_type (bt))
-    {
-      // Generate any temporary variables to demarshal the return value
-      ctx = *this->ctx_;
-      be_visitor_context *new_ctx =
-        new be_visitor_context (ctx);
-      be_visitor_operation_compiled_rettype_post_docall vis2 (new_ctx);
-      if (bt->accept (&vis2) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                             "gen_pre_stub_info - "
-                             "codegen rettype [post docall] failed\n"),
-                            -1);
-        }
-    }
-
-  // check if there was a user exception, else demarshal the
-  // return val (if any) and parameters (if any) that came with
-  // the response message
-  *os << "TAO_InputCDR &_tao_in = _tao_call.inp_stream ();" << be_nl
-      << "if (!(\n" << be_idt << be_idt << be_idt;
-
-  if (!this->void_return_type (bt))
-    {
-      // demarshal the return val
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS);
-      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                             "gen_marshal_and_invoke - "
-                             "codegen for return var failed\n"),
-                            -1);
-        }
-    }
-
-  if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
-      this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-      if (!this->void_return_type (bt))
-          *os << " &&\n";
-
-      // demarshal each out and inout argument
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS);
-      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                             "gen_marshal_and_invoke - "
-                             "codegen for return var failed\n"),
-                            -1);
-        }
-    }
-
-  if (!this->void_return_type (bt) ||
-      this->has_param_type (node, AST_Argument::dir_INOUT) ||
-      this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-
-      *os << be_uidt << be_uidt << be_nl
-          << "))" << be_nl;
-      // if marshaling fails, raise exception
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES") == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ami_cs::"
-                             "gen_marshal_and invoke - "
-                             "codegen for return var failed\n"),
-                            -1);
-        }
-      *os << be_uidt;
-    }
-
+  // Return type is void and we are going to worry about OUT or INOUT
+  // parameters. Return from here. 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
index 66d6b5763bb..4670062f2df 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_arglist.cpp
@@ -16,13 +16,13 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>  
+//    <alex@cs.wustl.edu>
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -40,6 +40,82 @@ be_visitor_operation_ami_handler_arglist::be_visitor_operation_ami_handler_argli
 {
 }
 
+// Visit the scope and its elements.
+// This implementation is the same as
+// <be_visitor_scope::visit_scope>. The variation is that it calls the
+// <post_process>  only if the return value of the <accept> is 1. We
+// need to do this since we have to differentiate between an argument
+// that was printed and an argument that was skipped in the signature.
+
+int
+be_visitor_operation_ami_handler_arglist::visit_scope (be_scope *node)
+{
+  // Proceed if the number of members in our scope is greater than 0.
+  if (node->nmembers () > 0)
+    {
+      // initialize an iterator to iterate thru our scope
+      UTL_ScopeActiveIterator *si;
+      ACE_NEW_RETURN (si,
+                      UTL_ScopeActiveIterator (node,
+                                               UTL_Scope::IK_decls),
+                      -1);
+      this->elem_number_ = 0;
+      // continue until each element is visited
+      while (!si->is_done ())
+        {
+          AST_Decl *d = si->item ();
+          if (!d)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"), -1);
+
+            }
+          be_decl *bd = be_decl::narrow_from_decl (d);
+          // set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation
+
+          this->ctx_->scope (node->decl ());
+
+          // set the node to be visited
+          this->ctx_->node (bd);
+          this->elem_number_++;
+
+          // Do any pre processing using the next item info.
+          if (this->pre_process (bd) == -1)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "pre processing failed\n"), -1);
+            }
+
+          // Send the visitor.
+          int visitor_result = 0;
+          if (bd == 0 ||  (visitor_result = bd->accept (this)) == -1)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+
+          // Do any post processing using this item info.
+          if (visitor_result == 1)
+            this->post_process (bd);
+
+          // Next argument.
+          si->next ();
+        } // end of while loop
+      delete si;
+    } // end of if
+
+  return 0;
+}
+
 be_visitor_operation_ami_handler_arglist::~be_visitor_operation_ami_handler_arglist (void)
 {
 }
@@ -48,11 +124,54 @@ int
 be_visitor_operation_ami_handler_arglist::visit_operation (be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
-  *os << " (" << be_idt << be_idt << "\n";
 
-  // All we do is hand over code generation to our scope. 
-  if (this->visit_scope (node) == -1)
+  *os << " (" << be_idt << be_idt << be_nl;
+
+  // First argument is a the return value of the operation.
+
+  // Indent.
+  os->indent ();
+
+  // Get the return type.
+  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_arglist::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // Grab the visitor.
+
+  be_visitor_context ctx = *this->ctx_;
+
+  // Set the state.
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RESULT_ARG);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+
+  // Pass the visitor.
+  int result_printed = bt->accept (visitor);
+  if (result_printed == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_arglist::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  if (result_printed)
+    *os << ", " << be_nl;
+
+  // Rest of the arguments.
+
+  // All we do is hand over code generation to our scope.
+  int args_printed = this->visit_scope (node);
+  if (args_printed == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_operation_ami_handler_arglist::"
@@ -61,29 +180,47 @@ be_visitor_operation_ami_handler_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-  // No argument for exception. What will you do if you get the
-  // exception from the call back method?
+  // Generate the CORBA::Environment parameter for the alternative
+  // mapping.
+  if (!idl_global->exception_support ())
+    {
+      // If the operation node has parameters, then we need to insert
+      // a comma.
+      // @@ Fix this.
+      // if (result_printed || args_printed)
+      //  *os << "," << be_nl;
 
-  // Arglist is over.
+      os->indent ();
+
+      switch (this->ctx_->state ())
+        {
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
+          // Last argument - is always CORBA::Environment
+          *os << "CORBA::Environment &ACE_TRY_ENV";
+          *os << " = " << be_idt_nl
+              << "TAO_default_environment ()"
+              << be_uidt;
+          break;
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS:
+          // Last argument - is always CORBA::Environment.
+          *os << "CORBA::Environment &ACE_TRY_ENV";
+          break;
+        }
+    }
   *os << be_uidt_nl << ")" << be_uidt;
 
-  // @@ No THROW SPECs. You can do anything if the call back guy
-  //    throws an exception. But I am not too sure about
-  //    this. (Alex). 
+  // Now generate the throw specs.
+  *os << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))"
+      << be_uidt_nl;
+
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
-      // Each method is pure virtual in the header.
-      *os << " = 0;\n\n";
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
+      *os << ";" << be_nl << be_nl;
       break;
     default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ami_handler_arglist::"
-                         "visit_operation - "
-                         "Bad operation\n"),
-                        -1);
+      *os << be_nl;
     }
-
   return 0;
 }
 
@@ -128,8 +265,11 @@ be_visitor_operation_ami_handler_arglist::visit_argument (be_argument *node)
 
   switch (this->ctx_->state ())
     {
-    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST);
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CH);
+      break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CS);
       break;
     default:
       {
@@ -151,7 +291,11 @@ be_visitor_operation_ami_handler_arglist::visit_argument (be_argument *node)
                          "Bad visitor\n"),
                         -1);
     }
-  if (node->accept (visitor) == -1)
+
+  // Pass the visitor.
+
+  int result = node->accept (visitor);
+  if (result == -1)
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -161,7 +305,7 @@ be_visitor_operation_ami_handler_arglist::visit_argument (be_argument *node)
                         -1);
     }
   delete visitor;
-  return 0;
+  return result;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp
new file mode 100644
index 00000000000..0707400379e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_argument_marshal.cpp
@@ -0,0 +1,172 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_argument_marshal.cpp
+//
+// = DESCRIPTION
+//    Visitor to pass arguments to the CDR operators. This one helps in
+//    generating the && and the , at the right place. This one is for the
+//    skeleton side.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_argument_marshal, "$Id$")
+
+
+// ************************************************************
+// operation visitor to handle the passing of arguments to the CDR operators
+// ************************************************************
+
+be_compiled_visitor_operation_ami_handler_argument_marshal::
+be_compiled_visitor_operation_ami_handler_argument_marshal (be_visitor_context
+                                               *ctx)
+  : be_visitor_operation_argument (ctx),
+    last_arg_printed_ (be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_NONE)
+{
+}
+
+be_compiled_visitor_operation_ami_handler_argument_marshal::
+~be_compiled_visitor_operation_ami_handler_argument_marshal (void)
+{
+}
+
+int
+be_compiled_visitor_operation_ami_handler_argument_marshal::pre_process (be_decl *bd)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  be_argument *arg = be_argument::narrow_from_decl (bd);
+
+  if (!arg)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) "
+                         "be_compiled_visitor_operation_ami_handler_argument_marshal"
+                         "::post_process - "
+                         "Bad argument node\n"),
+                        -1);
+    }
+  switch (arg->direction ())
+    {
+    case AST_Argument::dir_IN:
+      if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+        {
+          // nothing
+        }
+      else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+        {
+          // nothing
+        }
+      break;
+    case AST_Argument::dir_INOUT:
+      if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+        {
+          if (this->last_arg_printed_ !=
+              be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_NONE)
+            *os << " &&\n";
+        }
+      else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+        {
+          if (this->last_arg_printed_ !=
+              be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_NONE)
+            *os << " &&\n";
+        }
+      break;
+    case AST_Argument::dir_OUT:
+      if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+        {
+          if (this->last_arg_printed_ !=
+              be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_NONE)
+            *os << " &&\n";
+        }
+      else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+        {
+          if (this->last_arg_printed_ !=
+              be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_NONE)
+            *os << " &&\n";
+        }
+      break;
+    }
+
+  return 0;
+}
+
+int
+be_compiled_visitor_operation_ami_handler_argument_marshal::post_process (be_decl *bd)
+{
+  be_argument *arg = be_argument::narrow_from_decl (bd);
+
+  if (!arg)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) "
+                         "be_compiled_visitor_operation_ami_handler_argument_marshal"
+                         "::post_process - "
+                         "Bad argument node\n"),
+                        -1);
+    }
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      switch (arg->direction ())
+        {
+        case AST_Argument::dir_IN:
+          // these arguments don't get printed for the << operator on the stub
+          break;
+        case AST_Argument::dir_INOUT:
+          // only these arguments get printed
+          this->last_arg_printed_ =
+            be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_INOUT;
+          break;
+        case AST_Argument::dir_OUT:
+           // only these arguments get printed
+          this->last_arg_printed_ =
+            be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_OUT;
+         break;
+        }
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      switch (arg->direction ())
+        {
+        case AST_Argument::dir_IN:
+          // these arguments don't get printed for the >> on the stub
+          break;
+        case AST_Argument::dir_INOUT:
+          // only these arguments get printed
+          this->last_arg_printed_ =
+            be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_INOUT;
+          break;
+        case AST_Argument::dir_OUT:
+          // only these arguments get printed
+          this->last_arg_printed_ =
+            be_compiled_visitor_operation_ami_handler_argument_marshal::TAO_ARG_OUT;
+          break;
+        }
+      break;
+    default:
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) "
+                         "be_compiled_visitor_operation_ami_handler_argument_marshal"
+                         "::post_process - "
+                         "Bad sub state\n"),
+                        -1);
+    }
+  return 0;
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp
new file mode 100644
index 00000000000..30f38acf344
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation.cpp
@@ -0,0 +1,154 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_operation_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for AMI Handler call back operation in
+//    the client header.  
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_operation_ch, "$Id$")
+
+
+// ************************************************************
+// Operation visitor for server header
+// ************************************************************
+
+be_visitor_operation_ami_handler_operation_ch::be_visitor_operation_ami_handler_operation_ch (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_operation_ch::~be_visitor_operation_ami_handler_operation_ch (void)
+{
+}
+
+int
+be_visitor_operation_ami_handler_operation_ch::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node
+
+  os->indent (); // start with the current indentation level
+
+  // every operation is declared virtual in the client code
+  *os << "virtual ";
+
+  // STEP I: generate the return type. Return type is simpy void. 
+  *os << "void ";
+  
+  // STEP 2: generate the operation name.
+  *os << " " << node->local_name ();
+
+  // STEP 3: generate the argument list with the appropriate
+  //         mapping. For these we grab a visitor that generates the
+  //         parameter listing.
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_ami_handler_operation_ch::"
+                         "visit_operation - "
+                         "Bad visitor to return type\n"),
+                        -1);
+    }
+
+  if (node->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_ch::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  // Generating the skeleton method.
+
+  // Skeleton not necessary for collocated class.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH)
+    {
+      return 0;
+      /* NOT REACHED */
+    }
+
+  // Generate the corresponding static skeleton method for this
+  // operation only if there was no "native" type.
+  if (!node->has_native ())
+    {
+      // Next line.
+      *os << be_nl;
+      
+      // Indent.
+      os->indent ();
+      
+      *os << "static void ";
+      // Check if we are an attribute node in disguise
+      if (this->ctx_->attribute ())
+        {
+          // now check if we are a "get" or "set" operation
+          if (node->nmembers () == 1) // set
+            *os << "_set_";
+          else
+            *os << "_get_";
+        }
+      *os << node->local_name () <<
+        "_skel (" << be_idt << be_idt_nl;
+      
+      // Different skeletons for the AMI Handler class and the servant
+      // class.  
+      switch (this->ctx_->state ())
+        {
+        case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH:
+          *os << "CORBA::ServerRequest &_tao_req, " << be_nl
+              << "void *_tao_obj, " << be_nl
+              << "void *_tao_context, " << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+              << "TAO_default_environment ()"
+              << be_uidt << be_uidt_nl
+              << ");" << be_uidt << "\n\n"; 
+          break;
+       
+        case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH:
+          *os << "TAO_InputCDR &_tao_reply_cdr, " << be_nl
+              << "Messaging::ReplyHandler_ptr _tao_reply_handler, " << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+              << "TAO_default_environment ()"
+              << be_uidt << be_uidt_nl
+              << ");" << be_uidt << "\n\n";
+          break;
+
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_operation_ch::"
+                             "visit_operation - "
+                             "Unknown state\n"),
+                            -1);
+        }
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
index bc54b1b3710..30f38acf344 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_ch.cpp
@@ -65,7 +65,7 @@ be_visitor_operation_ami_handler_operation_ch::visit_operation (be_operation *no
   //         mapping. For these we grab a visitor that generates the
   //         parameter listing.
   be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST);
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CH);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
   if (!visitor)
     {
@@ -87,11 +87,25 @@ be_visitor_operation_ami_handler_operation_ch::visit_operation (be_operation *no
     }
   delete visitor;
 
+  // Generating the skeleton method.
+
+  // Skeleton not necessary for collocated class.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH)
+    {
+      return 0;
+      /* NOT REACHED */
+    }
+
   // Generate the corresponding static skeleton method for this
   // operation only if there was no "native" type.
   if (!node->has_native ())
     {
+      // Next line.
+      *os << be_nl;
+      
+      // Indent.
       os->indent ();
+      
       *os << "static void ";
       // Check if we are an attribute node in disguise
       if (this->ctx_->attribute ())
@@ -103,15 +117,38 @@ be_visitor_operation_ami_handler_operation_ch::visit_operation (be_operation *no
             *os << "_get_";
         }
       *os << node->local_name () <<
-        "_skel (" << be_idt << be_idt_nl
-          << "CORBA::ServerRequest &_tao_req, " << be_nl
-          << "void *_tao_obj, " << be_nl
-          << "void *_tao_context, " << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-	  << "TAO_default_environment ()"
-	  << be_uidt << be_uidt_nl
-	  << ");" << be_uidt << "\n\n";
+        "_skel (" << be_idt << be_idt_nl;
+      
+      // Different skeletons for the AMI Handler class and the servant
+      // class.  
+      switch (this->ctx_->state ())
+        {
+        case TAO_CodeGen::TAO_AMI_HANDLER_SERVANT_OPERATION_CH:
+          *os << "CORBA::ServerRequest &_tao_req, " << be_nl
+              << "void *_tao_obj, " << be_nl
+              << "void *_tao_context, " << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+              << "TAO_default_environment ()"
+              << be_uidt << be_uidt_nl
+              << ");" << be_uidt << "\n\n"; 
+          break;
+       
+        case TAO_CodeGen::TAO_AMI_HANDLER_STUB_OPERATION_CH:
+          *os << "TAO_InputCDR &_tao_reply_cdr, " << be_nl
+              << "Messaging::ReplyHandler_ptr _tao_reply_handler, " << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+              << "TAO_default_environment ()"
+              << be_uidt << be_uidt_nl
+              << ");" << be_uidt << "\n\n";
+          break;
+
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_operation_ch::"
+                             "visit_operation - "
+                             "Unknown state\n"),
+                            -1);
+        }
     }
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
new file mode 100644
index 00000000000..89d14a4d74e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_operation_cs.cpp
@@ -0,0 +1,810 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_operation_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_operation_cs, "$Id$")
+
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+be_visitor_operation_ami_handler_operation_cs::be_visitor_operation_ami_handler_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_operation_cs::~be_visitor_operation_ami_handler_operation_cs (void)
+{
+}
+
+// processing to be done after every element in the scope is processed
+int
+be_visitor_operation_ami_handler_operation_cs::post_process (be_decl *bd)
+{
+  // all we do here is to insert a comma and a newline
+  TAO_OutStream *os = this->ctx_->stream ();
+  if (!this->last_node (bd))
+    *os << ",\n";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_operation_cs::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;       // type node
+  be_visitor_context ctx;  // visitor context
+  be_visitor *visitor; // visitor
+
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node for future use
+
+  // Start with the current indentation level.
+  os->indent ();
+
+  // Init the return type variable.
+  bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ami_handler_operation_cs::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // Generate the return type. Return type is simply void.
+  *os << "void " << be_nl;
+
+  // Get the scope name.
+  be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+  if (parent == 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                         "visit_operation - "
+                         "scopeless operation :-<\n"),
+                        -1);
+    }
+
+  // Genereate scope name.
+  *os << parent->compute_name ("AMI_", "_Handler");
+
+  // Generate the operation name.
+  *os << "::" << node->local_name ();
+
+  // Generate the argument list with the appropriate mapping (same as
+  // in the header file).
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if ((!visitor) || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  os->indent ();
+  // Generate the actual code for the stub. However, if any of the argument
+  // types is "native", we flag a MARSHAL exception.
+  // last argument - is always CORBA::Environment
+  *os << "{" << be_idt_nl;
+
+  // Deal with differences between IDL mapping for true C++ exceptions and
+  // alternate mapping. Since our code uses the ACE_TRY_ENV variable in a
+  // number of places, for the true exception case, we will have to explicitly
+  // declare the ACE_TRY_ENV variable.
+  *os << this->gen_environment_var () << be_nl;
+
+  // Generate any pre stub info if and only if none of our parameters is of the
+  // native type.
+  if (!node->has_native ())
+    {
+      // native type does not exist.
+
+      // Generate any "pre" stub information such as tables or declarations
+      // This is a template method and the actual work will be done by the
+      // derived class
+      if (this->gen_pre_stub_info (node, bt) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "gen_pre_stub_info failed\n"),
+                            -1);
+        }
+    }
+
+  // Declaring return type is not necessary. Since return  type is
+  // void.
+
+  // Native exists => no stub.
+  if (node->has_native ())
+    {
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", "") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                             "visit_operation - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+    }
+  else
+    {
+      os->indent ();
+      // Generate code that retrieves the underlying stub object and then
+      // invokes do_static_call on it.
+      *os << be_nl
+          << "TAO_Stub *istub = this->_stubobj ();" << be_nl
+          << "if (istub == 0)" << be_idt_nl;
+
+      // If the stub object was bad, then we raise a system
+      // exception.
+      *os << "ACE_THROW (CORBA::INTERNAL ());\n\n";
+
+      *os << be_uidt;
+
+      // do any pre marshal and invoke stuff with arguments
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "codegen for argument pre invoke failed\n"),
+                            -1);
+        }
+
+      // Generate the code for marshaling in the parameters and transmitting
+      // them.
+      if (this->gen_marshal_and_invoke (node, bt) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "codegen for marshal and invoke failed\n"),
+                            -1);
+
+        }
+
+      // Return type is void,
+
+    } // end of if (!native)
+
+  *os << be_uidt_nl << "}" << be_nl << be_nl;
+
+  // Generate the skeleton method.
+
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_SKELETON_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_cs::"
+                         "visit_operation - "
+                         "codegen for AMI Handler skeleton failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_operation_cs::visit_argument (be_argument *node)
+{
+  // this method is used to generate the ParamData table entry
+
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt; // argument type
+
+  // retrieve the type for this argument
+  bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  os->indent ();
+  *os << "{" << bt->tc_name () << ", ";
+  switch (node->direction ())
+    {
+    case AST_Argument::dir_IN:
+      *os << "PARAM_IN, ";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << "PARAM_INOUT, ";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << "PARAM_OUT, ";
+      break;
+    }
+  *os << "0}";
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_operation_cs::gen_raise_exception (be_type *bt,
+                                                                    const char *excep,
+                                                                    const char *completion_status)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  if (this->void_return_type (bt))
+    {
+      *os << "ACE_THROW ("
+          << excep << " (" << completion_status << "));\n";
+    }
+  else
+    {
+      *os << "ACE_THROW_RETURN ("
+          << excep << " (" << completion_status << "), ";
+
+      // return the appropriate return value
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (bt->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                             "gen_raise_exception - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << ");\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_operation_cs::gen_check_exception (be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  os->indent ();
+  // check if there is an exception
+  if (this->void_return_type (bt))
+    {
+      *os << "ACE_CHECK;\n";
+      //<< "_tao_environment);\n";
+    }
+  else
+    {
+      *os << "ACE_CHECK_RETURN (";
+      // << "_tao_environment, ";
+
+      // return the appropriate return value
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (bt->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                             "gen_check_exception - "
+                             "codegen failed\n"),
+                            -1);
+        }
+      *os << ");" << be_nl;
+    }
+
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for interpretive client stubs
+// ************************************************************
+
+be_interpretive_visitor_operation_ami_handler_operation_cs::
+be_interpretive_visitor_operation_ami_handler_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_operation_cs (ctx)
+{
+}
+
+be_interpretive_visitor_operation_ami_handler_operation_cs::~be_interpretive_visitor_operation_ami_handler_operation_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_interpretive_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (be_operation *node,
+                                                                               be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  // Generate the TAO_Param_Data table
+  os->indent ();
+  *os << "static const TAO_Param_Data ";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flatname () <<
+    "_paramdata [] = " << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+
+  // entry for the return type
+  *os << "{" << bt->tc_name () << ", PARAM_RETURN, 0}";
+  if (node->nmembers () > 0)
+    *os << ",\n";
+
+      // generate entries for the param data table for arguments
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_interpretive_visitor_operation_ami_handler_operation_cs::"
+                         "gen_pre_stub_info - "
+                         "visit scope failed\n"),
+                        -1);
+    }
+
+  os->indent ();
+  *os << be_nl;
+  os->decr_indent ();
+  *os << "}; // " << node->flatname () << "_paramdata\n\n";
+
+  // Check if this operation raises any exceptions. In that case, we must
+  // generate a list of exception typecodes. This is not valid for
+  // attributes
+  if (!this->ctx_->attribute ())
+    {
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) "
+                             "be_interpretive_visitor_operation_ami_handler_operation_cs::"
+                             "gen_pre_stub_info - "
+                             "Exceptionlist generation error\n"),
+                            -1);
+        }
+    }
+
+  // now generate the calldata table
+  os->indent ();
+  *os << "static const TAO_Call_Data ";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flatname ()
+      << "_calldata = " << be_nl
+      << "{"
+      << "\"";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->local_name () << "\", ";
+
+      // are we oneway or two operation?
+  if (node->flags () == AST_Operation::OP_oneway)
+    {
+      *os << "0, "; // for false
+    }
+  else
+    {
+      *os << "1, "; // for true
+    }
+  // insert the size of the paramdata table i.e., number of arguments + 1
+  // for return type
+  *os << (node->argument_count () + 1) << ", ";
+
+      // insert the address of the paramdata table
+      // first check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flatname () << "_paramdata, ";
+
+      // insert exception list (if any) - node for attributes
+  if (this->ctx_->attribute ())
+    *os << "0, 0};\n\n";
+  else
+    {
+      if (node->exceptions ())
+        {
+          *os << node->exceptions ()->length ()
+              << ", _tao_" << node->flatname () << "_exceptiondata};\n\n";
+        }
+      else
+        *os << "0, 0};\n\n";
+    }
+  return 0;
+}
+
+int
+be_interpretive_visitor_operation_ami_handler_operation_cs::
+gen_marshal_and_invoke (be_operation*node,
+                        be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  os->indent ();
+  *os << "void* _tao_arguments["
+      << node->argument_count () + 1 << "];" << be_nl
+      << "const void** _tao_arg = ACE_const_cast (const void**,_tao_arguments);" << be_nl
+      << "*_tao_arg = ";
+
+  // pass the appropriate return value to docall
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_interpretive_visitor_operation_ami_handler_operation_cs::"
+                         "gen_marshal_and_invoke - "
+                         "codegen for return var in do_static_call failed\n"),
+                        -1);
+    }
+  *os << "; _tao_arg++;\n";
+
+  // pass each argument to do_static_call
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_interpretive_visitor_operation_ami_handler_operation_cs::"
+                         "gen_marshal_and_invoke - "
+                         "codegen for return var in do_static_call failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor=0;
+
+  // call do_static_call with appropriate number of arguments
+  os->indent ();
+  *os << "istub->do_static_call (" << be_idt_nl
+      << "ACE_TRY_ENV, " << be_nl
+      << "&";
+  // check if we are an attribute node in disguise
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "_set_";
+      else
+        *os << "_get_";
+    }
+  *os << node->flatname () << "_calldata," << be_nl
+      << "_tao_arguments" << be_uidt_nl
+      << ");\n";
+
+  os->indent ();
+  // check if there is an exception
+  if (this->gen_check_exception (bt) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_interpretive_visitor_operation_ami_handler_operation_cs::"
+                         "gen_marshal_and_invoke - "
+                         "codegen for checking exception failed\n"),
+                        -1);
+
+    }
+
+  // do any post processing for the arguments
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                         "visit_operation - "
+                         "codegen for args post do_static_call failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // do any post processing for the retval
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_POST_INVOKE_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_operation_cs::"
+                         "visit_operation - "
+                         "codegen for return type post do_static_call failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for compiled client stubs
+// ************************************************************
+
+be_compiled_visitor_operation_ami_handler_operation_cs::
+be_compiled_visitor_operation_ami_handler_operation_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_operation_cs (ctx)
+{
+}
+
+be_compiled_visitor_operation_ami_handler_operation_cs::~be_compiled_visitor_operation_ami_handler_operation_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_compiled_visitor_operation_ami_handler_operation_cs::gen_pre_stub_info (be_operation *node,
+                                                                           be_type *)
+{
+
+  // Check if this operation raises any exceptions. In that case, we must
+  // generate a list of exception typecodes. This is not valid for
+  // attributes
+  if (!this->ctx_->attribute ())
+    {
+      be_visitor_context ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) "
+                             "be_compiled_visitor_operation_ami_handler_operation_cs::"
+                             "gen_pre_stub_info - "
+                             "Exceptionlist generation error\n"),
+                            -1);
+        }
+      delete visitor;
+    }
+
+  return 0;
+}
+
+int
+be_compiled_visitor_operation_ami_handler_operation_cs::
+gen_marshal_and_invoke (be_operation *node,
+                        be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  os->indent ();
+
+  // Create the GIOP_Invocation and grab the outgoing CDR stream.
+  switch (node->flags ())
+    {
+    case AST_Operation::OP_oneway:
+      *os << "TAO_GIOP_Oneway_Invocation _tao_call ";
+      break;
+    default:
+      *os << "TAO_GIOP_Twoway_Invocation _tao_call ";
+    }
+  *os << "(" << be_idt << be_idt_nl
+      << "istub," << be_nl;
+
+  if (this->ctx_->attribute ())
+    {
+      // now check if we are a "get" or "set" operation
+      if (node->nmembers () == 1) // set
+        *os << "\"_set_\"";
+      else
+        *os << "\"_get_\"";
+    }
+
+  *os << "\"" << node->original_local_name ()
+      << "\"," << be_nl
+      << "istub->orb_core ()" << be_uidt_nl
+      << ");" << be_uidt_nl;
+
+  *os << "\n" << be_nl
+      << "for (;;)" << be_nl
+      << "{" << be_idt_nl;
+
+  *os << "ACE_TRY_ENV.clear ();" << be_nl;
+  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  // Check if there is an exception.
+  *os << "ACE_CHECK;";
+
+  // Now make sure that we have some AMI result  parameter or OUT or
+  // INOUT parameters. Otherwise, there is nothing to be marshaled
+  // in.
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_OUT) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT))
+    {
+      *os << be_nl
+          << "TAO_OutputCDR &_tao_out = _tao_call.out_stream ();"
+          << be_nl
+          << "if (!(\n" << be_idt << be_idt << be_idt;
+
+      // @@ Michael: This has to be replaced witht he code in the
+      //             "#if 0" clause
+      // Marshal the ami result argument, if the return type is not
+      // void.
+      if (!this->void_return_type (bt))
+        {
+          os->indent ();
+          *os << "(_tao_out << _tao_retval)";
+
+          // Print the && if there are OUT or INOUT arguements in the
+          // signature.
+          if (this->has_param_type (node, AST_Argument::dir_OUT) ||
+              this->has_param_type (node, AST_Argument::dir_INOUT))
+            *os << " &&\n";
+        }
+
+#if 0
+      // @@ This for giving the _tao_retval argument only. But
+      //    this may be needed for some data types.
+      //    But the one that is above is ok for basic types.
+      // @@ We may need to do this.
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_MARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_operation_cs::"
+                             "gen_marshal_and_invoke - "
+                             "codegen for return var in do_static_call failed\n"),
+                            -1);
+        }
+      delete visitor;
+      visitor = 0;
+#endif /* 0 */
+
+      // Marshal each out and inout argument.
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_operation_cs::"
+                             "gen_marshal_and_invoke - "
+                             "codegen for return var in do_static_call failed\n"),
+                            -1);
+        }
+      delete visitor;
+      visitor = 0;
+
+      *os << be_uidt << be_uidt_nl
+          << "))" << be_nl;
+
+      // if marshaling fails, raise exception.
+      *os << "ACE_THROW (CORBA::MARSHAL ());";
+
+      *os << be_uidt;
+    }
+
+  *os << be_nl
+      << "int _invoke_status =" << be_idt_nl;
+  if (node->flags () == AST_Operation::OP_oneway)
+    {
+      // oneway operation
+      *os << "_tao_call.invoke (ACE_TRY_ENV);";
+    }
+  else
+    {
+      if (node->exceptions ())
+        {
+          *os << "_tao_call.invoke (_tao_" << node->flatname ()
+              << "_exceptiondata, "
+              << node->exceptions ()->length ()
+              << ", ACE_TRY_ENV);";
+        }
+      else
+        {
+          *os << "_tao_call.invoke (0, 0, ACE_TRY_ENV);";
+        }
+    }
+
+  *os << be_uidt_nl;
+
+  // Check if there is an exception.
+  *os << "ACE_CHECK;";
+
+  *os << be_nl
+      << "if (_invoke_status == TAO_INVOKE_RESTART)" << be_idt_nl
+      << "continue;" << be_uidt_nl
+      << "// if (_invoke_status == TAO_INVOKE_EXCEPTION)" << be_idt_nl
+      << "// cannot happen" << be_uidt_nl
+      << "if (_invoke_status != TAO_INVOKE_OK)" << be_nl
+      << "{" << be_idt_nl;
+
+  // Check if there is an exception.
+  *os << "ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));";
+
+  *os << be_uidt_nl
+      << "}" << be_nl
+      << "break;" << be_nl
+      << be_uidt_nl << "}" << be_nl;
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp
new file mode 100644
index 00000000000..ce3f1b178ce
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_result_arg.cpp
@@ -0,0 +1,177 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_result_arg.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the result argument in a call back method
+//    of a Reply Handler.  
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_result_arg, "$Id$")
+
+
+// ************************************************************
+// Visitor for parameter list in AMI Handler call back declarations
+// and definitions.
+// ************************************************************
+
+be_visitor_operation_ami_handler_result_arg::be_visitor_operation_ami_handler_result_arg (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_result_arg::~be_visitor_operation_ami_handler_result_arg (void)
+{
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  
+  be_type *bt = be_type::narrow_from_decl (node);
+
+  *os << "const " << bt->type_name (node) << " _tao_ami_result";
+  
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node) << " _tao_ami_result" ;
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node, "_ptr") << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node, "_ptr") << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_native (be_native *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  *os << this->type_name (node) << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  // check if the type is an any
+  if (node->pt () == AST_PredefinedType::PT_any)
+    {
+      *os << "const " << this->type_name (node) << " &" << " _tao_ami_result";  
+    }
+  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
+    {
+      *os << this->type_name (node, "_ptr") << " _tao_ami_result";
+    }
+  else // simple predefined types
+    {
+      *os << this->type_name (node) << " _tao_ami_result";
+    }
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_string (be_string *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const char *" << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " &" << " _tao_ami_result";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_ami_handler_result_arg::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << this->type_name (node) << " *" << " _tao_ami_result";
+  return 0;
+} 
+
+int
+be_visitor_operation_ami_handler_result_arg::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  *os << "const " << this->type_name (node) << " *" << " _tao_ami_result";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
new file mode 100644
index 00000000000..0144fca3973
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
@@ -0,0 +1,480 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_skeleton_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, ami_handler_skeleton_cs, "$Id$")
+
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+be_visitor_operation_ami_handler_skeleton_cs::be_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+be_visitor_operation_ami_handler_skeleton_cs::~be_visitor_operation_ami_handler_skeleton_cs (void)
+{
+}
+
+// processing to be done after every element in the scope is processed
+int
+be_visitor_operation_ami_handler_skeleton_cs::post_process (be_decl *bd)
+{
+  // all we do here is to insert a comma and a newline
+  TAO_OutStream *os = this->ctx_->stream ();
+  if (!this->last_node (bd))
+    *os << ",\n";
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_skeleton_cs::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;       // type node
+  be_visitor_context ctx;  // visitor context
+  be_visitor *visitor = 0; // visitor
+
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node for future use
+
+  // Init the return type variable.
+  bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // Start with the current indentation level.
+  os->indent ();
+
+
+  // Generate the return type. Return type is simply void.
+  *os << be_nl << "void" << be_nl;
+
+  // Get the scope name.
+  be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+  if (parent == 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "scopeless operation :-<\n"),
+                        -1);
+    }
+
+  // Genereate scope name.
+  *os << parent->compute_name ("AMI_", "_Handler");
+
+  // Generate the operation name.
+  *os << "::" << node->local_name () << "_skel (" << be_idt_nl;
+
+  // Generate the argument list.
+  *os << "TAO_InputCDR &_tao_in, " << be_nl
+      << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV"<< be_uidt << be_uidt_nl
+      << ")" << be_nl;
+
+  // Generate the actual code for the stub. However, if any of the argument
+  // types is "native", we flag a MARSHAL exception.
+  // last argument - is always CORBA::Environment
+  *os << "{\n" << be_idt;
+
+  // Deal with differences between IDL mapping for true C++ exceptions and
+  // alternate mapping. Since our code uses the ACE_TRY_ENV variable in a
+  // number of places, for the true exception case, we will have to explicitly
+  // declare the ACE_TRY_ENV variable.
+  *os << this->gen_environment_var () << be_nl;
+
+  // Generate any pre stub info if and only if none of our parameters is of the
+  // native type.
+  if (!node->has_native ())
+    {
+      // native type does not exist.
+
+      // Generate any "pre" stub information such as tables or declarations
+      // This is a template method and the actual work will be done by the
+      // derived class
+      if (this->gen_pre_stub_info (node, bt) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "gen_pre_stub_info failed\n"),
+                            -1);
+        }
+    }
+
+  os->indent();
+
+  *os << "// Retrieve Reply Handler object." << be_nl;
+  *os << parent->compute_name ("AMI_", "_Handler") << "_var "
+      << "_tao_reply_handler_object =" << be_idt_nl;
+
+  *os << parent->compute_name ("AMI_", "_Handler");
+  *os << "::_narrow(_tao_reply_handler, ACE_TRY_ENV);" << be_uidt_nl;
+
+  *os << "ACE_CHECK;" << be_nl << be_nl
+      << "// @@ Error handling " << be_nl << be_nl;
+
+  *os << "//Demarshall all the arguments.\n";
+
+  // declare a return type variable
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (bt->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "codegen for return var decl failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // declare variables for arguments
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "codegen for return var decl failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  // Demarshal parameters
+  if (this->gen_marshal_and_invoke (node, bt) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%1) ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "gen_demarshal_params failed\n"),
+                        -1);
+    }
+
+  *os << be_uidt_nl << "};" << be_nl << be_nl;
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_skeleton_cs::visit_argument (be_argument *node)
+{
+  // this method is used to generate the ParamData table entry
+
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt; // argument type
+
+  // retrieve the type for this argument
+  bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ami_handler_skeleton_cs::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  os->indent ();
+  *os << "{" << bt->tc_name () << ", ";
+  switch (node->direction ())
+    {
+    case AST_Argument::dir_IN:
+      *os << "PARAM_IN, ";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << "PARAM_INOUT, ";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << "PARAM_OUT, ";
+      break;
+    }
+  *os << "0}";
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_skeleton_cs::gen_raise_exception (be_type *bt,
+                                                                    const char *excep,
+                                                                    const char *completion_status)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  if (this->void_return_type (bt))
+    {
+      *os << "ACE_THROW ("
+          << excep << " (" << completion_status << "));\n";
+    }
+  else
+    {
+      *os << "ACE_THROW_RETURN ("
+          << excep << " (" << completion_status << "), ";
+
+      // return the appropriate return value
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (bt->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_skeleton_cs::"
+                             "gen_raise_exception - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << ");\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_operation_ami_handler_skeleton_cs::gen_check_exception (be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor;
+  be_visitor_context ctx;
+
+  os->indent ();
+  // check if there is an exception
+  if (this->void_return_type (bt))
+    {
+      *os << "ACE_CHECK;\n";
+      //<< "_tao_environment);\n";
+    }
+  else
+    {
+      *os << "ACE_CHECK_RETURN (";
+      // << "_tao_environment, ";
+
+      // return the appropriate return value
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (bt->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_handler_skeleton_cs::"
+                             "gen_check_exception - "
+                             "codegen failed\n"),
+                            -1);
+        }
+      *os << ");\n";
+    }
+
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for interpretive client skeletons of the AMI reply handler
+// ************************************************************
+
+be_interpretive_visitor_operation_ami_handler_skeleton_cs::
+be_interpretive_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_skeleton_cs (ctx)
+{
+}
+
+be_interpretive_visitor_operation_ami_handler_skeleton_cs::~be_interpretive_visitor_operation_ami_handler_skeleton_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_interpretive_visitor_operation_ami_handler_skeleton_cs::gen_pre_stub_info (be_operation *node,
+                                                                               be_type *bt)
+{
+  // @@ Michael: To be done.
+  return 0;
+}
+
+int
+be_interpretive_visitor_operation_ami_handler_skeleton_cs::
+gen_marshal_and_invoke (be_operation*node,
+                        be_type *bt)
+{
+  // @@ Michael: To be done.
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for compiled client skeletons of the AMI reply handler
+// ************************************************************
+
+be_compiled_visitor_operation_ami_handler_skeleton_cs::
+be_compiled_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_handler_skeleton_cs (ctx)
+{
+}
+
+be_compiled_visitor_operation_ami_handler_skeleton_cs::~be_compiled_visitor_operation_ami_handler_skeleton_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_compiled_visitor_operation_ami_handler_skeleton_cs::gen_pre_stub_info (be_operation *node,
+                                                                           be_type *)
+{
+
+  // Check if this operation raises any exceptions. In that case, we must
+  // generate a list of exception typecodes. This is not valid for
+  // attributes
+  if (!this->ctx_->attribute ())
+    {
+      be_visitor_context ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) "
+                             "be_compiled_visitor_operation_ami_handler_skeleton_cs::"
+                             "gen_pre_stub_info - "
+                             "Exceptionlist generation error\n"),
+                            -1);
+        }
+      delete visitor;
+    }
+
+  return 0;
+}
+
+int
+be_compiled_visitor_operation_ami_handler_skeleton_cs::
+gen_marshal_and_invoke (be_operation *node,
+                        be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_visitor *visitor = 0;
+  be_visitor_context ctx;
+
+  os->indent ();
+
+  *os << "if (!(\n" << be_idt << be_idt << be_idt;
+
+  if (!this->void_return_type (bt))
+    {
+      // demarshal the return val
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ami_handler_skeleton_cs::"
+                             "gen_demarshal_params - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      delete visitor;
+
+      // Print the && if there are OUT or INOUT arguements in the
+      // signature.
+      if (this->has_param_type (node, AST_Argument::dir_OUT) ||
+          this->has_param_type (node, AST_Argument::dir_INOUT))
+        *os << " &&\n";
+    }
+
+  if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
+    {
+      // demarshal each in and inout argument
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS);
+      ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l)  be_compiled_visitor_operation_ami_handler_skeleton_cs::"
+                             "gen_marshal_params - "
+                             "codegen for args failed\n"),
+                            -1);
+        }
+      delete visitor;
+    }
+
+  *os << be_uidt << be_uidt_nl
+      << " ))" << be_nl
+      << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
+
+  // Invoke the callback method
+  *os << "// Invoke the call back method." << be_nl
+      << "_tao_reply_handler_object->"
+      << node->local_name () << " (" << be_idt_nl;
+
+  // if we have a non-void return type then pass it as the first argument
+  if (!this->void_return_type (bt))
+    *os << "_tao_retval,\n";
+
+  // generate the argument list containing the inout and inout arguments
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) ami_handler_skeleton_cs::"
+                         "visit_operation - "
+                         "codegen for making upcall failed\n"),
+                        -1);
+    }
+  delete visitor;
+  visitor = 0;
+
+  *os << be_nl << ");" << be_uidt_nl;
+
+  *os << "ACE_CHECK;" << be_nl;
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index f7d36bd63df..a36fd00d9a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -61,6 +61,20 @@ be_visitor_operation_argument::post_process (be_decl *bd)
         case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
           *os << ",\n";
           break;
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:          
+          {
+            // @@ Michael
+            // In the case of of AMI, we do not want to 
+            // print a comma for in arguments.
+            // This is due to the concept of post processing,
+            // which I was not able to prevent to be executed
+            // in the case of in arguments.
+            be_argument *arg = this->ctx_->be_node_as_argument ();
+            ACE_ASSERT (arg != 0);
+            if (arg->direction () != AST_Argument::dir_IN)
+              *os << ",\n";
+          }
+          break;
         default:
           break;
         }
@@ -91,6 +105,7 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
         {
         case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
         case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
+        case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
           // applicable only to these cases where the actual upcall is made 
 
           // last argument is the environment
@@ -155,18 +170,33 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS);
       break;
+    case TAO_CodeGen::TAO_AMI_OPERATION_ARG_INVOKE_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_ARGUMENT_INVOKE_CS);
+      break;
+// @@ Michael    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS:
+//      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS);
+//      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS);
       break;
     case TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS);
       break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS);
+      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_DEMARSHAL_SS);
       break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_DEMARSHAL_CS);
+      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS);
       break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_MARSHAL_CS);
+      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS);
       break;
@@ -176,15 +206,18 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS);
       break;
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS:
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS);
+      break;
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_UPCALL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS);
       break;
     case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS);
       break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI);
-      break;
+    // case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+    //   ctx.state (TAO_CodeGen::TAO_ARGUMENT_AMI);
+    //   break;
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
index 1dc503c91e0..ab97bf649f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
@@ -62,6 +62,7 @@ be_compiled_visitor_operation_argument_invoke::pre_process (be_decl *bd)
                          "Bad argument node\n"),
                         -1);
     }
+  
   switch (arg->direction ())
     {
     case AST_Argument::dir_IN:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/collocated_sh.cpp
index 19c9b14417e..6e24c848923 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/collocated_sh.cpp
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    direct_collocated_sh.cpp
+//    collocated_sh.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for direct_collocated operation in the server header
+//    Visitor generating code for collocated operation in the server header
 //
 // = AUTHOR
 //    Aniruddha Gokhale
@@ -24,26 +24,26 @@
 
 #include "be_visitor_operation.h"
 
-ACE_RCSID(be_visitor_operation, direct_collocated_sh, "$Id$")
+ACE_RCSID(be_visitor_operation, collocated_sh, "$Id$")
 
 
 // *************************************************************************
-//  be_visitor_operation_direct_collocated_sh --
-//  This visitor generates code for the direct_collocated operation signature in a
+//  be_visitor_operation_collocated_sh --
+//  This visitor generates code for the collocated operation signature in a
 //  server header file
 // *************************************************************************
 
-be_visitor_operation_direct_collocated_sh::be_visitor_operation_direct_collocated_sh
+be_visitor_operation_collocated_sh::be_visitor_operation_collocated_sh
 (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
 }
 
-be_visitor_operation_direct_collocated_sh::~be_visitor_operation_direct_collocated_sh (void)
+be_visitor_operation_collocated_sh::~be_visitor_operation_collocated_sh (void)
 {
 }
 
-int be_visitor_operation_direct_collocated_sh::visit_operation (be_operation *node)
+int be_visitor_operation_collocated_sh::visit_operation (be_operation *node)
 {
   TAO_OutStream *os; // output stream
   be_type *bt;       // type node representing the return type
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
index 78c7b56db5f..b2ccf9ec21e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    thru_poa_collocated_ss.cpp
+//    collocated_ss.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for thru_poa_collocated Operation in the skeleton.
+//    Visitor generating code for collocated Operation in the skeleton.
 //
 // = AUTHOR
 //    Aniruddha Gokhale
@@ -24,26 +24,26 @@
 
 #include "be_visitor_operation.h"
 
-ACE_RCSID(be_visitor_operation, thru_poa_collocated_ss, "$Id$")
+ACE_RCSID(be_visitor_operation, collocated_ss, "$Id$")
 
 
 // *************************************************************************
-//  be_visitor_operation_thru_poa_collocated_ss --
-//  This visitor generates code for the thru_poa_collocated operation signature in a
+//  be_visitor_operation_collocated_ss --
+//  This visitor generates code for the collocated operation signature in a
 //  server skeletons file
 // *************************************************************************
 
-be_visitor_operation_thru_poa_collocated_ss::be_visitor_operation_thru_poa_collocated_ss
+be_visitor_operation_collocated_ss::be_visitor_operation_collocated_ss
 (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
 }
 
-be_visitor_operation_thru_poa_collocated_ss::~be_visitor_operation_thru_poa_collocated_ss (void)
+be_visitor_operation_collocated_ss::~be_visitor_operation_collocated_ss (void)
 {
 }
 
-int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *node)
+int be_visitor_operation_collocated_ss::visit_operation (be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -58,7 +58,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
   if (!intf)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                         "(%N:%l) be_visitor_operation_collocated_ss::"
                          "visit_operation - "
                          "bad interface scope\n"),
                         -1);
@@ -69,7 +69,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                         "(%N:%l) be_visitor_operation_collocated_ss::"
                          "visit_operation - "
                          "Bad return type\n"),
                         -1);
@@ -83,7 +83,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
   if (!visitor)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_thru_poa_collocated_ss::"
+                         "be_visitor_operation_collocated_ss::"
                          "visit_operation - "
                          "Bad visitor for return type\n"),
                         -1);
@@ -93,14 +93,14 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                         "(%N:%l) be_visitor_operation_collocated_ss::"
                          "visit_operation - "
                          "codegen for return type failed\n"),
                         -1);
     }
   delete visitor;
 
-  *os << " " << intf->full_coll_name (be_interface::THRU_POA) << "::"
+  *os << " " << intf->full_coll_name () << "::"
       << node->local_name () << " ";
 
   // STEP 4: generate the argument list with the appropriate mapping (same as
@@ -130,6 +130,12 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
 
   *os << "{" << be_idt << "\n";
 
+  os->indent ();
+
+  *os << "if (this->_stubobj ()->orb_core ()->get_collocation_strategy ()"
+         " == TAO_ORB_Core::THRU_POA)" << be_idt_nl
+      << "{\n" << be_idt;
+
   if (!idl_global->exception_support ())
     {
       // Declare a return type
@@ -140,7 +146,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
         {
           delete visitor;
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                             "(%N:%l) be_visitor_operation_collocated_ss::"
                              "visit_operation - "
                              "codegen for return var decl failed\n"),
                             -1);
@@ -157,7 +163,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
             {
               delete visitor;
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_operation_thru_poa_collocated_cs::"
+                                 "(%N:%l) be_visitor_operation_collocated_cs::"
                                  "gen_check_exception - "
                                  "codegen failed\n"),
                                 -1);
@@ -188,7 +194,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
     if (this->gen_check_exception (bt) == -1)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                           "(%N:%l) be_visitor_operation_collocated_ss::"
                            "visit_operation - "
                            "codegen for checking exception failed\n"),
                           -1);
@@ -218,12 +224,24 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
     }
 
   *os << be_uidt_nl
+      << "}" << be_uidt_nl;
+
+  if (!this->void_return_type (bt))
+    {
+      *os << "return ";
+    }
+
+  *os << "this->servant_";
+  if (this->gen_invoke (ctx, node) == -1)
+    return -1;
+
+  *os << be_uidt_nl
       << "}\n\n";
 
   return 0;
 }
 
-int be_visitor_operation_thru_poa_collocated_ss::gen_invoke (be_visitor_context &ctx,
+int be_visitor_operation_collocated_ss::gen_invoke (be_visitor_context &ctx,
                                                     be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -238,7 +256,7 @@ int be_visitor_operation_thru_poa_collocated_ss::gen_invoke (be_visitor_context
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_thru_poa_collocated_ss::"
+                         "(%N:%l) be_visitor_operation_collocated_ss::"
                          "gen_invoke - "
                          "codegen for making upcall failed\n"),
                         -1);
@@ -251,7 +269,7 @@ int be_visitor_operation_thru_poa_collocated_ss::gen_invoke (be_visitor_context
 }
 
 int
-be_visitor_operation_thru_poa_collocated_ss::gen_check_exception (be_type *bt)
+be_visitor_operation_collocated_ss::gen_check_exception (be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_visitor *visitor;
@@ -272,7 +290,7 @@ be_visitor_operation_thru_poa_collocated_ss::gen_check_exception (be_type *bt)
         {
           delete visitor;
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_thru_poa_collocated_cs::"
+                             "(%N:%l) be_visitor_operation_collocated_cs::"
                              "gen_check_exception - "
                              "codegen failed\n"),
                             -1);
@@ -289,7 +307,7 @@ be_visitor_operation_thru_poa_collocated_ss::gen_check_exception (be_type *bt)
 }
 
 int
-be_visitor_operation_thru_poa_collocated_ss::void_return_type (be_type *bt)
+be_visitor_operation_collocated_ss::void_return_type (be_type *bt)
 {
   // is the operation return type void?
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
index ed123807f65..675a5807d94 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
@@ -68,7 +68,7 @@ visit_operation (be_operation *node)
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
-      os->indent ();
+      os->indent ();      
       *os << "(_tao_out << ";
     }
   else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp
deleted file mode 100644
index 3d4a0bdcf15..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    direct_collocated_ss.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for direct_collocated Operation in the skeleton.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_operation.h"
-
-ACE_RCSID(be_visitor_operation, direct_collocated_ss, "$Id$")
-
-
-// *************************************************************************
-//  be_visitor_operation_direct_collocated_ss --
-//  This visitor generates code for the direct_collocated operation signature in a
-//  server skeletons file
-// *************************************************************************
-
-be_visitor_operation_direct_collocated_ss::be_visitor_operation_direct_collocated_ss
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_direct_collocated_ss::~be_visitor_operation_direct_collocated_ss (void)
-{
-}
-
-int be_visitor_operation_direct_collocated_ss::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // We need the interface node in which this operation was defined. However,
-  // if this operation node was an attribute node in disguise, we get this
-  // information from the context
-  be_interface *intf;
-  intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (node->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_direct_collocated_ss::"
-                         "visit_operation - "
-                         "bad interface scope\n"),
-                        -1);
-    }
-
-  // retrieve the operation return type
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_direct_collocated_ss::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // STEP 2: generate the return type mapping (same as in the header file)
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_direct_collocated_ss::"
-                         "visit_operation - "
-                         "Bad visitor for return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_direct_collocated_ss::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << " " << intf->full_coll_name (be_interface::DIRECT) << "::"
-      << node->local_name () << " ";
-
-  // STEP 4: generate the argument list with the appropriate mapping (same as
-  // in the header file)
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << "{" << be_idt << "\n";
-
-  os->indent ();
-
-  if (!this->void_return_type (bt))
-    {
-      *os << "return ";
-    }
-
-  *os << "this->servant_";
-  if (this->gen_invoke (ctx, node) == -1)
-    return -1;
-
-  *os << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-int be_visitor_operation_direct_collocated_ss::gen_invoke (be_visitor_context &ctx,
-                                                    be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << "->" << node->local_name () << " ("
-      << be_idt << be_idt << "\n";
-
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_direct_collocated_ss::"
-                         "gen_invoke - "
-                         "codegen for making upcall failed\n"),
-                        -1);
-    }
-
-  // end the upcall
-  *os << be_uidt_nl
-      << ");\n" << be_uidt;
-  return 0;
-}
-
-int
-be_visitor_operation_direct_collocated_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  os->indent ();
-  // check if there is an exception
-  if (!this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK_RETURN (";
-      // << "_tao_environment, ";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_direct_collocated_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK;\n";
-      //<< "_tao_environment);\n";
-    }
-
-  return 0;
-}
-
-int
-be_visitor_operation_direct_collocated_ss::void_return_type (be_type *bt)
-{
-  // is the operation return type void?
-
-  if (bt->node_type () == AST_Decl::NT_pre_defined
-      && (be_predefined_type::narrow_from_decl (bt)->pt ()
-          == AST_PredefinedType::PT_void))
-    return 1;
-  else
-    return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
index 9db88553f3d..b8f6978e4f3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
@@ -15,7 +15,7 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
@@ -42,7 +42,7 @@ be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
 }
 
 // Processing to be done after every element in the scope is
-// processed.
+// processed.  
 int
 be_visitor_operation_ami_cs::post_process (be_decl *bd)
 {
@@ -65,13 +65,13 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   os->indent (); // start with the current indentation level
 
-  // Generate the return type mapping. Return type is simply void.
+  // Generate the return type mapping. Return type is simply void. 
   *os << "void" << be_nl;
-
+  
   // Generate the operation name.
 
   // Grab the scope name.
-  be_decl *parent =
+  be_decl *parent = 
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
   if (parent == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                        "visit_operation - "
                        "scope name is nil\n"),
                       -1);
-
+  
   // Generate the scope::operation name.
   *os << parent->fullname ()
       << "::"
@@ -107,7 +107,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
-  // Create the return type node. Return type is void.
+  // Create the return type node. Return type is void. 
   be_predefined_type *bt = 0;
   ACE_NEW_RETURN (bt,
                   be_predefined_type (AST_PredefinedType::PT_void,
@@ -667,8 +667,8 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  // *os << "ACE_TRY_ENV.clear ();" << be_nl
-  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  *os << "ACE_TRY_ENV.clear ();" << be_nl
+      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
   // check if there is an exception
   if (this->gen_check_exception (bt) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 6581578631c..d1323a80af2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -115,14 +115,14 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
-  // deal with differences between IDL mapping for trus C++ exceptions and
+  // Deal with differences between IDL mapping for true C++ exceptions and
   // alternate mapping. Since our code uses the ACE_TRY_ENV variable in a
   // number of places, for the true exception case, we will have to explicitly
   // declare the ACE_TRY_ENV variable.
   *os << this->gen_environment_var () << "\n";
 
-  // generate any pre stub info if and only if none of our parameters is of the
-  // native type
+  // Generate any pre stub info if and only if none of our parameters is of the
+  // native type.
   if (!node->has_native ())
     {
       // native type does not exist.
@@ -140,7 +140,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
         }
     }
 
-  // Declare a return type
+  // Declare return type.
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS);
   visitor = tao_cg->make_visitor (&ctx);
@@ -703,7 +703,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  // *os << "ACE_TRY_ENV.clear ();" << be_nl;
+  *os << "ACE_TRY_ENV.clear ();" << be_nl;
   *os << "_tao_call.start (ACE_TRY_ENV);\n";
   // check if there is an exception
   if (this->gen_check_exception (bt) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index 277021a3a0f..860210a7aab 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -45,8 +45,6 @@ be_visitor_operation_rettype::~be_visitor_operation_rettype (void)
 int
 be_visitor_operation_rettype::visit_array (be_array *node)
 {
-
-
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index 2dc75fbe214..5873b0d412f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -56,7 +56,11 @@ be_visitor_operation_rettype_vardecl_cs::visit_array (be_array *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_slice *_tao_retval = 0;\n\n";
+
+  *os << bt->name () << "_slice *_tao_retval = 0;";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -72,7 +76,11 @@ be_visitor_operation_rettype_vardecl_cs::visit_enum (be_enum *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << " _tao_retval = (" << bt->name () << ")0;\n";
+
+  *os << bt->name () << " _tao_retval = (" << bt->name () << ")0;";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -88,7 +96,10 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface (be_interface *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();\n";
+  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -104,7 +115,10 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();\n";
+  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -122,7 +136,11 @@ be_visitor_operation_rettype_vardecl_cs::visit_valuetype (be_valuetype *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "* _tao_retval = 0;\n";
+
+  *os << bt->name () << "* _tao_retval = 0;";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -138,7 +156,10 @@ be_visitor_operation_rettype_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "* _tao_retval = 0;\n";
+  *os << bt->name () << "* _tao_retval = 0;";
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -159,19 +180,22 @@ be_visitor_operation_rettype_vardecl_cs::visit_predefined_type (be_predefined_ty
     {
     case AST_PredefinedType::PT_pseudo:
       os->indent ();
-      *os << bt->name () << "_ptr _tao_retval = 0;\n";
+      *os << bt->name () << "_ptr _tao_retval = 0;";
       break;
     case AST_PredefinedType::PT_any:
       os->indent ();
-      *os << bt->name () << " *_tao_retval = 0;\n";
+      *os << bt->name () << "* _tao_retval = 0;";
       break;
     case AST_PredefinedType::PT_void:
       break;
     default:
       os->indent ();
-      *os << bt->name () << " _tao_retval = 0;\n";
+      *os << bt->name () << " _tao_retval = 0;";
       break;
     }
+
+  *os << be_nl << be_nl;
+
   return 0;
 }
 
@@ -189,7 +213,9 @@ be_visitor_operation_rettype_vardecl_cs::visit_sequence (be_sequence *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << " *_tao_retval = 0;\n";
+  *os << bt->name () << "* _tao_retval = 0;";
+
+  *os << be_nl << be_nl;
   return 0;
 }
 
@@ -199,7 +225,9 @@ be_visitor_operation_rettype_vardecl_cs::visit_string (be_string * /* node*/)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   os->indent ();
-  *os << "char *_tao_retval = 0;\n";
+  *os << "char* _tao_retval = 0;";
+
+  *os << be_nl << be_nl;
   return 0;
 }
 
@@ -215,15 +243,20 @@ be_visitor_operation_rettype_vardecl_cs::visit_structure (be_structure *node)
     bt = node;
 
   os->indent ();
+
   // based on whether we are variable or not, we return a pointer or the
   // aggregate type
   if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
+	  {
+	    *os << bt->name () << "* _tao_retval = 0;" << be_nl;
+	  }
   else
-    {
-      *os << bt->name () << " _tao_retval;" << be_nl;
-      *os << "ACE_OS::memset (&_tao_retval, 0, sizeof (" << bt->name () << "));\n";
-    }
+	  {
+	    *os << bt->name () << " _tao_retval;" << be_nl;
+	    *os << "ACE_OS::memset (&_tao_retval, 0, sizeof (" << bt->name () << "));"
+	        << be_nl;
+	  }
+
   return 0;
 }
 
@@ -255,13 +288,18 @@ be_visitor_operation_rettype_vardecl_cs::visit_union (be_union *node)
     bt = node;
 
   os->indent ();
+
   // based on whether we are variable or not, we return a pointer or the
   // aggregate type
   if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
+    {
+      *os << bt->name () << "* _tao_retval = 0;";
+    }
   else
     {
-      *os << bt->name () << " _tao_retval;\n";
+      *os << bt->name () << " _tao_retval;";
     }
+
+  *os << be_nl;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
index b368ff8fc43..88901556894 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
@@ -89,7 +89,7 @@ be_visitor_operation_rettype_vardecl_ss::visit_interface (be_interface *)
   // return type may be some derived class
   *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();\n";
 #if 0 /* ASG */
-  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();" << be_nl;
+  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();\n";
   *os << "CORBA::Object_ptr &_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
   return 0;
@@ -107,10 +107,10 @@ visit_interface_fwd (be_interface_fwd *)
   // CORBA::Object_ptr as the type for the return value even though the actual
   // return type may be some derived class
 #if 0 /* ASG */
-  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();" << be_nl;
+  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();\n";
   *os << "CORBA::Object_ptr &_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
-  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();" << be_nl;
+  *os << "CORBA::Object_var _tao_retval = CORBA::Object::_nil ();\n";
   return 0;
 }
 
@@ -156,7 +156,7 @@ visit_predefined_type (be_predefined_type *node)
     case AST_PredefinedType::PT_pseudo:
       os->indent ();
 #if 0 /* ASG */
-      *os << bt->name () << "_var _tao_retval;" << be_nl;
+      *os << bt->name () << "_var _tao_retval;\n";
       *os << bt->name () << "_ptr &_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
       *os << bt->name () << "_var _tao_retval;\n";
@@ -164,7 +164,7 @@ visit_predefined_type (be_predefined_type *node)
     case AST_PredefinedType::PT_any:
       os->indent ();
 #if 0 /* ASG */
-      *os << bt->name () << "_var _tao_retval;" << be_nl;
+      *os << bt->name () << "_var _tao_retval;\n";
       *os << bt->name () << "_ptr &_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
       *os << bt->name () << "_var _tao_retval;\n";
@@ -194,7 +194,7 @@ be_visitor_operation_rettype_vardecl_ss::visit_sequence (be_sequence *node)
 
   os->indent ();
 #if 0 /* ASg */
-  *os << bt->name () << "_var _tao_retval;" << be_nl;
+  *os << bt->name () << "_var _tao_retval;\n";
   *os << bt->name () << " *&_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
   *os << bt->name () << "_var _tao_retval;\n";
@@ -208,7 +208,7 @@ be_visitor_operation_rettype_vardecl_ss::visit_string (be_string * /* node*/)
 
   os->indent ();
 #if 0 /* ASG */
-  *os << "CORBA::String_var _tao_retval;" << be_nl;
+  *os << "CORBA::String_var _tao_retval;\n";
   *os << "char *&_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
   *os << "CORBA::String_var _tao_retval;\n";
@@ -232,7 +232,7 @@ be_visitor_operation_rettype_vardecl_ss::visit_structure (be_structure *node)
   if (node->size_type () == be_decl::VARIABLE)
     {
 #if 0 /* ASG */
-      *os << bt->name () << "_var _tao_retval;" << be_nl;
+      *os << bt->name () << "_var _tao_retval;\n";
       *os << bt->name () << " *&_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
       *os << bt->name () << "_var _tao_retval;\n";
@@ -275,10 +275,10 @@ be_visitor_operation_rettype_vardecl_ss::visit_union (be_union *node)
   if (node->size_type () == be_decl::VARIABLE)
     {
 #if 0 /* ASG */
-      *os << bt->name () << "_var _tao_retval;" << be_nl;
+      *os << bt->name () << "_var _tao_retval;\n";
       *os << bt->name () << " *&_tao_ptr_retval = _tao_retval.out ();\n";
 #endif
-      *os << bt->name () << "_var _tao_retval;" << be_nl;
+      *os << bt->name () << "_var _tao_retval;\n";
     }
   else
     *os << bt->name () << " _tao_retval;\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_sh.cpp
deleted file mode 100644
index c098696d347..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_sh.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    thru_poa_collocated_sh.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for thru_poa_collocated operation in the server header
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_operation.h"
-
-ACE_RCSID(be_visitor_operation, thru_poa_collocated_sh, "$Id$")
-
-
-// *************************************************************************
-//  be_visitor_operation_thru_poa_collocated_sh --
-//  This visitor generates code for the thru_poa_collocated operation signature in a
-//  server header file
-// *************************************************************************
-
-be_visitor_operation_thru_poa_collocated_sh::be_visitor_operation_thru_poa_collocated_sh
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_thru_poa_collocated_sh::~be_visitor_operation_thru_poa_collocated_sh (void)
-{
-}
-
-int be_visitor_operation_thru_poa_collocated_sh::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node representing the return type
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node
-
-  os->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *os << "virtual ";
-
-  // STEP I: generate the return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // grab the right visitor to generate the return type
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 2: generate the operation name
-  *os << " " << node->local_name ();
-
-  // STEP 3: generate the argument list with the appropriate mapping. For these
-  // we grab a visitor that generates the parameter listing
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_rettype.cpp b/TAO/TAO_IDL/be/be_visitor_rettype.cpp
new file mode 100644
index 00000000000..eb1cf5095d9
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_rettype.cpp
@@ -0,0 +1,3032 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_rettype.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the first argument of an ami handler's call
+//    back hook method.  
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_rettype.h"
+
+ACE_RCSID(be, be_visitor_rettype, "$Id$")
+
+
+// ******************************************************
+// TypeCode Definitions
+// ******************************************************
+
+be_visitor_rettype_ami_handler_result_arg::be_visitor_rettype_ami_handler_result_arg (be_visitor_context *ctx)
+  : be_visitor_scope (ctx),
+    computed_tc_size_ (0),
+    computed_encap_len_ (0),
+    computed_scope_encap_len_ (0),
+    tc_offset_ (0),
+    index_ (-1)
+
+{
+}
+
+be_visitor_rettype_ami_handler_result_arg::~be_visitor_rettype_ami_handler_result_arg (void)
+{
+  this->queue_reset (this->tc_queue_);
+  this->queue_reset (this->compute_queue_);
+}
+
+// the visit methods will be called for the top-level node whose typecode is
+// being generated
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_type (be_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // reset the queue
+  this->queue_reset (this->tc_queue_);
+  this->tc_offset_ = 0;
+
+  // check if optimized typecodes are desired OR if the node is involved in
+  // some form of recursion
+  if (idl_global->opt_tc () ||
+      node->in_recursion ())
+    {
+      if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_rettype_ami_handler_result_arg::"
+                             "visit_type - "
+                             "queue insert failed\n"), 
+                            -1);
+        }
+    }
+
+  os->indent (); // start from current indentation level
+
+  // generate the typecode information here
+  *os << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
+      << be_nl;
+  *os << "{" << be_idt << "\n";
+
+  // add the sizeof the enum tk_* and the encap length that we do not put into
+  // this array but which will exist in the CDR buffer
+
+  this->tc_offset_ = 4 + 4; 
+
+
+  // note that we just need the parameters here and hence we generate the
+  // encapsulation for the parameters
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_rettype_ami_handler_result_arg::"
+                         "visit_type - "
+                         "codegen for typecode encapsulation failed\n"), 
+                        -1);
+    }
+  *os << be_uidt << "};" << be_nl;
+
+  *os << "static CORBA::TypeCode _tc_TAO_tc_" << node->flatname ()
+      << " (";
+  switch (node->node_type ())
+    {
+    case AST_Decl::NT_array:
+      *os << "CORBA::tk_array";
+      break;
+    case AST_Decl::NT_enum:
+      *os << "CORBA::tk_enum";
+      break;
+    case AST_Decl::NT_except:
+      *os << "CORBA::tk_except";
+      break;
+    case AST_Decl::NT_interface:
+      *os << "CORBA::tk_objref";
+      break;
+    case AST_Decl::NT_sequence:
+      *os << "CORBA::tk_sequence";
+      break;
+    case AST_Decl::NT_struct:
+      *os << "CORBA::tk_struct";
+      break;
+    case AST_Decl::NT_typedef:
+      *os << "CORBA::tk_alias";
+      break;
+    case AST_Decl::NT_union:
+      *os << "CORBA::tk_union";
+      break;
+    default:
+      return -1; // error
+    }
+
+  *os << ", sizeof (_oc_" <<  node->flatname ()
+      << "), (char *) &_oc_" << node->flatname ()
+      << ", 0, sizeof (" << node->name () << "));" << be_nl;
+
+  // is our enclosing scope a module? We need this check because for
+  // platforms that support namespaces, the typecode must be declared
+  // extern
+  if (node->is_nested () &&
+      node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
+    {
+      *os << "TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)" << be_nl;
+      be_module *module = be_module::narrow_from_scope (node->defined_in ());
+      if (!module || (this->gen_nested_namespace_begin (module) == -1))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_rettype_ami_handler_result_arg::visit_type - "
+                             "Error parsing nested name\n"),
+                            -1);
+        }
+      *os << "TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_"
+          << node->local_name () << ", &_tc_TAO_tc_"
+          << node->flatname () << ")" << be_nl;
+      if (this->gen_nested_namespace_end (module) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_rettype_ami_handler_result_arg::visit_type - "
+                             "Error parsing nested name\n"),
+                            -1);
+        }
+    }
+  else
+    {
+      // outermost scope.
+      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc_TAO_tc_"
+          <<  node->flatname () << ";\n\n";
+    }
+  return 0;
+}
+
+// the following needs to be done to deal with the most bizarre behavior of
+// MSVC++ compiler
+int
+be_visitor_rettype_ami_handler_result_arg::gen_nested_namespace_begin (be_module *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  UTL_IdListActiveIterator *i;
+
+  i = new UTL_IdListActiveIterator (node->name ());
+  while (!(i->is_done ()))
+    {
+      if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
+        {
+          // leave the outermost root scope
+          *os << "TAO_NAMESPACE_BEGIN (" << i->item ()->get_string ()
+              << ")" << be_nl;
+        }
+      i->next ();
+    }
+  delete i;
+  return 0;
+}
+
+// the following needs to be done to deal with the most bizarre behavior of
+// MSVC++ compiler
+int
+be_visitor_rettype_ami_handler_result_arg::gen_nested_namespace_end (be_module *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  UTL_IdListActiveIterator *i;
+
+  i = new UTL_IdListActiveIterator (node->name ());
+  while (!(i->is_done ()))
+    {
+      if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
+        {
+          // leave the outermost root scope
+          *os << "TAO_NAMESPACE_END" << be_nl;
+        }
+      i->next ();
+    }
+  delete i;
+  return 0;
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_array (be_array *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_enum (be_enum *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      return this->visit_scope (node);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_enum_val (be_enum_val *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_exception (be_exception *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      return this->visit_scope (node);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_field (be_field *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_interface (be_interface *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_interface_fwd (be_interface_fwd *)
+{
+  // nothing to do
+  return 0;
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_predefined_type (be_predefined_type *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      // top level typecodes are defined in the CORBA library. If we show up
+      // here, then it is an error
+      break;
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_rettype_ami_handler_result_arg::visit_sequence (be_sequence *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_rettype_ami_handler_result_arg::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_typecode_defn::visit_string (be_string *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      // top level typecode for string is not permitted. It has to be a
+      // typedefed string 
+      break;
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_typecode_defn::visit_structure (be_structure *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      return this->visit_scope (node);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_typecode_defn::visit_typedef (be_typedef *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_typecode_defn::visit_union (be_union *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
+      return this->visit_type (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
+      return this->gen_typecode (node);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
+      this->computed_tc_size_ = this->compute_tc_size (node);
+      return ((this->computed_tc_size_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      return this->visit_scope (node);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+int
+be_visitor_typecode_defn::visit_union_branch (be_union_branch *node)
+{
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
+      return this->gen_encapsulation (node);
+    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
+      this->computed_encap_len_ = this->compute_encap_length (node);
+      return ((this->computed_encap_len_ > 0) ? 0 : -1);
+    default:
+      // error
+      break;
+    }
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                     ASYS_TEXT ("visit - bad sub state ")
+                     ASYS_TEXT ("in visitor context\n")),
+                    -1);
+}
+
+//  methods that actually produce the typecode and the encapsulations
+
+
+int
+be_visitor_typecode_defn::gen_typecode (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // we do not do typecode optimization for anonymous arrays
+
+  *os << "CORBA::tk_array, // typecode kind" << be_nl;
+  // size of the enum
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // emit the encapsulation length
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                         ASYS_TEXT ("gen_typecode (array) - ")
+                         ASYS_TEXT ("Failed to get encap length\n")),
+                        -1);
+    }
+  *os << this->computed_encap_len_ << ", // encapsulation length" 
+      << be_idt << "\n";
+  // size of the encap length
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // now emit the encapsulation
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
+                         ASYS_TEXT ("gen_typecode - ")
+                         ASYS_TEXT ("gen_encapsulation failed for array\n")),
+                        -1);
+    }
+
+  *os << be_uidt << "\n";
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *bt; // base type
+  unsigned long i;
+
+  os->indent (); // start from the current indentation level
+
+  // retrieve the base type
+  bt = be_type::narrow_from_decl (node->base_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_array::gen_encapsulation - "
+                         "bad base type\n"),
+                        -1);
+    }
+
+  // compute the typecode size
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                         ASYS_TEXT ("gen_encapsulation (array) - ")
+                         ASYS_TEXT ("Failed to get typecode size\n")),
+                        -1);
+    }
+
+  for (i = 0; i < (node->n_dims () - 1); i++)
+    {
+      unsigned long rem_encap_len;
+
+      *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+      // size of the encapsulation byte order flag. Although it is 1 byte, the
+      // aligned size is 4 bytes
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+      *os << "CORBA::tk_array, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+      rem_encap_len
+        = (node->n_dims () - (i + 1)) * (4 + 4)
+        + (node->n_dims () - (i + 2)) * (4 + 4)
+        + this->computed_tc_size_;
+      *os << rem_encap_len << ", // encapsulation length" << be_idt_nl;
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  
+  // now generate the typecode of the base type
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_array::gen_encapsulation - "
+                         "base type typecode gen failed\n"),
+                        -1);
+    }
+
+  os->indent ();
+  // now reduce the indentation appropriately
+  for (i = (node->n_dims () - 1); i > 0; i--)
+    {
+      *os << node->dims ()[i] << "," << be_uidt_nl;
+      // size of the dimension which is a 4 byte quantity
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  *os << node->dims ()[0] << ",\n";
+  // size of the dimension which is a 4 byte quantity
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                            -1);
+            }
+        }
+
+      *os << "CORBA::tk_enum, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (enum) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (enum) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+
+      *os << be_uidt << "\n";
+
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  // generate the member count
+  os->indent ();
+  *os << node->member_count () << ", // member count\n";
+  // size of the member length
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // hand over to the scope to generate the typecode for elements
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_encapsulation (enum) - ")
+                         ASYS_TEXT ("cannot generate typecode for members\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_enum_val *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // generate name
+  this->gen_name (node);
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_exception *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      *os << "CORBA::tk_except, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (exception) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (exception) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+
+      *os << be_uidt << "\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_exception *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  // generate the member count
+  os->indent ();
+  *os << node->member_count () << ", // member count\n"; 
+  // size of the member count
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // hand over to the scope to generate the typecode for elements
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_encapsulation (exception) - ")
+                         ASYS_TEXT ("cannot generate typecode for members\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_field *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *bt;  // our type node
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // generate name
+  this->gen_name (node);
+
+  // hand over code generation to our type node
+  bt = be_type::narrow_from_decl (node->field_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_encapsulation (field) - ")
+                         ASYS_TEXT ("failed to generate typecode\n")),
+                        -1);
+    }
+  // revert the state to what it was before because we may be dealing with
+  // subsequent fields for which we have to be in the "gen scope"
+  // substate 
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      *os << "CORBA::tk_objref, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (interface) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (interface) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+      *os << be_uidt << "\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_interface_fwd *)
+{
+  // nothing to do here
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_interface_fwd *)
+{
+  // nothing to be done
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from the current indentation level
+
+  // size of the enum
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_void:
+      *os << "CORBA::tk_void,\n\n";
+      break;
+    case AST_PredefinedType::PT_short:
+      *os << "CORBA::tk_short,\n\n";
+      break;
+    case AST_PredefinedType::PT_ushort:
+      *os << "CORBA::tk_ushort,\n\n";
+      break;
+    case AST_PredefinedType::PT_long:
+      *os << "CORBA::tk_long,\n\n";
+      break;
+    case AST_PredefinedType::PT_ulong:
+      *os << "CORBA::tk_ulong,\n\n";
+      break;
+    case AST_PredefinedType::PT_longlong:
+      *os << "CORBA::tk_longlong,\n\n";
+      break;
+    case AST_PredefinedType::PT_ulonglong:
+      *os << "CORBA::tk_ulonglong,\n\n";
+      break;
+    case AST_PredefinedType::PT_float:
+      *os << "CORBA::tk_float,\n\n";
+      break;
+    case AST_PredefinedType::PT_double:
+      *os << "CORBA::tk_double,\n\n";
+      break;
+    case AST_PredefinedType::PT_longdouble:
+      *os << "CORBA::tk_longdouble,\n\n";
+      break;
+    case AST_PredefinedType::PT_boolean:
+      *os << "CORBA::tk_boolean,\n\n";
+      break;
+    case AST_PredefinedType::PT_char:
+      *os << "CORBA::tk_char,\n\n";
+      break;
+    case AST_PredefinedType::PT_octet:
+      *os << "CORBA::tk_octet,\n\n";
+      break;
+    case AST_PredefinedType::PT_any:
+      *os << "CORBA::tk_any,\n\n";
+      break;
+    case AST_PredefinedType::PT_wchar:
+      *os << "CORBA::tk_wchar,\n\n";
+      break;
+    case AST_PredefinedType::PT_pseudo:
+      {
+        if (!ACE_OS::strcmp (node->local_name ()->get_string (), "TypeCode"))
+          *os << "CORBA::tk_TypeCode,\n\n";
+        else
+          if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
+            {
+              // check if we are repeated
+              const be_visitor_typecode_defn::QNode *qnode = 
+                this->queue_lookup (this->tc_queue_, node);
+              if (qnode)
+                {
+                  // we are repeated, so we must generate an indirection here
+                  *os << "0xffffffff, // indirection" << be_nl;
+                  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", 
+                             (qnode->offset - this->tc_offset_), 
+                             (qnode->offset - this->tc_offset_));
+                  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+                }
+              else
+                {
+                  if (idl_global->opt_tc () ||
+                      node->in_recursion ())
+                    {
+                      if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+                        {
+                          ACE_ERROR_RETURN ((LM_ERROR,
+                                             "(%N:%l) be_visitor_typecode_defn::"
+                                             "visit_type - "
+                                             "queue insert failed\n"), 
+                                            -1);
+                        }
+                    }
+                  
+                  *os << "CORBA::tk_objref," << be_nl;
+                  
+                  // reset the compute queue to set the stage for computing our
+                  // encapsulation length
+                  this->queue_reset (this->compute_queue_);
+
+                  // emit the encapsulation length
+                  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+                  if (node->accept (this) == -1)
+                    {
+                      ACE_ERROR_RETURN ((LM_ERROR,
+                                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                                         ASYS_TEXT ("gen_typecode (predefined) - ")
+                                         ASYS_TEXT ("Failed to get encap length\n")),
+                                        -1);
+                    }
+                  // reset the compute queue since we must not affect
+                  // computation of other nodes 
+                  this->queue_reset (this->compute_queue_);
+
+                  *os << this->computed_encap_len_ 
+                      << ", // encapsulation length" << be_idt << "\n";
+                  // size of the encap length
+                  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+                  
+                  // now emit the encapsulation
+                  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+                  if (node->accept (this) == -1)
+                    {
+                      ACE_ERROR_RETURN ((LM_ERROR,
+                                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                                         ASYS_TEXT ("::gen_typecode (predefined objref) - ")
+                                         ASYS_TEXT ("failed to generate encapsulation\n")),
+                                        -1);
+                    }
+                  *os << be_uidt << "\n";
+                }
+            }
+      }
+      break;
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_predefined_type *node)
+{
+  // this one is valid only for "Object"
+  if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
+    {
+      TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+      os->indent (); // start from whatever indentation level we were at
+
+      *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+      // size of the encapsulation byte order flag. Although it is 1 byte, the
+      // aligned size is 4 bytes
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // generate repoID
+      this->gen_repoID (node);
+
+      // generate name
+      os->indent ();
+      this->gen_name (node);
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // no typecode optimization for anonymous sequences
+
+  *os << "CORBA::tk_sequence, // typecode kind" << be_nl;
+  // size of the enum
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // reset the compute queue to set the stage for computing our
+  // encapsulation length
+  this->queue_reset (this->compute_queue_);
+
+  // emit the encapsulation length
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                         ASYS_TEXT ("gen_typecode (sequence) - ")
+                         ASYS_TEXT ("Failed to get encap length\n")),
+                        -1);
+    }
+  // reset the compute queue since we must not affect computation of other
+  // nodes 
+  this->queue_reset (this->compute_queue_);
+
+  *os << this->computed_encap_len_ << ", // encapsulation length" 
+      << be_idt << "\n";
+  // size of the encap length
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_typecode (sequence) - ")
+                         ASYS_TEXT ("failed to generate encapsulation\n")),
+                        -1);
+    }
+  *os << be_uidt << "\n";
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *bt; // base type
+
+  os->indent ();
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // emit typecode of element type
+  bt = be_type::narrow_from_decl (node->base_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_encapsulation (sequence) - ")
+                         ASYS_TEXT ("failed to generate typecode\n")),
+                        -1);
+    }
+
+  //  emit the sequence bounds (0 if unbounded)
+  os->indent ();
+  *os << node->max_size () << ",\n";
+  // size of the bound length
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_string *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  // no typecode optimizations for anonymous strings
+
+  os->indent (); // start from the current indentation level
+  // emit the enumeration
+  *os << "CORBA::tk_string, " << be_nl;
+  // size of the enum
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // emit the string bounds (0 if unbounded)
+  *os << node->max_size () << ", // string length\n";
+  // size of the bounds
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_string *)
+{
+  // nothing to be done here
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+  
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      *os << "CORBA::tk_struct, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (struct) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (structure) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+      *os << be_uidt << "\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  // generate the member count
+  os->indent ();
+  *os << node->member_count () << ", // member count\n";
+  // size of the member count
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // hand over to the scope to generate the typecode for elements
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n"));
+      return -1;
+    }
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_typedef *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      *os << "CORBA::tk_alias, // typecode kind for typedefs" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (typedef) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (typedef) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+
+      *os << be_uidt << "\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_typedef *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *bt; // base type
+
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  // generate typecode for the base type
+  bt = be_type::narrow_from_decl (node->base_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::gen_encapsulation (typedef) - ")
+                         ASYS_TEXT ("failed to generate typecode\n")),
+                        -1);
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_typecode (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+
+  os->indent (); // start from whatever indentation level we were at
+
+  // check if we are repeated
+  const be_visitor_typecode_defn::QNode *qnode = 
+    this->queue_lookup (this->tc_queue_, node);
+  if (qnode)
+    {
+      // we are repeated, so we must generate an indirection here
+      *os << "0xffffffff, // indirection" << be_nl;
+      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", 
+                 (qnode->offset - this->tc_offset_), 
+                 (qnode->offset - this->tc_offset_));
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "visit_type - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      *os << "CORBA::tk_union, // typecode kind" << be_nl;
+      // size of the enum
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // reset the compute queue to set the stage for computing our
+      // encapsulation length
+      this->queue_reset (this->compute_queue_);
+
+      // emit the encapsulation length
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
+                             ASYS_TEXT ("gen_typecode (union) - ")
+                             ASYS_TEXT ("Failed to get encap length\n")),
+                            -1);
+        }
+      // reset the compute queue since we must not affect computation of other
+      // nodes 
+      this->queue_reset (this->compute_queue_);
+
+      *os << this->computed_encap_len_ << ", // encapsulation length" 
+          << be_idt << "\n";
+      // size of the encap length
+      this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+      // now emit the encapsulation
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_typecode (union) - ")
+                             ASYS_TEXT ("failed to generate encapsulation\n")),
+                            -1);
+        }
+      *os << be_uidt << "\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *discrim;
+
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+  // size of the encapsulation byte order flag. Although it is 1 byte, the
+  // aligned size is 4 bytes
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate repoID
+  this->gen_repoID (node);
+
+  // generate name
+  os->indent ();
+  this->gen_name (node);
+
+  // generate typecode for discriminant
+  discrim = be_type::narrow_from_decl (node->disc_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+  if (discrim->accept (this) == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_union: cannot generate typecode for discriminant\n"));
+      return -1;
+    }
+
+  // generate the default used flag
+  os->indent ();
+  *os << node->default_index () << ", // default used index" << be_nl;
+  // size of the default index used
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // generate the member count
+  *os << node->member_count () << ", // member count\n";
+  // size of the member count
+  this->tc_offset_ += sizeof (ACE_CDR::ULong);
+
+  // hand over to the scope to generate the typecode for elements
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n"));
+      return -1;
+    }
+
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::gen_encapsulation (be_union_branch *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // output stream
+  be_type *bt;  // our type node
+
+  be_union *ub = this->ctx_->be_scope_as_union ();
+
+  ACE_UINT32 buf[1];
+  ACE_OS::memset (buf, 0, sizeof (buf));
+
+  for (unsigned long i = 0;
+       i < node->label_list_length ();
+       ++i)
+    {
+      os->indent ();
+  
+      // emit the case label value
+      if (node->label (i)->label_kind () == AST_UnionLabel::UL_label)
+        {
+          AST_Expression *expression = node->label (i)->label_val ();
+          AST_Expression::AST_ExprValue *ev = expression->ev ();
+          switch (ub->udisc_type ()) 
+            {
+            case AST_Expression::EV_char:
+              os->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)ev->u.cval);
+              // size of bool/char aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+            case AST_Expression::EV_bool:
+              os->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)ev->u.bval);
+              // size of bool/char aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+            case AST_Expression::EV_wchar:
+            case AST_Expression::EV_short:
+              os->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)ev->u.sval);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ushort:
+              os->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)ev->u.usval);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_long:
+              os->print ("0x%08.8x", (unsigned long)ev->u.lval);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ulong:
+              os->print ("0x%08.8x", ev->u.ulval);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_any:
+              // enum
+              os->print ("0x%08.8x", (unsigned long)ev->u.eval);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ulonglong:
+            case AST_Expression::EV_longlong:
+              // unimplemented yet
+
+            default:
+              ACE_ERROR_RETURN ((LM_DEBUG,
+                                 "be_union_branch: (%N:%l) Label value "
+                                 "type (%d) is invalid\n", ev->et), -1);
+              ACE_NOTREACHED (break;)
+            }
+
+          *os << ", // union case label (evaluated value)" << be_nl;
+        }
+      else
+        {
+          // default case
+          be_union::DefaultValue dv;
+          if (ub->default_value (dv) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode::"
+                                 "gen_encapsulation (union_branch) - "
+                                 "computing default value failed\n"),
+                                -1);
+            }
+
+          switch (ub->udisc_type ())
+            {
+            case AST_Expression::EV_char:
+              os->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)dv.u.char_val);
+              // size of bool/char aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+            case AST_Expression::EV_bool:
+              os->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)dv.u.bool_val);
+              // size of bool/char aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+            case AST_Expression::EV_wchar:
+            case AST_Expression::EV_short:
+              os->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)dv.u.short_val);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ushort:
+              os->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)dv.u.ushort_val);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_long:
+              os->print ("0x%08.8x", (unsigned long)dv.u.long_val);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ulong:
+              os->print ("0x%08.8x", (unsigned long)dv.u.ulong_val);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_any:
+              // enum
+              os->print ("0x%08.8x", (unsigned long)dv.u.enum_val);
+              // size of short/wchar aligned to 4 bytes
+              this->tc_offset_ += sizeof (ACE_CDR::ULong);
+              break;
+
+            case AST_Expression::EV_ulonglong:
+            case AST_Expression::EV_longlong:
+              // unimplemented yet
+
+            default:
+              ACE_ERROR_RETURN ((LM_DEBUG,
+                                 "be_union_branch: (%N:%l) Label value "
+                                 "type (%d) is invalid\n", ub->udisc_type ()), 
+                                -1);
+              ACE_NOTREACHED (break;)
+            }
+
+          *os << ", // union default label (evaluated value)" << be_nl;        
+        }
+
+      // emit name
+      this->gen_name (node);
+
+      // hand over code generation to our type node
+      bt = be_type::narrow_from_decl (node->field_type ());
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
+      if (!bt || bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::gen_encapsulation (union_branch) - ")
+                             ASYS_TEXT ("failed to generate typecode\n")),
+                            -1);
+        }
+    } // end of for loop
+
+  // revert the state
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
+  return 0;
+}
+
+
+// = methods for computing typecode and encapsulation sizes
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_array *node)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation
+
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_tc_size (array) - ")
+                         ASYS_TEXT ("cannot compute encap len\n")),
+                        -1);
+    }
+      
+  this->computed_tc_size_ =  4 + 4 + this->computed_encap_len_;
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_array *node)
+{
+  // Suppose "N" is the number of dimensions, then for a N dimensional array,
+  // we will have N encapsulations. The innermost encapsulation will hold the
+  // typecode of the real base type.
+  // Thus, we will have N byte order flags and dimensions, and N-1 tk_array
+  // enumerations, encapsulation lengths, and dimensions.
+
+  be_type *bt; // base type
+
+  bt = be_type::narrow_from_decl (node->base_type ());
+
+  ACE_CDR::Long encap_len =
+    // N byte order flags and dimensions
+    node->n_dims () * (4 + 4) 
+    +
+    // N-1 of tk_array and that many encapsulation lengths
+    (node->n_dims () - 1) * (4 + 4); 
+  
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (array) - ")
+                         ASYS_TEXT ("cannot compute tc size for base\n")),
+                        -1);
+    }
+      
+  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
+  return this->computed_encap_len_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_enum *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else 
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (enum) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+      // actual encapsulation
+
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (enum) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_enum *node)
+{
+  ACE_CDR::Long encap_len;
+  encap_len = 4;  // holds the byte order flag
+
+  encap_len +=
+    this->repoID_encap_len (node); // repoID storage
+
+  // do the same thing for the local name
+  encap_len += this->name_encap_len (node);
+
+  encap_len += 4; // to hold the member count
+
+  // save the current value of scope len and start with a fresh one for our
+  // scope length computation
+  if (this->push (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (enum) - ")
+                         ASYS_TEXT ("push failed\n")),
+                        -1);
+    }
+  this->computed_scope_encap_len_ = 0;
+
+  // compute encap length for members
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (enum) - ")
+                         ASYS_TEXT ("cannot compute scope tc size\n")),
+                        -1);
+    }
+      
+  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
+
+  // pop off the previous value of computed_scope_len_
+  if (this->pop (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (enum) - ")
+                         ASYS_TEXT ("pop failed\n")),
+                        -1);
+    }
+
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_enum_val *node)
+{
+  this->computed_encap_len_ = this->name_encap_len (node);
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_exception *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (exception) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (array) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_exception *node)
+{
+  ACE_CDR::Long encap_len;
+  encap_len = 4;  // holds the byte order flag
+
+  encap_len += this->repoID_encap_len (node); // repoID
+
+  // do the same thing for the local name
+  encap_len += this->name_encap_len (node);
+
+  encap_len += 4; // to hold the member count
+
+  // save the current value of scope len and start with a fresh one for our
+  // scope length computation
+  if (this->push (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (exception) - ")
+                         ASYS_TEXT ("push failed\n")),
+                        -1);
+    }
+  this->computed_scope_encap_len_ = 0;
+
+  // compute encap length for members
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (exception) - ")
+                         ASYS_TEXT ("cannot compute scope tc size\n")),
+                        -1);
+    }
+
+  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
+
+  // pop off the previous value of computed_scope_len_
+  if (this->pop (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (exception) - ")
+                         ASYS_TEXT ("pop failed\n")),
+                        -1);
+    }
+
+  return this->computed_encap_len_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_field *node)
+{
+  be_type *bt;
+  
+  // struct member is represented as the "name" followed by the typecode
+  
+  ACE_CDR::Long encap_len =
+    this->name_encap_len (node); // for name
+  
+  // add to this, the size of our typecode
+  bt = be_type::narrow_from_decl (node->field_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (array) - ")
+                         ASYS_TEXT ("cannot compute tc size\n")),
+                        -1);
+    }
+      
+  // note that we must add typecode size of base type
+  this->computed_encap_len_ = encap_len + this->computed_tc_size_; 
+
+  // revert the sub state
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+
+  return this->computed_encap_len_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_interface *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else 
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (interface) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (interface) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_interface *node)
+{
+  this->computed_encap_len_ = 4;  // holds the byte order flag
+  
+  this->computed_encap_len_ += 
+    this->repoID_encap_len (node); // for repoID
+  
+  // do the same thing for the local name
+  this->computed_encap_len_ += 
+    this->name_encap_len (node);
+
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_interface_fwd *)
+{
+  return 0;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_interface_fwd *)
+{
+  return 0;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_predefined_type *node)
+{
+  if (!ACE_OS::strcmp (node->local_name ()->get_string (), 
+                       "Object")) // not same
+    {
+      // while computing the encapsulation length we must keep in mind the typecode
+      // that has gotten generated until this point. Hence, we must first check the
+      // "tc_queue" to ensure if are already there somewhere in a previous
+      // encapsulation in which case we must count only the bytes for the
+      // indirection. If we are not already generated, we must then check if we
+      // have already been counted in the current computation or not by checking
+      // for our presence in the compute queue. In both cases, we only include the
+      // 8 bytes in the computation
+      if (this->queue_lookup (this->tc_queue_, node) ||
+          this->queue_lookup (this->compute_queue_, node))
+        {
+          this->computed_tc_size_ = 4 + 4;
+        }
+      else 
+        {
+          
+          if (idl_global->opt_tc () ||
+              node->in_recursion ())
+            {
+              if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     "(%N:%l) be_visitor_typecode_defn::"
+                                     "compute_tc_size (predefined type) - "
+                                     "queue insert failed\n"), 
+                                    -1);
+                }
+            }
+          
+          this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+          if (node->accept (this) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR, 
+                                 ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                                 ASYS_TEXT ("::compute_tc_size (predefined objref) - ")
+                                 ASYS_TEXT ("cannot compute encap len\n")),
+                                -1);
+            }
+          
+          this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+        }
+    }
+  else
+    this->computed_tc_size_ = 4;
+
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_predefined_type *node)
+{
+  if (!ACE_OS::strcmp (node->local_name ()->get_string (), 
+                       "Object")) // not same
+    {
+      this->computed_encap_len_ = 4;  // holds the byte order flag
+
+      this->computed_encap_len_ += 
+        this->repoID_encap_len (node); // for repoID
+
+      // do the same thing for the local name
+      this->computed_encap_len_ += 
+        this->name_encap_len (node);
+    }
+  else
+    this->computed_encap_len_ = 0;
+  
+  return this->computed_encap_len_;
+}
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_sequence *node)
+{
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_tc_size (sequence) - ")
+                         ASYS_TEXT ("cannot compute encap len\n")),
+                        -1);
+    }
+  
+  this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_sequence *node)
+{
+  be_type *bt; // base type
+  
+  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
+
+  // add the encapsulation length of our base type
+  bt = be_type::narrow_from_decl (node->base_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (sequence) - ")
+                         ASYS_TEXT ("cannot compute tc size\n")),
+                        -1);
+    }
+      
+  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
+  this->computed_encap_len_ += 4; // to hold the max size
+
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_string *)
+{
+  this->computed_tc_size_ = 4 + 4;
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_string *)
+{
+  this->computed_encap_len_ = 0;
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_structure *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else 
+    {
+
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (structure) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (structure) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_structure *node)
+{
+  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
+
+  encap_len += this->repoID_encap_len (node); // repoID
+
+  // do the same thing for the local name
+  encap_len += this->name_encap_len (node);
+
+  encap_len += 4; // to hold the member count
+
+  // save the current value of scope len and start with a fresh one for our
+  // scope length computation
+  if (this->push (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (struct) - ")
+                         ASYS_TEXT ("push failed\n")),
+                        -1);
+    }
+  this->computed_scope_encap_len_ = 0;
+
+  // compute encap length for members
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (structure) - ")
+                         ASYS_TEXT ("cannot compute scope tc size\n")),
+                        -1);
+    }
+
+  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
+
+  // pop off the previous value of computed_scope_len_
+  if (this->pop (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (struct) - ")
+                         ASYS_TEXT ("pop failed\n")),
+                        -1);
+    }
+
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_typedef *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else 
+    {
+
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (typedef) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+      
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (array) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
+{
+  be_type *bt; // base type
+  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
+
+  encap_len += 
+    this->repoID_encap_len (node); // repoID
+  
+  // do the same thing for the local name
+  encap_len += 
+    this->name_encap_len (node);
+
+  // add the encapsulation length of our base type
+  bt = be_type::narrow_from_decl (node->base_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (!bt || bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (typedef) - ")
+                         ASYS_TEXT ("cannot compute tc size\n")),
+                        -1);
+    }
+      
+  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
+  return this->computed_encap_len_;
+
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_tc_size (be_union *node)
+{
+  // while computing the encapsulation length we must keep in mind the typecode
+  // that has gotten generated until this point. Hence, we must first check the
+  // "tc_queue" to ensure if are already there somewhere in a previous
+  // encapsulation in which case we must count only the bytes for the
+  // indirection. If we are not already generated, we must then check if we
+  // have already been counted in the current computation or not by checking
+  // for our presence in the compute queue. In both cases, we only include the
+  // 8 bytes in the computation
+  if (this->queue_lookup (this->tc_queue_, node) ||
+      this->queue_lookup (this->compute_queue_, node))
+    {
+      this->computed_tc_size_ = 4 + 4;
+    }
+  else 
+    {
+      if (idl_global->opt_tc () ||
+          node->in_recursion ())
+        {
+          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_typecode_defn::"
+                                 "compute_tc_size (union) - "
+                                 "queue insert failed\n"), 
+                                -1);
+            }
+        }
+
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+      if (node->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_tc_size (union) - ")
+                             ASYS_TEXT ("cannot compute encap len\n")),
+                            -1);
+        }
+      
+      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
+    }
+  return this->computed_tc_size_;
+}
+
+
+ACE_CDR::Long 
+be_visitor_typecode_defn::compute_encap_length (be_union *node)
+{
+  be_type *discrim;
+  
+  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
+  
+  encap_len += this->repoID_encap_len (node); // for repoID
+  
+  // do the same thing for the local name
+  encap_len += this->name_encap_len (node); // for name
+  
+  // add encapsulation size of discriminant typecode
+  discrim = be_type::narrow_from_decl (node->disc_type ());
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+  if (!discrim || discrim->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (union) - ")
+                         ASYS_TEXT ("cannot compute tc size\n")),
+                        -1);
+    }
+      
+  encap_len += this->computed_tc_size_;
+  
+  encap_len += 4; // to hold the "default used" flag
+  encap_len += 4; // to hold the member count
+  
+  // save the current value of scope len and start with a fresh one for our
+  // scope length computation
+  if (this->push (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (union) - ")
+                         ASYS_TEXT ("push failed\n")),
+                        -1);
+    }
+  this->computed_scope_encap_len_ = 0;
+
+  // compute encap length for members
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+  if (node->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, 
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (union) - ")
+                         ASYS_TEXT ("cannot compute scope tc size\n")),
+                        -1);
+    }
+
+  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
+
+  // pop off the previous value of computed_scope_len_
+  if (this->pop (this->computed_scope_encap_len_) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::compute_encap_len (union) - ")
+                         ASYS_TEXT ("pop failed\n")),
+                        -1);
+    }
+
+  return this->computed_encap_len_;
+}
+
+
+ACE_CDR::Long
+be_visitor_typecode_defn::compute_encap_length (be_union_branch *node)
+{
+  be_type *bt;
+
+  ACE_CDR::Long encap_len = 0;
+
+  for (unsigned long i = 0;
+       i < node->label_list_length ();
+       ++i)
+    {
+      encap_len += 4; // case label;
+      encap_len += 
+        this->name_encap_len (node); // for name
+
+      bt = be_type::narrow_from_decl (node->field_type ());
+      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+      if (!bt || bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                             ASYS_TEXT ("::compute_encap_len (union branch) - ")
+                             ASYS_TEXT ("cannot compute tc size\n")),
+                            -1);
+        }
+      encap_len += this->computed_tc_size_;
+    }
+
+  this->computed_encap_len_ = encap_len;
+
+  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
+  return this->computed_encap_len_;
+}
+
+// helpers that accomplish a common task - that of generating the repository
+// IDs and names in a TypeCode description
+
+void
+be_visitor_typecode_defn::gen_repoID (be_decl *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  int flag = 0;
+
+  // check if we want to generate optimized typecodes. In such a case, there is
+  // no need to generate the repoID (unless we are an object reference or an
+  // exception in which case it is mandatory to have the repository ID)
+  // generate repoID
+
+  if (idl_global->opt_tc ())
+    {
+      switch (node->node_type ())
+        {
+        case AST_Decl::NT_interface:
+        case AST_Decl::NT_interface_fwd:
+        case AST_Decl::NT_except:
+          flag = 0;
+          break;
+        case AST_Decl::NT_pre_defined:
+          if (!ACE_OS::strcmp (node->local_name ()->get_string (),
+                               "Object"))
+            flag = 0;
+          else
+            flag = 1;
+          break;
+        default:
+          flag = 1;
+        }
+    }
+
+  // XXXASG -- there is still some doubts in my mind about whether repoID
+  // *must* be supplied or not as per spec 2.3a. So I am not going to allow
+  // optimizations here.
+  //  flag = 0;
+
+  if (flag)
+    {
+      // optimized case
+      *os << "1, 0x0,";
+      *os << " // repository ID = " << node->repoID ();
+      // size of the repoID filed
+      this->tc_offset_ += (2 * sizeof (ACE_CDR::ULong));
+    }
+  else
+    {
+      // unoptimized case
+      *os << (ACE_OS::strlen (node->repoID ()) + 1) << ", ";
+      
+      ACE_CDR::ULong *arr, i, arrlen;
+      (void) this->tc_name2long (node->repoID (), arr, arrlen);
+      for (i = 0; i < arrlen; i++)
+        {
+          os->print ("ACE_NTOHL (0x%x), ", arr[i]);
+        }
+      *os << " // repository ID = " << node->repoID ();
+      // size of the repoID field
+      this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
+    }
+  *os << "\n";
+  return;
+}
+
+void
+be_visitor_typecode_defn::gen_name (be_decl *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // generate name
+  if (idl_global->opt_tc ())
+    {
+      *os << "1, 0x0,";
+      *os << " // name = " << node->local_name ();
+      // size of the name field
+      this->tc_offset_ += (2 * sizeof (ACE_CDR::ULong));
+    }
+  else
+    {
+      ACE_CDR::ULong *arr, i, arrlen;
+      *os << (ACE_OS::strlen (node->local_name ()->get_string ()) + 1) << ", ";
+      (void) this->tc_name2long (node->local_name ()->get_string (), arr, arrlen);
+      for (i = 0; i < arrlen; i++)
+        {
+          os->print ("ACE_NTOHL (0x%x), ", arr[i]);
+        }
+      *os << " // name = " << node->local_name ();
+      // size of the name field
+      this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
+    }
+  *os << "\n";
+  return;
+}
+
+// return the length in bytes to hold the repoID inside a typecode. This
+// comprises 4 bytes indicating the length of the string followed by the actual
+// string represented as longs.
+ACE_CDR::ULong
+be_visitor_typecode_defn::repoID_encap_len (be_decl *node)
+{
+  int flag = 0;
+
+  // check if we want to generate optimized typecodes. In such a case, there is
+  // no need to generate the repoID (unless we are an object reference or an
+  // exception in which case it is mandatory to have the repository ID)
+  // generate repoID
+
+  if (idl_global->opt_tc ())
+    {
+      switch (node->node_type ())
+        {
+        case AST_Decl::NT_interface:
+        case AST_Decl::NT_interface_fwd:
+        case AST_Decl::NT_except:
+          flag = 0;
+          break;
+        case AST_Decl::NT_pre_defined:
+          if (!ACE_OS::strcmp (node->local_name ()->get_string (),
+                               "Object"))
+            flag = 0;
+          else
+            flag = 1;
+          break;
+        default:
+          flag = 1;
+        }
+    }
+
+  // XXXASG -- there is still some doubts in my mind about whether repoID
+  // *must* be supplied or not as per spec 2.3a. So I am not going to allow
+  // optimizations here.
+  //flag = 0;
+
+  if (flag)
+    {
+      return 4 + 4;
+    }
+  else
+    {
+      ACE_CDR::ULong slen = ACE_OS::strlen (node->repoID ()) + 1; 
+      // + 1 for NULL terminating char 
+      
+      // the number of bytes to hold the string must be a multiple of 4 since this
+      // will be represented as an array of longs
+      return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+    }
+}
+
+// return the length in bytes to hold the name inside a typecode. This
+// comprises 4 bytes indicating the length of the string followed by the actual
+// string represented as longs.
+ACE_CDR::ULong
+be_visitor_typecode_defn::name_encap_len (be_decl *node)
+{
+  if (idl_global->opt_tc ())
+    {
+      return 4 + 4;
+    }
+  else
+    {
+      ACE_CDR::ULong slen = 
+        ACE_OS::strlen (node->local_name ()->get_string ()) + 1; 
+      
+      // the number of bytes to hold the string must be a multiple of 4 since this
+      // will be represented as an array of longs
+      return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+    }
+}
+  
+// converts a string name into an array of 4 byte longs
+int
+be_visitor_typecode_defn::tc_name2long (const char *name, 
+                                        ACE_CDR::ULong *&larr, 
+                                        ACE_CDR::ULong &arrlen)
+{
+  const int bytes_per_word = sizeof (ACE_CDR::ULong);
+  static ACE_CDR::ULong buf [NAMEBUFSIZE];
+  ACE_CDR::ULong i, slen;
+
+  slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
+
+  // compute the number of bytes necessary to hold the name rounded to
+  // the next multiple of 4 (i.e., size of long)
+  arrlen = slen / bytes_per_word + (slen % bytes_per_word ? 1 : 0);
+
+  ACE_OS::memset (buf, 0, sizeof (buf));
+  larr = buf;
+  ACE_OS::memcpy (buf, name, slen);
+  for (i = 0; i < arrlen; i++)
+    larr [i] = ACE_HTONL (larr [i]);
+  return 0;
+}
+
+// post processing
+int
+be_visitor_typecode_defn::post_process (be_decl *)
+{
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN)
+    {
+      this->computed_scope_encap_len_ += this->computed_encap_len_;
+    }
+  return 0;
+}
+
+// scope stack routines
+int
+be_visitor_typecode_defn::push (ACE_CDR::Long val)
+{
+  if (this->index_ >= TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE)
+    return -1;
+
+  this->scope_stack_ [++this->index_] = val;
+  return 0;
+}
+
+int
+be_visitor_typecode_defn::pop (ACE_CDR::Long &val)
+{
+  if (this->index_ < 0)
+    return -1;
+
+  val = this->scope_stack_[this->index_--];
+  return 0;
+}
+
+const be_visitor_typecode_defn::QNode *
+be_visitor_typecode_defn::
+queue_insert (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
+              be_type *node, ACE_CDR::Long offset)
+{
+  be_visitor_typecode_defn::QNode *qnode;
+
+  ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, 0);
+
+  qnode->node = node;
+  qnode->offset = offset;
+
+  if (queue.enqueue_tail (qnode) == -1)
+    {
+      delete qnode;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
+                         ASYS_TEXT ("::queue_insert - failed\n")),
+                        0);
+    }
+
+  return qnode;
+}
+
+const be_visitor_typecode_defn::QNode *
+be_visitor_typecode_defn::
+queue_lookup (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
+              be_type *node)
+{
+  for (ACE_Unbounded_Queue_Iterator<be_visitor_typecode_defn::QNode *>
+         iter (queue);
+       !iter.done ();
+       iter.advance ())
+    {
+      be_visitor_typecode_defn::QNode **addr, *item;
+      iter.next (addr);
+      item = *addr;
+
+      if (!ACE_OS::strcmp (item->node->fullname (),
+                           node->fullname ()))
+        {
+          // found
+          return item;
+        }
+    }
+
+  return 0;
+}
+
+void
+be_visitor_typecode_defn::
+queue_reset (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue)
+{
+  while (!queue.is_empty ())
+    {
+      be_visitor_typecode_defn::QNode *qnode;
+      (void) queue.dequeue_head (qnode);
+      delete qnode;
+    }
+  return;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index 8ee75eff8df..d7fba5c69c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp
@@ -81,7 +81,7 @@ be_visitor_scope::visit_scope (be_scope *node)
           this->ctx_->node (bd);
           this->elem_number_++;
 
-          // do any pre processing using the next item info
+          // Do any pre processing using the next item info. 
           if (this->pre_process (bd) == -1)
             {
               delete si;
@@ -89,7 +89,9 @@ be_visitor_scope::visit_scope (be_scope *node)
                                  "(%N:%l) be_visitor_scope::visit_scope - "
                                  "pre processing failed\n"), -1);
             }
-          if (bd == 0 || bd->accept (this) == -1)
+
+          // Send the visitor.
+          if (bd == 0 ||  bd->accept (this) == -1)
             {
               delete si;
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -97,6 +99,8 @@ be_visitor_scope::visit_scope (be_scope *node)
                                  "codegen for scope failed\n"), -1);
 
             }
+
+          // Do any post processing using this item info.
           if (this->post_process (bd) == -1)
             {
               delete si;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
index a5fa66377e0..5ce3e28dfbb 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
@@ -38,11 +38,13 @@
 #include "be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp"
 #include "be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp"
 #include "be_visitor_sequence/gen_bounded_str_sequence_ch.cpp"
+#include "be_visitor_sequence/gen_object_manager_ch.cpp"
 #include "be_visitor_sequence/gen_unbounded_sequence_ci.cpp"
 #include "be_visitor_sequence/gen_bounded_sequence_ci.cpp"
 #include "be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp"
 #include "be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp"
 #include "be_visitor_sequence/gen_bounded_str_sequence_ci.cpp"
+#include "be_visitor_sequence/gen_object_manager_ci.cpp"
 #include "be_visitor_sequence/gen_unbounded_sequence_cs.cpp"
 #include "be_visitor_sequence/gen_bounded_sequence_cs.cpp"
 #include "be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp"
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 63a7cde5c2c..246a0810951 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
@@ -239,7 +239,7 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   // handle octet sequences using the optimizations provided by the TAO ORB
   // Core. If these optimizations are not available, then use the normal form
 
-  if (node->pt () == AST_PredefinedType::PT_octet && sequence->unbounded ())
+  if (node->pt () == AST_PredefinedType::PT_octet)
     {
       *os << "\n#if defined (TAO_NO_COPY_OCTET_SEQUENCES)" << be_nl;
       switch (this->ctx_->sub_state ())
@@ -250,9 +250,9 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
                 << "ACE_Message_Block::DONT_DELETE))" << be_nl
                 << "{" << be_idt_nl
                 << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl
-                << "  ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, "
-                << "&_tao_sequence);" << be_nl
-                << "oseq->replace (_tao_seq_len, strm.start ());"
+                << "  ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, "
+                << "&_tao_sequence);" << be_nl;
+            *os << "oseq->replace (_tao_seq_len, strm.start ());"
                 << be_nl
                 << "oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + "
                 << "_tao_seq_len);" << be_nl
@@ -269,9 +269,9 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
           {
             *os << "{" << be_idt_nl
                 << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl
-                << "  ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, "
-                << "(" << sequence->name () << " *)&_tao_sequence);" << be_nl
-                << "if (oseq->mb ())" << be_idt_nl
+                << "  ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, "
+                << "(" << sequence->name () << " *)&_tao_sequence);" << be_nl;
+            *os << "if (oseq->mb ())" << be_idt_nl
                 << "return strm.write_octet_array_mb (oseq->mb ());"
                 << be_uidt_nl
                 << "else" << be_idt_nl
@@ -389,7 +389,7 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
 
   *os << "_tao_sequence.length ());" << be_uidt_nl;
 
-  if (node->pt () == AST_PredefinedType::PT_octet && sequence->unbounded ())
+  if (node->pt () == AST_PredefinedType::PT_octet)
     *os << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCES */" << be_nl;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
index b7aae443bcf..1a50a9cf145 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
@@ -71,21 +71,36 @@ be_visitor_sequence_elemtype::visit_predefined_type (be_predefined_type *node)
     bt = this->ctx_->alias ();
   else
     bt = node;
-
+  
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_pseudo:
+      // !! branching in either compile time template instantiation
+      // or manual template instatiation
+      os->gen_ifdef_AHETI();
+  
+      if (this->ctx_->state() != TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
+        {
+          if (this->ctx_->scope()->fullname())
+            *os << this->ctx_->scope()->fullname() << "::";
+        }
+
+      *os << "_TAO_Object_Manager_" 
+          << this->ctx_->scope()->flatname() 
+          << "_" 
+          << bt->flatname ();
+
+      os->gen_else_AHETI();
+
       if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
         {
-          *os << "TAO_Object_Manager<"
-              << bt->nested_type_name (this->ctx_->scope ()) << ","
-              << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
+          *os << "TAO_Object_Manager<" 
+              << bt->nested_type_name (this->ctx_->scope ()) << ","<<bt->nested_type_name (this->ctx_->scope ())<< "_var> ";
         }
       else
-        *os << "TAO_Object_Manager<"
-            << bt->name () << ","
-            << bt->name () <<"_var> ";
+        *os << "TAO_Object_Manager<" << bt->name () << ","<<bt->name ()<<"_var> ";    
 
+      os->gen_endif_AHETI();
       break;
     default:
       if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
@@ -113,16 +128,32 @@ be_visitor_sequence_elemtype::visit_interface (be_interface *node)
   else
     bt = node;
 
+  // !! branching in either compile time template instantiation
+  // or manual template instatiation
+  os->gen_ifdef_AHETI();
+
+  if (this->ctx_->state() != TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
+    {
+      if (this->ctx_->scope()->fullname())
+        *os << this->ctx_->scope()->fullname() << "::";
+    }
+
+  *os << "_TAO_Object_Manager_" 
+      << this->ctx_->scope()->flatname() 
+      << "_" 
+      << bt->flatname ();
+  
+  os->gen_else_AHETI();
+
   if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
     {
-      *os << "TAO_Object_Manager<"
-          << bt->nested_type_name (this->ctx_->scope ()) << ","
-          << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
+      *os << "TAO_Object_Manager<" 
+          << bt->nested_type_name (this->ctx_->scope ()) <<","<<bt->nested_type_name (this->ctx_->scope ())<< "_var> ";
     }
   else
-    *os << "TAO_Object_Manager<"
-        << bt->name () << ","
-        << bt->name () << "_var> ";
+    *os << "TAO_Object_Manager<" << bt->name () <<","<<bt->name ()<<"_var> ";        
+
+  os->gen_endif_AHETI();
 
   return 0;
 }
@@ -138,16 +169,28 @@ be_visitor_sequence_elemtype::visit_interface_fwd (be_interface_fwd *node)
   else
     bt = node;
 
+  os->gen_ifdef_AHETI();
+
+  if (this->ctx_->state() != TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
+  {
+    if (this->ctx_->scope()->fullname())
+      *os << this->ctx_->scope()->fullname() << "::";
+  }
+
+  *os << "_TAO_Object_Manager_" 
+      << this->ctx_->scope()->flatname() 
+      << "_" 
+      << bt->flatname ();
+
+  os->gen_else_AHETI();
+ 
   if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
     {
-      *os << "TAO_Object_Manager<"
-          << bt->nested_type_name (this->ctx_->scope ()) << ","
-          << bt->nested_type_name (this->ctx_->scope ()) << "_var> ";
+      *os << "TAO_Object_Manager<" 
+          << bt->nested_type_name (this->ctx_->scope ()) <<","<<bt->nested_type_name (this->ctx_->scope ())<< "_var> ";
     }
   else
-    *os << "TAO_Object_Manager<"
-        << bt->name () << ","
-        << bt->name () << "_var>";
+    *os << "TAO_Object_Manager<" << bt->name () <<","<<bt->name ()<<"_var>";        
 
   os->gen_endif_AHETI();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index c8d099977e5..d16b35b5528 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -63,16 +63,20 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  const char * object_manager = node->object_manager_name ();
+
   // !! branching in either compile time template instantiation
-  // or manual template instantiation
+  // or manual template instatiation
   os->gen_ifdef_AHETI();
 
   os->gen_ifdef_macro (class_name);
 
   os->indent ();
 
-  *os << "class " << class_name
-      << " : public TAO_Bounded_Base_Sequence" << be_nl
+  //forward declaration of the object manager;
+  *os << "class " << object_manager << ";" << be_nl << be_nl;
+
+  *os << "class " << class_name << " : public TAO_Bounded_Base_Sequence" << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
       << "// = Initialization and termination methods." << be_nl
@@ -110,10 +114,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       << "// Assignment from another Bounded sequence." << be_nl;
 
   // operator[]
-  *os << "TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var>"
-      << " operator[] (CORBA::ULong index) const;"
+  *os << object_manager << " operator[] (CORBA::ULong index) const;"
       << "// Read-write accessor." << be_nl;
 
   // allocbuf
@@ -169,6 +170,12 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   // generate #endif for AHETI
   os->gen_endif_AHETI ();
 
+  // Due to a bug with g++2.7.2.3 we have to generate the object manager class
+  // after the sequence class and instead forward declare it above
+
+  this->gen_object_manager (node);
+  // Generate the code for the object manager
+
   delete visitor;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
index 9e2d7d9dc46..67518bd6354 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
@@ -76,6 +76,24 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  this->gen_object_manager (node);
+  // Generate the code for the object manager
+
+  static char object_manager [NAMEBUFSIZE];
+  ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE);
+
+  if (node->is_nested ())
+    {
+      ACE_OS::sprintf (object_manager, "%s::%s",
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       node->object_manager_name ());
+    }
+  else
+    {
+      ACE_OS::sprintf (object_manager, "%s",
+                       node->object_manager_name ());
+    }
+
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -91,7 +109,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   // allocbuf
   *os << "ACE_INLINE "; pt->accept (visitor);
   *os << " **" << be_nl;
-  *os << full_class_name << "::allocbuf (CORBA::ULong /* length */) "
+  *os << full_class_name << "::allocbuf (CORBA::ULong length) "
       << "// Allocate storage for a sequence.." << be_nl
       << "{" << be_idt_nl;
   // the accept is here the first time used and if an
@@ -105,7 +123,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-  *os <<" **buf = 0;" << be_nl
+  *os <<" **buf;" << be_nl
       << be_nl
       << "ACE_NEW_RETURN (buf, ";
   pt->accept (visitor);
@@ -238,9 +256,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << be_nl;
 
   // operator[]
-  *os << "ACE_INLINE TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var>" << be_nl
+  *os << "ACE_INLINE " << object_manager << be_nl
       << full_class_name << "::operator[] (CORBA::ULong index) const"
       << " // Read-write accessor." << be_nl
       << "{" << be_idt_nl
@@ -249,10 +265,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   *os <<" **const tmp = ACE_reinterpret_cast (";
   pt->accept (visitor);
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl
-      << "return TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var> "
-      << "(tmp + index, this->release_);" << be_uidt_nl
+      << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 8ff1a215796..bea7ce3b364 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -76,6 +76,21 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  static char object_manager [NAMEBUFSIZE];
+  ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE);
+
+  if (node->is_nested ())
+    {
+      ACE_OS::sprintf (object_manager, "%s::%s",
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       node->object_manager_name ());
+    }
+  else
+    {
+      ACE_OS::sprintf (object_manager, "%s",
+                       node->object_manager_name ());
+    }
+
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
index 0b72e049306..6e4ca76da43 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
@@ -88,7 +88,7 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
 
   // allocate_buffer
   *os << "void " << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong /* length */)" << be_nl
+      << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "// allocate a buffer of the requested length. The buffer is allocated for the" << be_nl
       << "// right type" << be_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
index bc74e1f12de..5fbb45f457d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
@@ -107,9 +107,9 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
 
   // allocbuf
   *os << "ACE_INLINE char **" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong /* length */)" << be_nl
+      << full_class_name << "::allocbuf (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl
-      << "char **buf = 0;" << be_nl
+      << "char **buf;" << be_nl
       << "ACE_NEW_RETURN (buf, char *[" << node->max_size () << "], 0);" << be_nl
       << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl
       << "buf[i] = 0;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
index 07a34995988..fd712bb818c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
@@ -103,7 +103,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
 
   // allocate_buffer
   *os << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong /* length */)" << be_nl
+      << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl
       << "// For this class memory is never reallocated so the implementation" << be_nl
       << "// is *really* simple." << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp
new file mode 100644
index 00000000000..03466b9d012
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp
@@ -0,0 +1,171 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    gen_object_manager_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Sequence in the client header
+//
+// = AUTHOR
+//    Michael Kircher
+//
+//    Modifications by Aniruddha Gokhale
+//
+// ============================================================================
+
+#include	"be.h"
+
+#include "be_visitor_sequence.h"
+
+ACE_RCSID(be_visitor_sequence, gen_object_manager_ch, "$Id$")
+
+
+int
+be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt;
+
+  // retrieve the base type since we may need to do some code
+  // generation for the base type.
+  bt = be_type::narrow_from_decl (node->base_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ch::"
+                         "visit_sequence - "
+                         "Bad element type\n"), -1);
+    }
+
+  // generate the class name
+  // we might want to use this later
+  be_type  *pt; // base types
+      
+  if (bt->node_type () == AST_Decl::NT_typedef)
+  {
+    // get the primitive base type of this typedef node
+    be_typedef *t = be_typedef::narrow_from_decl (bt);
+    pt = t->primitive_base_type ();
+  }
+  else
+    pt = bt;
+    
+
+  const char * class_name = node->instance_name ();
+
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  
+  const char * object_manager = node->object_manager_name ();  
+  // create the name for the object manager
+
+  // !! branching in either compile time template instantiation
+  // or manual template instatiation
+  os->gen_ifdef_AHETI();
+
+  os->gen_ifdef_macro (object_manager);
+
+  os->indent ();
+
+  *os << "class " << object_manager << be_nl
+      << "{" << be_idt_nl
+      << "friend class " << class_name << ";" << be_uidt_nl
+      << "public:" << be_idt_nl
+      << be_nl;
+
+  // constructor
+  *os << "// = Initialization and termination methods." << be_nl
+      << object_manager << " (const " << object_manager << " &rhs);" << be_nl;
+
+  // constructor
+  *os << object_manager << " ("; 
+  // the accept is here the first time used and if an 
+  // error occurs, it will occur here. Later no check
+  // for errors will be done.
+  if (pt->accept (visitor) == -1)
+  {
+     ACE_ERROR_RETURN ((LM_ERROR,
+                        "(%N:%l) be_visitor_sequence_ch::"
+                        "visit_sequence - "
+                        "base type visit failed\n"),
+                        -1);
+  }
+  *os << "** buffer, CORBA::Boolean release);" << be_nl;
+
+  // destructor
+  *os << "~" << object_manager << " (void);" << be_nl;
+
+  // operator=
+  *os << object_manager << " &operator= (const " << object_manager << " &rhs);" << be_nl;
+
+  // operator=
+  *os << object_manager << " &operator= ("; 
+  pt->accept (visitor); 
+  *os << " *p);" << be_nl;
+
+  // operator= from T_var @@Bala
+  *os << object_manager << " &operator= ("; 
+  pt->accept (visitor); 
+  *os << "_var &p);" << be_nl;
+
+  // operator -> @@Bala
+  pt->accept (visitor); 
+  *os << "* operator-> (void) const;" << be_nl;
+
+  //  cast operator
+  *os << "operator const "; 
+  pt->accept (visitor); 
+  *os << " *() const; // Cast (read-only)." << be_nl;
+
+  // cast operator
+  *os << "operator "; 
+  pt->accept (visitor); 
+  *os << " *&(); // Cast." << be_nl;
+  
+  // 
+  // in method
+  //*os << "const "; 
+  pt->accept (visitor); 
+  *os << " *in (void) const; // in " << be_nl;
+                                           
+  // inout method
+  pt->accept (visitor); 
+  *os << " *&inout (void); // inout " << be_nl;
+                                           
+  // out method
+  pt->accept (visitor);
+  *os << " *&out (void); // out " << be_nl;
+                                           
+  // retn method
+  pt->accept (visitor); 
+  *os << " *_retn (void); // retn " << be_uidt_nl;
+                                           
+  // members
+  *os << "private:" << be_idt_nl;
+  pt->accept(visitor); 
+  *os <<" **ptr_;" << be_nl
+      << "// data member, notice that it is a pointer, to implement the" << be_nl
+      << "// reference behavior for assignment." << be_nl
+      << be_nl
+      << "CORBA::Boolean release_;" << be_nl
+      << "// release flag based on parent's flag" << be_uidt_nl
+      << "};" << be_nl;
+  
+  os->gen_endif (); // endif macro
+
+  // generate #endif for AHETI
+  os->gen_endif_AHETI();
+
+  delete visitor;
+  return 0;
+}
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp
new file mode 100644
index 00000000000..97167aae41c
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp
@@ -0,0 +1,294 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    gen_object_manager_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Sequence in the client inline
+//
+// = AUTHOR
+//    Michael Kircher
+//
+//    Modifications by Aniruddha Gokhale
+//
+// ============================================================================
+
+#include	"be.h"
+
+#include "be_visitor_sequence.h"
+
+ACE_RCSID(be_visitor_sequence, gen_object_manager_ci, "$Id$")
+
+
+int
+be_visitor_sequence_ci::gen_object_manager (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_type *bt;
+
+  // retrieve the base type since we may need to do some code
+  // generation for the base type.
+  bt = be_type::narrow_from_decl (node->base_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ci::"
+                         "visit_sequence - "
+                         "Bad element type\n"), -1);
+    }
+
+  // generate the class name
+  // we might want to use this later
+  be_type  *pt; // base types
+      
+  if (bt->node_type () == AST_Decl::NT_typedef)
+  {
+    // get the primitive base type of this typedef node
+    be_typedef *t = be_typedef::narrow_from_decl (bt);
+    pt = t->primitive_base_type ();
+  }
+  else
+    pt = bt;
+    
+
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  
+  const char * object_manager = node->object_manager_name ();  
+
+  static char full_object_manager [NAMEBUFSIZE];
+  ACE_OS::memset (full_object_manager, '\0', NAMEBUFSIZE);
+
+  if (node->is_nested ())
+    {
+      ACE_OS::sprintf (full_object_manager, "%s::%s",
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       object_manager);
+    }
+  else
+    {
+      ACE_OS::sprintf (full_object_manager, "%s",
+                       object_manager);
+    }
+
+  // create the name for the object manager
+
+  // !! branching in either compile time template instantiation
+  // or manual template instatiation
+  os->gen_ifdef_AHETI();
+
+  os->gen_ifdef_macro (object_manager);
+
+  os->indent ();
+
+  // constructor
+  *os << "// = Initialization and termination methods." << be_nl
+      << "ACE_INLINE" << be_nl
+      << full_object_manager << "::" << object_manager << " (const " 
+      << full_object_manager << " &rhs)" << be_idt_nl
+      << ": ptr_ (rhs.ptr_)," << be_nl
+      << "release_ (rhs.release_)" << be_uidt_nl
+      << "{" << be_nl
+      << "}" << be_nl
+      << be_nl;
+
+  // constructor
+  *os << "ACE_INLINE" << be_nl
+      << full_object_manager << "::" << object_manager << " ("; 
+  // the accept is here the first time used and if an 
+  // error occurs, it will occur here. Later no check
+  // for errors will be done.
+  if (pt->accept (visitor) == -1)
+  {
+     ACE_ERROR_RETURN ((LM_ERROR,
+                        "(%N:%l) be_visitor_sequence_ci::"
+                        "visit_sequence - "
+                        "base type visit failed\n"),
+                        -1);
+  }
+  *os << "** buffer, CORBA::Boolean release)" << be_idt_nl
+      << ": ptr_ (buffer)," << be_nl
+      << "release_ (release)" << be_uidt_nl
+      << "{" << be_nl
+      << "}" << be_nl
+      << be_nl;
+
+  // destructor
+  *os << "ACE_INLINE" << be_nl
+      << full_object_manager << "::~" << object_manager << " (void)" << be_nl
+      << "{" << be_nl
+      << "}" << be_nl
+      << be_nl;
+
+  // operator=
+  *os << "ACE_INLINE " << full_object_manager << " &" << be_nl
+      << full_object_manager << "::operator= (const " << full_object_manager 
+      << " &rhs)" << be_nl
+      << "{" << be_idt_nl
+      << "if (this == &rhs)" << be_idt_nl
+      << "return *this;" << be_uidt_nl
+      << be_nl
+      << "if (this->release_)" << be_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (*this->ptr_);" << be_nl
+      << "*this->ptr_ = "; 
+  pt->accept (visitor); 
+  *os << "::_duplicate (*rhs.ptr_);" << be_uidt_nl
+      << "}" << be_nl
+      << "else" << be_idt_nl
+      << "*this->ptr_ = *rhs.ptr_;" << be_uidt_nl
+      << be_nl
+      << "return *this;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+  
+  // operator=
+  *os << "ACE_INLINE " << full_object_manager << " &" << be_nl
+      << full_object_manager << "::operator= ("; 
+  pt->accept (visitor); 
+  *os << " *p)" << be_nl
+      << "// Assignment from "; 
+  pt->accept (visitor); 
+  *os << " *." << be_nl
+      << "{" << be_idt_nl
+      << "if (this->release_)" << be_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (*this->ptr_);" << be_nl
+      << "*this->ptr_ = p;" << be_uidt_nl
+      << "}" << be_nl
+      << "else" << be_idt_nl
+      << "*this->ptr_ = p;" << be_uidt_nl
+      << be_nl
+      << "return *this;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+
+  //operator= from T_var @@Bala
+*os << "ACE_INLINE " << full_object_manager << " &" << be_nl
+      << full_object_manager << "::operator= ("; 
+  pt->accept (visitor); 
+  *os << "_var &p)" << be_nl
+      << "// Assignment from "; 
+  pt->accept (visitor); 
+  *os << "_var ." << be_nl
+      << "{" << be_idt_nl
+      << "if (this->release_)" << be_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (*this->ptr_);" << be_nl
+      << "*this->ptr_ = ";
+  pt->accept (visitor);
+  *os <<"::_duplicate(p.in());" << be_uidt_nl
+      << "}" << be_nl
+      << "else" << be_idt_nl
+      << "*this->ptr_ = p.in ();" << be_uidt_nl
+      << be_nl
+      << "return *this;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+
+  
+  
+  // operator -> 
+  *os << "ACE_INLINE " << be_nl;
+    pt->accept (visitor);
+  *os << "*"<< be_nl
+      << full_object_manager <<"::operator-> (void) const " << be_nl
+      << "{" << be_idt_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+
+  //  cast operator
+  *os << "ACE_INLINE " << be_nl
+      << full_object_manager << "::operator const "; 
+  pt->accept (visitor); 
+  *os << " *() const // Cast (read-only)." << be_nl
+      << "{" << be_idt_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+
+  // cast operator
+  *os << "ACE_INLINE" << be_nl
+      << full_object_manager << "::operator "; 
+  pt->accept (visitor); 
+  *os << " *&() // Cast." << be_nl
+      << "{" << be_idt_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+  
+  // in method @@Bala
+  *os << "ACE_INLINE "; 
+  pt->accept (visitor); 
+  *os << " *" << be_nl
+      << full_object_manager << "::in (void) const // in " 
+      << be_nl
+      << "{" << be_idt_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+                                           
+  // inout method
+  *os << "ACE_INLINE ";
+  pt->accept (visitor); 
+  *os << " *&" << be_nl
+      << full_object_manager << "::inout (void) // inout " 
+      << be_nl
+      << "{" << be_idt_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+                                           
+  // out method
+  *os << "ACE_INLINE ";
+  pt->accept (visitor);
+  *os << " *&" << be_nl
+      << full_object_manager << "::out (void) // out " 
+      << be_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (*this->ptr_);" << be_nl
+      << "*this->ptr_ = "; 
+  pt->accept (visitor); 
+  *os << "::_nil ();"
+      << be_nl
+      << "return *this->ptr_;" << be_uidt_nl
+      << "}" << be_nl
+      << be_nl;
+                                           
+  // retn method
+  *os << "ACE_INLINE ";
+  pt->accept (visitor); 
+  *os << " *" << be_nl
+      << full_object_manager << "::_retn (void) // retn " 
+      << be_nl
+      << "{" << be_idt_nl;
+  pt->accept (visitor);
+  *os << " *temp = *this->ptr_;" << be_nl
+      << "*this->ptr_ = "; 
+  pt->accept (visitor); 
+  *os << "::_nil ();"
+      << be_nl
+      << "return temp;" << be_uidt_nl
+      << "}" << be_nl;
+  
+  
+  os->gen_endif (); // endif macro
+  
+  // generate #endif for AHETI
+  os->gen_endif_AHETI();
+  
+  delete visitor;
+  return 0;
+}
+
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index fb8e494161a..98259e83e53 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -64,6 +64,8 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  const char * object_manager = node->object_manager_name ();
+
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -72,6 +74,9 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
 
   os->indent ();
 
+  //forward declaration of the object manager;
+  *os << "class " << object_manager << ";" << be_nl << be_nl;
+
   *os << "class " << class_name << " : public TAO_Unbounded_Base_Sequence" << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
@@ -101,10 +106,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl;
 
   // operator[]
-  *os << "TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var>"
-      << " operator[] (CORBA::ULong index) const;" << be_nl;
+  *os << object_manager << " operator[] (CORBA::ULong index) const;" << be_nl;
 
   // allocbuf
   *os << "static ";
@@ -158,6 +160,12 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   // generate #endif for AHETI
   os->gen_endif_AHETI();
 
+  // Due to a bug with g++2.7.2.3 we have to generate the object manager class
+  // after the sequence class and instead forward declare it above
+
+  this->gen_object_manager (node);
+  // Generate the code for the object manager
+
   delete visitor;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
index 4bb686ca3ee..ccb4fff7e11 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
@@ -47,7 +47,7 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
       // get the primitive base type of this typedef node
@@ -79,6 +79,23 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  this->gen_object_manager (node);
+
+  static char object_manager [NAMEBUFSIZE];
+  ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE);
+
+  if (node->is_nested ())
+    {
+      ACE_OS::sprintf (object_manager, "%s::%s",
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       node->object_manager_name ());
+    }
+  else
+    {
+      ACE_OS::sprintf (object_manager, "%s",
+                       node->object_manager_name ());
+    }
+
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -86,10 +103,10 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   os->indent ();
-
+  
   // allocbuf
-  *os << "ACE_INLINE ";
-  // the accept is here the first time used and if an
+  *os << "ACE_INLINE "; 
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -103,16 +120,16 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   *os << " **" << be_nl
       << full_class_name << "::allocbuf (CORBA::ULong nelems)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
-  *os <<" **buf = 0;" << be_nl
+  pt->accept(visitor); 
+  *os <<" **buf;" << be_nl
       << be_nl
-      << "ACE_NEW_RETURN (buf, ";
-  pt->accept (visitor);
+      << "ACE_NEW_RETURN (buf, "; 
+  pt->accept (visitor); 
   *os << "*[nelems], 0);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < nelems; i++)" << be_idt_nl
-      << "buf[i] = ";
-  pt->accept (visitor);
+      << "buf[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << be_nl
       << "return buf;" << be_uidt_nl
@@ -121,8 +138,8 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 
   // freebuf
   *os << "ACE_INLINE void " << be_nl
-      << full_class_name << "::freebuf (";
-  pt->accept (visitor);
+      << full_class_name << "::freebuf ("; 
+  pt->accept (visitor); 
   *os << " **buffer)" << be_nl
       << "{" << be_idt_nl
       << "if (buffer == 0)" << be_idt_nl
@@ -151,7 +168,7 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name << " (CORBA::ULong maximum," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<"* *value," << be_nl
       << "CORBA::Boolean release)" << be_uidt_nl
       << ": TAO_Unbounded_Base_Sequence (maximum, length, value, release)" << be_nl
@@ -161,25 +178,25 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 
   // constructor
   *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << "(const "
+      << full_class_name << "::" << class_name << "(const " 
       << full_class_name << " &rhs)" << be_idt_nl
       << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp1 = " << full_class_name << "::allocbuf (this->maximum_);" << be_nl;
-  pt->accept(visitor);
-  *os <<" ** const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" ** const tmp2 = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
-      << "tmp1[i] = ";
+      << "tmp1[i] = "; 
   pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
       << be_nl
       << "this->buffer_ = tmp1;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+      
   // operator=
   *os << "ACE_INLINE " << full_class_name << " &" << be_nl
       << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl
@@ -189,75 +206,70 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << be_nl
       << "if (this->release_)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " **, this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  pt->accept (visitor);
+      << "tmp[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << "}" << be_nl
       << "if (this->maximum_ < rhs.maximum_)" << be_nl
       << "{" << be_idt_nl
       << full_class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = " << full_class_name
+      << "this->buffer_ = " << full_class_name 
       << "::allocbuf (rhs.maximum_);" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_idt_nl
-      << "this->buffer_ = " << full_class_name
+      << "this->buffer_ = " << full_class_name 
       << "::allocbuf (rhs.maximum_);" << be_uidt_nl
       << be_nl
       << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl
       << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp1 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " **, this->buffer_);" << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" ** const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
-      << "tmp1[i] = ";
-  pt->accept (visitor);
+      << "tmp1[i] = "; 
+  pt->accept (visitor); 
   *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
       << be_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // operator[]
-  *os << "ACE_INLINE TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var>" << be_nl
+  *os << "ACE_INLINE " << object_manager << be_nl
       << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl
       << "// read-write accessor" << be_nl
       << "{" << be_idt_nl
       << "ACE_ASSERT (index < this->maximum_);" << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" ** const tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl
-      << "return TAO_Object_Manager<"
-      << pt->name () << ","
-      << pt->name () << "_var>"
-      << " (tmp + index, this->release_);" << be_uidt_nl
+      << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // get_buffer
   *os << "ACE_INLINE ";
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " **result = 0;" << be_nl
       << "if (orphan == 0)" << be_nl
       << "{" << be_idt_nl
@@ -280,8 +292,8 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "// We set the state back to default and relinquish" << be_nl
       << "// ownership." << be_nl
-      << "result = ACE_reinterpret_cast(";
-  pt->accept (visitor);
+      << "result = ACE_reinterpret_cast("; 
+  pt->accept (visitor); 
   *os << "**,this->buffer_);" << be_nl
       << "this->maximum_ = 0;" << be_nl
       << "this->length_ = 0;" << be_nl
@@ -295,8 +307,8 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE ";
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (void) const" << be_nl
       << "{" << be_idt_nl
@@ -314,3 +326,4 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index 892dce31bd4..0a79ee9d5f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -79,6 +79,21 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
+  static char object_manager [NAMEBUFSIZE];
+  ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE);
+
+  if (node->is_nested ())
+    {
+      ACE_OS::sprintf (object_manager, "%s::%s",
+                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (),
+                       node->object_manager_name ());
+    }
+  else
+    {
+      ACE_OS::sprintf (object_manager, "%s",
+                       node->object_manager_name ());
+    }
+
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
index b9307c1ce0f..f123cb3ae37 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
@@ -73,8 +73,7 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node)
 
   os->indent ();
 
-  *os << "class TAO_EXPORT_NESTED_MACRO "
-      << class_name << " : public TAO_Unbounded_Base_Sequence" << be_nl
+  *os << "class " << class_name << " : public TAO_Unbounded_Base_Sequence" << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
       << "// = Initialization and termination methods." << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
index d30852ffa11..2c2bc7bb184 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
@@ -56,12 +56,12 @@ be_visitor_sequence_ci::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_ci::"
                          "visit_sequence - "
-                         "codegen. for the primitive type sequence\n"),
+                         "codegen. for the primitive type sequence\n"), 
                         -1);
     }
 
   // end of instantiation
-
+  
   // generate the ifdefined macro for the sequence type
   os->gen_ifdef_macro (node->flatname ());
 
@@ -116,7 +116,7 @@ be_visitor_sequence_ci::instantiate_sequence (be_sequence *node)
     case be_sequence::MNG_STRING: // sequence of strings
       if (!node->unbounded ())
         this->gen_bounded_str_sequence (node);
-      // else
+      // else 
       //   inheriting from the right class is enough
       break;
     default: // not a managed type
@@ -128,9 +128,9 @@ be_visitor_sequence_ci::instantiate_sequence (be_sequence *node)
 	  be_predefined_type *predef = 0;
 	  if (bt->base_node_type () == AST_Type::NT_pre_defined)
 	    {
-	      be_typedef* alias =
+	      be_typedef* alias = 
 		be_typedef::narrow_from_decl (bt);
-
+	      
 	      if (alias == 0)
 		{
 		  predef =
@@ -151,7 +151,7 @@ be_visitor_sequence_ci::instantiate_sequence (be_sequence *node)
 	    this->gen_unbounded_sequence (node);
 #else
 	  // @@ This needs to be fixed. (Michael)
-	  be_predefined_type * bpt =
+	  be_predefined_type * bpt = 
 	    be_predefined_type::narrow_from_decl (node->base_type());
 	  if (bpt)
 	    {
@@ -475,7 +475,7 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
   *os << "ACE_INLINE" << be_nl;
   *os << fname << "::" << lname << " (const " << fname <<
     " &p) // copy constructor" << be_nl;
-  *os << "  : ptr_ (ACE_const_cast (" << fname
+  *os << "  : ptr_ (ACE_const_cast (" << fname 
       << "&,p).ptr_)" << be_nl;
   *os << "{}\n\n";
 
@@ -486,7 +486,7 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
     " &p)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
-  *os << "this->ptr_ = ACE_const_cast (" << fname
+  *os << "this->ptr_ = ACE_const_cast (" << fname 
       << "&,p).ptr_;" << be_nl;
   *os << "return *this;\n";
   os->decr_indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index 134201bca63..90db4fab104 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -45,7 +45,16 @@ be_visitor_typecode_decl::visit_type (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the typecode decl
+  // Generate the typecode decl.
+  const char *prefix = 0;
+  const char *postfix = 0;
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DECL)
+    {
+      prefix = "AMI_";
+      postfix = "_Handler";
+    }
+
   if (node->is_nested ())
     {
       // we have a scoped name
@@ -58,14 +67,14 @@ be_visitor_typecode_decl::visit_type (be_type *node)
       else
         *os << "static ";
       *os << "CORBA::TypeCode_ptr "
-          << node->tc_name ()->last_component () << ";\n\n";
+          << node->tc_name (prefix, postfix)->last_component () << ";\n\n";
     }
   else
     {
       // we are in the ROOT scope
       os->indent ();
       *os << "extern " << idl_global->export_macro () << " CORBA::TypeCode_ptr "
-          << " " << node->tc_name ()->last_component () << ";\n\n";
+          << " " << node->tc_name (prefix, postfix)->last_component () << ";\n\n";
     }
   return 0;
 }
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 de32d73c314..79fd133600f 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -119,23 +119,33 @@ be_visitor_typecode_defn::visit_type (be_type *node)
                             -1);
         }
     }
-
+  
   os->indent (); // start from current indentation level
 
-  // generate the typecode information here
-  *os << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
-      << be_nl;
+  // Generate the typecode information here
+  *os << "static const CORBA::Long _oc_";
+    
+  // Flat name generation.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+    *os << node->compute_flatname ("AMI_", "_Handler");
+  else
+    *os << node->flatname ();
+
+  *os << "[] =" << be_nl;
   *os << "{" << be_idt << "\n";
 
-  // add the sizeof the enum tk_* and the encap length that we do not put into
-  // this array but which will exist in the CDR buffer
+  // Add the sizeof the enum tk_* and the encap length that we do not put into
+  // this array but which will exist in the CDR buffer.
 
   this->tc_offset_ = 4 + 4; 
-
-
-  // note that we just need the parameters here and hence we generate the
-  // encapsulation for the parameters
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+  
+  // Note that we just need the parameters here and hence we generate the
+  // encapsulation for the parameters.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+    this->ctx_->sub_state (TAO_CodeGen::TAO_AMI_HANDLER_TC_DEFN_ENCAPSULATION);
+  else
+    this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
+  
   if (node->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,8 +156,17 @@ be_visitor_typecode_defn::visit_type (be_type *node)
     }
   *os << be_uidt << "};" << be_nl;
 
-  *os << "static CORBA::TypeCode _tc_TAO_tc_" << node->flatname ()
-      << " (";
+  // Type code definition.
+  *os << "static CORBA::TypeCode _tc_TAO_tc_";
+
+  // Flat name generation.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+    *os << node->compute_flatname ("AMI_", "_Handler");
+  else
+    *os << node->flatname ();
+  
+  *os << " (";
+  
   switch (node->node_type ())
     {
     case AST_Decl::NT_array:
@@ -178,13 +197,31 @@ be_visitor_typecode_defn::visit_type (be_type *node)
       return -1; // error
     }
 
-  *os << ", sizeof (_oc_" <<  node->flatname ()
-      << "), (char *) &_oc_" << node->flatname ()
-      << ", 0, sizeof (" << node->name () << "));" << be_nl;
+  *os << ", sizeof (_oc_";
+  
+  // Flat name generation.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+    *os <<  node->compute_flatname ("AMI_", "_Handler");
+  else
+    *os <<  node->flatname ();
+  
+  *os << "), (char *) &_oc_";
 
-  // is our enclosing scope a module? We need this check because for
+  // Flat name generation.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN) 
+    *os <<  node->compute_flatname ("AMI_", "_Handler");
+  else
+    *os <<  node->flatname ();
+  
+  // Name generation.
+  if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+    *os << ", 0, sizeof (" << node->compute_name ("AMI_", "_Handler") << "));" << be_nl; 
+  else
+    *os << ", 0, sizeof (" << node->name () << "));" << be_nl;
+  
+  // Is our enclosing scope a module? We need this check because for
   // platforms that support namespaces, the typecode must be declared
-  // extern
+  // extern.
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -197,9 +234,24 @@ be_visitor_typecode_defn::visit_type (be_type *node)
                              "Error parsing nested name\n"),
                             -1);
         }
-      *os << "TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_"
-          << node->local_name () << ", &_tc_TAO_tc_"
-          << node->flatname () << ")" << be_nl;
+      *os << "TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_";
+      
+      // Local name generation.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << "AMI_" << node->local_name () << "_Handler";
+      else
+        *os << node->local_name ();
+      
+      *os << ", &_tc_TAO_tc_";
+
+      // Flat name generation.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << node->compute_flatname ("AMI_", "_Handler");
+      else
+        *os << node->flatname ();
+
+      *os << ")" << be_nl;
+      
       if (this->gen_nested_namespace_end (module) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -211,8 +263,23 @@ be_visitor_typecode_defn::visit_type (be_type *node)
   else
     {
       // outermost scope.
-      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc_TAO_tc_"
-          <<  node->flatname () << ";\n\n";
+      *os << "CORBA::TypeCode_ptr ";
+
+      // Tc name generation.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << node->tc_name ("AMI_", "_Handler");
+      else
+        *os << node->tc_name ();
+      
+      *os << " = &_tc_TAO_tc_";
+
+      // Flat name generation.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN) 
+        *os <<  node->compute_flatname ("AMI_", "_Handler");
+      else
+        *os <<  node->flatname ();
+      
+      *os << ";\n\n";
     }
   return 0;
 }
@@ -226,8 +293,10 @@ be_visitor_typecode_defn::visit_array (be_array *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -254,8 +323,10 @@ be_visitor_typecode_defn::visit_enum (be_enum *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -306,8 +377,10 @@ be_visitor_typecode_defn::visit_exception (be_exception *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -354,12 +427,17 @@ be_visitor_typecode_defn::visit_interface (be_interface *node)
 {
   switch (this->ctx_->sub_state ())
     {
+    case TAO_CodeGen::TAO_AMI_HANDLER_TC_DEFN_TYPECODE:
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
       return this->visit_type (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_TC_DEFN_ENCAPSULATION:
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -395,8 +473,10 @@ be_visitor_typecode_defn::visit_predefined_type (be_predefined_type *node)
       break;
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -423,8 +503,10 @@ be_visitor_typecode_defn::visit_sequence (be_sequence *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -453,8 +535,10 @@ be_visitor_typecode_defn::visit_string (be_string *node)
       break;
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -481,8 +565,10 @@ be_visitor_typecode_defn::visit_structure (be_structure *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -512,8 +598,10 @@ be_visitor_typecode_defn::visit_typedef (be_typedef *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -540,8 +628,10 @@ be_visitor_typecode_defn::visit_union (be_union *node)
       return this->visit_type (node);
     case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
       return this->gen_typecode (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
       return this->gen_encapsulation (node);
+
     case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
       this->computed_tc_size_ = this->compute_tc_size (node);
       return ((this->computed_tc_size_ > 0) ? 0 : -1);
@@ -1079,10 +1169,10 @@ be_visitor_typecode_defn::gen_encapsulation (be_interface *node)
   // aligned size is 4 bytes
   this->tc_offset_ += sizeof (ACE_CDR::ULong);
 
-  // generate repoID
+  // generate repoID.
   this->gen_repoID (node);
 
-  // generate name
+  // generate name.
   os->indent ();
   this->gen_name (node);
 
@@ -2784,22 +2874,44 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
     {
       // optimized case
       *os << "1, 0x0,";
-      *os << " // repository ID = " << node->repoID ();
+      *os << " // repository ID = ";
+      
+      // repoID generation.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << node->compute_repoID ("AMI_", "_Handler");
+      else
+        *os << node->repoID ();
+      
       // size of the repoID filed
       this->tc_offset_ += (2 * sizeof (ACE_CDR::ULong));
     }
   else
     {
-      // unoptimized case
-      *os << (ACE_OS::strlen (node->repoID ()) + 1) << ", ";
+      // Unoptimized case.
+      
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << (ACE_OS::strlen (node->compute_repoID ("AMI_", "_Handler")) + 1) << ", ";
+      else
+        *os << (ACE_OS::strlen (node->repoID ()) + 1) << ", ";
       
       ACE_CDR::ULong *arr, i, arrlen;
-      (void) this->tc_name2long (node->repoID (), arr, arrlen);
+
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        (void) this->tc_name2long (node->compute_repoID ("AMI_", "_Handler"), arr, arrlen);
+      else
+        (void) this->tc_name2long (node->repoID (), arr, arrlen);
+
       for (i = 0; i < arrlen; i++)
         {
           os->print ("ACE_NTOHL (0x%x), ", arr[i]);
         }
-      *os << " // repository ID = " << node->repoID ();
+      
+      // Comment.
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << " // repository ID = " << node->compute_repoID ("AMI_", "_Handler");
+      else
+        *os << " // repository ID = " << node->repoID ();
+
       // size of the repoID field
       this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
     }
@@ -2812,7 +2924,10 @@ be_visitor_typecode_defn::gen_name (be_decl *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // generate name
+  // @@ AMI code generation should be done for this optimized
+  //    case. (Alex). 
+
+  // Generate name.
   if (idl_global->opt_tc ())
     {
       *os << "1, 0x0,";
@@ -2823,14 +2938,29 @@ be_visitor_typecode_defn::gen_name (be_decl *node)
   else
     {
       ACE_CDR::ULong *arr, i, arrlen;
-      *os << (ACE_OS::strlen (node->local_name ()->get_string ()) + 1) << ", ";
-      (void) this->tc_name2long (node->local_name ()->get_string (), arr, arrlen);
+
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        {
+          *os << (ACE_OS::strlen (node->compute_local_name ("AMI_", "_Handler")->get_string ()) + 1) << ", ";
+          (void) this->tc_name2long (node->compute_local_name ("AMI_", "_Handler")->get_string (), arr, arrlen);
+        }
+      else
+        {
+          *os << (ACE_OS::strlen (node->local_name ()->get_string ()) + 1) << ", ";
+          (void) this->tc_name2long (node->local_name ()->get_string (), arr, arrlen);
+        }
+
       for (i = 0; i < arrlen; i++)
         {
           os->print ("ACE_NTOHL (0x%x), ", arr[i]);
         }
-      *os << " // name = " << node->local_name ();
-      // size of the name field
+      
+      if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_TYPECODE_DEFN)
+        *os << " // name = " << node->compute_local_name ("AMI_", "_Handler");
+      else
+        *os << " // name = " << node->local_name ();
+
+      // size of the name field.
       this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
     }
   *os << "\n";
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 d739655b4f2..8510fc91314 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -117,8 +117,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
       *os << "// copy constructor" << be_nl;
       *os << node->name () << "::" << node->local_name ()
-          << " (const " << node->name () << " &u)" << be_nl
-          << "  : TAO_Base_Union ()" << be_nl;
+          << " (const " << node->name () << " &u)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "this->disc_ = u.disc_;" << be_nl;
       // now switch based on the disc value
@@ -174,7 +173,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->indent ();
       *os << "// reset method to reset old values of a union" << be_nl;
       *os << "void " << node->name () << "::_reset (" << bt->name ()
-          << ", CORBA::Boolean finalize)" << be_nl;
+          << " new_disc_val, CORBA::Boolean finalize)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "switch (this->disc_)" << be_nl;
       *os << "{" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
index 41084b0b09a..87ca50d4afc 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
@@ -140,8 +140,9 @@ be_visitor_union_branch_cdr_op_ci::visit_array (be_array *node)
       return 0;
 
     case TAO_CodeGen::TAO_CDR_SCOPE:
-      // This is done in cdr_op_cs.cpp  and hacked into *.i.
+      // proceed further
       break;
+
     default:
       // error
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index 3c1d6e42452..c6eb2126935 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -173,10 +173,7 @@ be_visitor_union_branch_private_ch::visit_interface (be_interface *node)
   // C++ does not allow an object declaration inside a union. Hence we
   // must have a pointer. This changes some of the methods.
   // We use TAO_Object_Field_T<> so that _upcast() and _downcast() will work.
-  *os << "TAO_Object_Field_T<"
-      << bt->nested_type_name (bu, "") << ",";
-  // Must use another statement, nested_type_name has side effects...
-  *os << bt->nested_type_name (bu, "_var")
+  *os << "TAO_Object_Field_T<" << bt->nested_type_name (bu, "")
       << "> *" << ub->local_name () << "_;\n";
   return 0;
 }
@@ -210,10 +207,7 @@ be_visitor_union_branch_private_ch::visit_interface_fwd (be_interface_fwd *node)
   // C++ does not allow an object declaration inside a union. Hence we
   // must have a pointer. This changes some of the methods.
   // We use TAO_Object_Field_T<> so that _upcast() and _downcast() will work.
-  *os << "TAO_Object_Field_T<"
-      << bt->nested_type_name (bu, "") << ",";
-  // Must use another statement, nested_type_name has side effects...
-  *os << bt->nested_type_name (bu, "_var")
+  *os << "TAO_Object_Field_T<" << bt->nested_type_name (bu, "")
       << "> *" << ub->local_name () << "_;\n";
   return 0;
 }
@@ -250,9 +244,7 @@ be_visitor_union_branch_private_ch::visit_predefined_type (be_predefined_type *n
       // check if we are dealing with a CORBA::Object
       if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
         {
-          *os << "TAO_Object_Field_T<"
-              << bt->name () << ","
-              << bt->name () << "_var"
+          *os << "TAO_Object_Field_T<" << bt->name () 
               << "> *" << ub->local_name () << "_;\n";
         }
       else
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
index 04e57571655..c48b0ce51fc 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp
@@ -85,7 +85,7 @@ visit_union_branch (be_union_branch *node)
       else
         *os << be_nl;
     }
-
+  
   if (bt->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -213,9 +213,7 @@ be_visitor_union_branch_public_access_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
   *os << "if (alloc_flag)" << be_idt_nl;
   *os << "ACE_NEW_RETURN (this->u_." << ub->local_name () << "_, "
-      << "(TAO_Object_Field_T<"
-      << bt->name () << ","
-      << bt->name () << "_var>), 0);" << be_uidt_nl;
+      << "TAO_Object_Field_T<" << bt->name () << ">, 0);" << be_uidt_nl;
   *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index d82862e40c1..e2498127676 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -226,9 +226,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
   os->indent (); // start from current indentation
   // set the discriminant to the appropriate label
   *os << "this->u_." << ub->local_name ()
-      << "_ = new TAO_Object_Field_T<"
-      << bt->name () << ","
-      << bt->name () << "_var"
+      << "_ = new TAO_Object_Field_T<" << bt->name ()
       << "> (" << bt->name () << "::_duplicate (u.u_."
       << ub->local_name () << "_->ptr ()));" << be_uidt_nl;
 
@@ -264,9 +262,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (be_interface_fwd
   os->indent (); // start from current indentation
   // set the discriminant to the appropriate label
   *os << "this->u_." << ub->local_name ()
-      << "_ = new TAO_Object_Field_T<"
-      << bt->name () << ","
-      << bt->name () << "_var"
+      << "_ = new TAO_Object_Field_T<" << bt->name ()
       << "> (" << bt->name () << "::_duplicate (u.u_."
       << ub->local_name () << "_->ptr ()));" << be_uidt_nl;
 
@@ -307,7 +303,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (be_predefined_t
       *os << "this->u_." << ub->local_name () << "_ = ";
       if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
         {
-          *os << "new TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> "
+          *os << "new TAO_Object_Field_T<CORBA::Object> "
               << "(CORBA::Object::_duplicate (u.u_."
               << ub->local_name () << "_->ptr ()));" << be_uidt_nl;
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 76e4e27d077..30df5d19ac4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -316,9 +316,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 
       *os << "this->u_." << ub->local_name ()
           << "_ = new TAO_Object_Field_T<"
-          << bt->nested_type_name (bu, "") << ",";
-      // Must use another statement, nested_type_name has side effects...
-      *os << bt->nested_type_name (bu, "_var")
+          << bt->nested_type_name (bu, "")
           << "> (" << bt->name ()
           << "::_duplicate (val));" << be_uidt_nl;
     }
@@ -388,9 +386,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
 
       *os << "this->u_." << ub->local_name ()
           << "_ = new TAO_Object_Field_T<"
-          << bt->nested_type_name (bu, "") << ",";
-      // Must use another statement, nested_type_name has side effects...
-      *os << bt->nested_type_name (bu, "") << "_var"
+          << bt->nested_type_name (bu, "")
           << "> (" << bt->name ()
           << "::_duplicate (val));" << be_uidt_nl;
     }
@@ -465,11 +461,10 @@ be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *no
           if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
             {
               *os << "this->u_." << ub->local_name () << "_ = new "
-                  << "TAO_Object_Field_T<CORBA::Object,"
-                  << "CORBA::Object_var> (CORBA::Object::_duplicate (val));"
+                  << "TAO_Object_Field_T<CORBA::Object> (CORBA::Object::_duplicate (val));"
                   << be_uidt_nl;
             }
-          else
+          else 
             {
               *os << "this->u_." << ub->local_name () << "_ = "
                   << bt->name () << "::_duplicate (val);" << be_uidt_nl;
@@ -508,12 +503,12 @@ be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *no
           << "{" << be_idt_nl;
       if (!ACE_OS::strcmp (bt->local_name ()->get_string (), "Object"))
         {
-          *os << "return this->u_." << ub->local_name ()
+          *os << "return this->u_." << ub->local_name () 
               << "_->ptr ();" << be_uidt_nl;
         }
       else
         {
-          *os << "return this->u_." << ub->local_name ()
+          *os << "return this->u_." << ub->local_name () 
               << "_;" << be_uidt_nl;
         }
       *os << "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index 77c3b394789..bcea3762d15 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -242,6 +242,14 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *
 int
 be_visitor_union_branch_public_reset_cs::visit_predefined_type (be_predefined_type *node)
 {
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 6786f1cc461..e241e54e09b 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -19,17 +19,11 @@
 #ifndef TAO_BE_CODEGEN_H
 #define TAO_BE_CODEGEN_H
 
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-
 #define NAMEBUFSIZE 1024
 // maximum length of static buffers used to store names
 
 class TAO_Visitor_Factory;
-class TAO_OutStream;
 class be_visitor_context;
-class be_visitor;
-class be_decl;
 
 class TAO_CodeGen
 {
@@ -75,7 +69,7 @@ public:
     TAO_ARGUMENT_PRE_UPCALL_SS,              // preprocessing of argument
                                              // variable before upcall
     TAO_ARGUMENT_UPCALL_SS,                  // passing argument variable to upcall
-    TAO_ARGUMENT_COLLOCATED_UPCALL_SS, // passing argument
+    TAO_ARGUMENT_COLLOCATED_UPCALL_SS,                  // passing argument
                                                         // variable to upcall
     TAO_ARGUMENT_POST_UPCALL_SS,             // postprocessing of argument
                                              // variable after upcall
@@ -87,11 +81,8 @@ public:
     TAO_ATTRIBUTE_IH,                        // in implementation header
     TAO_ATTRIBUTE_SS,                        // in server skeletons
     TAO_ATTRIBUTE_IS,                        // in implementation skeletons
-    TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SH, // in server header for collocated
-    TAO_ATTRIBUTE_THRU_POA_COLLOCATED_SS,             // in server skeletons for
-                                             // collocated
-    TAO_ATTRIBUTE_DIRECT_COLLOCATED_SH, // in server header for collocated
-    TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS,             // in server skeletons for
+    TAO_ATTRIBUTE_COLLOCATED_SH,             // in server header for collocated
+    TAO_ATTRIBUTE_COLLOCATED_SS,             // in server skeletons for
                                              // collocated
     TAO_ATTRIBUTE_TIE_SH,
     TAO_ATTRIBUTE_TIE_SI,
@@ -151,10 +142,8 @@ public:
     TAO_INTERFACE_SI,
     TAO_INTERFACE_SS,
     TAO_INTERFACE_IS,
-    TAO_INTERFACE_THRU_POA_COLLOCATED_SH,
-    TAO_INTERFACE_THRU_POA_COLLOCATED_SS,
-    TAO_INTERFACE_DIRECT_COLLOCATED_SH,
-    TAO_INTERFACE_DIRECT_COLLOCATED_SS,
+    TAO_INTERFACE_COLLOCATED_SH,
+    TAO_INTERFACE_COLLOCATED_SS,
     TAO_INTERFACE_ANY_OP_CH,
     TAO_INTERFACE_ANY_OP_CS,
     TAO_INTERFACE_CDR_OP_CH,
@@ -228,10 +217,8 @@ public:
     TAO_OPERATION_IH,                       // in implementation header
     TAO_OPERATION_SS,                       // in server skeletons
     TAO_OPERATION_IS,                       // in server skeletons
-    TAO_OPERATION_THRU_POA_COLLOCATED_SH,            // in collocated server header
-    TAO_OPERATION_THRU_POA_COLLOCATED_SS,            // in collocated server skel
-    TAO_OPERATION_DIRECT_COLLOCATED_SH,            // in collocated server header
-    TAO_OPERATION_DIRECT_COLLOCATED_SS,            // in collocated server skel
+    TAO_OPERATION_COLLOCATED_SH,            // in collocated server header
+    TAO_OPERATION_COLLOCATED_SS,            // in collocated server skel
     TAO_OPERATION_RETTYPE_CH,                // return type in client header op
                                              // signature
     TAO_OPERATION_RETTYPE_IS,                // return type in client header op
@@ -288,19 +275,72 @@ public:
     // Emitting code for AMI.
     TAO_OPERATION_AMI_CH,                  // AMI stub generation.
     TAO_OPERATION_AMI_CS,                  // AMI stub generation.
-    TAO_OPERATION_AMI_ARGLIST,             // AMI stubs in client header
+    TAO_OPERATION_AMI_ARGLIST_CH,             // AMI stubs in client header
+    TAO_OPERATION_AMI_ARGLIST_CS,             // AMI stubs in client cpp.
     TAO_OPERATION_ARG_AMI,                 // AMI stub.
     TAO_ARGUMENT_AMI,                      // Argument in AMI stub.
-    TAO_ARGUMENT_AMI_ARGLIST,              // Arg list in AMI stub.
+    TAO_ARGUMENT_AMI_ARGLIST_CH,              // Arg list in AMI stub.
+    TAO_ARGUMENT_AMI_ARGLIST_CS,              // Arg list in AMI stub.
     TAO_AMI_HANDLER_FWD_CH,                // FWD decl for AMI handler.
     TAO_AMI_HANDLER_FWD_CI,                // FWD decl for AMI handler.
-    // @ Alex: FWD does nt make sense.
-    //         Should rename it.
-    TAO_AMI_HANDLER_CH,
-    TAO_AMI_HANDLER_OPERATION_CH,
-    TAO_AMI_HANDLER_OPERATION_ARGLIST,
-    TAO_ARGUMENT_AMI_HANDLER_ARGLIST,
+
+    TAO_AMI_HANDLER_SERVANT_CH,            // POA_AMI_*_Handler.
+    TAO_AMI_HANDLER_SERVANT_CS,            // POA_AMI_*_Handler.
+
+    TAO_AMI_HANDLER_STUB_CH,               // AMI_*_Handler class visitor.
+
+    TAO_AMI_HANDLER_STUB_CS,               // AMI_*_Handler class visitor.
+
+    TAO_AMI_HANDLER_SERVANT_OPERATION_CH,  // Operation in AMI_*_Handler.
+    TAO_AMI_HANDLER_STUB_OPERATION_CH,     // Operation in POA_AMI_*_Handler.
+    TAO_AMI_HANDLER_OPERATION_ARGLIST_CH,
+    TAO_AMI_HANDLER_OPERATION_ARGLIST_CS,
+    TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CH,
+    TAO_ARGUMENT_AMI_HANDLER_ARGLIST_CS,
     TAO_ARGUMENT_ARGLIST_AMI_HANDLER,
+    TAO_AMI_HANDLER_OPERATION_RESULT_ARG,
+
+    TAO_AMI_HANDLER_TYPECODE_DECL,           // Typecode decl for the AMI_*_Handler.
+
+    TAO_COLLOCATED_AMI_HANDLER_CH,           // Collocated AMI_*_Handler class.
+
+    TAO_COLLOCATED_AMI_HANDLER_OPERATION_CH, // Operation inside the collocated AMI handler.
+
+// @@ Michael    TAO_AMI_HANDLER_ARGUMENT_INVOKE_CS,
+
+// @@ Michael    TAO_AMI_HANDLER_OPERATION_ARG_INVOKE_CS,
+
+    TAO_AMI_HANDLER_STUB_OPERATION_CS,
+
+    TAO_AMI_HANDLER_TYPECODE_DEFN,           // Typecode definition for AMI Handler class.
+
+    TAO_AMI_OPERATION_ARG_INVOKE_CS,         // Invoke arguments for AMI's sendc method.
+
+    TAO_AMI_ARGUMENT_INVOKE_CS,
+
+    TAO_AMI_HANDLER_SKELETON_CS,
+
+    TAO_AMI_HANDLER_OPERATION_RETVAL_DECL_CS,        // Result argument declaration.
+
+    TAO_AMI_HANDLER_OPERATION_ARG_DECL_CS,           // Argument declartion.
+
+    TAO_AMI_HANDLER_ARGUMENT_VARDECL_CS,             // State derived out of the above
+
+    TAO_AMI_HANDLER_OPERATION_ARG_UPCALL_CS,         // Argument list for the upcall
+                                                     // (only out and inout arguments)
+    TAO_AMI_HANDLER_ARGUMENT_UPCALL_CS,              // State derived out of the above
+
+    TAO_AMI_HANDLER_OPERATION_RETVAL_MARSHAL_CS,     // Marshalling the return value
+
+    TAO_AMI_HANDLER_OPERATION_RETVAL_DEMARSHAL_CS,   // Demarshalling the return value
+
+    TAO_AMI_HANDLER_OPERATION_ARG_MARSHAL_CS,        // Marshalling the inout and out arguments
+
+    TAO_AMI_HANDLER_ARGUMENT_MARSHAL_CS,             // State derived out of the above
+
+    TAO_AMI_HANDLER_OPERATION_ARG_DEMARSHAL_CS,      // Demarshalling the inout and out arguments
+
+    TAO_AMI_HANDLER_ARGUMENT_DEMARSHAL_CS,           // State derived out of the above
 
     // Emitting code for root.
     TAO_ROOT_CH,
@@ -424,12 +464,17 @@ public:
     // these are for typecode generation
     TAO_TC_DEFN_TYPECODE, // top level typecode
     TAO_TC_DEFN_TYPECODE_NESTED, // nested tc
+
     TAO_TC_DEFN_ENCAPSULATION, // encapsulation
+    TAO_AMI_HANDLER_TC_DEFN_ENCAPSULATION, // encapsulation
+
     TAO_TC_DEFN_SCOPE, // scope
     TAO_TC_DEFN_TC_SIZE, // tc size computation
     TAO_TC_DEFN_ENCAP_LEN, // encap size computation
     TAO_TC_DEFN_SCOPE_LEN, // scope size computation
 
+    TAO_AMI_HANDLER_TC_DEFN_TYPECODE, // For AMI Handler interface.
+
     // used to denote either error or don't care
     TAO_SUB_STATE_UNKNOWN
   };
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index cea43133eda..8760544110b 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -66,15 +66,37 @@ public:
   const char *fullname (void);
   // return the stringified full name
 
+  const char *ami_handler_fullname (void);
+  // return the stringified full name of the assosciated AMI reply handler.
+
   const char *flatname (void);
-  // return the flattened full scoped name
+  // return the flattened full scoped name.
+
+  const char *ami_handler_flatname (void);
+  // return the flattened full scoped name of the assosciated AMI reply handler.
 
+  char* compute_flatname (const char *prefix, const char *suffix);
+  // Both the arguments should be non-null!!!. Applies prefix and
+  // suffix to the local name and makes a flat name.
 
   const char *repoID (void);
-  // retrieve the repository ID
+  // retrieve the repository ID.
+
+  const char *ami_handler_repoID (void);
+  // retrieve the repository ID of the assosciated AMI reply handler.
+
+  char *compute_repoID (const char *prefix, const char *suffix);
+  // Apply the prefix and suffix to the local name and compute the
+  // repoID.  Both the parameters should be non-null.
+
+  int compute_ami_handler_name (const char *name,
+                                char *&ami_handler_name);
+  // Computes the name of the corresponding AMI handler out of a
+  // given name. The name might contain POA_ at the beginning
+  // and might possibly have many scope levels.
 
   const char* prefix (void);
-  // retrive the repository ID prefix
+  // retrieve the repository ID prefix
 
   virtual idl_bool is_nested (void);
   // determines if we are inside of a nested scope or not
@@ -160,13 +182,21 @@ protected:
   char *fullname_;
   // our full scoped name
 
+  char *ami_handler_fullname_;
+  // our full scoped name of the associated AMI reply handler
+
   char *flatname_;
   // flattened fully scoped name
 
+  char *ami_handler_flatname_;
+  // flattened fully scoped name of the associated AMI reply handler
 
   char *repoID_;
   // repository ID
 
+  char *ami_handler_repoID_;
+  // repository ID of the associated AMI reply handler
+
   char *prefix_;
   // The repository ID prefix
 
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index 9abb2d015dd..cfde79677bf 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -44,11 +44,6 @@ public:
   // Narrowing
   DEF_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl);
   DEF_NARROW_FROM_DECL (be_enum_val);
-
-protected:
-  virtual int compute_size_type (void);
-  // Trivial implementation, but it avoids a switch statement
-  // in be_decl::size_type()
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 4f408ad8393..a8c732688f7 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -38,11 +38,6 @@ class be_interface : public virtual AST_Interface,
   // = DESCRIPTION
   //
 public:
-  enum {
-    THRU_POA = 0,
-    DIRECT = 1
-  };
-  // Collocated stubs type value.
 
   // used to pass functions to the template method
   typedef int (*tao_code_emitter) (be_interface *, be_interface *, TAO_OutStream *);
@@ -90,6 +85,9 @@ public:
   const char *full_skel_name (void);
   // Retrieve the fully scoped skel class name.
 
+  const char *ami_handler_full_skel_name (void);
+  // Retrieve the fully scoped skel AMI handler class name
+
   //
   // Each interface (to fix names "T") also defines two help classes,
   // the "collocated" class inherits from T, but delegates on the
@@ -101,11 +99,27 @@ public:
   // defines the stubs (all operations in T are pure virtual).
   // @@ TODO currently the stub class is not implemented.
   //
-  const char *full_coll_name (int);
-  // retrieve the fully qualified collocated class name
+  const char *full_coll_name (void);
+  // Retrieve the fully qualified collocated class name
+
+  const char *ami_handler_full_coll_name (void);
+  // Retrieve the fully qualified collocated AMI handler class name
+
+  const char *local_coll_name (void) const;
+  // Retrieve the fully qualified collocated class name.
+
+  const char *ami_handler_local_coll_name (void);
+  // Retrieve the fully qualified collocated AMI handler class name.
 
-  const char *local_coll_name (int) const;
-  // retrieve the fully qualified collocated class name
+  const char *ami_handler_local_name (void);
+  // Retrieve the local name of the AMI handler
+
+  int compute_coll_names (const char *local_name,
+                          char *&coll_local_name,
+                          char *&coll_full_name);
+  // Generate collocated local and full names for the arbitrary local
+  // name under the scope of this interface. Usefull to generate AMI
+  // Handlers.
 
   virtual int traverse_inheritance_graph (tao_code_emitter gen,
                                           TAO_OutStream *os);
@@ -114,6 +128,9 @@ public:
   const char *relative_skel_name (const char *other_class_name);
   // relative skeleton name
 
+  const char *relative_coll_name (const char *other_class_name);
+  // relative name for collocated class.
+
   int in_mult_inheritance (void);
   // am I in some form of multiple inheritance
   // -1 => error
@@ -153,6 +170,12 @@ public:
   // helper method passed to the template method to generate code for the
   // skeletons in the inline file
 
+  static int collocated_ctor_helper (be_interface *,
+                                     be_interface *,
+                                     TAO_OutStream *os);
+  // helper method passed to the template method to invoke ctors of all the
+  // base classes.
+
   static int copy_ctor_helper (be_interface *,
                                be_interface *,
                                TAO_OutStream *os);
@@ -192,7 +215,7 @@ public:
   int gen_optable_entries (be_interface *);
   // generate the operation table entries.
 
-  void compute_coll_name (int);
+  void compute_coll_name (void);
   // compute the fully qualified collocated class name.
 
 private:
@@ -233,14 +256,26 @@ private:
   char *full_skel_name_;
   // Fully scoped skeleton name.
 
+  char *ami_handler_full_skel_name_;
+  // Fully scoped AMI Handler skeleton name
+
   int skel_count_;
   // Number of static skeletons in the operation table.
 
   char *full_coll_name_;
-  // full collocated name
+  // Full collocated name
+
+  char *ami_handler_full_coll_name_;
+  // Full collocated name of the AMI handler
 
   char *local_coll_name_;
-  // local collocated name
+  // Local collocated name
+
+  char *ami_handler_local_coll_name_;
+  // Local collocated name of the AMI handler
+
+  char *ami_handler_local_name_;
+  // Local name of the AMI Handler
 
   int in_mult_inheritance_;
   // am I directly or indirectly involved in a multiple inheritance. If the
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 373dd0b062a..07fad27f576 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -84,6 +84,9 @@ public:
   const char *instance_name ();
   // report the instance name for instantiation
 
+  const char *object_manager_name ();
+  // report the object manager name for the sequence of objects
+
 protected:
   virtual char *gen_name (void);
   // helper to create_name
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 61d10187d47..f1b16123b58 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -64,8 +64,12 @@ public:
   // If any one of the argument is 0, then use the name giin this
   // node, else use the arguments. );
 
-  UTL_ScopedName *tc_name (void);
-  // return the typecode name
+  UTL_ScopedName *tc_name (const char *prefix = 0,
+                           const char *suffix = 0);
+  // Return the typecode name. When both, the prefix and the suffix
+  // are non null, it computes and returns a tc name. Else, it also
+  // stores the result in a member variable.
+
 
   virtual const char *nested_type_name (be_decl *d,
                                         const char *suffix = 0,
@@ -94,6 +98,10 @@ protected:
   virtual void compute_tc_name (void);
   // computes the fully scoped typecode name
 
+  virtual UTL_ScopedName * compute_tc_name (const char *prefix,
+                                            const char *suffix);
+  // Compute and return the value.
+
   UTL_ScopedName *tc_name_;
   // typecode name
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index 0f9fdf3a6f4..78f39acb854 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -41,4 +41,9 @@
 #include "be_visitor_argument/pre_invoke_cs.h"
 #include "be_visitor_argument/ami_arglist.h"
 #include "be_visitor_argument/ami_handler_arglist.h"
+#include "be_visitor_argument/ami_handler_result_arg.h"
+#include "be_visitor_argument/ami_handler_compiled_marshal_cs.h"
+#include "be_visitor_argument/ami_handler_upcall_cs.h"
+#include "be_visitor_argument/ami_handler_vardecl_cs.h"
+
 #endif /* _BE_VISITOR_ARGUMENT_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h
new file mode 100644
index 00000000000..11d8bef925f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_compiled_marshal_cs.h
@@ -0,0 +1,89 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_compiled_marshal_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments for passing the arguments
+//    to the CDR << and >> operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ARGUMENT_ami_handler_compiled_marshal_cs_H_
+#define _BE_VISITOR_ARGUMENT_ami_handler_compiled_marshal_cs_H_
+
+// ************************************************************
+// class be_visitor_args_ami_handler_compiled_marshal_cs
+// ************************************************************
+class be_visitor_args_ami_handler_compiled_marshal_cs : public be_visitor_args
+{
+  //
+  // = TITLE
+  //   be_visitor_args_ami_handler_compiled_marshal_cs
+  //
+  // = DESCRIPTION
+  //   Code to be generated when making the do_static_call
+  //
+public:
+  be_visitor_args_ami_handler_compiled_marshal_cs (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_args_ami_handler_compiled_marshal_cs (void);
+  // destructor
+
+  virtual int visit_argument (be_argument *node);
+  // visit the argument node
+
+  // =visit all the nodes that can be the types for the argument
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit the enum node
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
+
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
+  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_union (be_union *node);
+  // visit union type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
+
+};
+
+#endif /* _BE_VISITOR_ARGUMENT_ami_handler_compiled_marshal_cs_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h
new file mode 100644
index 00000000000..67e4d85b4a7
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_result_arg.h
@@ -0,0 +1,86 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_result_arg.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the return
+//    type of the operation
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ARGS_AMI_HANDLER_RESULT_ARG_H_
+#define _BE_VISITOR_ARGS_AMI_HANDLER_RESULT_ARG_H_
+
+// ***********************************************************************
+// Operation visitor for return types in the signature of the operation
+// ***********************************************************************
+
+class be_visitor_args_ami_handler_result_arg : public be_visitor_args
+{
+  //
+  // = TITLE
+  //   be_visitor_args_ch
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation return types
+  //
+  //
+public:
+  be_visitor_args_ami_handler_result_arg (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_args_ami_handler_result_arg (void);
+  // destructor
+
+  int visit_array (be_array *node);
+  // visit an array node
+
+  int visit_enum (be_enum *node);
+  // visit an enum node
+
+  int visit_interface (be_interface *node);
+  // visit an interface node
+
+  int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface node
+
+  int visit_native (be_native *node);
+  // visit native type
+
+  int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
+
+  int visit_sequence (be_sequence *node);
+  // visit a sequence node
+
+  int visit_string (be_string *node);
+  // visit a sequence node
+
+  int visit_structure (be_structure *node);
+  // visit a structure node
+
+  int visit_typedef (be_typedef *node);
+  // visit a typedef node
+
+  int visit_union (be_union *node);
+  // visit a union node
+
+# ifdef IDL_HAS_VALUETYPE
+  int visit_valuetype (be_valuetype *node);
+  int visit_valuetype_fwd (be_valuetype_fwd *node);
+# endif /* IDL_HAS_VALUETYPE */
+
+};
+
+#endif /* _BE_VISITOR_ARGS_AMI_HANDLER_RESULT_ARG_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h
new file mode 100644
index 00000000000..a1da8fe0ed2
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_upcall_cs.h
@@ -0,0 +1,90 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_upcall_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    passing of arguments to the upcall.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ARGUMENT_upcall_cs_H_
+#define _BE_VISITOR_ARGUMENT_upcall_cs_H_
+
+// ************************************************************
+// class be_visitor_args_ami_handler_upcall_cs
+// ************************************************************
+class be_visitor_args_ami_handler_upcall_cs : public be_visitor_args
+{
+  //
+  // = TITLE
+  //   be_visitor_args_ami_handler_upcall_cs
+  //
+  // = DESCRIPTION
+  //   Visitor for passing argument to the upcall
+  //
+public:
+  be_visitor_args_ami_handler_upcall_cs (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_args_ami_handler_upcall_cs (void);
+  // destructor
+
+  virtual int visit_argument (be_argument *node);
+  // visit the argument node
+
+  // =visit all the nodes that can be the types for the argument
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit the enum node
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
+
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
+  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_union (be_union *node);
+  // visit union type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
+
+};
+
+#endif /* _BE_VISITOR_ARGUMENT_upcall_cs_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h
new file mode 100644
index 00000000000..fd2d80db63f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/ami_handler_vardecl_cs.h
@@ -0,0 +1,126 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_vardecl_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    variable declartion for the argument in the server-sde skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//    Michael Kircher
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ARGUMENT_ami_handler_vardecl_cs_H_
+#define _BE_VISITOR_ARGUMENT_ami_handler_vardecl_cs_H_
+
+// ************************************************************
+// class be_visitor_args_ami_handler_vardecl_cs
+// ************************************************************
+class be_visitor_args_ami_handler_vardecl_cs : public be_visitor_args
+{
+  //
+  // = TITLE
+  //   be_visitor_args_ami_handler_vardecl_cs
+  //
+  // = DESCRIPTION
+  //   Visitor for variable declaration for argument
+  //
+public:
+  be_visitor_args_ami_handler_vardecl_cs (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_args_ami_handler_vardecl_cs (void);
+  // destructor
+
+  virtual int visit_argument (be_argument *node);
+  // visit the argument node
+
+  // =visit all the nodes that can be the types for the argument
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit the enum node
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
+
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
+  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_union (be_union *node);
+  // visit union type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
+
+};
+
+// ************************************************************
+// class be_compiled_visitor_args_ami_handler_vardecl_cs
+// ************************************************************
+class be_compiled_visitor_args_ami_handler_vardecl_cs : public be_visitor_args_ami_handler_vardecl_cs
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_args_ami_handler_vardecl_cs
+  //
+  // = DESCRIPTION
+  //   Visitor for variable declaration for argument for compiled marshaling
+  //   skeletons
+  //
+public:
+  be_compiled_visitor_args_ami_handler_vardecl_cs (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_compiled_visitor_args_ami_handler_vardecl_cs (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
+
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
+};
+
+#endif /* _BE_VISITOR_ARGUMENT_ami_handler_vardecl_cs_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h
index e217dbacd01..34cf441e82f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h
@@ -22,7 +22,6 @@
 #define TAO_BE_VISITOR_DECL_H
 
 #include "be_visitor.h"
-#include "be_codegen.h"
 
 class be_visitor_decl : public be_visitor
 {
@@ -47,11 +46,6 @@ protected:
 
   be_visitor_context *ctx_;
   // any context information required by the visitor
-
-  int gen_anonymous_base_type (be_type *bt,
-                               TAO_CodeGen::CG_STATE cg_state);
-  // Factors out common code used when one anonymous type is
-  // contained by another.
 };
 
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index af9dca32cb8..7e1889bbd0b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -32,10 +32,8 @@
 #include "be_visitor_interface/interface_si.h"
 #include "be_visitor_interface/interface_ss.h"
 #include "be_visitor_interface/interface_is.h"
-#include "be_visitor_interface/thru_poa_collocated_sh.h"
-#include "be_visitor_interface/thru_poa_collocated_ss.h"
-#include "be_visitor_interface/direct_collocated_sh.h"
-#include "be_visitor_interface/direct_collocated_ss.h"
+#include "be_visitor_interface/collocated_sh.h"
+#include "be_visitor_interface/collocated_ss.h"
 #include "be_visitor_interface/any_op_ch.h"
 #include "be_visitor_interface/any_op_cs.h"
 #include "be_visitor_interface/cdr_op_ch.h"
@@ -45,5 +43,10 @@
 #include "be_visitor_interface/tie_si.h"
 #include "be_visitor_interface/ami_handler_fwd_ch.h"
 #include "be_visitor_interface/ami_handler_fwd_ci.h"
-#include "be_visitor_interface/ami_handler_ch.h"
+#include "be_visitor_interface/ami_handler_servant_ch.h"
+#include "be_visitor_interface/ami_handler_servant_cs.h"
+#include "be_visitor_interface/ami_handler_stub_ch.h"
+#include "be_visitor_interface/ami_handler_stub_cs.h"
+#include "be_visitor_interface/collocated_ami_handler_ch.h"
+
 #endif /* _BE_VISITOR_INTERFACE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h
new file mode 100644
index 00000000000..00f3472e5d2
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_cs.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_CS_H_
+#define _BE_INTERFACE_AMI_HANDLER_CS_H_
+
+class be_visitor_ami_handler_cs : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the AMI Handler
+  //   skeletons for interface.  
+  //
+public:
+  be_visitor_ami_handler_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_ami_handler_cs (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_INTERFACE_AMI_HANDLER_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h
new file mode 100644
index 00000000000..8bc8857ed4f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_ch.h
@@ -0,0 +1,47 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_SERVANT_CH_H_
+#define _BE_INTERFACE_AMI_HANDLER_SERVANT_CH_H_
+
+class be_visitor_interface_ami_handler_servant_ch : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_interface_ami_handler_servant_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for interface
+  //
+  //
+public:
+  be_visitor_interface_ami_handler_servant_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_ami_handler_servant_ch (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_INTERFACE_AMI_HANDLER_SERVANT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h
new file mode 100644
index 00000000000..71a082763e4
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_servant_cs.h
@@ -0,0 +1,46 @@
+// $Id$
+//
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_servant_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the server skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_INTERFACE_AMI_HANDLER_SERVANT_CS_H_
+#define _BE_INTERFACE_INTERFACE_AMI_HANDLER_SERVANT_CS_H_
+
+class be_visitor_interface_ami_handler_servant_cs : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_interface_ami_handler_servant_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for interface
+  //
+  //
+public:
+  be_visitor_interface_ami_handler_servant_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_ami_handler_servant_cs (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_INTERFACE_INTERFACE_AMI_HANDLER_SERVANT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h
new file mode 100644
index 00000000000..149201d00db
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_ch.h
@@ -0,0 +1,50 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_stub_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_STUB_CH_H_
+#define _BE_INTERFACE_AMI_HANDLER_STUB_CH_H_
+
+// we need derived interface visitors for the client and server header files. For
+// the others, they use the default interface visitor
+
+class be_visitor_interface_ami_handler_stub_ch : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_stub_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for
+  //   interface.
+  //
+public:
+  be_visitor_interface_ami_handler_stub_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_ami_handler_stub_ch (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_INTERFACE_AMI_HANDLER_STUB_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h
new file mode 100644
index 00000000000..3af5f1a4720
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_stub_cs.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_CS_H_
+#define _BE_INTERFACE_AMI_HANDLER_CS_H_
+
+class be_visitor_interface_ami_handler_stub_cs : public be_visitor_interface
+{
+  //
+  // = TITLE
+  //   be_visitor_interface_ami_handler_stub_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the AMI Handler
+  //   skeletons for interface.  
+  //
+public:
+  be_visitor_interface_ami_handler_stub_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_ami_handler_stub_cs (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_INTERFACE_AMI_HANDLER_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h
new file mode 100644
index 00000000000..d20938a046c
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ami_handler_ch.h
@@ -0,0 +1,42 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    collocated_ami_handler_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides code generation for collocated classes in server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_COLLOCATED_AMI_HANDLER_CH_H_
+#define _BE_INTERFACE_COLLOCATED_AMI_HANDLER_CH_H_
+
+class be_visitor_interface_collocated_ami_handler_ch : public be_visitor_interface
+{
+  // = TITLE
+  //   Generate the "collocated" class declaration.
+
+public:
+  be_visitor_interface_collocated_ami_handler_ch (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_interface_collocated_ami_handler_ch (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit an interface
+
+};
+
+#endif /* _BE_INTERFACE_COLLOCATED_AMI_HANDLER_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h
new file mode 100644
index 00000000000..a050c3fb47f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h
@@ -0,0 +1,42 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    collocated_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides code generation for collocated classes in server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_COLLOCATED_SH_H_
+#define _BE_INTERFACE_COLLOCATED_SH_H_
+
+class be_visitor_interface_collocated_sh : public be_visitor_interface
+{
+  // = TITLE
+  //   Generate the "collocated" class declaration.
+
+public:
+  be_visitor_interface_collocated_sh (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_interface_collocated_sh (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit an interface
+
+};
+
+#endif /* _BE_INTERFACE_COLLOCATED_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h
new file mode 100644
index 00000000000..a7ffeb3149e
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h
@@ -0,0 +1,42 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    collocated_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides code generation for collocated classes in server skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_COLLOCATED_SS_H_
+#define _BE_INTERFACE_COLLOCATED_SS_H_
+
+class be_visitor_interface_collocated_ss : public be_visitor_interface
+{
+  // = TITLE
+  //   Generate the "collocated" class declaration.
+
+public:
+  be_visitor_interface_collocated_ss (be_visitor_context *ctx);
+  // constructor
+
+  virtual ~be_visitor_interface_collocated_ss (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface
+
+};
+
+#endif /* _BE_INTERFACE_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_sh.h
deleted file mode 100644
index 76e937d32e9..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_sh.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    direct_collocated_sh.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface node.
-//    This provides code generation for direct collocated classes in server header
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_DIRECT_COLLOCATED_SH_H_
-#define _BE_INTERFACE_DIRECT_COLLOCATED_SH_H_
-
-class be_visitor_interface_direct_collocated_sh : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "direct collocated" class declaration.
-
-public:
-  be_visitor_interface_direct_collocated_sh (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_direct_collocated_sh (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit an interface
-
-};
-
-#endif /* _BE_INTERFACE_DIRECT_COLLOCATED_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_ss.h
deleted file mode 100644
index faca2392b8e..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_collocated_ss.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    driect_collocated_ss.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface node.
-//    This provides code generation for direct collocated classes in server skeleton
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_DIRECT_COLLOCATED_SS_H_
-#define _BE_INTERFACE_DIRECT_COLLOCATED_SS_H_
-
-class be_visitor_interface_direct_collocated_ss : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "direct collocated" class declaration.
-
-public:
-  be_visitor_interface_direct_collocated_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_direct_collocated_ss (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  static int collocated_ctor_helper (be_interface *,
-                                     be_interface *,
-                                     TAO_OutStream *os);
-  // helper method passed to the template method to invoke ctors of all the
-  // base classes.
-};
-
-#endif /* _BE_DIRECT_INTERFACE_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_sh.h
deleted file mode 100644
index 89a73401341..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_sh.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    thru_poa_collocated_sh.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface node.
-//    This provides code generation for thru_poa collocated classes in server header
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_THRU_POA_COLLOCATED_SH_H_
-#define _BE_INTERFACE_THRU_POA_COLLOCATED_SH_H_
-
-class be_visitor_interface_thru_poa_collocated_sh : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "thru_poa collocated" class declaration.
-
-public:
-  be_visitor_interface_thru_poa_collocated_sh (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_thru_poa_collocated_sh (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit an interface
-
-};
-
-#endif /* _BE_INTERFACE_THRU_POA_COLLOCATED_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_ss.h
deleted file mode 100644
index 9348412e9c3..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/thru_poa_collocated_ss.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    thru_poa_collocated_ss.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface node.
-//    This provides code generation for thru_poa collocated classes in server skeleton
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_THRU_POA_COLLOCATED_SS_H_
-#define _BE_INTERFACE_THRU_POA_COLLOCATED_SS_H_
-
-class be_visitor_interface_thru_poa_collocated_ss : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "thru_poa collocated" class declaration.
-
-public:
-  be_visitor_interface_thru_poa_collocated_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_thru_poa_collocated_ss (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  static int collocated_ctor_helper (be_interface *,
-                                     be_interface *,
-                                     TAO_OutStream *os);
-  // helper method passed to the template method to invoke ctors of all the
-  // base classes.
-};
-
-#endif /* _BE_INTERFACE_THRU_POA_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index e195f96d8a0..fd87c65c805 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -33,10 +33,8 @@
 #include "be_visitor_operation/operation_is.h"
 #include "be_visitor_operation/tie_sh.h"
 #include "be_visitor_operation/tie_si.h"
-#include "be_visitor_operation/thru_poa_collocated_sh.h"
-#include "be_visitor_operation/thru_poa_collocated_ss.h"
-#include "be_visitor_operation/direct_collocated_sh.h"
-#include "be_visitor_operation/direct_collocated_ss.h"
+#include "be_visitor_operation/collocated_sh.h"
+#include "be_visitor_operation/collocated_ss.h"
 #include "be_visitor_operation/arglist.h"
 #include "be_visitor_operation/rettype.h"
 #include "be_visitor_operation/rettype_is.h"
@@ -60,4 +58,7 @@
 #include "be_visitor_operation/ami_arglist.h"
 #include "be_visitor_operation/ami_handler_operation_ch.h"
 #include "be_visitor_operation/ami_handler_arglist.h"
+#include "be_visitor_operation/ami_handler_operation_cs.h"
+#include "be_visitor_operation/ami_handler_skeleton_cs.h"
+#include "be_visitor_operation/ami_handler_argument_marshal.h"
 #endif // TAO_BE_VISITOR_OPERATION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h
index c3bbc7aaedc..9e0ceb2c62d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_arglist.h
@@ -43,6 +43,14 @@ public:
   ~be_visitor_operation_ami_handler_arglist (void);
   // destructor
 
+  virtual int visit_scope (be_scope *node);
+  // Visit the scope and its elements. 
+  // This implementation is the same as
+  // <be_visitor_scope::visit_scope>. The variation is that it calls the
+  // <post_process>  only if the return value of the <accept> is 1. We
+  // need to do this since we have to differentiate between an argument
+  // that was printed and an argument that was skipped in the signature.
+  
   virtual int visit_operation (be_operation *node);
   // visit the operation
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h
new file mode 100644
index 00000000000..1697ff6cdd0
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_argument_marshal.h
@@ -0,0 +1,67 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_argument_marshal.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This is a visitor for
+//    passing arguments to the CDR operators in a compiled marshaling
+//    stub/skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_ami_handler_argument_marshal_H_
+#define _BE_VISITOR_OPERATION_ami_handler_argument_marshal_H_
+
+// ************************************************************
+// generic operation visitor for docall, upcall, pre/post
+// ************************************************************
+
+class be_compiled_visitor_operation_ami_handler_argument_marshal
+  : public be_visitor_operation_argument
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_operation_ami_handler_argument_marshal
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate a variable declaration of an operation
+  //   return type
+  //
+public:
+  be_compiled_visitor_operation_ami_handler_argument_marshal (be_visitor_context *ctx);
+  // constructor
+
+  ~be_compiled_visitor_operation_ami_handler_argument_marshal (void);
+  // destructor
+
+  virtual int pre_process (be_decl *bd);
+  // stuff to o/p before each element of the scope is handled
+
+  virtual int post_process (be_decl *bd);
+  // stuff to o/p after each element of the scope is handled
+
+  enum LAST_ARG_PRINTED
+  {
+    TAO_ARG_NONE,
+    TAO_ARG_IN,
+    TAO_ARG_INOUT,
+    TAO_ARG_OUT
+  };
+
+private:
+  LAST_ARG_PRINTED last_arg_printed_;
+};
+
+
+#endif /* _BE_VISITOR_OPERATION_ami_handler_argument_marshal_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h
new file mode 100644
index 00000000000..cb7640b40b0
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation.h
@@ -0,0 +1,52 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_operation_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for AMI Handler call back operations
+//    in client header.  
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_AMI_HANDLER_OPERATION_CH_H_
+#define _BE_VISITOR_OPERATION_AMI_HANDLER_OPERATION_CH_H_
+
+// ************************************************************
+// Operation visitor for server header
+// ************************************************************
+
+class be_visitor_operation_ami_handler_operation_ch : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_operation_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for operation
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_operation_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_operation_ch (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation.
+
+};
+
+#endif /* _BE_VISITOR_OPERATION_AMI_HANDLER_OPERATION_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h
new file mode 100644
index 00000000000..139cc1ecd37
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_operation_cs.h
@@ -0,0 +1,126 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_handler_operation_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_OPERATION_CS_H_
+#define _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_OPERATION_CS_H_
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+class be_visitor_operation_ami_handler_operation_cs : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_handler_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_operation_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_operation_cs (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation.
+
+  virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
+
+  // = template methods
+  virtual int gen_pre_stub_info (be_operation *, be_type *) = 0;
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *) = 0;
+  // generate code that marshals the arguments and transmits them
+
+  // =helper
+  virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
+
+  virtual int gen_raise_exception (be_type *,
+                                   const char * excep,
+                                   const char * status);
+  // helper that generates code for raising an exception
+
+  virtual int gen_check_exception (be_type *);
+  // helper that generates code for checking for an exception
+
+};
+
+// specialized visitors
+
+class be_interpretive_visitor_operation_ami_handler_operation_cs : public be_visitor_operation_ami_handler_operation_cs
+{
+  //
+  // = TITLE
+  //   be_interpretive_visitor_operation_ami_handler_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //   using interpretive marshaling.
+  //
+  //
+public:
+  be_interpretive_visitor_operation_ami_handler_operation_cs (be_visitor_context *);
+  // ctor
+
+  ~be_interpretive_visitor_operation_ami_handler_operation_cs (void);
+  // dtor
+
+  virtual int gen_pre_stub_info (be_operation *, be_type *);
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *);
+  // generate code that marshals the arguments and transmits them
+
+};
+
+class be_compiled_visitor_operation_ami_handler_operation_cs : public be_visitor_operation_ami_handler_operation_cs
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_operation_ami_handler_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //   using compiled marshaling.
+  //
+  //
+public:
+  be_compiled_visitor_operation_ami_handler_operation_cs (be_visitor_context *);
+  // ctor
+
+  ~be_compiled_visitor_operation_ami_handler_operation_cs (void);
+  // dtor
+
+  virtual int gen_pre_stub_info (be_operation *, be_type *);
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *);
+  // generate code that marshals the arguments and transmits them
+
+};
+
+#endif /* _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_OPERATION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h
new file mode 100644
index 00000000000..4405174311f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_result_arg.h
@@ -0,0 +1,86 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_result_arg.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the return
+//    type of the operation
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_AMI_HANDLER_RESULT_ARG_H_
+#define _BE_VISITOR_OPERATION_AMI_HANDLER_RESULT_ARG_H_
+
+// ***********************************************************************
+// Operation visitor for return types in the signature of the operation
+// ***********************************************************************
+
+class be_visitor_operation_ami_handler_result_arg : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ch
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation return types
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_result_arg (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_result_arg (void);
+  // destructor
+
+  int visit_array (be_array *node);
+  // visit an array node
+
+  int visit_enum (be_enum *node);
+  // visit an enum node
+
+  int visit_interface (be_interface *node);
+  // visit an interface node
+
+  int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface node
+
+  int visit_native (be_native *node);
+  // visit native type
+
+  int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
+
+  int visit_sequence (be_sequence *node);
+  // visit a sequence node
+
+  int visit_string (be_string *node);
+  // visit a sequence node
+
+  int visit_structure (be_structure *node);
+  // visit a structure node
+
+  int visit_typedef (be_typedef *node);
+  // visit a typedef node
+
+  int visit_union (be_union *node);
+  // visit a union node
+
+# ifdef IDL_HAS_VALUETYPE
+  int visit_valuetype (be_valuetype *node);
+  int visit_valuetype_fwd (be_valuetype_fwd *node);
+# endif /* IDL_HAS_VALUETYPE */
+
+};
+
+#endif /* _BE_VISITOR_OPERATION_AMI_HANDLER_RESULT_ARG_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h
new file mode 100644
index 00000000000..ee6fe758b53
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_skeleton_cs.h
@@ -0,0 +1,129 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_handler_skeleton_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code skelton code for IDL operations
+//    of AMI Reply Handlers.
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_SKELETON_CS_H_
+#define _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_SKELETON_CS_H_
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+class be_visitor_operation_ami_handler_skeleton_cs : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_handler_operation_cs
+  //
+  // = DESCRIPTION
+  //    Visitor for generating code skelton code for IDL operations
+  //    of AMI Reply Handlers.
+  //
+  //
+public:
+  be_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_handler_skeleton_cs (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation.
+
+  virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
+
+  // = template methods
+  virtual int gen_pre_stub_info (be_operation *, be_type *) = 0;
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *) = 0;
+  // generate code that marshals the arguments and transmits them
+
+  // =helper
+  virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
+
+  virtual int gen_raise_exception (be_type *,
+                                   const char * excep,
+                                   const char * status);
+  // helper that generates code for raising an exception
+
+  virtual int gen_check_exception (be_type *);
+  // helper that generates code for checking for an exception
+
+};
+
+// specialized visitors
+
+class be_interpretive_visitor_operation_ami_handler_skeleton_cs : public be_visitor_operation_ami_handler_skeleton_cs
+{
+  //
+  // = TITLE
+  //   be_interpretive_visitor_operation_ami_skeleton_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client skeletons
+  //   for AMI reply handlers of IDL operations using interpretive marshaling.
+  //
+  //
+public:
+  be_interpretive_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *);
+  // ctor
+
+  ~be_interpretive_visitor_operation_ami_handler_skeleton_cs (void);
+  // dtor
+
+  virtual int gen_pre_stub_info (be_operation *, be_type *);
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *);
+  // generate code that marshals the arguments and transmits them
+
+};
+
+class be_compiled_visitor_operation_ami_handler_skeleton_cs : public be_visitor_operation_ami_handler_skeleton_cs
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_operation_ami_handler_skeleton_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client skeletons
+  //   for AMI reply handlers of IDL operations using compiled marshaling.
+  //
+  //
+public:
+  be_compiled_visitor_operation_ami_handler_skeleton_cs (be_visitor_context *);
+  // ctor
+
+  ~be_compiled_visitor_operation_ami_handler_skeleton_cs (void);
+  // dtor
+
+  virtual int gen_pre_stub_info (be_operation *, be_type *);
+  // generate any info before the actual code for the stub is generated
+
+  virtual int gen_marshal_and_invoke (be_operation *, be_type *);
+  // generate code that marshals the arguments and transmits them
+
+};
+
+
+#endif /* _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_SKELETON_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/thru_poa_collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h
index 26aa40394c6..805846419e4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/thru_poa_collocated_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    thru_poa_collocated_ch.h
+//    collocated_ch.h
 //
 // = DESCRIPTION
-//    Visitor for generating code for IDL operations for the thru_poa collocated case
+//    Visitor for generating code for IDL operations for the collocated case
 //    inside of the servant header
 //
 // = AUTHOR
@@ -19,29 +19,29 @@
 //
 // ============================================================================
 
-#ifndef _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SH_H_
-#define _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SH_H_
+#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SH_H_
+#define _BE_VISITOR_OPERATION_COLLOCATED_SH_H_
 
 // ************************************************************
-// Operation visitor for server header in the thru_poa collocated class
+// Operation visitor for server header in the collocated class
 // ************************************************************
 
-class be_visitor_operation_thru_poa_collocated_sh : public be_visitor_scope
+class be_visitor_operation_collocated_sh : public be_visitor_scope
 {
   //
   // = TITLE
-  //   be_visitor_operation_thru_poa_collocated_sh
+  //   be_visitor_operation_collocated_sh
   //
   // = DESCRIPTION
   //   This is a concrete visitor to generate the server header for operation
-  //   in the thru_poa collocated class
+  //   in the collocated class
   //
   //
 public:
-  be_visitor_operation_thru_poa_collocated_sh (be_visitor_context *ctx);
+  be_visitor_operation_collocated_sh (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_operation_thru_poa_collocated_sh (void);
+  ~be_visitor_operation_collocated_sh (void);
   // destructor
 
   virtual int visit_operation (be_operation *node);
@@ -49,4 +49,4 @@ public:
 
 };
 
-#endif /* _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SH_H_ */
+#endif /* _BE_VISITOR_OPERATION_COLLOCATED_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
index 015139b3047..c1d9720ffe1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_collocated_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
@@ -8,10 +8,10 @@
 //    TAO IDL
 //
 // = FILENAME
-//    direct_collocated_ss.h
+//    collocated_ss.h
 //
 // = DESCRIPTION
-//    Visitor for generating code for IDL operations for the direct_collocated case
+//    Visitor for generating code for IDL operations for the collocated case
 //    inside of the servant skeleton
 //
 // = AUTHOR
@@ -19,14 +19,14 @@
 //
 // ============================================================================
 
-#ifndef _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SS_H_
-#define _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SS_H_
+#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SS_H_
+#define _BE_VISITOR_OPERATION_COLLOCATED_SS_H_
 
 // *****************************************************************
-// Operation visitor for server skeletons for the direct collocated class
+// Operation visitor for server skeletons for the collocated class
 // *****************************************************************
 
-class be_visitor_operation_direct_collocated_ss : public be_visitor_scope
+class be_visitor_operation_collocated_ss : public be_visitor_scope
 {
   //
   // = TITLE
@@ -34,14 +34,14 @@ class be_visitor_operation_direct_collocated_ss : public be_visitor_scope
   //
   // = DESCRIPTION
   //   This is a concrete visitor to generate the server skeletons for
-  //   operation in the direct collocated class
+  //   operation in the collocated class
   //
   //
 public:
-  be_visitor_operation_direct_collocated_ss (be_visitor_context *ctx);
+  be_visitor_operation_collocated_ss (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_operation_direct_collocated_ss (void);
+  ~be_visitor_operation_collocated_ss (void);
   // destructor
 
   virtual int visit_operation (be_operation *node);
@@ -57,4 +57,4 @@ public:
   // is my return type void?
 };
 
-#endif /* _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SS_H_ */
+#endif /* _BE_VISITOR_OPERATION_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_collocated_sh.h
deleted file mode 100644
index 413d7ce3059..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_collocated_sh.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    direct_collocated_ch.h
-//
-// = DESCRIPTION Visitor for generating code for IDL operations for
-//               the direct collocated case inside of the servant header
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SH_H_
-#define _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SH_H_
-
-// ************************************************************
-// Operation visitor for server header in the direct collocated class
-// ************************************************************
-
-class be_visitor_operation_direct_collocated_sh : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_direct_collocated_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for operation
-  //   in the direct collocated class
-  //
-  //
-public:
-  be_visitor_operation_direct_collocated_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_direct_collocated_sh (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation node.
-
-};
-
-#endif /* _BE_VISITOR_OPERATION_DIRECT_COLLOCATED_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/thru_poa_collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/thru_poa_collocated_ss.h
deleted file mode 100644
index b6566b5a15c..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/thru_poa_collocated_ss.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    thru_poa_collocated_ss.h
-//
-// = DESCRIPTION
-//    Visitor for generating code for IDL operations for the thru_poa collocated case
-//    inside of the servant skeleton
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SS_H_
-#define _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SS_H_
-
-// *****************************************************************
-// Operation visitor for server skeletons for the thru_poa collocated class
-// *****************************************************************
-
-class be_visitor_operation_thru_poa_collocated_ss : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeletons for
-  //   operation in the thru_poa collocated class
-  //
-  //
-public:
-  be_visitor_operation_thru_poa_collocated_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_thru_poa_collocated_ss (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation node.
-
-  virtual int gen_invoke (be_visitor_context &ctx, be_operation *node);
-  // A helper method to generate operation invocation code.
-
-  virtual int gen_check_exception (be_type *bt);
-  // ACE_CHECK macros generator.
-
-  virtual int void_return_type (be_type *bt);
-  // is my return type void?
-};
-
-#endif /* _BE_VISITOR_OPERATION_THRU_POA_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index 5dd18112fd8..5babfec9fd9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -62,6 +62,9 @@ public:
   virtual int instantiate_sequence (be_sequence *node);
   // determine which sequence to instantiate
 
+  virtual int gen_object_manager (be_sequence *node);
+  // generate a instance of the object manager
+
   virtual int gen_base_sequence_class (be_sequence *node);
   // generate the base sequence class
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
index 076f5120ed5..de026499c8d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
@@ -63,6 +63,9 @@ public:
   virtual int instantiate_sequence (be_sequence *node);
   // determine which sequence to instantiate
 
+  virtual int gen_object_manager (be_sequence *node);
+  // generate a instance of the object manager
+
   virtual int gen_var_impl (be_sequence *node);
   // generate the var impl
 
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index a2c10e9938c..4d4bd4b31e0 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -380,9 +380,9 @@ DRV_parse_args (long ac, char **av)
               idl_global->gperf_path (av[i+1]);
               i++;
               break;
-
+              
               // Option to generate the features regarding the
-              // Messaging Specification.
+              // Messaging Specification.  
 
               // Directory where all the IDL-Compiler-Generated files are to
               // be kept. Default is the current directory from which the
@@ -547,16 +547,6 @@ DRV_parse_args (long ac, char **av)
                   // suppress typecode support
                   idl_global->tc_support (0);
                 }
-              else if (av[i][2] == 'p')
-                {
-                  // suppress generating Thru_POA collocated stubs
-                  idl_global->gen_thru_poa_collocation (0);
-                }
-              else if (av[i][2] == 'd')
-                {
-                  // suppress generating Direct collocated stubs
-                  idl_global->gen_direct_collocation (0);
-                }
               else if (av[i][2] == 'v')
                 {
                   // disable OBV (Valuetype) support
@@ -612,7 +602,7 @@ DRV_parse_args (long ac, char **av)
               else if (av[i][2] == 'e')
                 {
                   int option = atoi (av[i+1]);
-
+                                    
                   // exception support
                   idl_global->exception_support (!option);
                   i++;
@@ -622,16 +612,6 @@ DRV_parse_args (long ac, char **av)
                   // optimized typecode support
                   idl_global->opt_tc (1);
                 }
-              else if (av[i][2] == 'p')
-                {
-                  // generating Thru_POA collocated stubs.
-                  idl_global->gen_thru_poa_collocation (1);
-                }
-              else if (av[i][2] == 'd')
-                {
-                  // generating Direct collocated stubs.
-                  idl_global->gen_direct_collocation (1);
-                }
               else if (av[i][2] == 'v')
                 {
 #             ifdef IDL_HAS_VALUETYPE
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index a5d2519763b..ba420be05aa 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -77,7 +77,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Process_Manager.h"
 #include "ace/SString.h"
 #include "ace/Env_Value_T.h"
-#include "ace/ARGV.h"
 
 ACE_RCSID(driver, drv_preproc, "$Id$")
 
@@ -149,67 +148,44 @@ DRV_cpp_init (void)
 #endif /* _MSC_VER */
 
   DRV_cpp_putarg (cpp_loc);
-  DRV_cpp_putarg("-DIDL");
-  DRV_cpp_putarg ("-I.");
-
-  // Added some customisable preprocessor options
-
-  ACE_Env_Value<char*> cpp_flags ("TAO_IDL_DEFAULT_CPP_FLAGS", (char *) 0);
-
-  if (cpp_flags == 0)
-    {
-      // If no cpp flag was defined by the user, we define some
-      // platform specific flags here.
-#if defined (__BORLANDC__)
-      DRV_cpp_putarg("-P-");
-      DRV_cpp_putarg("-ocon");
-#else
 #if defined (ACE_WIN32)
-      DRV_cpp_putarg ("-nologo");
+  DRV_cpp_putarg ("-nologo");
 #endif /* ACE_WIN32 */
 #if defined (ACE_MVS)
-      DRV_cpp_putarg ("-+");
+  DRV_cpp_putarg ("-+");
 #endif /* ACE_MVS */
-      DRV_cpp_putarg ("-E");
-#endif /* !defined (__BORLANDC__) */
-
-      // So we can find the required orb.idl file.
-      char* option = new char[BUFSIZ];
-      ACE_OS::strcpy (option, "-I");
-      const char* TAO_ROOT =
-        ACE_OS::getenv ("TAO_ROOT");
-      if (TAO_ROOT != 0)
+  DRV_cpp_putarg ("-E");
+  DRV_cpp_putarg("-DIDL");
+  DRV_cpp_putarg ("-I.");
+
+  // So we can find the required orb.idl file.
+  char* option = new char[BUFSIZ];
+  ACE_OS::strcpy (option, "-I");
+  const char* TAO_ROOT =
+    ACE_OS::getenv ("TAO_ROOT");
+  if (TAO_ROOT != 0)
+    {
+      ACE_OS::strcat (option, TAO_ROOT);
+      ACE_OS::strcat (option, "/tao");
+    }
+  else
+    {
+      const char* ACE_ROOT =
+        ACE_OS::getenv ("ACE_ROOT");
+      if (ACE_ROOT != 0)
         {
-          ACE_OS::strcat (option, TAO_ROOT);
-          ACE_OS::strcat (option, "/tao");
+          ACE_OS::strcat (option, ACE_ROOT);
+          ACE_OS::strcat (option, "/TAO/tao");
         }
       else
         {
-          const char* ACE_ROOT =
-            ACE_OS::getenv ("ACE_ROOT");
-          if (ACE_ROOT != 0)
-            {
-              ACE_OS::strcat (option, ACE_ROOT);
-              ACE_OS::strcat (option, "/TAO/tao");
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "TAO_IDL: neither TAO_ROOT nor ACE_ROOT defined\n"));
-              ACE_OS::strcat (option, ".");
-            }
+          ACE_ERROR ((LM_ERROR,
+                      "TAO_IDL: neither TAO_ROOT nor ACE_ROOT defined\n"));
+          ACE_OS::strcat (option, ".");
         }
-
-      DRV_cpp_putarg (option);
     }
-  else
-    {
-      // Users specify their own.  Add them to cpp's arglist.
-      ACE_ARGV arglist (cpp_flags);
 
-      for (size_t arg_cnt = 0; arg_cnt < arglist.argc (); ++arg_cnt)
-        DRV_cpp_putarg (arglist[arg_cnt]);
-    }
+  DRV_cpp_putarg (option);
 }
 
 /*
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 09f38091eb7..1922b537a6f 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -312,7 +312,7 @@ FE_InterfaceHeader::check_further (AST_Interface *i)
 }
 
 idl_bool
-FE_InterfaceHeader::check_supports (AST_Interface *)
+FE_InterfaceHeader::check_supports (AST_Interface *i)
 {
   return 0;
 }
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index d220e987f50..7fc02519ebc 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -102,14 +102,7 @@ static int scan_obv_token (int token)
         return token;
       }
 #endif /* IDL_HAS_VALUETYPE */
-    TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-    const TAO_IDL_CPP_Keyword_Entry *entry =
-      cpp_key_tbl.lookup (ace_yytext,
-                          ACE_OS::strlen (ace_yytext));
-    if (entry)
-      yylval.strval = ACE_OS::strdup (entry->mapping_);
-    else
-      yylval.strval = ACE_OS::strdup (ace_yytext);
+    yylval.strval = ACE_OS::strdup (ace_yytext);
     return IDENTIFIER;
 }
 
@@ -195,7 +188,7 @@ oneway		return IDL_ONEWAY;
   return IDENTIFIER;
 }
 
-"-"?(([0-9]+"."[0-9]*)|("."[0-9]+))([eE][+-]?[0-9]+)?[lLfF]?      {
+"-"?[0-9]+"."[0-9]*([eE][+-]?[0-9]+)?[lLfF]?      {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
@@ -229,7 +222,7 @@ oneway		return IDL_ONEWAY;
 		  return IDL_UINTEGER_LITERAL;
 	      	}
 
-\"([^\\\"]*|\\[ntvbrfa\\\?\'\"])*\"	{
+"\""[^\"]*"\""	{
 		  /* Skip the quotes */
 		  char *tmp = ace_yytext;
 		  tmp[strlen(tmp)-1] = '\0';
@@ -354,7 +347,7 @@ idl_parse_line_and_file(char *buf)
   for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
     continue;
   *r++ = 0;
-  idl_global->set_lineno(idl_atoui(h, 10));
+  idl_global->set_lineno(idl_atoi(h, 10));
 
   /* Find file name, if present */
   for (; *r != '"'; r++)
@@ -593,7 +586,7 @@ idl_escape_reader(
 	    }
 	    char save = str[i];
 	    str[i] = '\0';
-	    char out = (char)idl_atoui(&str[2], 16);
+	    char out = (char)idl_atoi(&str[2], 16);
 	    str[i] = save;
 	    return out;
 	}
@@ -607,7 +600,7 @@ idl_escape_reader(
 	    }
 	    char save = str[i];
 	    str[i] = '\0';
-	    char out = (char)idl_atoui(&str[1], 8);
+	    char out = (char)idl_atoi(&str[1], 8);
 	    str[i] = save;
 	    return out;
 	} else {
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 29a0c40c016..cf2cf238f4f 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -283,52 +283,50 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
 
 #define TAO_YY_NUM_RULES 79
 #define TAO_YY_END_OF_BUFFER 80
-static tao_yyconst short int tao_yy_accept[393] =
+static tao_yyconst short int tao_yy_accept[388] =
     {   0,
        76,   76,   80,   78,   76,   77,   77,   78,   78,   78,
-       78,   78,   56,   52,   78,   78,   78,   48,   48,   48,
+       78,   56,   52,   78,   78,   78,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   78,   77,
-       76,    0,   57,    0,    0,    0,    0,   55,   51,   49,
-       75,    0,   49,   56,    0,    0,    0,   52,   47,   45,
-       46,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   42,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   78,   77,   76,
+        0,   57,    0,    0,   55,   51,   75,    0,   49,   56,
+        0,    0,    0,   52,   47,   45,   46,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   42,   48,   48,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,    0,   70,    0,    0,
 
-        0,   70,    0,    0,    0,    0,    0,    0,    0,   58,
-        0,   58,    0,    0,   55,    0,   51,    0,   49,    0,
-       74,   74,   49,    0,   50,   54,   48,   48,   48,    1,
+        0,    0,    0,    0,   58,    0,   58,    0,    0,   55,
+        0,   51,    0,   74,   74,   49,    0,   49,    0,   50,
+       54,   48,   48,   48,    1,   48,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   43,
+       48,   48,   48,   48,   43,   48,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,    0,    0,    0,
-        0,    0,    0,   61,   59,    0,    0,   53,    0,   49,
-       50,   48,   39,   48,   48,   48,   18,   25,   48,   48,
-       48,   48,   48,   12,   48,   48,   33,   48,   48,   22,
+       48,   48,    0,    0,    0,    0,    0,    0,   61,   59,
+        0,    0,   53,    0,   49,   50,   48,   39,   48,   48,
+       48,   18,   25,   48,   48,   48,   48,   48,   12,   48,
+       48,   33,   48,   48,   22,   48,   48,   48,   48,   48,
 
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   29,
-       48,   48,    0,    0,    0,    0,    0,    0,   71,    0,
-        0,    0,    0,    0,   59,    0,   60,    0,   40,   48,
-       48,   48,    9,   48,   48,   48,   48,   48,   20,   41,
-       48,   48,   48,   28,   48,   48,   48,   48,   48,   48,
-       23,   48,   48,   48,   48,   48,   48,   16,   48,   48,
-       26,   48,   66,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   48,   48,   48,   48,   32,   48,   21,   48,
-       48,    2,   30,   44,   48,   35,    3,   48,   48,   13,
-
-       11,   48,   17,   48,   48,   48,   48,   48,   64,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       48,   48,   27,    7,   19,   48,   48,   34,   48,   48,
-       48,   48,   10,   48,   48,   14,    0,   72,   72,    0,
-        0,    0,   67,    0,    0,    0,    0,   31,   48,   48,
-       48,    4,   15,   36,   48,   24,   48,    0,    0,    0,
-       65,    0,    0,    0,    0,    0,    0,    5,    6,    8,
-       48,   38,   68,    0,   62,   62,    0,   73,   73,    0,
-        0,    0,   48,    0,    0,    0,   37,   69,    0,   63,
-       63,    0
-
+       48,   48,   48,   48,   29,   48,   48,    0,    0,    0,
+        0,    0,    0,   71,    0,    0,    0,    0,    0,   59,
+        0,   60,    0,   40,   48,   48,   48,    9,   48,   48,
+       48,   48,   48,   20,   41,   48,   48,   48,   28,   48,
+       48,   48,   48,   48,   48,   23,   48,   48,   48,   48,
+       48,   48,   16,   48,   48,   26,   48,   66,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   48,   48,   48,
+       48,   32,   48,   21,   48,   48,    2,   30,   44,   48,
+       35,    3,   48,   48,   13,   11,   48,   17,   48,   48,
+
+       48,   48,   48,   64,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   48,   48,   27,    7,   19,
+       48,   48,   34,   48,   48,   48,   48,   10,   48,   48,
+       14,    0,   72,   72,    0,    0,    0,   67,    0,    0,
+        0,    0,   31,   48,   48,   48,    4,   15,   36,   48,
+       24,   48,    0,    0,    0,   65,    0,    0,    0,    0,
+        0,    0,    5,    6,    8,   48,   38,   68,    0,   62,
+       62,    0,   73,   73,    0,    0,    0,   48,    0,    0,
+        0,   37,   69,    0,   63,   63,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
@@ -365,294 +363,280 @@ static tao_yyconst int tao_yy_ec[256] =
 
 static tao_yyconst int tao_yy_meta[58] =
     {   0,
-        1,    1,    2,    1,    1,    3,    1,    4,    1,    1,
-        1,    1,    1,    5,    5,    5,    1,    1,    1,    1,
-        3,    5,    5,    5,    5,    6,    6,    6,    6,    6,
-        6,    6,    3,    6,    7,    7,    5,    5,    5,    7,
-        6,    6,    6,    6,    6,    8,    6,    6,    6,    8,
-        6,    8,    6,    8,    6,    6,    6
+        1,    1,    2,    1,    1,    1,    1,    3,    1,    1,
+        1,    1,    1,    4,    4,    4,    1,    1,    1,    1,
+        1,    4,    4,    4,    4,    5,    5,    5,    5,    5,
+        5,    5,    1,    5,    4,    4,    4,    4,    4,    4,
+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5
     } ;
 
-static tao_yyconst short int tao_yy_base[411] =
+static tao_yyconst short int tao_yy_base[405] =
     {   0,
-        0,   51,  736,  737,   57,  737,  737,   54,  702,   49,
-       52,   60,   62,   67,  717,  715,  712,    0,  709,  702,
-       44,  682,   50,   60,   42,  684,  681,  679,  678,  689,
-       47,   52,   36,   69,   59,  677,   78,   75,  125,  701,
-      112,   98,  737,    0,  713,  128,  118,  133,  138,  176,
-      737,  116,  160,  171,  182,  197,    0,  210,  737,  737,
-      737,    0,  693,  688,  667,  660,  664,  668,  663,  678,
-      666,  660,  670,  656,  655,  670,  659,  112,  659,  666,
-      651,  650,  662,  648,  656,  662,  654,  661,  646,  647,
-      643,  644,  648,  637,  641,   72,  644,  644,  644,  633,
-
-      640,  737,  138,  214,  645,  639,  631,  661,  145,  737,
-      671,  670,  223,  669,  227,    0,  232,  243,  737,  167,
-      737,  229,    0,  165,  247,    0,  647,  651,  622,    0,
-      623,  628,  632,  620,  115,  617,  633,  631,  621,  626,
-      629,  611,  609,  622,  619,  606,  615,  618,  601,    0,
-      601,  610,  602,  614,  598,  600,  156,  601,  596,  601,
-      607,  598,  601,  590,  604,  606,  590,  633,  632,  598,
-      590,  600,  290,  737,  737,  261,  626,    0,  263,  274,
-      737,  609,    0,  582,  588,  591,    0,    0,  577,  589,
-      580,  573,  581,    0,  576,  571,    0,  570,  571,    0,
-
-      576,  565,  566,  582,  581,  572,  575,  566,  573,  559,
-      564,  572,  561,  570,  569,  567,  558,  562,  563,    0,
-      551,  557,  593,  277,  552,  558,  555,  551,  737,  196,
-      305,  556,  550,  542,  737,  583,  737,  525,    0,  486,
-      482,  479,    0,  442,  449,  449,  441,  417,    0,    0,
-      427,  427,  425,    0,  405,  408,  421,  405,  409,  408,
-        0,  385,  370,  368,  375,  377,  372,    0,  364,  356,
-        0,  361,  737,  309,  348,  326,  344,  375,  374,  340,
-      332,  342,  322,  303,  309,  299,    0,  298,    0,  302,
-      309,    0,    0,    0,  304,    0,    0,  295,  300,    0,
-
-        0,  280,    0,  277,  287,  283,  260,  275,  737,  332,
-      264,  347,  352,  355,  280,  301,  369,  257,  263,  259,
-      245,  244,    0,    0,    0,  239,  247,    0,  226,  234,
-      219,  230,    0,  226,  212,    0,  361,  737,  372,  249,
-      246,  133,  737,  380,  193,  383,  191,    0,  188,  177,
-      175,    0,    0,    0,  169,    0,  165,  187,  383,  388,
-      737,  399,  402,  414,  419,  422,  128,    0,    0,    0,
-      112,    0,  737,  428,  737,  436,  438,  737,  440,  104,
-       89,  156,   50,   64,  442,  444,    0,  737,  447,  737,
-      449,  737,  470,  478,  482,  488,  496,  504,  508,  512,
-
-      515,  522,  527,  534,  542,  550,  558,  566,  574,  582
+        0,   51,  676,  677,   57,  677,  677,  669,  641,   49,
+       57,   59,   64,  656,  654,  651,    0,  648,  641,   41,
+      621,   47,   21,   39,  623,  620,  618,  617,  628,   44,
+       46,   66,   65,   52,  616,   75,   55,  121,  640,  106,
+      654,  677,  651,  119,  116,  129,  677,  135,  162,  146,
+      168,  180,    0,  196,  677,  677,  677,    0,  631,  626,
+      605,  598,  602,  606,  601,  616,  604,  598,  608,  594,
+      593,  608,  597,   69,  597,  604,  589,  588,  600,  586,
+      594,  600,  592,  599,  584,  585,  581,  582,  586,  575,
+      579,   18,  582,  582,  582,  571,  578,  677,  108,  200,
+
+      583,  577,  569,  599,  677,  609,  608,  159,  607,  210,
+        0,  215,  196,  677,  215,    0,  227,  677,  230,  236,
+        0,  585,  589,  560,    0,  561,  566,  570,  558,   95,
+      555,  571,  569,  559,  564,  567,  549,  547,  560,  557,
+      544,  553,  556,  539,    0,  539,  548,  540,  552,  536,
+      538,   76,  539,  534,  539,  545,  536,  539,  528,  542,
+      544,  528,  571,  570,  536,  528,  538,  279,  677,  677,
+      245,  564,    0,  241,  252,  677,  547,    0,  520,  526,
+      529,    0,    0,  515,  527,  518,  511,  519,    0,  514,
+      509,    0,  508,  509,    0,  514,  503,  504,  520,  519,
+
+      510,  513,  504,  511,  497,  502,  510,  499,  508,  507,
+      505,  496,  500,  501,    0,  489,  495,  531,  266,  490,
+      496,  493,  489,  677,  144,  294,  494,  488,  480,  677,
+      521,  677,  520,    0,  492,  490,  490,    0,  468,  478,
+      478,  482,  468,    0,    0,  479,  479,  478,    0,  459,
+      463,  477,  462,  466,  465,    0,  469,  457,  458,  465,
+      471,  466,    0,  458,  451,    0,  456,  677,  298,  449,
+      302,  455,  441,  434,  393,  384,  394,  391,  373,  379,
+      371,    0,  369,    0,  377,  384,    0,    0,    0,  379,
+        0,    0,  367,  348,    0,    0,  331,    0,  326,  321,
+
+      320,  297,  295,  677,  317,  244,  332,  337,  259,  300,
+      324,  285,  283,  289,  285,  273,  272,    0,    0,    0,
+      264,  268,    0,  234,  239,  221,  227,    0,  220,  192,
+        0,  282,  677,  337,  227,  226,  152,  677,  341,  176,
+      358,  178,    0,  174,  163,  159,    0,    0,    0,  161,
+        0,  154,  175,  346,  361,  677,  365,  367,  382,  387,
+      361,  144,    0,    0,    0,  127,    0,  677,  387,  677,
+      391,  396,  677,  401,  153,  143,  161,   74,   80,  403,
+      406,    0,  677,  410,  677,  412,  677,  433,  438,  440,
+      445,  450,   80,  453,   63,  457,  460,  464,  469,  474,
+
+      479,  484,  489,  494
     } ;
 
-static tao_yyconst short int tao_yy_def[411] =
+static tao_yyconst short int tao_yy_def[405] =
     {   0,
-      392,    1,  392,  392,  392,  392,  392,  393,  394,  392,
-      392,  392,  392,  392,  392,  392,  392,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  392,  392,
-      392,  393,  392,  396,  392,  397,  392,  392,  392,  392,
-      392,  398,   50,  392,  392,  392,  399,  392,  392,  392,
-      392,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-
-       39,  392,   39,  392,  392,  392,  392,  392,  393,  392,
-      392,  392,  392,  400,  392,  401,  392,  392,  392,  398,
-      392,  398,   53,  392,  392,  399,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  402,  392,  392,
-      392,  392,  392,  392,  392,  392,  403,  401,  392,  392,
-      392,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  402,  392,  392,  392,  392,  173,  392,  173,
-      392,  392,  392,  392,  392,  392,  392,  392,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  392,  392,  392,  392,  392,  404,  392,  392,
-      392,  392,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-
-      395,  395,  395,  395,  395,  395,  395,  395,  392,  392,
-      405,  392,  392,  392,  392,  404,  392,  392,  392,  392,
-      395,  395,  395,  395,  395,  395,  395,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  405,  392,  405,  406,
-      392,  392,  392,  392,  392,  392,  392,  395,  395,  395,
-      395,  395,  395,  395,  395,  395,  395,  406,  392,  407,
-      392,  392,  408,  392,  392,  392,  392,  395,  395,  395,
-      395,  395,  392,  407,  392,  407,  408,  392,  408,  409,
-      392,  392,  395,  409,  392,  410,  395,  392,  410,  392,
-      410,    0,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392
+      387,    1,  387,  387,  387,  387,  387,  388,  389,  387,
+      387,  387,  387,  387,  387,  387,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  387,  387,  387,
+      388,  387,  387,  391,  387,  387,  387,  392,  387,  387,
+      387,  387,  393,  387,  387,  387,  387,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,   38,  387,   38,  387,
+
+      387,  387,  387,  387,  387,  387,  387,  387,  394,  387,
+      395,  387,  392,  387,  392,   49,  387,  387,  387,  387,
+      393,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  396,  387,  387,  387,  387,  387,  387,  387,
+      387,  397,  395,  387,  387,  387,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  396,  387,  387,
+      387,  387,  168,  387,  168,  387,  387,  387,  387,  387,
+      387,  387,  387,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  387,  387,  387,
+      387,  387,  398,  387,  387,  387,  387,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+
+      390,  390,  390,  387,  387,  399,  387,  387,  387,  387,
+      398,  387,  387,  387,  387,  390,  390,  390,  390,  390,
+      390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  399,  387,  399,  400,  387,  387,  387,  387,  387,
+      387,  387,  390,  390,  390,  390,  390,  390,  390,  390,
+      390,  390,  400,  387,  401,  387,  387,  402,  387,  387,
+      387,  387,  390,  390,  390,  390,  390,  387,  401,  387,
+      401,  402,  387,  402,  403,  387,  387,  390,  403,  387,
+      404,  390,  387,  404,  387,  404,    0,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+
+      387,  387,  387,  387
     } ;
 
-static tao_yyconst short int tao_yy_nxt[795] =
+static tao_yyconst short int tao_yy_nxt[735] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-       10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
-        7,   18,   18,   18,   19,   18,   18,   18,   18,   20,
-       18,   18,    4,    4,   21,   22,   23,   24,   25,   26,
-       18,   18,   27,   28,   29,   30,   31,   32,   18,   33,
-       34,   35,   36,   37,   38,   18,   18,   39,   41,   43,
-       47,   41,   48,   49,   49,   50,   50,   50,   51,  385,
-       87,   40,   52,   53,   88,   54,   54,   55,   53,   65,
-       58,   58,   58,   82,   69,   56,   44,   75,  387,   66,
-       56,   70,   83,   57,  380,   67,   71,   76,   73,   84,
-
-       56,   85,   72,   43,   86,   56,   74,   89,   94,  385,
-       90,   99,   97,   41,  162,   95,   41,   57,  121,  122,
-       91,   92,  163,   93,   98,  100,  101,  102,  102,  103,
-       44,   50,   50,   50,  360,  112,  122,  360,  104,  104,
-      104,  113,  113,  168,   53,  102,  115,  115,   55,   53,
-       43,  117,  117,  117,  142,  383,   56,  386,  143,  114,
-      386,   56,  382,  144,  116,  189,  190,  105,  106,  121,
-      122,   56,  107,  123,  123,  123,   56,   44,  125,  125,
-      125,  392,   53,  114,   54,   54,   55,  122,  116,   50,
-       50,   50,  359,   53,   56,   55,   55,   55,  211,  118,
-
-      119,  278,  119,  372,  371,   56,  124,  124,  212,   56,
-      125,  125,  125,  370,  118,  119,  102,  102,  169,  119,
-       56,   53,  369,   58,   58,   58,  368,  104,  104,  104,
-      175,  121,  122,   56,  102,  367,  176,  176,   53,  392,
-      115,  115,   55,   53,  363,  117,  117,  117,   56,  122,
-       56,  340,  179,  179,  359,   56,  180,  180,  180,  357,
-      125,  125,  125,  356,  355,   56,  338,  339,  235,  354,
-       56,  181,  353,  181,  236,  236,  180,  180,  180,  273,
-      273,  274,  352,  351,  339,  350,  181,  180,  180,  180,
-      181,  228,  229,  229,  230,  349,  348,  273,  119,  347,
-
-      119,  346,  345,  231,  231,  231,  317,  229,  229,  279,
-      229,  309,  309,  119,  342,  336,  335,  119,  231,  231,
-      231,  334,  310,  310,  310,  229,  333,  312,  332,  309,
-      313,  331,  232,  233,  309,  309,  330,  234,  329,  314,
-      314,  314,  328,  327,  326,  310,  310,  310,  312,  325,
-      324,  313,  309,  312,  323,  322,  313,  340,  321,  341,
-      314,  314,  314,  338,  339,  314,  314,  314,  314,  314,
-      314,  343,  343,  344,  338,  339,  320,  319,  318,  278,
-      317,  339,  361,  361,  364,  373,  373,  365,  315,  343,
-      375,  376,  339,  362,  362,  362,  366,  366,  366,  311,
-
-      361,  361,  361,  373,  378,  379,  308,  307,  376,  306,
-      305,  304,  362,  362,  362,  364,  303,  302,  365,  361,
-      364,  301,  379,  365,  380,  300,  381,  366,  366,  366,
-      375,  376,  366,  366,  366,  366,  366,  366,  375,  376,
-      378,  379,  378,  379,  388,  388,  390,  391,  376,  390,
-      391,  390,  391,  299,  298,  297,  376,  296,  379,  295,
-      379,  294,  388,  293,  391,  292,  291,  391,  290,  391,
-       42,   42,   42,   42,   42,   42,   42,   42,   45,  289,
-       45,   45,   45,   45,   45,   45,   62,   62,   62,   62,
-      109,  109,  288,  287,  109,  109,  111,  286,  111,  111,
-
-      111,  111,  111,  111,  120,  120,  120,  120,  120,  120,
-      120,  120,  126,  285,  126,  177,  177,  284,  177,  178,
-      283,  178,  223,  223,  223,  223,  223,  223,  223,  223,
-      238,  238,  237,  238,  316,  316,  316,  316,  316,  316,
-      316,  316,  337,  337,  337,  337,  337,  337,  337,  337,
-      358,  358,  358,  358,  358,  358,  358,  358,  374,  374,
-      374,  374,  374,  374,  374,  374,  377,  377,  377,  377,
-      377,  377,  377,  377,  384,  384,  384,  384,  384,  384,
-      384,  384,  389,  389,  389,  389,  389,  389,  389,  389,
-      235,  282,  281,  280,  392,  277,  276,  275,  224,  272,
-
-      271,  270,  269,  268,  267,  266,  265,  264,  263,  262,
-      261,  260,  259,  258,  257,  256,  255,  254,  253,  252,
-      251,  250,  249,  248,  247,  246,  245,  244,  243,  242,
-      241,  240,  239,  237,  227,  226,  225,  168,  224,  222,
-      221,  220,  219,  218,  217,  216,  215,  214,  213,  210,
-      209,  208,  207,  206,  205,  204,  203,  202,  201,  200,
-      199,  198,  197,  196,  195,  194,  193,  192,  191,  188,
-      187,  186,  185,  184,  183,  182,  174,  174,  174,  173,
-      172,  171,  170,  392,  167,  166,  165,  164,  161,  160,
-      159,  158,  157,  156,  155,  154,  153,  152,  151,  150,
-
-      149,  148,  147,  146,  145,  141,  140,  139,  138,  137,
-      136,  135,  134,  133,  132,  131,  130,  129,  128,  127,
-      110,  108,   96,   81,   80,   79,   78,   77,   68,   64,
-       63,   61,   60,   59,   46,  392,    3,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392
-
+       10,    4,   11,   12,   13,   13,   14,   15,    4,   16,
+        7,   17,   17,   17,   18,   17,   17,   17,   17,   19,
+       17,   17,    4,    4,   20,   21,   22,   23,   24,   25,
+       17,   17,   26,   27,   28,   29,   30,   31,   17,   32,
+       33,   34,   35,   36,   37,   17,   17,   38,   40,   69,
+      157,   40,   45,   46,   46,   47,  173,   70,  158,   48,
+       49,   39,   50,   50,   51,   49,   61,   54,   54,   54,
+       78,   65,   52,  121,   71,  380,   62,   52,   66,   79,
+       53,   95,   63,   67,   72,   81,   80,   52,   82,   68,
+
+       83,   90,   52,   85,   84,   96,   86,   40,   91,   93,
+       40,  137,  382,  163,   53,  138,   87,   88,  206,   89,
+      139,   94,   97,   98,   98,   99,  107,   49,  207,  110,
+      110,   51,  108,  108,  100,  100,  100,  114,  115,   52,
+       49,   98,  112,  112,  112,  184,  185,  111,  375,  273,
+      109,  387,   52,  355,   52,  115,  355,   49,  380,   50,
+       50,   51,  381,  101,  102,  381,  170,   52,  103,   52,
+      378,  111,  171,  171,  109,  116,  116,  116,  377,   49,
+      354,   51,   51,   51,   52,  117,  118,  387,  118,  119,
+      119,   52,  367,  120,  120,  120,  366,  365,  114,  115,
+
+      117,  118,   98,   98,  164,  118,   52,   49,  364,   54,
+       54,   54,  363,  100,  100,  100,  115,  114,  115,   52,
+       98,   49,  362,  110,  110,   51,   49,  358,  112,  112,
+      112,  335,  354,   52,   52,  115,  174,  174,   52,  352,
+      175,  175,  175,  120,  120,  120,  333,  334,   52,  120,
+      120,  120,  230,   52,  175,  175,  175,  351,  231,  231,
+      176,  350,  176,  336,  334,  175,  175,  175,  268,  268,
+      269,  349,  309,  309,  309,  176,  118,  348,  118,  176,
+      223,  224,  224,  225,  333,  334,  268,  338,  338,  339,
+      347,  118,  226,  226,  226,  118,  224,  224,  274,  224,
+
+      304,  304,  334,  307,  346,  338,  308,  226,  226,  226,
+      345,  305,  305,  305,  224,  309,  309,  309,  304,  304,
+      304,  227,  228,  344,  343,  342,  229,  341,  340,  312,
+      305,  305,  305,  307,  337,  331,  308,  304,  307,  333,
+      334,  308,  335,  356,  356,  309,  309,  309,  368,  368,
+      309,  309,  309,  330,  357,  357,  357,  334,  329,  359,
+      328,  356,  360,  370,  371,  376,  368,  356,  356,  373,
+      374,  361,  361,  361,  361,  361,  361,  327,  357,  357,
+      357,  371,  326,  359,  325,  356,  360,  374,  359,  370,
+      371,  360,  375,  370,  371,  361,  361,  361,  373,  374,
+
+      361,  361,  361,  373,  374,  383,  383,  371,  385,  386,
+      324,  371,  385,  386,  385,  386,  374,  323,  322,  321,
+      320,  374,  319,  383,  318,  317,  386,  316,  315,  314,
+      386,  313,  386,   41,   41,   41,   41,   41,   43,  273,
+       43,   43,   43,   58,   58,  106,  312,  106,  106,  106,
+      113,  113,  113,  113,  113,  172,  172,  218,  218,  218,
+      218,  218,  233,  233,  311,  311,  311,  311,  311,  332,
+      332,  332,  332,  332,  353,  353,  353,  353,  353,  369,
+      369,  369,  369,  369,  372,  372,  372,  372,  372,  379,
+      379,  379,  379,  379,  384,  384,  384,  384,  384,  310,
+
+      306,  303,  302,  301,  300,  299,  298,  297,  296,  295,
+      294,  293,  292,  291,  290,  289,  288,  287,  286,  285,
+      284,  283,  282,  281,  280,  279,  278,  232,  230,  277,
+      276,  275,  387,  272,  271,  270,  219,  267,  266,  265,
+      264,  263,  262,  261,  260,  259,  258,  257,  256,  255,
+      254,  253,  252,  251,  250,  249,  248,  247,  246,  245,
+      244,  243,  242,  241,  240,  239,  238,  237,  236,  235,
+      234,  232,  222,  221,  220,  163,  219,  217,  216,  215,
+      214,  213,  212,  211,  210,  209,  208,  205,  204,  203,
+      202,  201,  200,  199,  198,  197,  196,  195,  194,  193,
+
+      192,  191,  190,  189,  188,  187,  186,  183,  182,  181,
+      180,  179,  178,  177,  169,  169,  169,  168,  167,  166,
+      165,  387,  162,  161,  160,  159,  156,  155,  154,  153,
+      152,  151,  150,  149,  148,  147,  146,  145,  144,  143,
+      142,  141,  140,  136,  135,  134,  133,  132,  131,  130,
+      129,  128,  127,  126,  125,  124,  123,  122,  105,   42,
+      104,   92,   77,   76,   75,   74,   73,   64,   60,   59,
+       57,   56,   55,   44,   42,  387,    3,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387
     } ;
 
-static tao_yyconst short int tao_yy_chk[795] =
+static tao_yyconst short int tao_yy_chk[735] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    2,    5,    8,
-       10,    5,   10,   10,   10,   11,   11,   11,   12,  384,
-       33,    2,   12,   13,   33,   13,   13,   13,   14,   21,
-       14,   14,   14,   31,   23,   13,    8,   25,  383,   21,
-       14,   23,   31,   13,  381,   21,   23,   25,   24,   31,
-
-       13,   32,   23,   42,   32,   14,   24,   34,   35,  380,
-       34,   38,   37,   41,   96,   35,   41,   13,   52,   52,
-       34,   34,   96,   34,   37,   38,   39,   39,   39,   39,
-       42,   47,   47,   47,  342,   46,   52,  342,   39,   39,
-       39,   46,   46,  103,   48,   39,   48,   48,   48,   49,
-      109,   49,   49,   49,   78,  371,   48,  382,   78,   46,
-      382,   49,  367,   78,   48,  135,  135,   39,   39,  120,
-      120,   48,   39,   53,   53,   53,   49,  109,  124,  124,
-      124,  103,   54,   46,   54,   54,   54,  120,   48,   50,
-       50,   50,  358,   55,   54,   55,   55,   55,  157,   50,
-
-       50,  230,   50,  357,  355,   55,   56,   56,  157,   54,
-       56,   56,   56,  351,   50,   50,  104,  104,  104,   50,
-       55,   58,  350,   58,   58,   58,  349,  104,  104,  104,
-      113,  122,  122,   58,  104,  347,  113,  113,  115,  230,
-      115,  115,  115,  117,  345,  117,  117,  117,   58,  122,
-      115,  341,  118,  118,  340,  117,  118,  118,  118,  335,
-      125,  125,  125,  334,  332,  115,  311,  311,  176,  331,
-      117,  125,  330,  125,  176,  176,  179,  179,  179,  224,
-      224,  224,  329,  327,  311,  326,  125,  180,  180,  180,
-      125,  173,  173,  173,  173,  322,  321,  224,  180,  320,
-
-      180,  319,  318,  173,  173,  173,  316,  231,  231,  231,
-      173,  274,  274,  180,  315,  308,  307,  180,  231,  231,
-      231,  306,  274,  274,  274,  231,  305,  276,  304,  274,
-      276,  302,  173,  173,  310,  310,  299,  173,  298,  276,
-      276,  276,  295,  291,  290,  310,  310,  310,  312,  288,
-      286,  312,  310,  313,  285,  284,  313,  313,  283,  314,
-      312,  312,  312,  337,  337,  313,  313,  313,  314,  314,
-      314,  317,  317,  317,  339,  339,  282,  281,  280,  279,
-      278,  337,  344,  344,  346,  359,  359,  346,  277,  317,
-      360,  360,  339,  344,  344,  344,  346,  346,  346,  275,
-
-      344,  362,  362,  359,  363,  363,  272,  270,  360,  269,
-      267,  266,  362,  362,  362,  364,  265,  264,  364,  362,
-      365,  263,  363,  365,  365,  262,  366,  364,  364,  364,
-      374,  374,  365,  365,  365,  366,  366,  366,  376,  376,
-      377,  377,  379,  379,  385,  385,  386,  386,  374,  389,
-      389,  391,  391,  260,  259,  258,  376,  257,  377,  256,
-      379,  255,  385,  253,  386,  252,  251,  389,  248,  391,
-      393,  393,  393,  393,  393,  393,  393,  393,  394,  247,
-      394,  394,  394,  394,  394,  394,  395,  395,  395,  395,
-      396,  396,  246,  245,  396,  396,  397,  244,  397,  397,
-
-      397,  397,  397,  397,  398,  398,  398,  398,  398,  398,
-      398,  398,  399,  242,  399,  400,  400,  241,  400,  401,
-      240,  401,  402,  402,  402,  402,  402,  402,  402,  402,
-      403,  403,  238,  403,  404,  404,  404,  404,  404,  404,
-      404,  404,  405,  405,  405,  405,  405,  405,  405,  405,
-      406,  406,  406,  406,  406,  406,  406,  406,  407,  407,
-      407,  407,  407,  407,  407,  407,  408,  408,  408,  408,
-      408,  408,  408,  408,  409,  409,  409,  409,  409,  409,
-      409,  409,  410,  410,  410,  410,  410,  410,  410,  410,
-      236,  234,  233,  232,  228,  227,  226,  225,  223,  222,
-
-      221,  219,  218,  217,  216,  215,  214,  213,  212,  211,
-      210,  209,  208,  207,  206,  205,  204,  203,  202,  201,
-      199,  198,  196,  195,  193,  192,  191,  190,  189,  186,
-      185,  184,  182,  177,  172,  171,  170,  169,  168,  167,
-      166,  165,  164,  163,  162,  161,  160,  159,  158,  156,
-      155,  154,  153,  152,  151,  149,  148,  147,  146,  145,
-      144,  143,  142,  141,  140,  139,  138,  137,  136,  134,
-      133,  132,  131,  129,  128,  127,  114,  112,  111,  108,
-      107,  106,  105,  101,  100,   99,   98,   97,   95,   94,
-       93,   92,   91,   90,   89,   88,   87,   86,   85,   84,
-
-       83,   82,   81,   80,   79,   77,   76,   75,   74,   73,
-       72,   71,   70,   69,   68,   67,   66,   65,   64,   63,
-       45,   40,   36,   30,   29,   28,   27,   26,   22,   20,
-       19,   17,   16,   15,    9,    3,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392
-
+        1,    1,    1,    1,    1,    1,    1,    2,    5,   23,
+       92,    5,   10,   10,   10,   11,  395,   23,   92,   11,
+       12,    2,   12,   12,   12,   13,   20,   13,   13,   13,
+       30,   22,   12,  393,   24,  379,   20,   13,   22,   30,
+       12,   37,   20,   22,   24,   31,   30,   12,   31,   22,
+
+       32,   34,   13,   33,   32,   37,   33,   40,   34,   36,
+       40,   74,  378,   99,   12,   74,   33,   33,  152,   33,
+       74,   36,   38,   38,   38,   38,   44,   45,  152,   45,
+       45,   45,   44,   44,   38,   38,   38,   48,   48,   45,
+       46,   38,   46,   46,   46,  130,  130,   45,  376,  225,
+       44,   99,   46,  337,   45,   48,  337,   50,  375,   50,
+       50,   50,  377,   38,   38,  377,  108,   46,   38,   50,
+      366,   45,  108,  108,   44,   49,   49,   49,  362,   51,
+      353,   51,   51,   51,   50,   49,   49,  225,   49,   52,
+       52,   51,  352,   52,   52,   52,  350,  346,  113,  113,
+
+       49,   49,  100,  100,  100,   49,   51,   54,  345,   54,
+       54,   54,  344,  100,  100,  100,  113,  115,  115,   54,
+      100,  110,  342,  110,  110,  110,  112,  340,  112,  112,
+      112,  336,  335,  110,   54,  115,  117,  117,  112,  330,
+      117,  117,  117,  119,  119,  119,  306,  306,  110,  120,
+      120,  120,  171,  112,  174,  174,  174,  329,  171,  171,
+      120,  327,  120,  309,  306,  175,  175,  175,  219,  219,
+      219,  326,  309,  309,  309,  120,  175,  325,  175,  120,
+      168,  168,  168,  168,  332,  332,  219,  312,  312,  312,
+      324,  175,  168,  168,  168,  175,  226,  226,  226,  168,
+
+      269,  269,  332,  271,  322,  312,  271,  226,  226,  226,
+      321,  269,  269,  269,  226,  271,  271,  271,  269,  305,
+      305,  168,  168,  317,  316,  315,  168,  314,  313,  311,
+      305,  305,  305,  307,  310,  303,  307,  305,  308,  334,
+      334,  308,  308,  339,  339,  307,  307,  307,  354,  354,
+      308,  308,  308,  302,  339,  339,  339,  334,  301,  341,
+      300,  339,  341,  355,  355,  361,  354,  357,  357,  358,
+      358,  341,  341,  341,  361,  361,  361,  299,  357,  357,
+      357,  355,  297,  359,  294,  357,  359,  358,  360,  369,
+      369,  360,  360,  371,  371,  359,  359,  359,  372,  372,
+
+      360,  360,  360,  374,  374,  380,  380,  369,  381,  381,
+      293,  371,  384,  384,  386,  386,  372,  290,  286,  285,
+      283,  374,  281,  380,  280,  279,  381,  278,  277,  276,
+      384,  275,  386,  388,  388,  388,  388,  388,  389,  274,
+      389,  389,  389,  390,  390,  391,  273,  391,  391,  391,
+      392,  392,  392,  392,  392,  394,  394,  396,  396,  396,
+      396,  396,  397,  397,  398,  398,  398,  398,  398,  399,
+      399,  399,  399,  399,  400,  400,  400,  400,  400,  401,
+      401,  401,  401,  401,  402,  402,  402,  402,  402,  403,
+      403,  403,  403,  403,  404,  404,  404,  404,  404,  272,
+
+      270,  267,  265,  264,  262,  261,  260,  259,  258,  257,
+      255,  254,  253,  252,  251,  250,  248,  247,  246,  243,
+      242,  241,  240,  239,  237,  236,  235,  233,  231,  229,
+      228,  227,  223,  222,  221,  220,  218,  217,  216,  214,
+      213,  212,  211,  210,  209,  208,  207,  206,  205,  204,
+      203,  202,  201,  200,  199,  198,  197,  196,  194,  193,
+      191,  190,  188,  187,  186,  185,  184,  181,  180,  179,
+      177,  172,  167,  166,  165,  164,  163,  162,  161,  160,
+      159,  158,  157,  156,  155,  154,  153,  151,  150,  149,
+      148,  147,  146,  144,  143,  142,  141,  140,  139,  138,
+
+      137,  136,  135,  134,  133,  132,  131,  129,  128,  127,
+      126,  124,  123,  122,  109,  107,  106,  104,  103,  102,
+      101,   97,   96,   95,   94,   93,   91,   90,   89,   88,
+       87,   86,   85,   84,   83,   82,   81,   80,   79,   78,
+       77,   76,   75,   73,   72,   71,   70,   69,   68,   67,
+       66,   65,   64,   63,   62,   61,   60,   59,   43,   41,
+       39,   35,   29,   28,   27,   26,   25,   21,   19,   18,
+       16,   15,   14,    9,    8,    3,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387,  387,  387,  387,  387,  387,  387,
+      387,  387,  387,  387
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -674,7 +658,7 @@ char *tao_yytext_ptr;
 #line 1 "fe/idl.ll"
 #define INITIAL 0
 #line 2 "fe/idl.ll"
-/*  $Id: idl.ll,v 1.39 1999/07/03 22:45:51 parsons Exp $
+/*  $Id: idl.ll,v 1.33 1999/06/16 08:20:19 schmidt Exp $
 
 COPYRIGHT
 
@@ -747,12 +731,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_private.h"
 #include "y.tab.h"
 
-static char		idl_escape_reader(char *);
-static double		idl_atof(char *);
-static long		idl_atoi(char *, long);
+static char	idl_escape_reader(char *);
+static double	idl_atof(char *);
+static long	idl_atoi(char *, long);
 static unsigned long	idl_atoui(char *, long);
-static void		idl_parse_line_and_file(char *);
-static void		idl_store_pragma(char *);
+static void	idl_parse_line_and_file(char *);
+static void	idl_store_pragma(char *);
 
 #if 0 /* defined (HPUX) */
 // HPUX has tao_yytext typed to unsigned char *. We make sure here that
@@ -777,14 +761,7 @@ static int scan_obv_token (int token)
         return token;
       }
 #endif /* IDL_HAS_VALUETYPE */
-    TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-    const TAO_IDL_CPP_Keyword_Entry *entry =
-      cpp_key_tbl.lookup (ace_tao_yytext,
-                          ACE_OS::strlen (ace_tao_yytext));
-    if (entry)
-      tao_yylval.strval = ACE_OS::strdup (entry->mapping_);
-    else
-      tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext);
+    tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext);
     return IDENTIFIER;
 }
 
@@ -939,10 +916,10 @@ TAO_YY_MALLOC_DECL
 TAO_YY_DECL
 	{
 	register tao_yy_state_type tao_yy_current_state;
-	register char *tao_yy_cp = 0, *tao_yy_bp = 0;
+	register char *tao_yy_cp, *tao_yy_bp;
 	register int tao_yy_act;
 
-#line 124 "fe/idl.ll"
+#line 117 "fe/idl.ll"
 
 
 
@@ -996,13 +973,13 @@ tao_yy_match:
 			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 >= 393 )
+				if ( tao_yy_current_state >= 388 )
 					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_base[tao_yy_current_state] != 737 );
+		while ( tao_yy_base[tao_yy_current_state] != 677 );
 
 tao_yy_find_action:
 		tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1030,237 +1007,237 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 TAO_YY_RULE_SETUP
-#line 126 "fe/idl.ll"
+#line 119 "fe/idl.ll"
 return IDL_ANY;
 	TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
-#line 127 "fe/idl.ll"
+#line 120 "fe/idl.ll"
 return IDL_MODULE;
 	TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
-#line 128 "fe/idl.ll"
+#line 121 "fe/idl.ll"
 return IDL_RAISES;
 	TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
-#line 129 "fe/idl.ll"
+#line 122 "fe/idl.ll"
 return IDL_READONLY;
 	TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
-#line 130 "fe/idl.ll"
+#line 123 "fe/idl.ll"
 return IDL_ATTRIBUTE;
 	TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
-#line 131 "fe/idl.ll"
+#line 124 "fe/idl.ll"
 return IDL_EXCEPTION;
 	TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
-#line 132 "fe/idl.ll"
+#line 125 "fe/idl.ll"
 return IDL_CONTEXT;
 	TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
-#line 133 "fe/idl.ll"
+#line 126 "fe/idl.ll"
 return IDL_INTERFACE;
 	TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
-#line 134 "fe/idl.ll"
+#line 127 "fe/idl.ll"
 return IDL_CONST;
 	TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
-#line 135 "fe/idl.ll"
+#line 128 "fe/idl.ll"
 return IDL_TYPEDEF;
 	TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
-#line 136 "fe/idl.ll"
+#line 129 "fe/idl.ll"
 return IDL_STRUCT;
 	TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
-#line 137 "fe/idl.ll"
+#line 130 "fe/idl.ll"
 return IDL_ENUM;
 	TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
-#line 138 "fe/idl.ll"
+#line 131 "fe/idl.ll"
 return IDL_STRING;
 	TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
-#line 139 "fe/idl.ll"
+#line 132 "fe/idl.ll"
 return IDL_WSTRING;
 	TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
-#line 140 "fe/idl.ll"
+#line 133 "fe/idl.ll"
 return IDL_SEQUENCE;
 	TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
-#line 141 "fe/idl.ll"
+#line 134 "fe/idl.ll"
 return IDL_UNION;
 	TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
-#line 142 "fe/idl.ll"
+#line 135 "fe/idl.ll"
 return IDL_SWITCH;
 	TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
-#line 143 "fe/idl.ll"
+#line 136 "fe/idl.ll"
 return IDL_CASE;
 	TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
-#line 144 "fe/idl.ll"
+#line 137 "fe/idl.ll"
 return IDL_DEFAULT;
 	TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
-#line 145 "fe/idl.ll"
+#line 138 "fe/idl.ll"
 return IDL_FLOAT;
 	TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
-#line 146 "fe/idl.ll"
+#line 139 "fe/idl.ll"
 return IDL_DOUBLE;
 	TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
-#line 147 "fe/idl.ll"
+#line 140 "fe/idl.ll"
 return IDL_LONG;
 	TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
-#line 148 "fe/idl.ll"
+#line 141 "fe/idl.ll"
 return IDL_SHORT;
 	TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
-#line 149 "fe/idl.ll"
+#line 142 "fe/idl.ll"
 return IDL_UNSIGNED;
 	TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
-#line 150 "fe/idl.ll"
+#line 143 "fe/idl.ll"
 return IDL_CHAR;
 	TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
-#line 151 "fe/idl.ll"
+#line 144 "fe/idl.ll"
 return IDL_WCHAR;
 	TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
-#line 152 "fe/idl.ll"
+#line 145 "fe/idl.ll"
 return IDL_BOOLEAN;
 	TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
-#line 153 "fe/idl.ll"
+#line 146 "fe/idl.ll"
 return IDL_OCTET;
 	TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
-#line 154 "fe/idl.ll"
+#line 147 "fe/idl.ll"
 return IDL_VOID;
 	TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
-#line 155 "fe/idl.ll"
+#line 148 "fe/idl.ll"
 return IDL_NATIVE;
 	TAO_YY_BREAK
 case 31:
 TAO_YY_RULE_SETUP
-#line 156 "fe/idl.ll"
+#line 149 "fe/idl.ll"
 return scan_obv_token (IDL_ABSTRACT);
 	TAO_YY_BREAK
 case 32:
 TAO_YY_RULE_SETUP
-#line 157 "fe/idl.ll"
+#line 150 "fe/idl.ll"
 return scan_obv_token (IDL_CUSTOM);
 	TAO_YY_BREAK
 case 33:
 TAO_YY_RULE_SETUP
-#line 158 "fe/idl.ll"
+#line 151 "fe/idl.ll"
 return scan_obv_token (IDL_INIT);
 	TAO_YY_BREAK
 case 34:
 TAO_YY_RULE_SETUP
-#line 159 "fe/idl.ll"
+#line 152 "fe/idl.ll"
 return scan_obv_token (IDL_PRIVATE);
 	TAO_YY_BREAK
 case 35:
 TAO_YY_RULE_SETUP
-#line 160 "fe/idl.ll"
+#line 153 "fe/idl.ll"
 return scan_obv_token (IDL_PUBLIC);
 	TAO_YY_BREAK
 case 36:
 TAO_YY_RULE_SETUP
-#line 161 "fe/idl.ll"
+#line 154 "fe/idl.ll"
 return scan_obv_token (IDL_SUPPORTS);
 	TAO_YY_BREAK
 case 37:
 TAO_YY_RULE_SETUP
-#line 162 "fe/idl.ll"
+#line 155 "fe/idl.ll"
 return scan_obv_token (IDL_TRUNCATABLE);
 	TAO_YY_BREAK
 case 38:
 TAO_YY_RULE_SETUP
-#line 163 "fe/idl.ll"
+#line 156 "fe/idl.ll"
 return scan_obv_token (IDL_VALUETYPE);
 	TAO_YY_BREAK
 case 39:
 TAO_YY_RULE_SETUP
-#line 165 "fe/idl.ll"
+#line 158 "fe/idl.ll"
 return IDL_TRUETOK;
 	TAO_YY_BREAK
 case 40:
 TAO_YY_RULE_SETUP
-#line 166 "fe/idl.ll"
+#line 159 "fe/idl.ll"
 return IDL_FALSETOK;
 	TAO_YY_BREAK
 case 41:
 TAO_YY_RULE_SETUP
-#line 168 "fe/idl.ll"
+#line 161 "fe/idl.ll"
 return IDL_INOUT;
 	TAO_YY_BREAK
 case 42:
 TAO_YY_RULE_SETUP
-#line 169 "fe/idl.ll"
+#line 162 "fe/idl.ll"
 return IDL_IN;
 	TAO_YY_BREAK
 case 43:
 TAO_YY_RULE_SETUP
-#line 170 "fe/idl.ll"
+#line 163 "fe/idl.ll"
 return IDL_OUT;
 	TAO_YY_BREAK
 case 44:
 TAO_YY_RULE_SETUP
-#line 171 "fe/idl.ll"
+#line 164 "fe/idl.ll"
 return IDL_ONEWAY;
 	TAO_YY_BREAK
 case 45:
 TAO_YY_RULE_SETUP
-#line 173 "fe/idl.ll"
+#line 166 "fe/idl.ll"
 return IDL_LEFT_SHIFT;
 	TAO_YY_BREAK
 case 46:
 TAO_YY_RULE_SETUP
-#line 174 "fe/idl.ll"
+#line 167 "fe/idl.ll"
 return IDL_RIGHT_SHIFT;
 	TAO_YY_BREAK
 case 47:
 TAO_YY_RULE_SETUP
-#line 175 "fe/idl.ll"
+#line 168 "fe/idl.ll"
 {
 		  tao_yylval.strval = (char *) "::";
 		  return IDL_SCOPE_DELIMITOR;
@@ -1268,7 +1245,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 48:
 TAO_YY_RULE_SETUP
-#line 180 "fe/idl.ll"
+#line 173 "fe/idl.ll"
 {
   // 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++
@@ -1289,7 +1266,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 49:
 TAO_YY_RULE_SETUP
-#line 198 "fe/idl.ll"
+#line 191 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
@@ -1297,7 +1274,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 50:
 TAO_YY_RULE_SETUP
-#line 202 "fe/idl.ll"
+#line 195 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
@@ -1305,7 +1282,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 51:
 TAO_YY_RULE_SETUP
-#line 207 "fe/idl.ll"
+#line 200 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
 		  return IDL_INTEGER_LITERAL;
@@ -1313,7 +1290,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 52:
 TAO_YY_RULE_SETUP
-#line 211 "fe/idl.ll"
+#line 204 "fe/idl.ll"
 {
 		  tao_yylval.uival = idl_atoui(ace_tao_yytext, 10);
 		  return IDL_UINTEGER_LITERAL;
@@ -1321,7 +1298,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 53:
 TAO_YY_RULE_SETUP
-#line 215 "fe/idl.ll"
+#line 208 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
 		  return IDL_INTEGER_LITERAL;
@@ -1329,7 +1306,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 54:
 TAO_YY_RULE_SETUP
-#line 219 "fe/idl.ll"
+#line 212 "fe/idl.ll"
 {
                   tao_yylval.uival = idl_atoui(ace_tao_yytext, 16);
 		  return IDL_UINTEGER_LITERAL;
@@ -1337,7 +1314,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 55:
 TAO_YY_RULE_SETUP
-#line 223 "fe/idl.ll"
+#line 216 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
 		  return IDL_INTEGER_LITERAL;
@@ -1345,7 +1322,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 56:
 TAO_YY_RULE_SETUP
-#line 227 "fe/idl.ll"
+#line 220 "fe/idl.ll"
 {
 		  tao_yylval.uival = idl_atoui(ace_tao_yytext, 8);
 		  return IDL_UINTEGER_LITERAL;
@@ -1353,7 +1330,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 57:
 TAO_YY_RULE_SETUP
-#line 232 "fe/idl.ll"
+#line 225 "fe/idl.ll"
 {
 		  /* Skip the quotes */
 		  char *tmp = ace_tao_yytext;
@@ -1364,7 +1341,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 58:
 TAO_YY_RULE_SETUP
-#line 239 "fe/idl.ll"
+#line 232 "fe/idl.ll"
 {
 		  tao_yylval.cval = ace_tao_yytext [1];
 		  return IDL_CHARACTER_LITERAL;
@@ -1372,7 +1349,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 59:
 TAO_YY_RULE_SETUP
-#line 243 "fe/idl.ll"
+#line 236 "fe/idl.ll"
 {
 		  // octal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
@@ -1381,7 +1358,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 60:
 TAO_YY_RULE_SETUP
-#line 248 "fe/idl.ll"
+#line 241 "fe/idl.ll"
 {
 		  // hexadecimal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
@@ -1390,63 +1367,63 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 61:
 TAO_YY_RULE_SETUP
-#line 253 "fe/idl.ll"
+#line 246 "fe/idl.ll"
 {
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	TAO_YY_BREAK
 case 62:
-#line 258 "fe/idl.ll"
+#line 251 "fe/idl.ll"
 case 63:
 TAO_YY_RULE_SETUP
-#line 258 "fe/idl.ll"
+#line 251 "fe/idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_tao_yytext);
 		}
 	break;
 case 64:
-#line 263 "fe/idl.ll"
+#line 256 "fe/idl.ll"
 case 65:
 TAO_YY_RULE_SETUP
-#line 263 "fe/idl.ll"
+#line 256 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
 case 66:
-#line 267 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 case 67:
 TAO_YY_RULE_SETUP
-#line 267 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
 case 68:
-#line 271 "fe/idl.ll"
+#line 264 "fe/idl.ll"
 case 69:
 TAO_YY_RULE_SETUP
-#line 271 "fe/idl.ll"
+#line 264 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
 case 70:
-#line 275 "fe/idl.ll"
+#line 268 "fe/idl.ll"
 case 71:
 TAO_YY_RULE_SETUP
-#line 275 "fe/idl.ll"
+#line 268 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 	        }
 	break;
 case 72:
-#line 279 "fe/idl.ll"
+#line 272 "fe/idl.ll"
 case 73:
 TAO_YY_RULE_SETUP
-#line 279 "fe/idl.ll"
+#line 272 "fe/idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
@@ -1454,7 +1431,7 @@ TAO_YY_RULE_SETUP
 	break;
 case 74:
 TAO_YY_RULE_SETUP
-#line 283 "fe/idl.ll"
+#line 276 "fe/idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
@@ -1462,7 +1439,7 @@ TAO_YY_RULE_SETUP
 	break;
 case 75:
 TAO_YY_RULE_SETUP
-#line 287 "fe/idl.ll"
+#line 280 "fe/idl.ll"
 {
 		  for(;;) {
 		    char c = tao_yyinput();
@@ -1480,24 +1457,24 @@ TAO_YY_RULE_SETUP
 	break;
 case 76:
 TAO_YY_RULE_SETUP
-#line 301 "fe/idl.ll"
+#line 294 "fe/idl.ll"
 ;
 	TAO_YY_BREAK
 case 77:
 TAO_YY_RULE_SETUP
-#line 302 "fe/idl.ll"
+#line 295 "fe/idl.ll"
 {
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	break;
 case 78:
 TAO_YY_RULE_SETUP
-#line 305 "fe/idl.ll"
+#line 298 "fe/idl.ll"
 return ace_tao_yytext [0];
 	TAO_YY_BREAK
 case 79:
 TAO_YY_RULE_SETUP
-#line 307 "fe/idl.ll"
+#line 300 "fe/idl.ll"
 TAO_YY_ECHO;
 	TAO_YY_BREAK
 case TAO_YY_STATE_EOF(INITIAL):
@@ -1792,7 +1769,7 @@ static tao_yy_state_type tao_yy_get_previous_state()
 		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 >= 393 )
+			if ( tao_yy_current_state >= 388 )
 				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];
@@ -1827,11 +1804,11 @@ tao_yy_state_type tao_yy_current_state;
 	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 >= 393 )
+		if ( tao_yy_current_state >= 388 )
 			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 == 392);
+	tao_yy_is_jam = (tao_yy_current_state == 387);
 
 	return tao_yy_is_jam ? 0 : tao_yy_current_state;
 	}
@@ -2387,7 +2364,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 307 "fe/idl.ll"
+#line 300 "fe/idl.ll"
 
 	/* subroutines */
 
@@ -2438,7 +2415,7 @@ idl_parse_line_and_file(char *buf)
   for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
     continue;
   *r++ = 0;
-  idl_global->set_lineno(idl_atoui(h, 10));
+  idl_global->set_lineno(idl_atoi(h, 10));
 
   /* Find file name, if present */
   for (; *r != '"'; r++)
@@ -2677,7 +2654,7 @@ idl_escape_reader(
 	    }
 	    char save = str[i];
 	    str[i] = '\0';
-	    char out = (char)idl_atoui(&str[2], 16);
+	    char out = (char)idl_atoi(&str[2], 16);
 	    str[i] = save;
 	    return out;
 	}
@@ -2691,7 +2668,7 @@ idl_escape_reader(
 	    }
 	    char save = str[i];
 	    str[i] = '\0';
-	    char out = (char)idl_atoui(&str[1], 8);
+	    char out = (char)idl_atoi(&str[1], 8);
 	    str[i] = save;
 	    return out;
 	} else {
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index 89544d77dde..636d2c505d0 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,6 +1,6 @@
---- lex.yy.cpp	Sat Jul  3 18:55:03 1999
-+++ lex.yy.cpp.new	Sat Jul  3 18:52:58 1999
-@@ -927,7 +927,7 @@
+--- lex.yy.cpp	Fri Jun 18 18:36:24 1999
++++ lex.yy.cpp.new	Fri Jun 18 18:34:12 1999
+@@ -904,7 +904,7 @@
  
  /* Code executed at the end of each rule. */
  #ifndef TAO_YY_BREAK
@@ -9,61 +9,52 @@
  #endif
  
  #define TAO_YY_RULE_SETUP \
-@@ -939,7 +939,7 @@
- TAO_YY_DECL
- 	{
- 	register tao_yy_state_type tao_yy_current_state;
--	register char *tao_yy_cp, *tao_yy_bp;
-+	register char *tao_yy_cp = 0, *tao_yy_bp = 0;
- 	register int tao_yy_act;
- 
- #line 124 "fe/idl.ll"
-@@ -1405,7 +1405,7 @@
+@@ -1382,7 +1382,7 @@
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		  idl_store_pragma(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
  case 64:
- #line 263 "fe/idl.ll"
+ #line 256 "fe/idl.ll"
  case 65:
-@@ -1414,7 +1414,7 @@
+@@ -1391,7 +1391,7 @@
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
  case 66:
- #line 267 "fe/idl.ll"
+ #line 260 "fe/idl.ll"
  case 67:
-@@ -1423,7 +1423,7 @@
+@@ -1400,7 +1400,7 @@
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
  case 68:
- #line 271 "fe/idl.ll"
+ #line 264 "fe/idl.ll"
  case 69:
-@@ -1432,7 +1432,7 @@
+@@ -1409,7 +1409,7 @@
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
  case 70:
- #line 275 "fe/idl.ll"
+ #line 268 "fe/idl.ll"
  case 71:
-@@ -1441,7 +1441,7 @@
+@@ -1418,7 +1418,7 @@
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  	        }
 -	TAO_YY_BREAK
 +	break;
  case 72:
- #line 279 "fe/idl.ll"
+ #line 272 "fe/idl.ll"
  case 73:
-@@ -1451,7 +1451,7 @@
+@@ -1428,7 +1428,7 @@
  		  /* ignore cpp ident */
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
@@ -71,8 +62,8 @@
 +	break;
  case 74:
  TAO_YY_RULE_SETUP
- #line 283 "fe/idl.ll"
-@@ -1459,7 +1459,7 @@
+ #line 276 "fe/idl.ll"
+@@ -1436,7 +1436,7 @@
  		  /* ignore comments */
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
@@ -80,8 +71,8 @@
 +	break;
  case 75:
  TAO_YY_RULE_SETUP
- #line 287 "fe/idl.ll"
-@@ -1477,7 +1477,7 @@
+ #line 280 "fe/idl.ll"
+@@ -1454,7 +1454,7 @@
  		    }
  	          }
  	        }
@@ -89,8 +80,8 @@
 +	break;
  case 76:
  TAO_YY_RULE_SETUP
- #line 301 "fe/idl.ll"
-@@ -1489,7 +1489,7 @@
+ #line 294 "fe/idl.ll"
+@@ -1466,7 +1466,7 @@
  {
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
@@ -98,4 +89,4 @@
 +	break;
  case 78:
  TAO_YY_RULE_SETUP
- #line 305 "fe/idl.ll"
+ #line 298 "fe/idl.ll"
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 490deb3bb16..2e3f0ccb15f 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -970,7 +970,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_INDENT */
 #ifndef TAO_YYDEBUG_REDUCE
 #ifdef __cplusplus
-void TAO_YYDEBUG_REDUCE(int, int, const char *tao_yyrule_string, int tao_yynew_indent, int tao_yyrhs_count)
+void TAO_YYDEBUG_REDUCE(int tao_yynew_state, int tao_yyrule_num, const char *tao_yyrule_string, int tao_yynew_indent, int tao_yyrhs_count)
 #else
 TAO_YYDEBUG_REDUCE(tao_yynew_state, tao_yyrule_num, tao_yyrule_string, tao_yynew_indent, tao_yyrhs_count)
 int tao_yynew_state;
@@ -1000,7 +1000,7 @@ int tao_yyrhs_count;
 #endif /* TAO_YYDEBUG_REDUCE */
 #ifndef TAO_YYDEBUG_SHIFT_LEXEME
 #ifdef __cplusplus
-void TAO_YYDEBUG_SHIFT_LEXEME(int, int, const char *tao_yytoken_string, int tao_yynew_indent)
+void TAO_YYDEBUG_SHIFT_LEXEME(int tao_yyold_state, int tao_yynew_state, const char *tao_yytoken_string, int tao_yynew_indent)
 #else
 TAO_YYDEBUG_SHIFT_LEXEME(tao_yyold_state, tao_yynew_state, tao_yytoken_string, tao_yynew_indent)
 int tao_yyold_state;
@@ -1015,7 +1015,7 @@ int tao_yynew_indent;
 #endif /*  TAO_YYDEBUG_SHIFT_LEXEME */
 #ifndef TAO_YYDEBUG_LOOK_AHEAD
 #ifdef __cplusplus
-void TAO_YYDEBUG_LOOK_AHEAD(int, int tao_yytoken_num, const char *tao_yytoken_string, int tao_yyindent)
+void TAO_YYDEBUG_LOOK_AHEAD(int tao_yynew_state, int tao_yytoken_num, const char *tao_yytoken_string, int tao_yyindent)
 #else
 TAO_YYDEBUG_LOOK_AHEAD(tao_yynew_state, tao_yytoken_num, tao_yytoken_string, tao_yyindent)
 int tao_yynew_state;
@@ -1032,7 +1032,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_LOOK_AHEAD */
 #ifndef TAO_YYDEBUG_DISCARD_STATE
 #ifdef __cplusplus
-void TAO_YYDEBUG_DISCARD_STATE(int, int tao_yyindent)
+void TAO_YYDEBUG_DISCARD_STATE(int tao_yynew_state, int tao_yyindent)
 #else
 TAO_YYDEBUG_DISCARD_STATE(tao_yynew_state, tao_yyindent)
 int tao_yynew_state;
@@ -1060,7 +1060,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_DISCARD_STATE */
 #ifndef TAO_YYDEBUG_DISCARD_TOKEN
 #ifdef __cplusplus
-void TAO_YYDEBUG_DISCARD_TOKEN(int, int, const char *tao_yytoken_string, int tao_yyindent)
+void TAO_YYDEBUG_DISCARD_TOKEN(int tao_yynew_state, int tao_yytoken_num, const char *tao_yytoken_string, int tao_yyindent)
 #else
 TAO_YYDEBUG_DISCARD_TOKEN(tao_yynew_state, tao_yytoken_num, tao_yytoken_string, tao_yyindent)
 int tao_yynew_state;
@@ -1075,7 +1075,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_DISCARD_TOKEN */
 #ifndef TAO_YYDEBUG_SHIFT_ERROR_LEXEME
 #ifdef __cplusplus
-void TAO_YYDEBUG_SHIFT_ERROR_LEXEME(int, int, int tao_yyindent)
+void TAO_YYDEBUG_SHIFT_ERROR_LEXEME(int tao_yyold_state, int tao_yynew_state, int tao_yyindent)
 #else
 TAO_YYDEBUG_SHIFT_ERROR_LEXEME(tao_yyold_state, tao_yynew_state, tao_yyindent)
 int tao_yyold_state;
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 69f48e0ff58..a455914f445 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -148,11 +148,20 @@ public:
   void set_line(long l);
   UTL_String *file_name();
   void set_file_name(UTL_String *s);
+
   UTL_ScopedName *name();
+
+  UTL_ScopedName *compute_name (const char *prefix, const char *suffix);
+  // Variation of the <name>. Computes scoped name string, applying
+  // prefix and suffix to the local name component. 
+
   void set_name(UTL_ScopedName *n);
   
   Identifier *local_name ();
 
+  Identifier *compute_local_name (const char *prefix, const char *sufix);
+  // Apply prefix and suffix to the local name and return.
+
   //
   // If there is _cxx_ in the beginning, we will remove that and keep
   // a copy of the original name. TAO IDL's front end adds _cxx_
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index d852679038f..a224ee07160 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -209,75 +209,75 @@ public:
   virtual UTL_ScopeStack   *scopes();              // Scopes stack
   virtual void             set_scopes(UTL_ScopeStack *);
                                                    // Set it
-
+                           
   virtual AST_Root         *root();                // Root of AST
   virtual void             set_root(AST_Root *);   // Set it
-
+                           
   virtual AST_Generator    *gen();                 // Generator
   virtual void             set_gen(AST_Generator *);// Set it
-
+                           
   virtual UTL_Error        *err();                 // Error reporter
   virtual void             set_err(UTL_Error *);   // Set it
-
+                           
   virtual long             err_count();            // How many errors?
   virtual void             set_err_count(long);    // Set it
-
+                           
   virtual long             lineno();               // Where in file?
   virtual void             set_lineno(long);       // Set it
-
+                           
   virtual UTL_String       *filename();            // What file?
   virtual void             set_filename(UTL_String *); // Set it
-
+                           
   virtual UTL_String       *main_filename();       // What's the main
                                                    // file name?
   virtual void             set_main_filename(UTL_String *);
                                                    // Set it
-
+                           
   virtual UTL_String       *real_filename();       // What's the real
                                                    // file name?
   virtual void             set_real_filename(UTL_String *);
                                                    // Set it
-
+                           
   virtual UTL_String       *stripped_filename();   // Stripped filename
   virtual void             set_stripped_filename(UTL_String *);  // Set it
-
+                           
   virtual idl_bool         imported();             // Are we imported?
   virtual idl_bool         import();               // Is import on?
   virtual void             set_import(idl_bool);   // Set it
-
+                           
   virtual idl_bool         in_main_file();         // Are we?
   virtual void             set_in_main_file(idl_bool);     // Set it
-
+                           
   virtual const char       *prog_name(void);           // Invoked as..
   virtual void             set_prog_name(const char *);  // Set it
-
+                           
   virtual const char       *cpp_location(void);     // Where's CPP?
   virtual void             set_cpp_location(const char *);// Set it
-
+                           
   virtual long             compile_flags(void);   // What flags are on?
   virtual void             set_compile_flags(long);// Turn some on or off
-
+                           
   virtual const char       *be(void);                  // Get BE to use
   virtual void             set_be(const char *);         // Set it
-
+                           
   virtual char             *local_escapes(void);       // Get local escapes
   virtual void             set_local_escapes(const char *);// Set it
-
+                           
   virtual UTL_Indenter     *indent();              // Get indenter
   virtual void             set_indent(UTL_Indenter *);
                                                    // Set it
-
+                           
   virtual UTL_StrList      *pragmas();             // Get pragmas
   virtual void             set_pragmas(UTL_StrList *);// Set it
-
+                           
   virtual idl_bool         read_from_stdin();      // Reading from stdin?
   virtual void             set_read_from_stdin(idl_bool); // Set it
-
+                           
   virtual void             store_include_file_name(UTL_String *);
-
+                           
   virtual UTL_String       **include_file_names();   // Array of file names
   virtual void             set_include_file_names(UTL_String **); // Set it
-
+                           
   virtual unsigned long    n_include_file_names(); // How many
   virtual void             set_n_include_file_names(unsigned long n);
 
@@ -384,14 +384,6 @@ public:
   // set the name of the include file that contains the export
   // macro definition.
 
-  virtual const char* pch_include (void) const;
-  // returns the name of the include file to be used for precompiled
-  // header support.
-
-  virtual void pch_include (const char* s);
-  // set the name of the include file to be used for precompiled
-  // header support.
-
   // = Set and get methods for different file name endings.
 
   virtual void client_hdr_ending (const char* s);
@@ -524,38 +516,26 @@ public:
   virtual void compiled_marshaling (idl_bool);
   // enable compiled marshaling support
 
-  virtual idl_bool compiled_marshaling (void);
-  // check if we use compiled marshaling
-
   virtual void gen_impl_files (idl_bool);
   //enable generation of implementation files
 
-  virtual idl_bool gen_impl_files (void);
-  // check if we want to generate implementation files
-
   virtual void gen_copy_ctor (idl_bool);
   //enable generation of copy constructor
 
-  virtual idl_bool gen_copy_ctor (void);
-  //check if we want to generate the copy constructor
-
   virtual void gen_assign_op (idl_bool);
   //enable the generation of the assignment operator
 
-  virtual idl_bool gen_assign_op (void);
-  //check if we want to generate the assignment operator
-
-  virtual void gen_thru_poa_collocation (idl_bool);
-  // set whether we want to generate Thru_POA collocation stubs.
+  virtual idl_bool compiled_marshaling (void);
+  // check if we use compiled marshaling
 
-  virtual idl_bool gen_thru_poa_collocation (void);
-  // check if we want to generate Thru_POA collocation stubs.
+  virtual idl_bool gen_impl_files (void);
+  // check if we want to generate implementation files
 
-  virtual void gen_direct_collocation (idl_bool);
-  // set whether we want to generate Direct collocation stubs.
+  virtual idl_bool gen_copy_ctor (void);
+  //check if we want to generate the copy constructor
 
-  virtual idl_bool gen_direct_collocation (void);
-  // check if we want to generate Direct collocation stubs.
+  virtual idl_bool gen_assign_op (void);
+  //check if we want to generate the assignment operator
 
   virtual void exception_support (idl_bool);
   // enable real C++ exceptions
@@ -620,12 +600,12 @@ private:
   // For char*'s have been allocated for this.
 
   ParseState                pd_parse_state;         // Parse state we're in.
-
-  // Operations
+                  
+  // Operations   
   long                      seen_include_file_before(UTL_String *);
                                                     // Seen this include
                                                     // before?
-
+                  
   UTL_String                *pd_idl_src_file;       // IDL source file.
 
   size_t  changing_standard_include_files_;
@@ -635,7 +615,6 @@ private:
 
   char* export_macro_;
   char* export_include_;
-  char* pch_include_;
 
   // Client's header file name ending. Default is "C.h".
   char*  client_hdr_ending_;
@@ -704,25 +683,19 @@ private:
   // do we optimize valuetype accessors?
 
   idl_bool compiled_marshaling_;
-  // do we support compiled marshaling?
+  // do we support compiled marshaling
 
   idl_bool gen_impl_files_;
-  // are we generating implementation files?
+  //are we generating implementation files
 
   idl_bool gen_copy_ctor_;
-  // are we generating the copy constructor?
+  //are we generating the copy constructor
 
   idl_bool gen_assign_op_;
-  // are we generating the assignment operator?
-
-  idl_bool gen_thru_poa_collocation_;
-  // are we generating Thru_POA collocated stubs?
-
-  idl_bool gen_direct_collocation_;
-  // are we generating Direct collocated stubs?
+  //are we generating the assignment operator
 
   idl_bool exception_support_;
-  // do we support real C++ exceptions (strict mapping) for stubs/skeletons?
+  // do we support real C++ exceptions (strict mapping) for stubs/skeletons
 
   idl_bool opt_tc_;
   // do we generate optimized typecodes?
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index ab2a11ca875..a3c35dd112b 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=TAO_IDL Compiler - Win32 Debug

+CFG=TAO_IDL Compiler - Win32 Alpha Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,7 +14,7 @@ CFG=TAO_IDL Compiler - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "tao_idl.mak" CFG="TAO_IDL Compiler - Win32 Debug"

+!MESSAGE NMAKE /f "tao_idl.mak" CFG="TAO_IDL Compiler - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -44,7 +44,7 @@ CFG=TAO_IDL Compiler - Win32 Debug
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "include" /I "be_include" /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -99,8 +99,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -128,9 +128,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -157,490 +157,1832 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\ast\ast_argument.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_array.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_attribute.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_check.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_concrete_type.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_constant.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_decl.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_enum.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_enum_val.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_exception.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_expression.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_field.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_generator.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_interface.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_interface_fwd.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_module.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_native.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_operation.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_predefined_type.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_recursive.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_redef.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_root.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_sequence.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_string.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_structure.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_type.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_typedef.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_union.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_union_branch.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ast\ast_union_label.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_args.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_argument.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_array.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_attribute.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_codegen.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_constant.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_decl.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_enum.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_enum_val.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_exception.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_expression.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_field.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_generator.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_helper.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_init.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_interface.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_interface_fwd.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_module.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_native.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_operation.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_predefined_type.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_produce.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_root.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_scope.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_sequence.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_stream_factory.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_string.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_structure.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_sunsoft.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_type.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_typedef.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_union.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_union_branch.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_union_label.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_valuetype.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_valuetype_fwd.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_argument.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_array.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_attribute.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_constant.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_context.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_decl.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_enum.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_exception.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_factory.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_field.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_interface.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_interface_fwd.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_module.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_operation.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_root.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_scope.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_sequence.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_structure.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_typecode.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_typedef.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_union.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_union_branch.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_valuetype.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\be\be_visitor_valuetype_fwd.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_args.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_fork.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_init.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_link.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_preproc.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\driver\drv_private.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_declarator.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_extern.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_init.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_interface_header.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_lookup.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\fe_private.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\lex.yy.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\narrow\narrow.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\tao_idl.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_decllist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_error.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_exceptlist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_exprlist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_global.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_identifier.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_idlist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_indenter.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_labellist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_list.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_namelist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_scope.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_stack.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_string.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\util\utl_strlist.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\fe\y.tab.cpp

+

+!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/TAO_IDL/tao_idl_static.dsp b/TAO/TAO_IDL/tao_idl_static.dsp
index 0afcd217a9d..92f33aba81e 100644
--- a/TAO/TAO_IDL/tao_idl_static.dsp
+++ b/TAO/TAO_IDL/tao_idl_static.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,7 +87,7 @@ LINK32=link.exe
 # Name "TAO_IDL Compiler Static - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter ".cpp"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\ast\ast_argument.cpp

@@ -346,14 +346,6 @@ SOURCE=.\be\be_union_label.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\be\be_valuetype.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_valuetype_fwd.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\be\be_visitor.cpp

 # End Source File

 # Begin Source File

@@ -446,14 +438,6 @@ SOURCE=.\be\be_visitor_union_branch.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\be\be_visitor_valuetype.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_valuetype_fwd.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\driver\drv_args.cpp

 # End Source File

 # Begin Source File

@@ -579,7 +563,7 @@ SOURCE=.\fe\y.tab.cpp
 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter ".h"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\include\ast.h

@@ -834,14 +818,6 @@ SOURCE=.\be_include\be_union_label.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_valuetype_fwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\be_include\be_visitor.h

 # End Source File

 # Begin Source File

@@ -934,14 +910,6 @@ SOURCE=.\be_include\be_visitor_union_branch.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_visitor_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_valuetype_fwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\include\drv_extern.h

 # End Source File

 # Begin Source File

@@ -1077,5 +1045,37 @@ SOURCE=.\include\utl_strlist.h
 SOURCE=.\fe\y.tab.h

 # End Source File

 # End Group

+# Begin Source File

+

+SOURCE=.\be\be_valuetype.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be_include\be_valuetype.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_valuetype_fwd.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be_include\be_valuetype_fwd.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_visitor_valuetype.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be_include\be_visitor_valuetype.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_visitor_valuetype_fwd.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be_include\be_visitor_valuetype_fwd.h

+# End Source File

 # End Target

 # End Project

diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index b8783829f18..82adabd597c 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -110,7 +110,6 @@ IDL_GlobalData::IDL_GlobalData (void)
       changing_standard_include_files_ (1),
       export_macro_ (0),
       export_include_ (0),
-      pch_include_ (0),
       client_hdr_ending_ (ACE::strnew ("C.h")),
       client_stub_ending_ (ACE::strnew ("C.cpp")),
       client_inline_ending_ (ACE::strnew ("C.i")),
@@ -139,8 +138,6 @@ IDL_GlobalData::IDL_GlobalData (void)
       gen_impl_files_ (I_FALSE),
       gen_copy_ctor_ (I_FALSE),
       gen_assign_op_ (I_FALSE),
-      gen_thru_poa_collocation_ (I_TRUE), // Default is thru_poa.
-      gen_direct_collocation_ (I_FALSE),
 #ifdef ACE_HAS_EXCEPTIONS
       exception_support_ (I_TRUE),
 #else
@@ -1029,18 +1026,6 @@ IDL_GlobalData::export_include (void) const
   return this->export_include_;
 }
 
-const char*
-IDL_GlobalData::pch_include (void) const
-{
-  return this->pch_include_;
-}  
-
-void
-IDL_GlobalData::pch_include (const char *s)
-{
-  this->pch_include_ = ACE_OS::strdup (s);
-}
-
 void
 IDL_GlobalData::export_include (const char *s)
 {
@@ -1330,36 +1315,18 @@ IDL_GlobalData::compiled_marshaling (idl_bool val)
   this->compiled_marshaling_ = val;
 }
 
-idl_bool
-IDL_GlobalData::compiled_marshaling (void)
-{
-  return this->compiled_marshaling_;
-}
-
 void
 IDL_GlobalData::gen_impl_files (idl_bool val)
 {
   this->gen_impl_files_ = val;
 }
 
-idl_bool
-IDL_GlobalData::gen_impl_files (void)
-{
-  return this->gen_impl_files_;
-}
-
 void
 IDL_GlobalData::gen_copy_ctor (idl_bool val)
 {
   this->gen_copy_ctor_ = val;
 }
 
-idl_bool
-IDL_GlobalData::gen_copy_ctor (void)
-{
-  return this->gen_copy_ctor_;
-}
-
 void
 IDL_GlobalData::gen_assign_op (idl_bool val)
 {
@@ -1367,33 +1334,27 @@ IDL_GlobalData::gen_assign_op (idl_bool val)
 }
 
 idl_bool
-IDL_GlobalData::gen_assign_op (void)
-{
-  return this->gen_assign_op_;
-}
-
-void
-IDL_GlobalData::gen_thru_poa_collocation (idl_bool val)
+IDL_GlobalData::gen_impl_files (void)
 {
-  this->gen_thru_poa_collocation_ = val;
+  return this->gen_impl_files_;
 }
 
 idl_bool
-IDL_GlobalData::gen_thru_poa_collocation (void)
+IDL_GlobalData::gen_copy_ctor (void)
 {
-  return this->gen_thru_poa_collocation_;
+  return this->gen_copy_ctor_;
 }
 
-void
-IDL_GlobalData::gen_direct_collocation (idl_bool val)
+idl_bool
+IDL_GlobalData::gen_assign_op (void)
 {
-  this->gen_direct_collocation_ = val;
+  return this->gen_assign_op_;
 }
 
 idl_bool
-IDL_GlobalData::gen_direct_collocation (void)
+IDL_GlobalData::compiled_marshaling (void)
 {
-  return this->gen_direct_collocation_;
+  return this->compiled_marshaling_;
 }
 
 void
diff --git a/TAO/VERSION b/TAO/VERSION
index 99e38aec3ae..de13d632acf 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 0.4, released Thu Jul 01 21:14:56 1999.
+This is TAO version 0.3.25, released Fri Jun 18 19:37:32 1999.
 
 If you have any problems with or questions about TAO, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/TAO/docs/INS.html b/TAO/docs/INS.html
index b08247c97ec..8369da0eab1 100644
--- a/TAO/docs/INS.html
+++ b/TAO/docs/INS.html
@@ -1,4 +1,3 @@
-  <!-- $Id$ -->
 <HTML>
 
 <HEAD>
@@ -12,10 +11,8 @@ bgcolor="#ffffff">
 <HR><P>
 <H3>TAO Interoperable Naming Service</H3>
 
-The CORBA <A
-HREF="ftp://ftp.omg.org/pub/docs/orbos/98-10-11.pdf">Interoperable
-Naming Service</A> (INS) service allows the ORB to be configured
-administratively to return object references from
+The Interoperable Naming Service (INS) service allows the ORB to be
+configured administratively to return object references from
 <CODE>CORBA::ORB::resolve_initial_references</CODE> for non-locality
 constrained objects.  The service also introduces the
 <CODE>iioploc</CODE> and <CODE>iiopname</CODE> IOR formats, which can
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index a16efbf6ec8..c038dbe0b5e 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1,8 +1,8 @@
 <HTML>
 <HEAD>
-<!-- $Id$ -->
-<META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-<TITLE>Options for TAO Components</TITLE>
+  <!-- $Id$ -->
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
+  <TITLE>Options for TAO Components</TITLE>
 </HEAD>
 
 <BODY text = "#000000"
@@ -46,36 +46,31 @@ The following environment variables are supported by TAO:
 
 <BLOCKQUOTE>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-  <TR>
-    <TH>Environment Variable</TH>
-    <TH>Description</TH>
-  </TR>
-  <TR>
-    <TD><CODE>NameServiceIOR</CODE> <EM>which</EM></TD>
-    <TD>
-        Specifies which IOR the Naming Service is listening on.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>NameServicePort</CODE> <EM>which</EM></TD>
-    <TD>
-        Specifies which port the Naming Service is listening on for multicast
-        requests.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>TradingServiceIOR</CODE> <EM>which</EM></TD>
-    <TD>
-        Specifies which IOR the Trading Service is listening on.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>TradingServicePort</CODE> <EM>which</EM></TD>
-    <TD>
-        Specifies which port the Trading Service is listening on for multicast
-        requests.
-    </TD>
-  </TR>
+<TR>
+<TH>Environment Variable</TH>
+<TH>Description</TH></TR>
+<TR>
+<TD><CODE>NameServiceIOR</CODE> <EM>which</EM></TD>
+<TD>
+Specifies which IOR the Naming Service is listening on.
+</TD></TR>
+<TR>
+<TD><CODE>NameServicePort</CODE> <EM>which</EM></TD>
+<TD>
+Specifies which port the Naming Service is listening on for multicast
+requests.
+</TD></TR>
+<TR>
+<TD><CODE>TradingServiceIOR</CODE> <EM>which</EM></TD>
+<TD>
+Specifies which IOR the Trading Service is listening on.
+</TD></TR>
+<TR>
+<TD><CODE>TradingServicePort</CODE> <EM>which</EM></TD>
+<TD>
+Specifies which port the Trading Service is listening on for multicast
+requests.
+</TD></TR>
 </TABLE>
 </P>
 </BLOCKQUOTE>
@@ -103,342 +98,299 @@ while the rest of the options are set via the service configurator
 <blockquote>
 <H3><CODE>CORBA::ORB</CODE><A NAME="ORB"></A></H3>
 
-<p><em>Note:</em> <code>-ORBGlobalCollocation</code> flag has been
-merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
-
 <blockquote>
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING= "0">
-  <TR>
-    <TH>Option</TH>
-    <TH>Description</TH>
-  </TR>
-  <!-- <TR NAME="ORBsvcconf"> -->
-  <tr>
-    <TD><CODE>-ORBSvcConf</CODE> <EM>config file name</EM></TD>
-    <TD>Specifies the name of the file from which it will read dynamic service configuration
-        directives <EM>ala</EM> ACE's Service Configurator.</TD>
-  </TR>
-  <tr>
-    <TD><CODE>-ORBSvcConfDirective</CODE> <EM>directivestring</EM></TD>
-    <TD>Specifies a service configuration
-        directive, which is passed to ACE's Service Configurator.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBDaemon</CODE></TD>
-    <TD>Specifies that the ORB should <I>daemonize</I> itself.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBDebug</CODE></TD>
-    <TD>Turns on the output of debugging messages within ACE's Service Configurator
-        componentry.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBDebugLevel</CODE> <EM>level</EM></TD>
-    <TD>Control the level of debugging in the ORB. Higher number produce
-        more output (try 10).
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBEndpoint</CODE> <EM>endpoint</EM></TD>
-    <TD><a name="-ORBEndpoint"></a>Tells the ORB to listen for requests on the
-        interface specified by <I><EM>endpoint</EM></I>.  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 protcol 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
-        </CODE></blockquote>
-        is equivalent to:
-        <blockquote><CODE>
-        -ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock'
-        </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:
-        <blockquote><CODE>
-        -ORBEndpoint uiop://
-        </CODE></blockquote>
-        then a default endpoint will be created for the specified protocol.
-    </TD>
-  </TR>
-
-  <TR>
-
-    <TD><CODE>-ORBHost</CODE> <EM>hostname</EM></TD>
-    <TD><a name="-ORBHost"></a>Tells the ORB to listen for requests on the
-        interface associated with the host named
-        <I><EM>hostname</EM></I>.  This option is valid only for IIOP endpoints.<BR>
-        <STRONG>NOTE:</STRONG> This option has been superceded by the
-        <CODE>-ORBEndpoint</CODE> option. It will not be supported in the
-        future.</TD>
-  </TR>
-
-  <TR>
-
-    <TD><CODE>-ORBPort</CODE> <EM>portspec</EM></TD>
-    <TD>Tells the ORB to
-        listen for requests on the port specified by
-        <I><EM>portspec</EM></I>. If not specified, the OS gets to choose a
-        random empty port.  This option is valid only for IIOP endpoints.<BR>
-        <STRONG>NOTE:</STRONG> This option has been superceded by the
-        <CODE>-ORBEndpoint</CODE> option. It will not be supported in the
-        future.</TD>
-
-  </TR>
-
-  <TR>
-    <TD><CODE>-ORBObjRefStyle</CODE> <EM>which</EM></TD>
-    <TD>Specifies the user-visible style of object references. The range of values
-        is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
-        or <CODE>URL</CODE>, which looks more like a URL.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBRcvSock</CODE> <EM>receive buffer size</EM></TD>
-    <TD><A NAME="-ORBRcvSock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
-        If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBSndSock</CODE> <EM>send buffer size</EM></TD>
-    <TD><A NAME="-ORBSndSock"></a>Specify the size of the socket send buffer as a positive, non-zero integer.
-        If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBNameServicePort</CODE> <EM>portspec</EM></TD>
-    <TD>Specifies which port the Naming Service is listening on for
-        multicast requests.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBNameServiceIOR</CODE> <EM>ior</EM></TD>
-    <TD>Specifies the IOR for the Naming Service.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBTradingServiceIOR</CODE> <EM>ior</EM></TD>
-    <TD>Specifies the IOR for the Trading Service.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBTradingServicePort</CODE> <EM>portspec</EM></TD>
-    <TD>Specifies to which port the Trading Service is listening on for
-        multicast requests.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBImplRepoIOR</CODE> <EM>ior</EM></TD>
-    <TD>Specifies the IOR for the Implementation Repository.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBImplRepoPort</CODE> <EM>portspec</EM></TD>
-    <TD>Specifies to which port the Implementation Repository is listening on for
-        multicast requests.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBCollocation</CODE> <EM>yes/global/per-orb/no</EM></TD>
-    <TD><a name="-ORBCollocation"></a>Specifies the use of collocation
-        object optimization.  If <em>global</em> or <em>yes</em> is
-        specified, objects in the same process will be treated as collocated.
-        If <em>per-orb</em> is specified, only objects in the same ORB are
-        treated as collocated.  When <em>no</em> is specified, no objects are
-        treated as collocated.   Default is global.</TD>
-  </TR>
-  <TR>
-    <TD>
-        <CODE>-ORBCollocationStrategy</CODE> <EM>thru_poa/direct</EM>
-    </TD>
-    <TD>
-        Specifies what kind of collocated object to use.  If the
-        <em>thru_poa</em> strategy is used, TAO uses the collocation
-        object implementation that respects POA's current state and
-        policies.   When using the <em>direct</em> strategy, method
-        invocations on collocated objects become direct calls to servant
-        without checking POA's status.  Default is thru_poa.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBPreconnect</CODE> <EM>endpoint</EM></TD>
-    <TD><A name="-ORBPreconnect"></a>Pre-establishes a blocking connection to
-        each listed <EM>endpoint</EM>. If a connection cannot be established the
-        failed preconnection will be ignored and the next preconnection in the list
-        will be processed.  Successful and unsuccessful preconnections will be
-        displayed if a debugging level greater than or equal to one is specified by
-        using the <CODE>-ORBDebugLevel</CODE> option.  Listing the same combination
-        multiple times will properly establish multiple connections to that endpoint.
-        The <CODE>-ORBPreconnect</CODE> option uses the same endpoint format as the
-        <CODE>-ORBEndpoint</CODE> option.  Specifying IIOP endpoints using a comma
-        delimited list of <EM>host<STRONG>:</STRONG>port</EM> pairs is deprecated
-        and will not be supported in the future.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBCDRTradeoff</CODE> <EM>maxsize</EM></TD>
-    <TD><A name="-ORBCDRTradeoff"></a>Control the strategy to tradeoff
-        between copy vs no copy marshalling of octet sequences.
-        If an octet sequence is smaller than <EM>maxsize</EM> and the current
-        message block contains enough space for it the octet sequence is
-        copied instead of appended to the CDR stream.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBSkipServiceConfigOpen</CODE></TD>
-    <TD><A name="-ORBSkipServiceConfigOpen"></a>Do not call the <code>ACE_Service_Config::open</code>
-        method, which is necessary if the ORB is being linked dynamically via the ACE Service Configurator
-        which is not reentrant.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBGIOPlite</CODE></TD>
-    <TD><A name="-ORBGIOPlite"></a>Enable a lightweight version of the
-        GIOP protocol. This protocol removes some of the fields in
-        the GIOP and the Request header. It only works on
-        homogenous environments..</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBDottedDecimalAddresses</CODE> <EM>boolean (0 / 1)</EM></TD>
-    <TD><A name="-ORBDottedDecimalAddresses"></a> Use the dotted decimal
-        notation for addresses.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBInitRef</CODE> <EM>ObjectId=IOR</EM></TD>
-    <TD><A name="-ORBInitRef"></a> Allows specification of an arbitrary
-        object reference for an initial service. The IOR could be in any
-        one of the following formats : OMG IOR, URL, iioploc or
-        file. iioploc is a multiple end-point IOR understood by the
-        string_to_object () and used as a boot-strapping mechanism by the
-        resolve_initial_references (). The mappings specified through this
-        argument override the orb-install-time defaults. The
-        file://<I>pathname</I> interprets the contents of the <I>pathname</I> file
-        as an object reference in any of the above formats. </TD>
-  </TR>
-
-  <TR>
-    <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 '/' and a simple object key, forms a new URL to identify an initial object reference. The URL prefix format currently supported is iioploc.</TD>
-  </TR>
-
-  <TR>
-    <TD><CODE>-ORBStdProfileComponents</CODE> <EM>boolean (0 / 1)</EM></TD>
-    <TD><A name="-ORBStdProfileComponents"></a> If <EM>0</EM> then the ORB
-        does not generate the OMG standarized profile
-        components, such as the ORB type and codesets.
-        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>
-  </TR>
-
-  <TR>
-    <TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
-    <TD><A name=-ORBResources>Control the use of thread specific resources
-        in the ORB.
-        If (<em>which</em> = <code>global</code>) then the
-        same set of resources are shared by all the threads
-        that use that ORB.
-        If (<em>which</em> = <code>tss</code>) then each that
-        uses that ORB gets its own set of resources.
-        Currently the resources are limited to the reactor.
-    </TD>
-  </TR>
+<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING=
+"0">
+<TR>
+<TH>Option</TH>
+<TH>Description</TH></TR>
+<!-- <TR NAME="ORBsvcconf"> -->
+<TD><CODE>-ORBSvcConf</CODE> <EM>config file name</EM></TD>
+<TD>Specifies the name of the file from which it will read dynamic service configuration
+directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
+<TD><CODE>-ORBSvcConfDirective</CODE> <EM>directivestring</EM></TD>
+<TD>Specifies a service configuration
+directive, which is passed to ACE's Service Configurator.</TD></TR>
+<TR>
+<TD><CODE>-ORBDaemon</CODE></TD>
+<TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
+<TR>
+<TD><CODE>-ORBDebug</CODE></TD>
+<TD>Turns on the output of debugging messages within ACE's Service Configurator
+componentry.</TD></TR>
+<TR>
+<TD><CODE>-ORBDebugLevel</CODE> <EM>level</EM></TD>
+<TD>Control the level of debugging in the ORB. Higher number produce
+more output (try 10).
+</TD></TR>
+<TR>
 
-</TABLE>
-</P>
-</blockquote>
+<TD><CODE>-ORBEndpoint</CODE> <EM>endpoint</EM></TD> <TD><a
+name="-ORBEndpoint"></a>Tells the ORB to listen for requests on the
+interface specified by <I><EM>endpoint</EM></I>.  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 protcol 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
+</CODE></blockquote>
+is equivalent to:
+<blockquote><CODE>
+-ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock'
+</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:
+<blockquote><CODE>
+-ORBEndpoint uiop://
+</CODE></blockquote>
+then a default endpoint will be created for the specified protocol.
+</TD></TR>
 
-<H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
+<TR>
 
-<p><em>Note:</em> <code>-ORBReactorLock</code> flag has been superceded by <code>-ORBReactorType</code>.
+<TD><CODE>-ORBHost</CODE> <EM>hostname</EM></TD> <TD><a
+name="-ORBHost"></a>Tells the ORB to listen for requests on the
+interface associated with the host named
+<I><EM>hostname</EM></I>.  This option is valid only for IIOP endpoints.<BR>
+<STRONG>NOTE:</STRONG> This option has been superceded by the
+<CODE>-ORBEndpoint</CODE> option. It will not be supported in the
+future.</TD></TR>
+
+<TR>
+
+<TD><CODE>-ORBPort</CODE> <EM>portspec</EM></TD> <TD>Tells the ORB to
+listen for requests on the port specified by
+<I><EM>portspec</EM></I>. If not specified, the OS gets to choose a
+random empty port.  This option is valid only for IIOP endpoints.<BR>
+<STRONG>NOTE:</STRONG> This option has been superceded by the
+<CODE>-ORBEndpoint</CODE> option. It will not be supported in the
+future.</TD>
 
-<blockquote>
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0">
-  <TR>
-    <TH>Option</TH>
-    <TH>Description</TH>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
-    <TD>Specify whether each thread uses a global
-        (<em>which</em> = <code>global</code>) or a thread-specific
-        (<em>which</em> = <code>tss</code>) instance for the resources it
-        returns.
-        <B>NOTE:</B> This option controls the default value for
-        the ORB option of the same name.</A>.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBReactorType</CODE> <EM>which</EM></TD>
-    <TD><a name="-ORBReactorType"></a>Specify what kind of reactor does the
-        ORB use, the options are:
-        <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0">
-          <TR><TH><em>which</em></TH><TH>Reactor</TH>
-        </TR>
-        <TR><TD><CODE>select_mt<CODE></TD><TD>Use the
-            <CODE>ACE_Select_Reactor</CODE> with the usual
-            locking mechanism for this platform</TD>
-      </TR>
-      <TR><TD><CODE>select_st<CODE></TD><TD>Use the
-          <CODE>ACE_Select_Reactor</CODE> with null locks
-      </TD>
-    </TR>
-    <TR><TD><CODE>fl<CODE></TD><TD>Use the
-        <CODE>ACE_FlReactor</CODE> only available if ACE
-        was compiled with support for the FL toolkit
-    </TD>
-  </TR>
-</TR>
-<TR><TD><CODE>wfmo<CODE></TD>
-<TD>Use the
-    <CODE>ACE_WFMO_Reactor</CODE> only available on
-    Win32 platforms.
-</TD>
-</TR>
-<TR><TD><CODE>msg_wfmo<CODE></TD><TD>Use the
-    <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
-    Win32 platforms.
-</TD>
-</TR>
-<TR><TD><CODE>tp<CODE></TD><TD>Use the
-    <CODE>ACE_TP_Reactor</CODE>, a select based
-    thread-pool reactor.
-</TD>
-</TR>
-</TABLE>
-The default is <code>select_mt</code></TD>
 </TR>
+
+<TR>
+<TD><CODE>-ORBObjRefStyle</CODE> <EM>which</EM></TD>
+<TD>Specifies the user-visible style of object references. The range of values
+is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
+or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
+<TR>
+<TD><CODE>-ORBRcvSock</CODE> <EM>receive buffer size</EM></TD>
+<TD><A NAME="-ORBRcvSock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
+If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD></TR>
+<TR>
+<TD><CODE>-ORBSndSock</CODE> <EM>send buffer size</EM></TD>
+<TD><A NAME="-ORBSndSock"></a>Specify the size of the socket send buffer as a positive, non-zero integer.
+If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD></TR>
 <TR>
-  <TD><CODE>-ORBProtocolFactory</CODE> <EM>factory</EM></TD>
-  <TD><a name="-ORBProtocolFactory"></a>
-      Specify which pluggable protocol factory to load.  By default,
-      the factories for the IIOP and UIOP protocols (<code>IIOP_Factory</code>
-      and <code>UIOP_Factory</code>, respectively) are loaded.
-      <p>
-      For example, if some protocol called <em><code>Foo</code></em> whose
-      factory was called <em><code>Foo_Factory</code></em> was available,
-      then it could be loaded into TAO by specifying
-      <code>-ORBProtocolFactory Foo_Factory</code> on the command line. The
-      <em><code>Foo</code></em> pluggable protocol would then be available
-      for use.
+<TD><CODE>-ORBNameServicePort</CODE> <EM>portspec</EM></TD>
+<TD>Specifies which port the Naming Service is listening on for
+multicast requests.</TD></TR>
+<TR>
+<TD><CODE>-ORBNameServiceIOR</CODE> <EM>ior</EM></TD>
+<TD>Specifies the IOR for the Naming Service.</TD></TR>
+<TR>
+<TD><CODE>-ORBTradingServiceIOR"</CODE> <EM>ior</EM></TD>
+<TD>Specifiles the IOR for the Trading Service.</TD></TR>
+<TR>
+<TD><CODE>-ORBTradingServicePort"</CODE> <EM>portspec</EM></TD>
+<TD>Specifies to which port the Trading Service is listening on for
+    multicast requests.</TD></TR>
+<TR>
+<TD><CODE>-ORBCollocation</CODE> <EM>yes/no</EM></TD>
+<TD>Specifies the use of collocation object optimization.  Default is yes.</TD></TR>
+<TR>
+  <TD>
+      <CODE>-ORBCollocationStrategy</CODE> <EM>thru_poa/direct</EM>
+  </TD>
+  <TD>
+      Specifies what kind of collocated object to use.  If the
+      <em>thru_poa</em> strategy is used, TAO uses the collocation
+      object implementation that respects POA's current state and
+      policies.   When using the <em>direct</em> strategy, method
+      invocations on collocated objects become direct calls to servant
+      without checking POA's status.  Default is thru_poa.
   </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
-      if 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>
+      <CODE>-ORBGlobalCollocation</CODE> <EM>yes/no</EM>
+  </TD>
+  <TD>
+      Specifies whether objects from different ORBs within the same
+      process can be treated as collocated or not.  If no, only objects
+      in the same ORB are treated as collocated.   Default is yes.
   </TD>
 </TR>
+<TR>
+<TD><CODE>-ORBPreconnect</CODE> <EM>endpoint</EM></TD>
+<TD><A name="-ORBPreconnect"></a>Pre-establishes a blocking connection to
+each listed <EM>endpoint</EM>. If a connection cannot be established the
+failed preconnection will be ignored and the next preconnection in the list
+will be processed.  Successful and unsuccessful preconnections will be
+displayed if a debugging level greater than or equal to one is specified by
+using the <CODE>-ORBDebugLevel</CODE> option.  Listing the same combination
+multiple times will properly establish multiple connections to that endpoint.
+The <CODE>-ORBPreconnect</CODE> option uses the same endpoint format as the
+<CODE>-ORBEndpoint</CODE> option.  Specifying IIOP endpoints using a comma
+delimited list of <EM>host<STRONG>:</STRONG>port</EM> pairs is deprecated
+and will not be supported in the future.</TD></TR>
+<TR>
+<TD><CODE>-ORBCDRTradeoff</CODE> <EM>maxsize</EM></TD>
+<TD><A name="-ORBCDRTradeoff"></a>Control the strategy to tradeoff
+between copy vs no copy marshalling of octet sequences.
+If an octet sequence is smaller than <EM>maxsize</EM> and the current
+message block contains enough space for it the octet sequence is
+copied instead of appended to the CDR stream.</TD></TR>
+<TR>
+<TD><CODE>-ORBSkipServiceConfigOpen</CODE></TD>
+<TD><A name="-ORBSkipServiceConfigOpen"></a>Do not call the <code>ACE_Service_Config::open</code>
+method, which is necessary if the ORB is being linked dynamically via the ACE Service Configurator
+which is not reentrant.</TD></TR>
+<TR>
+<TD><CODE>-ORBGIOPlite</CODE></TD>
+<TD><A name="-ORBGIOPlite"></a>Enable a lightweight version of the
+            GIOP protocol. This protocol removes some of the fields in
+            the GIOP and the Request header. It only works on
+            homogenous environments..</TD></TR>
+<TR>
+<TD><CODE>-ORBDottedDecimalAddresses</CODE> <EM>boolean (0 / 1)</EM></TD>
+<TD><A name="-ORBDottedDecimalAddresses"></a> Use the dotted decimal
+            notation for addresses.</TD></TR>
+<TR>
+<TD><CODE>-ORBInitRef</CODE> <EM>ObjectId=IOR</EM></TD>
+<TD><A name="-ORBInitRef"></a> Allows specification of an arbitrary
+    object reference for an initial service. The IOR could be in any
+    one of the following formats : OMG IOR, URL, iioploc or
+    file. iioploc is a multiple end-point IOR understood by the
+    string_to_object () and used as a boot-strapping mechanism by the
+    resolve_initial_references (). The mappings specified through this
+    argument override the orb-install-time defaults. The
+    file://<I>pathname</I> interprets the contents of the <I>pathname</I> file
+    as an object reference in any of the above formats. </TD></TR>
+
+<TR>
+<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 '/' and a simple object key, forms a new URL to identify an initial object reference. The URL prefix format currently supported is iioploc.</TD></TR>
+
+<TR>
+<TD><CODE>-ORBStdProfileComponents</CODE> <EM>boolean (0 / 1)</EM></TD>
+<TD><A name="-ORBStdProfileComponents"></a> If <EM>0</EM> then the ORB
+              does not generate the OMG standarized profile
+              components, such as the ORB type and codesets.
+              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></TR>
+
+<TR>
+<TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
+<TD><A name=-ORBResources>Control the use of thread specific resources
+                in the ORB.
+                If (<em>which</em> = <code>global</code>) then the
+                same set of resources are shared by all the threads
+                that use that ORB.
+                If (<em>which</em> = <code>tss</code>) then each that
+                uses that ORB gets its own set of resources.
+                Currently the resources are limited to the reactor.
+            </TD></TR>
+<TR>
+
+</TABLE>
+</P>
+</blockquote>
+
+<H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
+
+<blockquote>
+<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0">
+<TR>
+<TH>Option</TH>
+<TH>Description</TH></TR>
+<TR>
+<TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
+<TD>Specify whether each thread uses a global
+(<em>which</em> = <code>global</code>) or a thread-specific
+(<em>which</em> = <code>tss</code>) instance for the resources it
+              returns.
+              <B>NOTE:</B> This option has been deprecated, use the
+              same option on the <A HREF="#ORB">ORB parameters</A>.
+</TD></TR>
+<TR>
+<TD><CODE>-ORBReactorLock</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBReactorLock"></a>Specify whether the ORB reactor is
+              thread-safe
+(<em>which</em> = <code>token</code>) or not
+(<em>which</em> = <code>null</code>).  Default is <code>token</code>.
+              <P>This option has been superseeded by
+                <CODE>-ORBReactorType</CODE>
+              </P>
+</TD></TR>
+<TR>
+<TD><CODE>-ORBReactorType</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBColTable"></a>Specify what kind of reactor does the
+              ORB use, the options are:
+  <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0">
+  <TR><TH><em>which</em></TH><TH>Reactor</TH></TR>
+  <TR><TD><CODE>select_mt<CODE></TD><TD>Use the
+                    <CODE>ACE_Select_Reactor</CODE> with the usual
+                    locking mechanism for this platform</TD></TR>
+  <TR><TD><CODE>select_st<CODE></TD><TD>Use the
+                    <CODE>ACE_Select_Reactor</CODE> with null locks
+                  </TD></TR>
+  <TR><TD><CODE>fl<CODE></TD><TD>Use the
+                    <CODE>ACE_FlReactor</CODE> only available if ACE
+                    was compiled with support for the FL toolkit
+                  </TD></TR>
+  <TR><TD><CODE>xt<CODE></TD><TD>Use the
+                    <CODE>ACE_FlReactor</CODE> only available if ACE
+                    was compiled with support for the XWindows Toolkit
+                  </TD></TR>
+  <TR><TD><CODE>wfmo<CODE></TD><TD>Use the
+                    <CODE>ACE_WFMO_Reactor</CODE> only available on
+                    Win32 platforms.
+                  </TD></TR>
+  <TR><TD><CODE>msg_wfmo<CODE></TD><TD>Use the
+                    <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
+                    Win32 platforms.
+                  </TD></TR>
+  <TR><TD><CODE>tp<CODE></TD><TD>Use the
+                    <CODE>ACE_TP_Reactor</CODE>, a select based
+                    thread-pool reactor.
+                  </TD></TR>
+  </TABLE>
+  The default is <code>select_mt</code></TD></TR>
+<TR>
+<TD><CODE>-ORBColTable</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBColTable"></a>Specify whether each ORB uses a global
+(<em>which</em> = <code>global</code>) or a per-ORB
+(<em>which</em> = <code>orb</code>) collocation table.</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
+              if 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>
 </TABLE>
 </P>
 </blockquote>
@@ -450,153 +402,118 @@ The default is <code>select_mt</code></TD>
 
 <blockquote>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-  <TR>
-    <TH>Option</TH>
-    <TH>Description</TH>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBConcurrency</CODE> <EM>which</EM></TD>
-    <TD>Specify which
-        concurrency strategy to use.  Range of values is <code>reactive</code>
-        for a purely Reactor-driven concurrency strategy or
-        <code>thread-per-connection</code> for creating a new thread to
-        service each connection.</TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBActiveObjectMapSize</CODE> <EM>active object map
-        size</EM></TD>
-    <TD>Specify the size of the active object map. If not
-        specified, the default value is 64.</TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBUseridPolicyDemuxStrategy</CODE> <EM>user id policy
-        based demultiplexing strategy</EM></TD>
-    <TD>Specify the demultiplexing
-        lookup strategy to be used with the user id policy.  The
-        <EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE> or
-        <CODE>linear</CODE>.  This option defaults to use the
-        <CODE>dynamic</CODE> strategy. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBSystemidPolicyDemuxStrategy</CODE> <EM>system id policy
-        based demultiplexing strategy</EM></TD>
-    <TD>Specify the demultiplexing
-        lookup strategy to be used with the system id policy. The
-        <EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE>,
-        <CODE>linear</CODE>, or <CODE>active</CODE>. This option defaults to
-        use the <CODE>active</CODE> strategy. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBUniqueidPolicyReverseDemuxStrategy</CODE> <EM>unique id
-        policy based reverse demultiplexing strategy</EM></TD>
-    <TD>Specify the
-        reverse demultiplexing lookup strategy to be used with the unique id
-        policy. The <EM>reverse demultiplexing strategy</EM> can be one of
-        <CODE>dynamic</CODE> or <CODE>linear</CODE>. This option defaults to
-        use the <CODE>dynamic</CODE> strategy. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBAllowReactivationOfSystemids</CODE> <EM>allows
-        reactivation of system ids</EM></TD>
-    <TD>Specify whether system ids
-        can be reactivated, i.e., once an id that was generated by the system
-        has be deactivated, will the user reactivate a new servant using the
-        old id.  If the user is not going to use this feature, the IORs can be
-        shortened, an extra comparison in the critical upcall path removed,
-        and some memory on the server side can be saved. The
-        <CODE>ORBallowreactivationofsystemids</CODE> can be <CODE>0</CODE> or
-        <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBActiveHintInIds</CODE> <EM>adds an active hint in
-        ids</EM></TD>
-    <TD>Specify whether an active hint should be added to
-        ids. With active hints, ids can be found quickly.  However, they lead
-        to larger IORs. Note that this option is disregarded
-        <CODE>-ORBAllowReactivationOfSystemids</CODE> is set to
-        <CODE>0</CODE>. The <EM>-ORBActiveHintInIds</EM> can be <CODE>0</CODE>
-        or <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBPoaMapSize</CODE> <EM>poa map size</EM></TD>
-    <TD>Specify
-        the size of the poa map. If not specified, the default value is
-        24.</TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBPersiententidPolicyDemuxStrategy</CODE> <EM>persistent
-        id policy based demultiplexing strategy</EM></TD>
-    <TD>Specify the
-        demultiplexing lookup strategy to be used with the persistent id
-        policy.  The <EM>demultiplexing strategy</EM> can be one of
-        <CODE>dynamic</CODE> or <CODE>linear</CODE>.  This option defaults to
-        use the <CODE>dynamic</CODE> strategy. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBTransientidPolicyDemuxStrategy</CODE> <EM>transient id
-        policy based demultiplexing strategy</EM></TD>
-    <TD>Specify the
-        demultiplexing lookup strategy to be used with the transient id
-        policy. The <EM>demultiplexing strategy</EM> can be one of
-        <CODE>dynamic</CODE>, <CODE>linear</CODE>, or
-        <CODE>active</CODE>. This option defaults to use the
-        <CODE>active</CODE> strategy. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBActiveHintInPOANames</CODE> <EM>adds an active hint in
-        poa names</EM></TD>
-    <TD>Specify whether an active hint should be added
-        to poa names. With active hints, poa names can be found quickly.
-        However, they lead to larger IORs. The
-        <EM>-ORBActiveHintInPOANames</EM> can be <CODE>0</CODE> or
-        <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBThreadFlags</CODE> <EM>thread flags</EM></TD>
-    <TD>Specify the flags used for thread creation. Flags can be any
-        logical-OR combination of <CODE>THR_DETACHED</CODE>,
-        <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
-        <CODE>THE_SUSPENDED</CODE>.</TD>
-  </TR>
-  <TR>
-
-    <TD><CODE>-ORBPOALock</CODE> <EM>lock type</EM></TD>
-    <TD><a
-        name="-ORBPOALock"></a>Specify the type of lock to be used for POA
-        accesses.  Possible values for <em>lock type</em> are
-        <code>thread</code>, which specifies that an inter-thread mutex is
-        used to guarantee exclusive acccess, and <code>null</code>, which
-        specifies that no locking be performed.  The default is
-        <code>thread</code>.</TD>
-  </TR>
-<!--
-  <TR>
-
-    <TD><CODE>-ORBEventLoopLock</CODE> <EM>lock type</EM></TD>
-    <TD><font color=red>Somebody document me.</font></TD>
-  </TR>
-  <TR>
--->
-    <TD><CODE>-ORBConnectorLock</CODE> <EM>lock type</EM></TD>
-    <TD><a
-        name="-ORBConnectorLock"></a>Specify the type of lock to be used by
-        the connector.  Possible values for <em>lock type</em> are
-        <code>thread</code>, which specifies that an inter-thread mutex is
-        used to guarantee exclusive acccess, and <code>null</code>, which
-        specifies that no locking be performed.  The default is
-        <code>thread</code>.</TD>
-  </TR>
+<TR>
+<TH>Option</TH>
+<TH>Description</TH></TR>
+<TR>
+
+<TD><CODE>-ORBConcurrency</CODE> <EM>which</EM></TD> <TD>Specify which
+concurrency strategy to use.  Range of values is <code>reactive</code>
+for a purely Reactor-driven concurrency strategy or
+<code>thread-per-connection</code> for creating a new thread to
+service each connection.</TD></TR> <TR>
+
+<TD><CODE>-ORBActiveObjectMapSize</CODE> <EM>active object map
+size</EM></TD> <TD>Specify the size of the active object map. If not
+specified, the default value is 64.</TD></TR> <TR>
+
+<TD><CODE>-ORBUseridPolicyDemuxStrategy</CODE> <EM>user id policy
+based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
+lookup strategy to be used with the user id policy.  The
+<EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE> or
+<CODE>linear</CODE>.  This option defaults to use the
+<CODE>dynamic</CODE> strategy. </TD></TR> <TR>
+
+<TD><CODE>-ORBSystemidPolicyDemuxStrategy</CODE> <EM>system id policy
+based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
+lookup strategy to be used with the system id policy. The
+<EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE>,
+<CODE>linear</CODE>, or <CODE>active</CODE>. This option defaults to
+use the <CODE>active</CODE> strategy. </TD></TR> <TR>
+
+<TD><CODE>-ORBUniqueidPolicyReverseDemuxStrategy</CODE> <EM>unique id
+policy based reverse demultiplexing strategy</EM></TD> <TD>Specify the
+reverse demultiplexing lookup strategy to be used with the unique id
+policy. The <EM>reverse demultiplexing strategy</EM> can be one of
+<CODE>dynamic</CODE> or <CODE>linear</CODE>. This option defaults to
+use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
+
+<TD><CODE>-ORBAllowReactivationOfSystemids</CODE> <EM>allows
+reactivation of system ids</EM></TD> <TD>Specify whether system ids
+can be reactivated, i.e., once an id that was generated by the system
+has be deactivated, will the user reactivate a new servant using the
+old id.  If the user is not going to use this feature, the IORs can be
+shortened, an extra comparison in the critical upcall path removed,
+and some memory on the server side can be saved. The
+<CODE>ORBallowreactivationofsystemids</CODE> can be <CODE>0</CODE> or
+<CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
+<TR>
+
+<TD><CODE>-ORBActiveHintInIds</CODE> <EM>adds an active hint in
+ids</EM></TD> <TD>Specify whether an active hint should be added to
+ids. With active hints, ids can be found quickly.  However, they lead
+to larger IORs. Note that this option is disregarded
+<CODE>-ORBAllowReactivationOfSystemids</CODE> is set to
+<CODE>0</CODE>. The <EM>-ORBActiveHintInIds</EM> can be <CODE>0</CODE>
+or <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
+<TR>
+
+<TD><CODE>-ORBPoaMapSize</CODE> <EM>poa map size</EM></TD> <TD>Specify
+the size of the poa map. If not specified, the default value is
+24.</TD></TR> <TR>
+
+<TD><CODE>-ORBPersiententidPolicyDemuxStrategy</CODE> <EM>persistent
+id policy based demultiplexing strategy</EM></TD> <TD>Specify the
+demultiplexing lookup strategy to be used with the persistent id
+policy.  The <EM>demultiplexing strategy</EM> can be one of
+<CODE>dynamic</CODE> or <CODE>linear</CODE>.  This option defaults to
+use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
+
+<TD><CODE>-ORBTransientidPolicyDemuxStrategy</CODE> <EM>transient id
+policy based demultiplexing strategy</EM></TD> <TD>Specify the
+demultiplexing lookup strategy to be used with the transient id
+policy. The <EM>demultiplexing strategy</EM> can be one of
+<CODE>dynamic</CODE>, <CODE>linear</CODE>, or
+<CODE>active</CODE>. This option defaults to use the
+<CODE>active</CODE> strategy. </TD></TR> <TR>
+
+<TD><CODE>-ORBActiveHintInPOANames</CODE> <EM>adds an active hint in
+poa names</EM></TD> <TD>Specify whether an active hint should be added
+to poa names. With active hints, poa names can be found quickly.
+However, they lead to larger IORs. The
+<EM>-ORBActiveHintInPOANames</EM> can be <CODE>0</CODE> or
+<CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
+<TR>
+
+<TD><CODE>-ORBThreadFlags</CODE> <EM>thread flags</EM></TD>
+<TD>Specify the flags used for thread creation. Flags can be any
+logical-OR combination of <CODE>THR_DETACHED</CODE>,
+<CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
+<CODE>THE_SUSPENDED</CODE>.</TD></TR> <TR>
+
+<TD><CODE>-ORBPOALock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBPOALock"></a>Specify the type of lock to be used for POA
+accesses.  Possible values for <em>lock type</em> are
+<code>thread</code>, which specifies that an inter-thread mutex is
+used to guarantee exclusive acccess, and <code>null</code>, which
+specifies that no locking be performed.  The default is
+<code>thread</code>.</TD></TR> <TR>
+
+<TD><CODE>-ORBColTblLock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBColTblLock"></a>Specify the type of lock to be used for the
+global collocation table.  Possible values for <em>lock type</em> are
+<code>thread</code>, which specifies that an inter-thread mutex is
+used to guarantee exclusive acccess, and <code>null</code>, which
+specifies that no locking be performed.  The default is
+<code>thread</code>.</TD></TR> <TR>
+
+<TD><CODE>-ORBConnectorLock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBConnectorLock"></a>Specify the type of lock to be used by
+the connector.  Possible values for <em>lock type</em> are
+<code>thread</code>, which specifies that an inter-thread mutex is
+used to guarantee exclusive acccess, and <code>null</code>, which
+specifies that no locking be performed.  The default is
+<code>thread</code>.</TD></TR> <TR>
 
 </TABLE>
 </P>
@@ -606,71 +523,69 @@ The default is <code>select_mt</code></TD>
 
 <BLOCKQUOTE>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-  <TR>
-    <TH>Option</TH>
-    <TH>Description</TH>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBProfileLock</CODE> <EM>which</EM></TD>
-    <TD>
-        Specify the kind of synchronization primitive for the
-        Profiles.
-        Default is <code>thread</code>, which means that a regular thread
-        mutex is used. The
-        second option is <code>null</code>, which means a null lock is used.
-        This makes sense in case of optimizations and is allowed when
-        no forwarding is used or only a single threaded client.
-    </TD>
-  </TR>
-  <TR>
-    <TD><CODE>-ORBClientConnectionHandler</CODE> <EM>MT / ST / RW</EM></TD>
-
-    <TD><A name="-ORBClientConnectionHandler"></a>
-
-        ST means use the single-threaded client connection handler, i.e., the
-        leader follower model will not be used.  However, ST does support
-        nested upcalls and handling of new requests while waiting for the
-        reply from a server. <p>
-
-        MT means use the multi-threaded client connection handler which uses
-        the leader follower model. This model allows the use of multiple
-        threads with a single Reactor.  <p>
-
-        RW selects a strategy that simply blocks in recv() when waiting for a
-        response from the server instead of waiting in the Reactor.  The RW
-        strategy only works when the application does not have to worry about
-        new request showing up when waiting for a response. Therefore, this
-        strategy is appropriate only for "pure" clients. Note that
-        applications with nested upcalls are not "pure" clients. Also note
-        that this strategy will only effect two way calls, since there is no
-        waiting for one way calls. This strategy can also be used in an
-        application that is both a client and a server if the server side is
-        handled by a separate thread and the client threads are "pure"
-        clients. <p>
-
-        Default for this option is MT.
-
-    </TD>
-  </TR>
-
-  <TR>
-    <TD><CODE>-ORBTransportMuxStrategy</CODE> <EM>EXCLUSIVE / MUXED</EM></TD>
-
-    <TD><A name="-ORBTransportMuxStrategy"></a>
-
-        EXCLUSIVE 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>
-
-        MUXED means that Transport multiplexes more than one request at the
-        same time on a connection. This is very important for getting the
-        Asynchronous Method Invocation model to work. This is not
-        implemented yet. <p>
-
-        Default for this option is EXCLUSIVE.
-
-    </TD>
-  </TR>
+<TR>
+<TH>Option</TH>
+<TH>Description</TH></TR>
+<TR>
+<TD><CODE>-ORBIIOPProfileLock</CODE> <EM>which</EM></TD>
+<TD>
+Specify, whether to use a lock for accessing the IIOP Profile or not.
+Default is <code>thread</code>, which means that a lock is used. The
+second option is <code>null</code>, which means a null lock is used.
+This makes sense in case of optiziations and is allowed when
+no forwarding is used or only a single threaded client.
+</TD></TR>
+<TR>
+<TD><CODE>-ORBClientConnectionHandler</CODE> <EM>MT / ST / RW</EM></TD>
+
+<TD><A name="-ORBClientConnectionHandler"></a>
+
+ST means use the single-threaded client connection handler, i.e., the
+leader follower model will not be used.  However, ST does support
+nested upcalls and handling of new requests while waiting for the
+reply from a server. <p>
+
+MT means use the multi-threaded client connection handler which uses
+the leader follower model. This model allows the use of multiple
+threads with a single Reactor.  <p>
+
+RW selects a strategy that simply blocks in recv() when waiting for a
+response from the server instead of waiting in the Reactor.  The RW
+strategy only works when the application does not have to worry about
+new request showing up when waiting for a response. Therefore, this
+strategy is appropriate only for "pure" clients. Note that
+applications with nested upcalls are not "pure" clients. Also note
+that this strategy will only effect two way calls, since there is no
+waiting for one way calls. This strategy can also be used in an
+application that is both a client and a server if the server side is
+handled by a separate thread and the client threads are "pure"
+clients. <p>
+
+Default for this option is MT.
+
+</TD></TR>
+
+<TR>
+<TD><CODE>-ORBTransportMuxStrategy</CODE> <EM>EXCLUSIVE / MUXED</EM></TD>
+
+<TD><A name="-ORBTransportMuxStrategy"></a>
+
+EXCLUSIVE 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>
+
+MUXED means that Transport multiplexes more than one request at the
+    same time on a connection. This is very important for getting the
+    Asynchronous Method Invocation model to work. This is not
+    implemented yet. <p>
+
+Default for this option is EXCLUSIVE.
+
+</TD></TR>
+
+
+
+
 </TABLE>
 </P>
 </BLOCKQUOTE>
diff --git a/TAO/docs/Tags.html b/TAO/docs/Tags.html
index 4ff3f3160f1..73fdf8dc2cb 100644
--- a/TAO/docs/Tags.html
+++ b/TAO/docs/Tags.html
@@ -63,7 +63,7 @@ bgcolor="#ffffff">
         <TH>Description</TH></TR>
       <TR>
         <TD>0x54414f00</TD><TD>"TAO\0x00"</TD><TD>A TAO local IPC (aka
-          Unix domain) profile.
+          Unix domain) profiles.
         </TD>
       </TR>
     </TABLE></P>
@@ -194,32 +194,20 @@ bgcolor="#ffffff">
 
     <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
       <TR><TH>Location encoding</TH><TH>Description</TH></TR>
-      <TR><TD>0x01</TD>
+      <TR><TD>0x00</TD>
         <TD>Connect failed</TD></TR>
-      <TR><TD>0x02</TD>
+      <TR><TD>0x01</TD>
         <TD>Location forward failed</TD></TR>
-      <TR><TD>0x03</TD>
+      <TR><TD>0x02</TD>
         <TD>Send request failed</TD></TR>
-      <TR><TD>0x04</TD>
+      <TR><TD>0x03</TD>
         <TD>POA in discarding state</TD></TR>
-      <TR><TD>0x05</TD>
+      <TR><TD>0x04</TD>
         <TD>POA in holding state</TD></TR>
-      <TR><TD>0x06</TD>
+      <TR><TD>0x05</TD>
         <TD>Unhandled C++ exception in server side</TD></TR>
-      <TR><TD>0x07</TD>
+      <TR><TD>0x06</TD>
         <TD>Failure while reading the reply</TD></TR>
-      <TR><TD>0x08</TD>
-        <TD>All protocols failed to parse the IOR</TD></TR>
-      <TR><TD>0x09</TD>
-        <TD>Attempt to use null pointer</TD></TR>
-      <TR><TD>0x0A</TD>
-        <TD>Error during MProfile creation</TD></TR>
-      <TR><TD>0x0B</TD>
-        <TD>Timeout while trying to establish the connection</TD></TR>
-      <TR><TD>0x0C</TD>
-        <TD>Timeout while sending the request</TD></TR>
-      <TR><TD>0x0D</TD>
-        <TD>Timeout while waiting for the reply</TD></TR>
     </TABLE></P>
 
     <P><HR></P>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 669f8ba8931..2afa2120b4f 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -1,9 +1,9 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
-<title>TAO IDL compiler User's Guide</title>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
+   <title>TAO IDL compiler User's Guide</title>
 <!-- $Id$ -->
 </head>
 <body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#CC0000">
@@ -30,11 +30,11 @@ appending the following suffixes (see the list of TAO's IDL compiler
 these files:) <P>
 
 <UL>
-  <LI> <EM>Client stubs</EM> -- <tt>*C.h</tt>, <tt>*C.i</tt>, and <tt>*C.cpp</tt>
-  <LI> <EM>Server skeletons</EM> -- <tt>*S.h</tt>, <tt>*S.i</tt>, and
-      <tt>*S.cpp</tt>
-  <LI> <EM>Server skeleton templates </EM> -- <tt>*S_T.h</tt>, <tt>S_T.i</tt>,
-      and <tt>*S_T.cpp</tt>
+<LI> <EM>Client stubs</EM> -- <tt>*C.h</tt>, <tt>*C.i</tt>, and <tt>*C.cpp</tt>
+<LI> <EM>Server skeletons</EM> -- <tt>*S.h</tt>, <tt>*S.i</tt>, and
+<tt>*S.cpp</tt>
+<LI> <EM>Server skeleton templates </EM> -- <tt>*S_T.h</tt>, <tt>S_T.i</tt>,
+and <tt>*S_T.cpp</tt>
 </UL>
 
 TAO's IDL compiler creates separate <TT>*.i</TT> and <TT>*S_T.*</TT>
@@ -44,30 +44,8 @@ the <tt>*C.h</tt> file and the skeletons in the <tt>*S.h</tt> file in
 your code. <P>
 
 <HR><P>
-<a name="idl_env"><h3>Environment Variables</h3></a>
-TAO_IDL looks for two environment variables <code>CPP_LOCATION</code>
-and <code>TAO_IDL_DEFAULT_CPP_FLAGS</code>.  TAO_IDL doesn't
-implements its own preprocessor and it borrows the preprocessor of
-the compiler of your choice to perform the preprocessing work.
-On most platform TAO's makefiles can locate the compiler
-automatically.  However, on NT and some other situation (like cross
-compiling,) you need to instruct which specific compiler to use.
-<code>CPP_LOCATION</code> allows you to achieve this.  It holds the
-program name of the compiler that TAO_IDL uses.  This should be a full
-pathname if the compiler is not within your <code>$PATH</code>.
-
-TAO_IDL also defines a set of default command line options passed to
-the preprocessor depending on which platform TAO_IDL is compiled.  The
-environment variable <CODE>TAO_IDL_DEFAULT_CPP_FLAGS</CODE> allows you
-to alter the command line optiona passed to the preprocessor.  You can
-use it to alter the default options for the preprocessor and specify
-things like include directories and how the preprocessor is invoked.
-Two flags that won't get overwritten by the environment variable are
-<code>-DIDL</code> and <code>-I.</code>.  They are always passed to
-the preprocessor.
-
-<HR><P>
-<h3>Operation Demuxing Strategies</h3>
+<h3>
+Operation Demuxing Strategies</h3>
 
 The server skeleton can use different demuxing strategies to match the
 incoming operation with the correct operation at the servant.  TAO's
@@ -84,49 +62,28 @@ To configure TAO's IDL compiler to support perfect hashing please do
 the following:
 
 <ul>
-  <LI> Enable <CODE>ACE_HAS_GPERF</CODE> when building ACE and TAO.
-      This macro has been defined for the platforms where <CODE>gperf</CODE>
-      has been tested, which includes most <A
-      HREF="http://www.cs.wustl.edu/~schmidt/ACE-versions-i.html">platforms</A>
-      that ACE runs on. <P>
-
-  <li> Build the <CODE>gperf</CODE> in $ACE_ROOT/apps/gperf.  This build
-      also leaves a copy/link of the gperf program at the $ACE_ROOT/bin
-      directory.<P>
-
-  <li> Set the environment variable $ACE_ROOT appropriately or add
-      $ACE_ROOT/bin to your search path. <P>
-
-  <li> Use the <CODE>-g</CODE> option for the TAO IDL compiler or set
-      your search path accordingly to install <CODE>gperf</CODE> in a
-      directory other than $ACE_ROOT/bin.
+<LI> Enable <CODE>ACE_HAS_GPERF</CODE> when building ACE and TAO.
+This macro has been defined for the platforms where <CODE>gperf</CODE>
+has been tested, which includes most <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-versions-i.html">platforms</A>
+that ACE runs on. <P>
+
+<li> Build the <CODE>gperf</CODE> in $ACE_ROOT/apps/gperf.  This build
+also leaves a copy/link of the gperf program at the $ACE_ROOT/bin
+directory.<P>
+
+<li> Set the environment variable $ACE_ROOT appropriately or add
+$ACE_ROOT/bin to your search path. <P>
+
+<li> Use the <CODE>-g</CODE> option for the TAO IDL compiler or set
+your search path accordingly to install <CODE>gperf</CODE> in a
+directory other than $ACE_ROOT/bin.
 </ul>
 
 Note that if you can't use perfect hashing for some reason the next
 best operation demuxing strategy is binary search, which can be
 configured using TAO's IDL compiler <A HREF="#options">options</A>.<P>
 
-<hr><p>
-<h3><a name="collocation-stubs">Collocation Strategies</a></h3>
-
-TAO_IDL can generate collocated stubs using two different collocation
-strategies.  It also allows you to supress/enable the generation of
-the stubs of a particular strategy.  To gain great flexibility at
-run-time, you can gereate stubs for both collocation strategies
-(using both '<a href="#Gp"><code>-Gp</code></a>' and '<a
-href="#Gd"><code>-Gd</code></a>' flags at the same time) and defer the
-determination of collocation strategy until run-time.  On the other
-hand, if you want to minimize the footprint of your program, you might
-want to pre-determine the collocation strategy you want and only
-generate the right collocated stubs (or not generating any at all using
-both  '<a href="#Sp"><code>-Sp</code></a>' and '<a
-href="#Sd"><code>-Sd</code></a>' flags at the same time if
-it's a pure client.)  See our <a
-href="http://www.cs.wustl.edu/~schmidt/C++-report-col18.ps.gz">collocation
-paper</a> for a detail discussion on the collocation support in
-TAO.<p>
-
-
 <HR><P>
 <h3><A NAME="options">TAO's IDL Compiler Options</A></h3>
 
@@ -136,398 +93,317 @@ options for preprocessors (such as <tt>-D</tt> or <tt>-I</tt>).  It
 also receives other options that are specific to it. <P>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 >
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-    <th>Remark</th>
-  </tr>
-  <tr><a NAME="u">
-    <td><tt>-u</tt></td>
-
-    <td>The compiler prints out the options that are given below and exits
-        clean </td>
-    <td>&nbsp;</td>
-  </tr>
-
-  <tr> <a NAME="V">
-    <td><tt>-V</tt></td>
-
-    <td>The compiler printouts its version and exits</td>
-    <td>&nbsp;</td>
-  </tr>
-
-  <tr><a name="Wb">
-    <td><tt>-Wb,</tt><i>option_list</i></EM</TD></td>
-
-    <td>Pass options to the TAO IDL compiler backend.</td>
-    <td>&nbsp;</td>
-  </tr>
-
-  <tr><a name="export_macro">
-    <td></td>
-
-    <td><tt>export_macro=</tt><i>macro_name</i></td>
-
-    <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword, this is needed for Windows/NT that requires
-        special directives to export symbols from DLLs, usually the definition
-        is just a space on unix platforms.&nbsp;</td>
-  </tr>
-
-  <tr><a name="export_include">
-    <td></td>
-
-    <td><tt>export_include=</tt><i>include_path</i></td>
+<tr>
+<th>Option</th>
 
-    <td>The compiler will generate code to include <i>include_path</i> at the
-        top of the client header, this is usually a good place to define the export
-        macro.</td>
-  </tr>
+<th>Description</th>
+</tr>
+<tr NAME="u">
+<td><tt>-u</tt></td>
 
-  <tr><a name="pch_include">
-    <td></td>
+<td>The compiler prints out the options that are given below and exits
+clean </td>
+</tr>
 
-    <td><tt>pch_include=</tt><i>include_path</i></td>
+<tr NAME="V">
+<td><tt>-V</tt></td>
 
-    <td>The compiler will generate code to include <i>include_path</i> at the
-        top of all TAO IDL compiler generated files.  This can be used with a
-        precompiled header mechanism, such as those provided by Borland
-        C++Builder or MSVC++.</td>
-  </tr>
+<td>The compiler printouts its version and exits</td>
+</tr>
 
-  <tr><a name="E">
-    <td><tt>-E</tt></td>
+<tr NAME="Wb">
+<td><tt>-Wb,</tt><i>option_list</i></EM</TD></td>
 
-    <td>Only invoke the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Pass options to the backend.</td>
+</tr>
 
-  <tr><a name="Wp">
-    <td><tt>-Wp,</tt><i>option_list</i></EM</TD></td>
+<tr NAME="export_macro">
+<td></td>
 
-    <td>Pass options to the preprocessor.</td>
-    <td>&nbsp;</td>
-  </tr>
+<td><tt>export_macro=</tt><i>macro_name</i></td>
 
-  <tr><a name="D">
-    <td><tt>-D</tt><i>macro_definition</i></td>
+<td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
+or <tt>extern</tt> keyword, this is needed for Windows/NT that requires
+special directives to export symbols from DLLs, usually the definition
+is just a space on unix platforms.&nbsp;</td>
+</tr>
 
-    <td>It is passed to the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<tr NAME="export_include">
+<td></td>
 
-  <tr><a name="U">
-    <td><tt>-U</tt><i>macro_name</i></td>
+<td><tt>export_include=</tt><i>include_path</i></td>
 
-    <td>It is passed to the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>The compiler will generate code to include <i>include_path</i> at the
+top of the client header, this is usually a good place to define the export
+macro.&nbsp;</td>
+</tr>
 
-  <tr><a name="I">
-    <td><tt>-I</tt><i>include_path</i></td>
+<tr NAME="E">
+<td><tt>-E</tt></td>
 
-    <td>It is passed to the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Only invoke the preprocessor</td>
+</tr>
 
-  <tr><a name="A">
-    <td><tt>-A</tt><i>assertion</i></td>
+<tr NAME="Wp">
+<td><tt>-Wp,</tt><i>option_list</i></EM</TD></td>
 
-    <td>It is passed to the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Pass options to the preprocessor.</td>
+</tr>
 
-  <tr><a name="Y">
-    <td><tt>-Y</tt></td>
+<tr NAME="D">
+<td><tt>-D</tt><i>macro_definition</i></td>
 
-    <td>It is passed to the preprocessor</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>It is passed to the preprocessor</td>
+</tr>
 
-  <tr><a name="H perfect_hash">
-    <td><tt>-H perfect_hash</tt></td>
+<tr NAME="U">
+<td><tt>-U</tt><i>macro_name</i></td>
 
-    <td>To specify the IDL compiler to generate skelton code that uses perfect
-        hashed operation demuxing strategy, which is the default strategy. Perfect
-        hashing uses <a href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf
-        </a>program,
-        to generate demuxing methods.&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>It is passed to the preprocessor</td>
+</tr>
 
-  <tr><a name="H dynamic_hash">
-    <td><tt>-H dynamic_hash</tt></td>
+<tr NAME="I">
+<td><tt>-I</tt><i>include_path</i></td>
 
-    <td>To specify the IDL compiler to generate skelton code that uses dynamic
-        hashed operation demuxing strategy.&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>It is passed to the preprocessor</td>
+</tr>
 
-  <tr><a name="H binary_search">
-    <td><tt>-H binary_search</tt></td>
+<tr NAME="A">
+<td><tt>-A</tt><i>assertion</i></td>
 
-    <td>To specify the IDL compiler to generate skelton code that uses binary
-        search based operation demuxing strategy.&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>It is passed to the preprocessor</td>
+</tr>
 
-  <tr><a name="H linear_search">
-    <td><tt>-H linear_search</tt></td>
+<tr NAME="Y">
+<td><tt>-Y</tt></td>
 
-    <td>To specify the IDL compiler to generate skelton code that uses linear
-        search based operation demuxing strategy.  Note that this option is for testing purposes only and should not be used for production code since it's inefficient.</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>It is passed to the preprocessor</td>
+</tr>
 
+<tr NAME="H perfect_hash">
+<td><tt>-H perfect_hash</tt></td>
 
-  <tr><a name="in">
-    <TD><TT>-in</TT></TD>
-    <TD> To generate #include statements with <>'s for the standard
-        include files (e.g. tao/corba.h) indicating them as non-changing
-        files</TD>
-    <td>&nbsp;</td>
-  </TR>
+<td>To specify the IDL compiler to generate skelton code that uses perfect
+hashed operation demuxing strategy, which is the default strategy. Perfect
+hashing uses <a href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf
+</a>program,
+to generate demuxing methods.&nbsp;</td>
+</tr>
 
+<tr NAME="H dynamic_hash">
+<td><tt>-H dynamic_hash</tt></td>
 
-  <TR><A NAME="ic">
-    <TD><TT>-ic</TT></TD>
-    <TD> To generate #include statements with ""s for changing
-        standard include files (e.g. tao/corba.h). </TD>
-    <td>&nbsp;</td>
-  </TR>
+<td>To specify the IDL compiler to generate skelton code that uses dynamic
+hashed operation demuxing strategy.&nbsp;</td>
+</tr>
 
-  <tr><a name="g">
-    <td><tt>-g</tt></td>
+<tr NAME="H binary_search">
+<td><tt>-H binary_search</tt></td>
 
-    <td>To specify the path for the perfect hasing program (GPERF). Default
-        is $ACE_ROOT/bin/gperf.&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>To specify the IDL compiler to generate skelton code that uses binary
+search based operation demuxing strategy.&nbsp;</td>
+</tr>
 
-  <tr><a name="o">
-    <td><tt>-o</tt></td>
+<tr NAME="H linear_search">
+<td><tt>-H linear_search</tt></td>
 
-    <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>
-  </tr>
+<td>To specify the IDL compiler to generate skelton code that uses linear
+search based operation demuxing strategy.  Note that this option is for testing purposes only and should not be used for production code since it's inefficient.</td>
+</tr>
 
-  <tr><a name="hc">
-    <td><tt>-hc</tt></td>
 
-    <td>Client's header file name ending. Default is "C.h".</td>
-    <td>&nbsp;</td>
-  </tr>
+<tr NAME="in">
+<TD><TT>-in</TT></TD>
+<TD> To generate #include statements with <>'s for the standard
+    include files (e.g. tao/corba.h) indicating them as non-changing
+    files</TD> 
+</TR>
 
-  <tr><a name="hs">
-    <td><tt>-hs</tt></td>
 
-    <td>Server's header file name ending. Default is "S.h".</td>
-    <td>&nbsp;</td>
-  </tr>
+<TR NAME="ic">
+<TD><TT>-ic</TT></TD>
+<TD> To generate #include statements with ""s for changing
+    standard include files (e.g. tao/corba.h). </TD>
+</TR>
 
-  <tr><a name="hT">
-    <td><tt>-hT</tt></td>
+<tr NAME="g">
+<td><tt>-g</tt></td>
 
-    <td>Server's template header file name ending. Default is "S_T.h".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>To specify the path for the perfect hasing program (GPERF). Default
+is $ACE_ROOT/bin/gperf.&nbsp;</td>
+</tr>
 
-  <tr><a name="cs">
-    <td><tt>-cs</tt></td>
+<tr NAME="o">
+<td><tt>-o</tt></td>
 
-    <td>Client stub's file name ending. Default is "C.cpp".</td>
-    <td>&nbsp;</td>
-  </tr>
+<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>
+</tr>
 
-  <tr><a name="ci">
-    <td><tt>-ci</tt></td>
+<tr NAME="hc">
+<td><tt>-hc</tt></td>
 
-    <td>Client inline file name ending. Default is "C.i".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Client's header file name ending. Default is "C.h".</td>
+</tr>
 
-  <tr><a name="ss">
-    <td><tt>-ss</tt></td>
+<tr NAME="hs">
+<td><tt>-hs</tt></td>
 
-    <td>Server skeleton file name ending. Default is "S.cpp".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Server's header file name ending. Default is "S.h".</td>
+</tr>
 
-  <tr><a name="sT">
-    <td><tt>-sT</tt></td>
+<tr NAME="hT">
+<td><tt>-hT</tt></td>
 
-    <td>Server template skeleton file name ending. Default is "S_T.cpp".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Server's template header file name ending. Default is "S_T.h".</td>
+</tr>
 
-  <tr><a name="si">
-    <td><tt>-si</tt></td>
+<tr NAME="cs">
+<td><tt>-cs</tt></td>
 
-    <td>Server inline skeleton file name ending. Default is "S.i".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Client stub's file name ending. Default is "C.cpp".</td>
+</tr>
 
-  <tr><a name="st">
-    <td><tt>-st</tt></td>
+<tr NAME="ci">
+<td><tt>-ci</tt></td>
 
-    <td>Server's template inline file name ending. Default is "S_T.i".</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Client inline file name ending. Default is "C.i".</td>
+</tr>
 
-  <tr><a name="t">
-    <td><tt>-t</tt></td>
+<tr NAME="ss">
+<td><tt>-ss</tt></td>
 
-    <td>Temporary directory to be used by the IDL compiler. Default :
-        Resolve ACE_DEFAULT_TEMP_DIR_ENV. If it is not defined, choose
-        /tmp/.
-    </td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Server skeleton file name ending. Default is "S.cpp".</td>
+</tr>
 
-  <tr><a name="Cw">
-    <td><tt>-Cw</tt></td>
+<tr NAME="sT">
+<td><tt>-sT</tt></td>
 
-    <td>Output a warning if two identifiers in the same scope differ in
-        spelling only by case (default for now).</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Server template skeleton file name ending. Default is "S_T.cpp".</td>
+</tr>
 
-  <tr><a name="Ce">
-    <td><tt>-Ce</tt></td>
+<tr NAME="si">
+<td><tt>-si</tt></td>
 
-    <td>Output an error if two indentifiers in the same scope differ in
-        spelling only by case. Default output is warning (for now).</td>
+<td>Server inline skeleton file name ending. Default is "S.i".</td>
+</tr>
 
-    <td>Since there is at least one OMG IDL file (sfp.idl, part of the
-        AVStreams specification) that is inconsistent with its own spelling
-        rule, we have made a warning the default output until the issue
-        is resolved.</td>
-  </tr>
+<tr NAME="st">
+<td><tt>-st</tt></td>
 
-  <tr><a name="Gc">
-    <td><tt>-Gc</tt></td>
+<td>Server's template inline file name ending. Default is "S_T.i".</td>
+</tr>
 
-    <td>Generate stubs and skeletons using compiled marshaling&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<tr NAME="t">
+<td><tt>-t</tt></td>
 
-  <tr><a name="Gi">
-    <td><tt>-Gi</tt></td>
+<td>Temporary directory to be used by the IDL compiler. Default :
+    Resolve ACE_DEFAULT_TEMP_DIR_ENV. If it is not defined, choose
+    /tmp/.
+</td>
+</tr>
 
-    <td>Generate stubs and skeletons using interpretive marshaling (default
-        for now)&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
+<tr NAME="Cw">
+<td><tt>-Cw</tt></td>
 
-  <tr><a name="Ge flag">
-    <td><tt>-Ge </tt><i>flag</i></td>
+<td>Output a warning if two identifiers in the same scope differ in
+spelling only by case (default for now).</td>
+</tr>
 
-    <td>If the value of the flag is 0, tao_idl will generate code that
-        will use native C++ exceptions. If the value of the flag is 1,
-        tao_idl will generate code that will use environment variable for
-        passing exceptions </td>
-    <td>&nbsp;</td>
-  </tr>
+<tr NAME="Ce">
+<td><tt>-Ce</tt></td>
 
-  <tr><a name="Gp">
-    <td><tt>-Gp </tt></td>
+<td>Output an error if two indentifiers in the same scope differ in 
+spelling only by case. Default output is warning (for now).</td>
 
-    <td>Generated collocated stubs that use <code>Thru_POA</code> collocation strategy (default)</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Since there is at least one OMG IDL file (sfp.idl, part of the
+AVStreams specification) that is inconsistent with its own spelling
+rule, we have made a warning the default output until the issue 
+is resolved.</td>
+</tr>
 
-  <tr><a name="Gd">
-    <td><tt>-Gd </tt></td>
+<tr NAME="Gc">
+<td><tt>-Gc</tt></td>
 
-    <td>Generated collocated stubs that use <code>Direct</code> collocation strategy</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate stubs and skeletons using compiled marshaling&nbsp;</td>
+</tr>
 
-  <tr><a name="Gt">
-    <td><tt>-Gt</tt></td>
+<tr NAME="Gi">
+<td><tt>-Gi</tt></td>
 
-    <td>Generate optimized TypeCodes (unimplemented as yet)</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate stubs and skeletons using interpretive marshaling (default
+for now)&nbsp;</td>
+</tr>
 
-  <tr><a name="Gv">
-    <td><tt>-Gv</tt></td>
+<tr NAME="Ge flag">
+<td><tt>-Ge </tt><i>flag</i></td>
 
-    <td>Generate code that suppports Object-By-Value</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>If the value of the flag is 0, tao_idl will generate code that
+    will use native C++ exceptions. If the value of the flag is 1,
+    tao_idl will generate code that will use environment variable for
+    passing exceptions </td>
+</tr>
 
-  <tr>
-    <td>-<tt>GI</tt></td>
+<tr NAME="Gt">
+<td><tt>-Gt</tt></td>
 
-    <td>Generate templates files for the servant implementation </td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate optimized TypeCodes (unimplemented as yet)</td>
+</tr>
 
-  <tr>
-    <td><tt>-GIh </tt><i>arg</i></td>
+<tr NAME="Gv">
+<td><tt>-Gv</tt></td>
 
-    <td>Servant implemenation header file name ending</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate code that suppports Object-By-Value</td>
+</tr>
 
-  <tr>
-    <td><tt>-GIs </tt><i>arg</i></td>
+<tr>
+<td>-<tt>GI</tt></td>
 
-    <td>Servant implemenation skeleton file name ending</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate templates files for the servant implementation </td>
+</tr>
 
-  <tr>
-    <td><tt>-GIb </tt><i>arg</i></td>
+<tr>
+<td><tt>-GIh </tt><i>arg</i></td>
 
-    <td>Prefix to the implementation class names</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Servant implemenation header file name ending</td>
+</tr>
 
-  <tr>
-    <td><tt>-GIe </tt><i>arg</i></td>
+<tr>
+<td><tt>-GIs </tt><i>arg</i></td>
 
-    <td>Suffix to the implementation class names</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Servant implemenation skeleton file name ending</td>
+</tr>
 
-  <tr>
-    <td><tt>-GIc </tt><i>arg</i></td>
+<tr>
+<td><tt>-GIb </tt><i>arg</i></td>
 
-    <td>Generate copy constructors in the servant implementation template files</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Prefix to the implementation class names</td>
+</tr>
 
-  <tr><a name="Sa">
-    <td><tt>-Sa</tt></td>
+<tr>
+<td><tt>-GIe </tt><i>arg</i></td>
 
-    <td>Suppress generation of the Any operators</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Suffix to the implementation class names</td>
+</tr>
 
-  <tr><a name="Sp">
-    <td><tt>-Sa</tt></td>
+<tr>
+<td><tt>-GIc </tt><i>arg</i></td>
 
-    <td>Suppress generation of collocated stubs that use <code>Thru_POA</code> collocation strategy</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Generate copy constructors in the servant implementation template files</td>
+</tr>
 
-  <tr><a name="Sd">
-    <td><tt>-Sd</tt></td>
+<tr NAME="Sa">
+<td><tt>-Sa</tt></td>
 
-    <td>Suppress generation of collocated stubs that use <code>Direct</code> collocation strategy (default)</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Suppress generation of the Any operators</td>
+</tr>
 
-  <tr><a name="St">
-    <td><tt>-St</tt></td>
+<tr NAME="St">
+<td><tt>-St</tt></td>
 
-    <td>Suppress generation of the TypeCodes</td>
-    <td>&nbsp;</td>
-  </tr>
+<td>Suppress generation of the TypeCodes</td>
+</tr>
 </table> <P>
 
 <P><HR><P>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index 5e092cd59fc..64fb79b5f99 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -80,11 +80,11 @@ Roadmap</h3>
 model.</a></li>
 
 <li>
-<a href="#tpool">Multiple threads, thread-pool model.</a></li>
+<a href="#tpool">Multiple threads, thread-pool model.</a> (Not yet implemented.)</li>
 
 <li>
 <a href="#multiorb-tpool">Multiple threads, ORB-per-thread, thread-pool
-model.</a></li>
+model.</a> (Not yet implemented.)</li>
 
 <li>
 Each configuration has the following information:</li>
@@ -166,8 +166,8 @@ reactively and running in separate threads.</li>
 a new thread whose job is to service requests coming from the connection.
 The new threads inherits all properties from the ORB threads (see below.)</li>
 
-<li> <tt>thread-pool</tt>: The ORB pre-spawn a group of threads for
-servicing the incoming requests.  Threads are not bound to a specific connection.</li>
+<li>
+<tt>thread-pool</tt> (not yet implemented): ... to be continued ...</li>
 </UL><P>
 
 <li>
@@ -225,8 +225,8 @@ multiple threads using the same <tt>CORBA::Object</tt> and using forwarding,
 it is necessary to protect the forwarding <tt>IIOP_Profile</tt>, which
 is part of the <tt>IIOP_Object</tt>, which is part of the CORBA::Object
 against multiple access. Therefore a mutex lock is used by default to ensure
-proper access. Using the switch <tt>-ORBprofilelock</tt> this policy
-can be deactivated specifying <tt>-ORBprofilelock null</tt>. A motivation
+proper access. Using the switch <tt>-ORBiiopprofilelock</tt> this policy
+can be deactivated specifying <tt>-ORBiiopprofilelock null</tt>. A motivation
 to do this might be performance reasons in cases, where no forwarding is
 used or no multithreading with access to shared <tt>CORBA::Object</tt>'s.
 Deactivating forces the ORB to use a null mutex, which does introduce only
@@ -457,7 +457,7 @@ threads which service requests form establiched connections.</td>
 is a good example on using <i>multiple threads, ORB-per-thread, and thread-per-connection</i>
 configuration.<P>
 <li>
-<a NAME="tpool"></a>Multiple threads, thread-pool model.</li><P>
+<a NAME="tpool"></a>Multiple threads, thread-pool model. (Not yet implemented.)</li><P>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
@@ -495,7 +495,7 @@ movement between threads.</td>
 
 <P><li>
 Multiple threads, ORB-per-thread, thread-pool model.<a NAME="multiorb-tpool"></a>
-</li><P>
+(Not yet implemented.)</li><P>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html
deleted file mode 100644
index 06c8c54d8ed..00000000000
--- a/TAO/docs/ec_options.html
+++ /dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>Real-time Event Channel Configuration</title>
-    <!-- $Id$ -->
-  </head>
-
-  <body>
-    <CENTER>
-    <h1>Real-time Event Channel Configuration</h1>
-    </CENTER>
-
-    <H3>Overview</H3>
-
-    <P>The new implementation of the real-time event channel uses a
-      factory to build all the objects and strategies it requires.
-      The factory can be dynamically loaded using ACE Service
-      Configurator, this is extremely convenient because the factory
-      can also parse options in the Service Configurator script file.
-    </P>
-
-    <P>The current implementation provides a default implementation
-      for this Factory, this document describes the options used by
-      this default implementation.
-    </P>
-
-    <H3>The configuration file</H3>
-
-    <P>The real-time event channel uses the same service configurator
-      file that the ORB uses, the default name for this file is
-      <CODE>svc.conf</CODE>, but the ORB option
-      <CODE>-ORBSvcConf</CODE> can be used to override this.
-      The format of the file is described in detail in
-      the service configurator documentation, but the relevant section
-      for the event channel looks like this:
-    </P>
-
-<PRE>
-# Comments go here...
-# More comments if you want to...
-static EC_Factory "-ECFiltering basic ....."
-</PRE>
-
-    <P>All the event service factory options start with
-      <CODE>-EC</CODE></P>
-
-
-    <H3>The options</H3>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0">
-        <TR>
-          <TH>Option</TH>
-          <TH>Description</TH>
-        </TR>
-        <!-- <TR NAME="ECDispatching"> -->
-        <TR>
-          <TD><CODE>-ECDispatching</CODE>
-            <EM>dispatching_strategy</EM>
-          </TD>
-          <TD>Select the dispatching strategy used by the real-time
-            event service. A <EM>reactive</EM> strategy will use the
-            same thread that received the event from the supplier to
-            push the event to all the consumers,
-            the <EM>priority</EM> strategy will use a prioritized pool
-            of threads and will query the scheduling service to select
-            the thread that will dispatch each event;
-            the <EM>mt</EM> strategy will also use a pool of threads,
-            but the thread to dispatch is randomly selected.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECDispatchingThreads"> -->
-        <TR>
-          <TD><CODE>-ECDispatchingThreads</CODE>
-            <EM>number_of_threads</EM>
-          </TD>
-          <TD>Select the number of threads used bythe <EM>mt</EM>
-            dispatching strategy.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECFiltering"> -->
-        <TR>
-          <TD><CODE>-ECFiltering</CODE>
-            <EM>consumer_filtering_strategy</EM>
-          </TD>
-          <TD>Select the filtering strategy used by the consumers.
-            The <EM>null</EM> filtering strategy will build trivial
-            filters for all consumers.
-            The <EM>basic</EM> filtering strategy supports
-            disjunction, conjunctions and timeouts based on the
-            subscriptions passed by the consumer during the connect
-            call.
-            The <EM>priority</EM> filtering strategy supports the same
-            features, but it also collaborates with the scheduling
-            service to build the dependency graph.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECSupplierFiltering"> -->
-        <TR>
-          <TD><CODE>-ECSupplierFiltering</CODE>
-            <EM>supplier_filtering_strategy</EM>
-          </TD>
-          <TD>The event channel can also perform some filtering close
-            to the suppliers by minimizing the number of consumers
-            that are tested for given event.
-            If the strategy is <EM>null</EM> then a global collection
-            of consumers is maintained and each event is filtered by
-            each consumer.
-            If the strategy is <EM>per-supplier</EM> then the EC uses
-            the supplier publications and the consumer subscriptions
-            to determine which consumers could potentially be
-            interested in events for each supplier.
-            This set of consumers is usually smaller than the complete
-            set and it is thus faster to traverse it, but keeping more
-            collections of consumers increases the connection and
-            disconnection time as well as the memory requirements.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECTimeout"> -->
-        <TR>
-          <TD><CODE>-ECTimeout</CODE>
-            <EM>timeout_strategy</EM>
-          </TD>
-          <TD>A consumer can request that the event channel generate
-            periodic or oneshot timeout events.
-            This option controls the strategy to generate the
-            timeouts,
-            using <EM>reactive</EM> the same reactor used for the ORB
-            is used by the event service.
-            The <EM>priority</EM> strategy uses a prioritized group of
-            threads, timeouts with higher rate are generated by
-            threads of higher priority.
-            <BR><B>NOTE: The <EM>priority</EM> strategy is not
-              implemented</B>
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECObserver"> -->
-        <TR>
-          <TD><CODE>-ECObserver</CODE>
-            <EM>observer</EM>
-          </TD>
-          <TD>The event channel uses the Observer pattern to report
-            changes in the subscriptions and publications of its
-            suppliers and consumers; this is specially useful in the
-            implementation of event channel gateways.
-            The user can disable this feature by selecting the
-            <EM>null</EM> strategy;
-            whereas the <EM>basic</EM> strategy provides a simple, yet
-            efficient implementation.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECScheduling"> -->
-        <TR>
-          <TD><CODE>-ECScheduling</CODE>
-            <EM>scheduling_strategy</EM>
-          </TD>
-          <TD>The event channel can collaborate with the scheduling
-            service to build the dependency list between the consumers
-            and the suppliers.
-            If the <EM>null</EM> scheduling strategy is selected this
-            feature is disabled,
-            the <EM>priority</EM> strategy enables this feature.
-            <BR><B>NOTE:<B> The default is to have the feature disabled.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECPushSupplierSet"> -->
-        <TR>
-          <TD><CODE>-ECPushSupplierSet</CODE>
-            <EM>strategy</EM>
-          </TD>
-          <TD><P>Consumers can connect and disconnect from the event
-              channel as part of push to one consumer;
-              changing the set of consumers as a result of such an
-              operation would invalidate the iterators used by the event
-              channel to dispatch to the relevant consumers.
-              There are several ways to handle this problem, for example
-              a copy of the set could be made <I>before</I> initiating
-              the dispatch, or only if there is a change on the set
-              <I>during</I> the dispatch.
-              If the dispatching strategy is not reactive then it is
-              possible to lock the set of consumers during the duration
-              of the dispatch operation, the change in the subscriptions
-              will be held until the event is completely processed.
-              Finally the subscription change could be delayed until the
-              event is fully processed and there is no risk of
-              invalidating an iterator.
-            </P>
-            <P>All this strategies have merits under different
-              circumstances, the user can select the right one for his
-              application using this option.
-              The <EM>immediate</EM> strategy will perform any changes
-              on the consumer set immediately, simply using a lock to
-              synchronize access. The <EM>delayed</EM> operation will
-              wait until there are no threads iterating over the set
-              to perform any modifications on it.
-              The <EM>immediate_st</EM> simply performs the
-              modications without taking any locks, it is useful for
-              single threaded applications that do not receive changes
-              are part of an upcall (for example: if there are no
-              collocated consumers).
-            </P>
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECProxyConsumerLock"> -->
-        <TR>
-          <TD><CODE>-ECProxyConsumerLock</CODE>
-            <EM>lock_type</EM>
-          </TD>
-          <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or
-            <EM>recursive</EM>) to synchronize access to the
-            ProxyPushConsumer state.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECProxySupplierLock"> -->
-        <TR>
-          <TD><CODE>-ECProxySupplierLock</CODE>
-            <EM>lock_type</EM>
-          </TD>
-          <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or
-            <EM>recursive</EM>) to synchronize access to the
-            ProxyPushSupplier state.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECConsumerAdminLock"> -->
-        <TR>
-          <TD><CODE>-ECConsumerAdminLock</CODE>
-            <EM>lock_type</EM>
-          </TD>
-          <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or
-            <EM>recursive</EM>) to synchronize access to the
-            ConsumerAdmin state.
-          </TD>
-        </TR>
-
-        <!-- <TR NAME="ECSupplierAdminLock"> -->
-        <TR>
-          <TD><CODE>-ECSupplierAdminLock</CODE>
-            <EM>lock_type</EM>
-          </TD>
-          <TD>Select the lock type (<EM>null</EM>, <EM>thread</EM> or
-            <EM>recursive</EM>) to synchronize access to the
-            SupplierAdmin state.
-          </TD>
-        </TR>
-      </TABLE>
-    </P>
-
-    <H3>The constructor</H3>
-
-    <P>The <CODE>TAO_EC_Event_Channel</CODE> class implements the
-      <CODE>RtecEventChannelAdmin::EventChannel</CODE> interface;
-      this class takes one mandatory and two optional parameters in
-      its constructor:
-    </P>
-
-<PRE>
-  TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attributes,
-                        TAO_EC_Factory* factory = 0,
-                        int own_factory = 0);
-</PRE>
-
-    <P>The <CODE>factory</CODE> is an optional parameter to override
-      the default strategy factory used by the event channel,
-      the event channel will destroy the factory if the
-      <CODE>own_factory</CODE> argument is true.
-    </P>
-
-    <P>The <CODE>attributes</CODE> parameter can be used to fine tune
-      some of the algorithms and strategies used by the event channel,
-      the default values are probably OK for most applications.
-      Notice that the attributes include the POA used to activate the
-      ConsumerAdmin, SupplierAdmin, ProxyPushConsumer and
-      ProxyPushSupplier objects;
-      this POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the
-      <CODE>SYSTEM_ID</CODE> policies (as the RootPOA does).
-    </P>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0">
-        <TR><TH>Attribute</TH><TH>Description</TH></TR>
-
-        <TR><TD><CODE>consumer_reconnecto</CODE></TD>
-          <TD>If the attribute is not zero then the same consumer can
-            call <CODE>connect_push_consumer</CODE> on its
-            ProxyPushSupplier multiple times to change its
-            subscriptions;
-            this is usually more efficient that disconnecting and
-            connecting again.
-          </TD>
-        </TR>
-
-        <TR><TD><CODE>supplier_reconnecto</CODE></TD>
-          <TD>If the attribute is not zero then the same supplier can
-            call <CODE>connect_push_supplier</CODE> on its
-            ProxyPushConsumer multiple times to change its
-            publications;
-            this is usually more efficient that disconnecting and
-            connecting again.
-          </TD>
-        </TR>
-
-        <TR><TD><CODE>busy_hwm</CODE></TD>
-          <TD>When using the delayed strategy to update
-            ProxyPushSupplier sets this flag controls the maximum
-            number of thread that can simultaneously iterate over the
-            set before blocking.
-            It can be used to avoid starvation in delayed updates on
-            the set.
-          </TD>
-        </TR>
-
-        <TR><TD><CODE>max_write_delay</CODE></TD>
-          <TD>When using the delayed strategy to update
-            ProxyPushSupplier sets this flag controls the maximum
-            number of threads that will initiate dispatching
-            <B>after</B> a change has been posted.
-            Any thread after that is blocked until the operations are
-            performed.
-            It can be used to completely stop starvation of delayed
-            updates on the set.
-          </TD>
-        </TR>
-
-        <TR><TD><CODE>scheduler</CODE></TD>
-          <TD>Most configurations of the real-time event channel do
-            not require an scheduler.
-            If any of the strategies that require an scheduling
-            service is selected then this attribute should be set
-            appropiately.
-          </TD>
-        </TR>
-      </TABLE>
-    </P>
-
-    <P><HR><P>
-
-      Back to the TAO <A HREF="index.html">components documentation</A>.
-
-      <!--#include virtual="/~schmidt/cgi-sig.html" -->
-
-    <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address>
-<!-- Created: Thu Jul  1 21:44:28 CDT 1999 -->
-<!-- hhmts start -->
-Last modified: Fri Jul  2 11:24:48 CDT 1999
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/TAO/docs/implrepo/index.html b/TAO/docs/implrepo/index.html
index 5ce150eeaf7..03def3ac7e2 100644
--- a/TAO/docs/implrepo/index.html
+++ b/TAO/docs/implrepo/index.html
@@ -1,9 +1,9 @@
 <html>
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
+<meta http-equiv="Content-Type"
+content="text/html; charset=iso-8859-1">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
 <title>Implementation Repository</title>
 <!-- $Id$ -->
 </head>
@@ -12,110 +12,62 @@
 
 <hr>
 
-<h2>Implementation Repository in TAO</h2>
-<p>The purpose of the Implementation Repository in TAO is for the automatic
-activation of a TAO server when a method is invoked but the server is not
-running. It does this by working with the server to keep track of when it is
-activated and stores information on how to reactivate it. Method
-invocations on the server will actually be sent to the Implementation
-Repository, which will then be able to start the server process if it is not
-already running and forward the invocation to the real server. </p>
+<h2>Impementation Repository</h2>
 
-<p>In the pages here (and in most of the documentation written for it),
-Implementation Repository will often be shortened to ImplRepo or IR.</p>
+<p>The Implementation Repository (often shortened to IR or
+ImplRepo) in TAO is an activation/reactivation service. Its
+purpose is to maintain a registry of servers so that it can
+restart servers upond demand. The IR redirect requests from
+clients to the correct server so that servers can shutdown and
+restart without sacrificing the functionality of persistent IORs.
+Our work has been largely based on an excellent paper by <a
+href="http://www.triodia.com/staff/michi-henning.html">Michi
+Henning</a>, <a
+href="http://www.triodia.com/staff/michi/cacm.pdf">Binding,
+Migration, and Scalability in CORBA</a>. </p>
 
 <hr>
 
-<h3>Resources</h3>
-<p>The IR in TAO was first based on a paper on the subject by <a href="http://www.triodia.com/staff/michi-henning.html">Michi
-Henning</a> called <a href="http://www.triodia.com/staff/michi/cacm.pdf">Binding,
-Migration, and Scalability in CORBA</a>. Mr. Henning later went on to
-coauthor the book <a href="http://cseng.awl.com/bookdetail.qry?ISBN=0-201-37927-9&amp;ptype=0">Advanced
-CORBA Programming in C++</a> and included a chapter on the Implementation
-Repository. The description of the IR in this chapter is used as the
-specification for TAO's IR. </p>
+<h3>Other IR Documents</h3>
 
-<p><a href="usersguide.html">Users Guide</a> - Overall documentation on
-how to use the IR in your programs.</p>
+<DL>
+<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
+<a href="status.html">Status Page</a> - This page details a
+checklist of short-term and long-term goals for the development
+of the IR. <P>
 
-<p><a href="paper.html">The Paper</a> - A paper that has a general
-description of the IR. This is also where to look to find information on the
-inner working of the IR.</p>
+<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
+<a href="usersguide.html">Users Guide</a> - Overall documentation on
+    how to use the IR in your programs. <P>
 
-<p><a href="http://tao.cs.wustl.edu/~brunsch/implrepo.html">Discussion
-Page</a> - Notes that I've made while working on the IR.</p>
+<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
+<a href="paper.html">The Paper</a> - A paper that has a
+general description of the IR. This is also where to look to
+find information on the inner working of the IR. <P>
 
-<hr>
-
-<h3>The Future</h3>
-<p>A large part of the IR has been implemented, but there are several areas that
-are not finished or complete yet.</p>
-
-<table border="1">
-  <tr>
-    <th><b>Feature</b></th>
-    <th><b>Status</b></th>
-  </tr>
-  <tr>
-    <td>Persistence</td>
-    <td>It was removed because of ACE subsetting issues, and a new strategy is
-      in the works.</td>
-  </tr>
-  <tr>
-    <td>Environment Variables</td>
-    <td>In the IDL interface, but not used on the server side or implemented in
-      tao_ir</td>
-  </tr>
-  <tr>
-    <td>Logical Server names</td>
-    <td>In the IDL interface, but not used on the server side or fully
-      implemented in tao_ir</td>
-  </tr>
-  <tr>
-    <td>Server Shutdown</td>
-    <td>Only cooperative shutdown implemented.</td>
-  </tr>
-  <tr>
-    <td>POA/ORB Integration</td>
-    <td>Only some options have been added, ORBImplRepoIOR, etc.</td>
-  </tr>
-  <tr>
-    <td>Multicast location of IRs</td>
-    <td>The client part is in the ORB, but the server doesn't listen for it yet.</td>
-  </tr>
-  <tr>
-    <td>Client-side Optimizations</td>
-    <td>Nothing planned yet</td>
-  </tr>
-  <tr>
-    <td>Server Security</td>
-    <td>Nothing planned yet</td>
-  </tr>
-  <tr>
-    <td>Federations</td>
-    <td>Nothing planned yet</td>
-  </tr>
-  <tr>
-    <td>DLL servers</td>
-    <td>Nothing planned yet</td>
-  </tr>
-</table>
+<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
+<a href="http://tao.cs.wustl.edu/~brunsch/implrepo.html">Discussion
+Page</a> - Notes that I've made while working on the
+IR. 
+</DL>
 
 <hr>
 
-<h3>Who wrote it?</h3>
-<p>The guy currently in charge of the IR is Darrell Brunsch &lt;<a href="mailto:brunsch@cs.wustl.edu">brunsch@cs.wustl.edu</a>&gt;.
-You can reach me by either email (which is better), or through the <a href="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">ACE
-mailing list</a> &lt;<a href="mailto:ace-useres@cs.wustl.edu">ace-users@cs.wustl.edu</a>&gt;,
-or through the <a href="news:comp.soft-sys.ace">comp.soft-sys.ace</a> newsgroup.
-The newsgroup mirrors the mailing list, but not the other way. Also, if you use
-the mailing list, it is best if you join it before sending a question since
-responses are usually just replied back to the group.</p>
+<h3>Who's Responsible?</h3>
+
+<p>The person responsible is Darrell Brunsch &lt;<a
+href="mailto:brunsch@cs.wustl.edu">brunsch@cs.wustl.edu</a>&gt;.
+You can reach me by either email, through the <a
+href="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">ACE mailing
+list</a> &lt;<a href="mailto:ace-useres@cs.wustl.edu">ace-users@cs.wustl.edu</a>&gt;,
+or through the <a href="news:comp.soft-sys.ace">comp.soft-sys.ace</a>
+newsgroup. The newsgroup mirrors the mailing list, but not the
+other way. Also, if you use the mailing list, it is best if you
+join it before sending a question, since responses are usually
+just replied back to the group.</p>
 
 <hr>
 
 <p>Back to the <a href="../index.html">TAO Documentation</a>.</p>
-
 </body>
-
 </html>
diff --git a/TAO/docs/implrepo/status.html b/TAO/docs/implrepo/status.html
new file mode 100644
index 00000000000..1397e8c1a89
--- /dev/null
+++ b/TAO/docs/implrepo/status.html
@@ -0,0 +1,70 @@
+<html>
+<!-- $Id$ -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="GENERATOR" content="Microsoft FrontPage 3.0">
+<title>Implementation Repository Status</title>
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+<hr>
+
+<h3>Implementation Repository Status</h3>
+
+<p>Point of contact: <a href="mailto:brunsch@cs.wustl.edu">Darrell Brunsch</a> </p>
+
+<p>Here is a brief list of my goals (and the dates completed).</p>
+
+<p>Immediate goals:
+
+<ul>
+  <li>[7/17] Create the base test client and server programs</li>
+  <li>[7/23] Add an IR that forwards server requests</li>
+  <li>[7/23] Persistence</li>
+  <li>[8/10] Have the server register its IOR with the IR</li>
+  <li>[8/14] Have the server exit after every call, so it is restarted each time</li>
+  <li>[9/10] Make the IR forward any request</li>
+  <li>[9/10] Add the ping object to the server</li>
+  <li>[9/10] Add in shutdown calls to test ping objects</li>
+  <li>[9/15] Implement the full IDL Interface for the IR</li>
+  <li>Add more Documentation</li>
+  <li>Fix a problem</li>
+  <li>Add another test server</li>
+</ul>
+
+<p>Longer term goals:
+
+<ul>
+  <li>Change IOR format</li>
+  <li>Add in support for virtual server names</li>
+  <li>Integration with POA and ORB</li>
+</ul>
+
+<p>Other goals: 
+
+<ul>
+  <li>Multiple Profiles</li>
+  <li>POA extension</li>
+</ul>
+
+<p>Future Goals (might or might not happen): 
+
+<ul>
+  <li>TAO client-side optimization with restarted servers</li>
+  <li>Server security (checksums)</li>
+  <li>Helper Application</li>
+  <li>Federation of IRs</li>
+  <li>DLLs</li>
+</ul>
+
+<hr>
+
+<p>Last update to this document: $Date$</p>
+
+<p>Back to <a href="../releasenotes/">TAO Release Notes</a></p>
+
+<p>Back to <a href="index.html">Implementation Repository</a></p>
+</body>
+</html>
diff --git a/TAO/docs/implrepo/tao_ir.html b/TAO/docs/implrepo/tao_ir.html
deleted file mode 100644
index 823957facf1..00000000000
--- a/TAO/docs/implrepo/tao_ir.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<html>
-<!-- $Id$ -->
-<head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<title>Implementation Repository User's Guide</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<hr>
-
-<h2>tao_ir Usage</h2>
-
-<p>The usage of tao_ir is as follows:</p>
-
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] <a href="#examples">command</a>
-[command-arguments]</code></p>
-
-<p><i>ORB_options</i> is the ORB options to be given. This is where
-options like &quot;-ORBImplRepoIOR&quot; would be placed. <i>command </i>is
-one of the supported commands like add, remove, etc. <i>command-arguments</i>
-are dependent on the command used. For example, <i>add </i>will need a
-server name for registration, but list does not necessarily need any arguments.</p>
-
-<hr>
-
-<h3><a name="examples">Examples</a></h3>
-<p>There is a file in the current directory name <i>implrepo.ior</i> that
-contains the IOR of the Implementation Repository. The server executable
-is called <i>airplane.exe</i> and the POA name used by the object is <i>plane</i>.
-The server needs the -i option to use the IR and the IOR of the IR. So the
-command would be:</p>
-
-<p><code>tao_ir -ORBImplRepoIOR file://implrepo.ior add plane -c &quot;airplane.exe
--i file://implrepo.ior&quot;</code></p>
-
-<p><code>And if you want to later remove that server from the IR:</code></p>
-
-<p><code>tao_ir -ORBImplRepoIOR file://implrepo.ior remove plane</code></p>
-
-<p>Or if you wanted to update the entry to have a working directory of
-C:\airplane\.</p>
-
-<p><code>tao_ir -ORBImplRepoIOR file://implrepo.ior update plane -w
-&quot;C:\airplane\&quot;</code></p>
-
-<hr>
-
-<h3><a name="commands">Commands</a></h3>
-
-<p><i>tao_ir</i> currently supports these commands:</p>
-
-<table border="1">
-  <tr>
-    <th>Command</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td><a href="#activate">activate</a></td>
-    <td>Activates a server through the IR</td>
-  </tr>
-  <tr>
-    <td><a href="#add">add</a></td>
-    <td>Adds a server to the server database in the IR</td>
-  </tr>
-  <tr>
-    <td><a href="#list">list</a></td>
-    <td>Lists the details of one server or lists all the servers registered in
-      the IR</td>
-  </tr>
-  <tr>
-    <td><a href="#remove">remove</a></td>
-    <td>Removes a server from the server database in the IR</td>
-  </tr>
-  <tr>
-    <td><a href="#shutdown">shutdown</a></td>
-    <td>Shuts down a server through the IR</td>
-  </tr>
-  <tr>
-    <td><a href="#update">update</a></td>
-    <td>Updates information for a server in the server database in the IR</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="activate">activate</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] activate <i>name </i>[-h]</code></p>
-
-<p>Activate a server through the Implementation Repository. The <i>name</i> is
-the server (POA) name that is used to identify the server.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="add">add</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] add <i>name </i>[-h]
-[-c <i>command</i>] [-w <i>working_dir</i>]</code></p>
-
-<p>Creates a new server entry in the Implementation Repository. The <i>name</i>
-must be be the name of the POA that the object resides in.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-  <tr>
-    <td>-c <i>command</i></td>
-    <td>Adds the command line string used to restart this server</td>
-  </tr>
-  <tr>
-    <td>-w <i>working_dir</i></td>
-    <td>Adds the working directory that is used for the server</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="list">list</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] list [<i>name</i>]<i>
-</i>[-h] [-v]</code></p>
-
-<p>Lists all or one of the server entries in the Implementation Repository. If a
-<i>name</i> is used, it will display verbose information about the server
-identified by its server (POA) name.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-  <tr>
-    <td>-v</td>
-    <td>When listing the list of servers (no <i>name</i> specified), display
-      verbose information for all servers.</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="remove">remove</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] add <i>name </i>[-h]</code></p>
-
-<p>Removes a server entry from the Implementation Repository. The <i>name</i> is
-the server (POA) name that is used to identify the server.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="shutdown">shutdown</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] shutdown <i>name </i>[-h]</code></p>
-
-<p>Shuts down a server through the Implementation Repository. The <i>name</i> is
-the server (POA) name that is used to identify the server.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-</table>
-
-<hr>
-
-<h3><a name="update">update</a></h3>
-<p><code><b>tao_ir </b>[<a href="../Options.html">ORB options</a>] add <i>name </i>[-h]
-[-c <i>command</i>] [-w <i>working_dir</i>]</code></p>
-
-<p><code>Update a server entry in the Implementation Repository. </code>The <i>name</i>
-is the server (POA) name that is used to identify the server.</p>
-
-<table border="1">
-  <tr>
-    <th>Option</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>-h</td>
-    <td>Displays help for this command</td>
-  </tr>
-  <tr>
-    <td>-c <i>command</i></td>
-    <td>Changes the command line string used to restart this server</td>
-  </tr>
-  <tr>
-    <td>-w <i>working_dir</i></td>
-    <td>Changes the working directory that is used for the server</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>Back to <a href="index.html">Implementation Repository</a></p>
-</body>
-</html>
diff --git a/TAO/docs/implrepo/usersguide.html b/TAO/docs/implrepo/usersguide.html
index 7c34c93c5d3..12b0f1de771 100644
--- a/TAO/docs/implrepo/usersguide.html
+++ b/TAO/docs/implrepo/usersguide.html
@@ -1,10 +1,9 @@
 <html>
-<!-- $Id$ -->
 
 <head>
 <meta http-equiv="Content-Type"
 content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
 <title>Implementation Repository User's Guide</title>
 </head>
 
@@ -12,14 +11,14 @@ content="text/html; charset=iso-8859-1">
 
 <hr>
 
-<h3><font color="#FF0000">Warning, this document is out of date and is currently
-being updated.</font></h3>
+<h3>User's Guide</h3>
 
-<h3>Implementation Repository User's Guide</h3>
-
-<p>Since the POA/ORB integration is not yet completed, the functionality still
-exists in separately in IR_Helper, which is included in orbsvcs. When the
-integration is done, this dependency to orbsvcs will be removed.</p>
+<p>The Implementation Repository is still kind of in a state of
+flux and will probably change quite a bit this semester. Right
+now it works, although it is still a bit inflexible. Most of this
+document will change, so make sure to get the version of this
+document that is paired with the version of the IR that you are
+using.</p>
 
 <hr>
 
@@ -34,7 +33,7 @@ it if necessary).</p>
 
 <p>So the server needs to know the IOR of the IR in order to
 change the host and port in it to that of the IR. The information
-the IR needs to receive from the server is its POA name (which it
+the IR needs to receive from the server is its poa name (which it
 uses as an identifier) and commands used to restart the server.</p>
 
 <hr>
@@ -52,7 +51,7 @@ just refering to any server that has used the structure of the
 IDL_Cubit test (a lot of TAO's examples are like this).</p>
 
 <dir>
-    <li>Make yourself an IR_Helper object. (If you follow
+    <li>Make yourself an IR_Helper object.&nbsp; (If you follow
         the Cubit-style architecture, this will be a pointer in
         the Server_i class). </li>
     <li>After you create the POA, construct the IR_Helper and
@@ -60,11 +59,11 @@ IDL_Cubit test (a lot of TAO's examples are like this).</p>
         new object within Server_i::init) </li>
     <li>If you need to register, call register_server ()
         (Cubit-style: add another option &quot;-r&quot; and have
-        it set a flag. Within Server_i::init call
+        it set a flag.&nbsp; Within Server_i::init call
         register_server ()) </li>
     <li>After you create and register your objects, call
-        change_object to redo the references.  Then you can
-        output the new IOR. (Cubit-style: still within
+        change_object to redo the references. &nbsp; Then you can
+        output the new IOR.&nbsp; (Cubit-style: still within
         Server_i::init) </li>
     <li>Right before ORB::run call notify_startup and afterwards,
         call notify shutdown (Cubit-style: within Server_i::run) </li>
@@ -85,6 +84,16 @@ choose you can just use the IR all the time and only worry about
 
 <hr>
 
+<h4>The implrepo.conf file</h4>
+
+<p>Because with the way it is set up, and the current
+over-restrictiveness of the POA locks, the IR requires a special
+configuration file, implrepo.conf, which you need to pass to the
+IR via <font face="Times New Roman"><code>-ORBsvcconf
+implrepo.conf</code></font> flag</p>
+
+<hr>
+
 <p>Last update to this document: $Date$</p>
 
 <p>Back to <a href="index.html">Implementation Repository</a></p>
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
index c7e1429a2d2..c6b53d8e193 100644
--- a/TAO/docs/minimumTAO.html
+++ b/TAO/docs/minimumTAO.html
@@ -1,8 +1,5 @@
-<!-- $Id$ -->
-
 <title> Minimum TAO </title>
 
-
 <body text = "#000000"
       link="#000fff"
       vlink="#ff0f0f"
@@ -192,7 +189,7 @@ The above make options translate into:
     <th>Dynamic Any
   <tr>
     <th rowspan=2>Complete TAO
-    <th>Size, Kbytes
+    <th>Size, bytes
     <td align=center>862.0
     <td align=center>281.9
     <td align=center>14.6
@@ -213,7 +210,7 @@ The above make options translate into:
     <td align=center>15
   <tr>
     <th rowspan=2>Minimum  TAO
-    <th>Size, Kbytes
+    <th>Size, bytes
     <td align=center>639.5
     <td align=center>207.2
     <td align=center>14.6
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index dfa7657dea7..52c665052f0 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -28,17 +28,16 @@
     </P>
 
     <OL>
-      <LI><P>The ORB should support server side and client side
-	  interceptors
-	  <BR>[ASSIGNED TO:] Nanbor
-	</P>
-      </LI>
-      
       <LI><P>Implement an Implementation Repository for TAO.
 	  <BR>[ASSIGNED TO:] Darrell.
 	</P>
       </LI>
 
+      <LI><P>Support the thread pool reactor in the ORB.
+	  <BR>[ASSIGNED TO:] Nanbor.
+	</P>
+      </LI>
+
       <LI><P>Implement a nice example of the COS Event Channel,
           showing how it can provide filtering when combined with the
           real-time Event Channel.
@@ -289,7 +288,6 @@
 	    <CODE>Event_Latency</CODE>)
 	  </LI>
 	  <LI>A connection time test
-	    <BR>[DONE]
 	  </LI>
 	  <LI>A test to verify filtering and correlation
 	  </LI>
@@ -300,7 +298,6 @@
 	  <LI>A test to measure CPU scalability
 	  </LI>
 	  <LI>A stress test for gateways and observers
-	    <BR>[DONE]
 	  </LI>
 	  </UL>
         </P>
@@ -321,7 +318,7 @@
       </LI>
 
       <LI><P><B>EC:</B> We need some strategy in the EC to periodically 
-	  flush out misbehaving suppliers and consumers. Examples of
+	  flush out mibehaving suppliers and consumers. Examples of
 	  misbehavior include: suppliers flooding the EC;
 	  consumers or suppliers that are destroyed, but were not
 	  disconnected;
@@ -331,6 +328,21 @@
         </P>
       </LI>
 
+      <LI><P><B>EC:</B>The observer in the <CODE>TAO_EC_Gateway</CODE> 
+	  class is not properly deactivated.
+        </P>
+      </LI>
+
+      <LI><P><B>EC:</B> Sometimes the Event Channel dead-locks during
+          shutdown. According to Ulf Jährig
+	  &lt;jaehrig@desys.com&gt;, an easy way to reproduce the
+	  problem is to run the EC_Throughput test under windows NT.
+	  <BR>[STATUS] The test in question works perfectly on NT; it
+	  looks like a race condition. Apparently this is only a
+	  problem with the old EC.
+        </P>
+      </LI>
+
       <LI><P><B>IDL Compiler:</B> Support for the <CODE>version</CODE> 
 	  pragma, this also requires some changes in the
 	  <CODE>_is_a()</CODE> implementation.
@@ -434,6 +446,16 @@
 	</P>
       </LI>
       
+      <LI><P><B>ORB:</B>
+	  Support multiple endpoints in the ORB.
+	  Some interesting concurrency models (such as
+	  thread-per-endpoint or thread-pool-per-endpoint) require
+	  that we give an explicit name to each endpoint, and use
+	  policies to match the thread with the endpoints it will
+	  serve (and share).
+        </P>
+      </LI>
+
       <LI><B>EC:</B> Call ORB_init() in the EC threads?
 	[The dispatching threads for Boeing]
       <P></LI>
@@ -535,7 +557,6 @@
       <LI><P><B>ORB:</B>
 	  Is the client side in TAO handling a
 	  <CODE>CloseConnection</CODE> GIOP message properly?
-	  <BR>[STATUS] The code has been inspected and seems correct
 	</P>
       </LI>
 
@@ -596,6 +617,22 @@
         </P>
       </LI>
 
+      <LI><P><B>IDL Compiler:</B> The TAO_IDL compiler does not handle
+          the following code sequence properly:
+<PRE>
+    // IDL
+    interface Foo;
+    typedef sequence<Foo> FooSeq;
+
+    interface Foo {
+      // anything here
+    }; 
+</PRE>
+        It may be necessary to have a multi-pass code generator to
+        solve this problem.
+        </P>
+      </LI>
+
       <LI><P><B>IDL Compiler:</B> We must also check that oneways do
           not contain any <CODE>out</CODE> or <CODE>inout</CODE>
           parameters.
@@ -662,11 +699,6 @@
 	</P>
       </LI>
 
-      <LI><P>Need to support CORBA::Bounds to be compliant with 2.3
-	  spec.
-	</P>
-      </LI>
-      
     <HR></HR>
 
   <!-- Things below this point are "big" tasks" that -->
@@ -741,12 +773,13 @@ encapsulation format.
         </P>
       </LI>
 
-    <LI><P>Add support for Smart Proxies to the ORB
-	<BR>[STATUS] The new implementation of collocation has the
-	roots for this.
-      </P>
-    </LI>
+      <LI><P>Add support for Smart Proxies to the ORB</P>
+      </LI>
 
+      <LI><P>The ORB should support server side and client side
+	  interceptors</P>
+      </LI>
+      
       <LI><P>The ORB does not have an interface repository</P>
       </LI>
 
@@ -761,70 +794,6 @@ encapsulation format.
 	complicated then.
       <P></LI>
 
-    <LI><P>Consider decompositions of the ORB that would allow
-	dynamically linked plug-ins, for example it should be easy to
-        dynamically load a pluggable protocol.
-        Other decompositions are harder, but still worthwhile looking
-        at: 
-      <UL>
-        <LI>Dynamically load the support for costly features, as the
-          ImplRepo or Location Forwarding.
-	  <P>
-        </LI>
-        <LI>Dynamically configure POA with or without support for
-          holding state.
-	  <P>
-        </LI>
-      </UL>
-    </P>
-    </LI>
-      
-    <LI><P><B>IDL Compiler:</B> Currently the IDL compiler creates an
-        operation table that 
-	includes all the base classes operations; this permits the
-	generation of efficient code that does not rely in
-	dynamic_cast or the _downcast() method for Servants (which
-	compare strings, hence it is slow).
-	It could be interesting to implement the alternative approach
-	were the class only looks its own operations and then tries
-	the parent. This will reduce code size, but will probably
-	decrease performance.
-      </P></LI>
-
-      <LI>Server_Request objects in TAO are magical, the _duplicate()
-	method returns 0 and release() does nothing.
-	The problem starts because Server_Request is allocated from the
-	stack (to speed up things), hence reference counting would be
-	useless. Adding a clone() method will work better, but the
-	Server_Request holds pointers to several positions in the CDR
-	stream, we could clone the CDR stream, but a normal
-	Server_Request does not own it....  In our opinion (Carlos and
-	Irfan) we need not worry about this until we find a use case for
-	it.
-      <P></LI>
-
-    </OL>
-
-<HR><P>
-      <H3>Completed Tasks</H3>
-
-    <OL> 
-      <LI><P>The current implementation of collocation is optimal for
-	  hard-real-time 
-	  applications, but in some cases it may be desirable to follow
-	  the normal execution path yet minize costs for collocated
-	  calls.
-	  An example would include an application that activates the
-	  objects on demand.
-	  It would be interesting to have a half-collocated stub
-	  implementation, that will marshall the request and then
-	  invokes the normal path on the "server" side, but without
-	  crossing the kernel boundary. Ideally even the serialization
-	  could be minimized or avoided.
-	  <BR>[DONE] The ORB supports collocation through the POA.
-	</P>
-      </LI>
-
       <LI><P>The CORBAlite RFP is very interesting IMHO we just need to
 	remove features from TAO to make it a CORBAlite
 	implementation. The problem is how to keep the full blown
@@ -878,63 +847,71 @@ encapsulation format.
 	    interpretive marshalling in the CORBAlite framework (where
 	    TypeCodes don't have enough methods as to traverse them).
       </P>
-	<P>[STATUS] The ORB can be compiled with support for CORBAlite 
-	  (aka Minimum CORBA).
-	</P>
     </LI>
 
-      <LI><P>Support the thread pool reactor in the ORB.
-	  <BR>[ASSIGNED TO:] Nanbor.
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> The TAO_IDL compiler does not handle
-          the following code sequence properly:
-<PRE>
-    // IDL
-    interface Foo;
-    typedef sequence<Foo> FooSeq;
-
-    interface Foo {
-      // anything here
-    }; 
-</PRE>
-        It may be necessary to have a multi-pass code generator to
-        solve this problem.
-	<BR>[DONE] Andy has completed the implementation of recursive
-	types.
-        </P>
-      </LI>
+    <LI><P>Consider decompositions of the ORB that would allow
+	dynamically linked plug-ins, for example it should be easy to
+        dynamically load a pluggable protocol.
+        Other decompositions are harder, but still worthwhile looking
+        at: 
+      <UL>
+        <LI>Dynamically load the support for costly features, as the
+          ImplRepo or Location Forwarding.
+	  <P>
+        </LI>
+        <LI>Dynamically configure POA with or without support for
+          holding state.
+	  <P>
+        </LI>
+      </UL>
+    </P>
+    </LI>
+      
+    <LI><P><B>IDL Compiler:</B> Currently the IDL compiler creates an
+        operation table that 
+	includes all the base classes operations; this permits the
+	generation of efficient code that does not rely in
+	dynamic_cast or the _downcast() method for Servants (which
+	compare strings, hence it is slow).
+	It could be interesting to implement the alternative approach
+	were the class only looks its own operations and then tries
+	the parent. This will reduce code size, but will probably
+	decrease performance.
+      </P></LI>
 
-      <LI><P><B>ORB:</B>
-	  Support multiple endpoints in the ORB.
-	  Some interesting concurrency models (such as
-	  thread-per-endpoint or thread-pool-per-endpoint) require
-	  that we give an explicit name to each endpoint, and use
-	  policies to match the thread with the endpoints it will
-	  serve (and share).
-	  <BR>[DONE] The ORB supports multiple-endpoints, mapping
-	  threads to endpoints is in another entry.
-        </P>
-      </LI>
+      <LI>Server_Request objects in TAO are magical, the _duplicate()
+	method returns 0 and release() does nothing.
+	The problem starts because Server_Request is allocated from the
+	stack (to speed up things), hence reference counting would be
+	useless. Adding a clone() method will work better, but the
+	Server_Request holds pointers to several positions in the CDR
+	stream, we could clone the CDR stream, but a normal
+	Server_Request does not own it....  In our opinion (Carlos and
+	Irfan) we need not worry about this until we find a use case for
+	it.
+      <P></LI>
 
-      <LI><P><B>EC:</B>The observer in the <CODE>TAO_EC_Gateway</CODE> 
-	  class is not properly deactivated.
-	  <BR>[DONE]
-        </P>
-      </LI>
+      <LI>
+	The current implementation of collocation is optimal for
+	hard-real-time 
+	applications, but in some cases it may be desirable to follow
+	the normal execution path yet minize costs for collocated
+	calls.
+	An example would include an application that activates the
+	objects on demand.
+	It would be interesting to have a half-collocated stub
+	implementation, that will marshall the request and then
+	invokes the normal path on the "server" side, but without
+	crossing the kernel boundary. Ideally even the serialization
+	could be minimized or avoided.
+      <P></LI>
+      
+    </OL>
 
-      <LI><P><B>EC:</B> Sometimes the Event Channel dead-locks during
-          shutdown. According to Ulf Jährig
-	  &lt;jaehrig@desys.com&gt;, an easy way to reproduce the
-	  problem is to run the EC_Throughput test under windows NT.
-	  <BR>[STATUS] The test in question works perfectly on NT; it
-	  looks like a race condition. Apparently this is only a
-	  problem with the old EC.
-        </P>
-      </LI>
+<HR><P>
+      <H3>Completed Tasks</H3>
 
+    <OL> 
       <LI><P>The <CODE>TAO_Object_Manager</CODE> class needs an
 	  assigment operator from <CODE>T_var</CODE>.
 	  Either change the class to have two arguments or 
@@ -1897,7 +1874,6 @@ class POA_Foo {
 	compiler now.
       <P></LI>
 
-          
       <LI>Prepare the 0.2 release:<P>
 	<OL>
 	  <LI>Execute all the tests in $TAO_ROOT/tests
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 14055b72a03..b288c3f96f4 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -31,7 +31,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <a HREF="../poa_migration.html">POA Migration Notes</a></li>
 
 <li>
-<a href="../implrepo/index.html">Implementation Repository</a></li>
+<a href="../implrepo/status.html">Implementation Repository</a></li>
 
 <li>
 <a href="#interfrepo">Interface Repository</a></li>
@@ -319,7 +319,7 @@ extra pass over the internal representation of the IDL file has to be done.<P>
 </ul>
 
 
-<hr>
+<hr></li>
 
 <br><!--#include virtual="orbcore.html" -->
 <hr>
@@ -347,12 +347,12 @@ protocols, e.g., replacements for GIOP. Each of these steps is outlined
 below:
 <ul>
 <li>
-<b>Basic pluggable transport protocols framework</b>: We have added
+<b>Basic pluggable transport protocols framework</b>: We're currently adding
 several Bridge classes that decouple the transport-specific details from
 the rest of TAO's ORB Core. This allows us to isolate the details of how
 messages are communicated at the transport layer in a few classes. This
-design resulted in the restructuring of the ORB Core and how requests are
-handled.  For instance, there is now the concept of communication layers:
+design has led us to restructure how TAO's ORB Core sends and receives
+requests. For instance, there is now the concept of communication layers:
 Objects (e.g., references, method invocations, etc.), ORB Messaging, Transport,
 and Network. The Object layer is just the usual stubs and skeletons.</li>
 
@@ -375,7 +375,7 @@ QoS, network and transport protocols, addresses or routes.<p>
 
 <li>
 <b>Example Transport protocols</b>- The first example, aside from IIOP, that
-has been implemented, UIOP, uses local IPC. Other interesting transport
+has been implemented uses UNIX domain sockets. Other interesting transport
 protocols would be for ATM, Buses (VME or PCI), shared memory, TP4, GSMP, and
 UDP/IP.</li> <p>
 
@@ -400,7 +400,7 @@ and <tt>EC_Throughput</tt> were run successfully.</li><P>
             list of TAO_Acceptors is kept in the Acceptor
             Registry. When the ORB needs to create an IOR it iterates
             over all the acceptors to do so. Using either multiple
-            <code>-ORBEndpoint</code> options or several endpoints
+            <code>-ORBendpoint</code> options or several endpoints
             separated by semi-colons ';', the user can specify what
             addresses the ORB should use.  Each endpoint is specified
             in URL format (ex: <code>iiop://foo.bar.com:0</code>),
@@ -431,10 +431,11 @@ and <tt>EC_Throughput</tt> were run successfully.</li><P>
 
 <li>
 	    Enabled the UIOP protocol, this protocol uses local IPC
-            (aka UNIX domain sockets) as the transport mechanism.  The
-            protocol is loaded by default.  If no explicit
-            <code>-ORBEndpoint</code> option is used (ex:
-            <code>-ORBEndpoint uiop:///tmp/my_rendezvous</code>). 
+            (aka UNIX domain) sockets as the transport mechanism.  The
+            protocol is loaded by default but no endpoints are created
+            unless an explicit <code>-ORBendpoint</code> option is
+            used (ex: <code>-ORBendpoint
+            uiop:///tmp/my_rendezvous</code>).
 
 </li><P>
 
@@ -444,32 +445,22 @@ and <tt>EC_Throughput</tt> were run successfully.</li><P>
             its list of arguments.  These protocol names are used to
             load an abstract factory via the service configurator.
             This factory can create acceptors or connectors on demand.
-            By default only IIOP and UIOP (if supported by the
-            platform) are loaded.
-</li><P>
-
-<li>
-
-The service configurator is now used to load protocol factories.
-
+            By default only IIOP and UIOP are loaded.
 </li><P>
 
 <li>
-
-	    The <code>-ORBHost</code> and <code>-ORBPort</code>
-            options are deprecated. The new <code>-ORBEndpoint</code>
+	    The <code>-ORBhost</code> and <code>-ORBport</code>
+            options are deprecated. The new <code>-ORBendpoint</code>
             option supercedes them. If the deprecated options are
-            used, the ORB issues a warning.  The user should not
-            depend on the existence of these options in the future.
+            used, the ORB issues a warning.
 </li><P>
 
 <li>
-            The <code>-ORBPreconnect</code> option supports multiple
+            The <code>-ORBpreconnect</code> option supports multiple
             protocols using the same URL formats that
-            <code>-ORBEndpoint</code> does. Note that the old
+            <code>-ORBendpoint</code> does. Note that the old
             <em><code>host:port</code></em> format is supported for
-            backwards compatibility, but the user should not depend on 
-            the existence of this old format.
+            backwards compatibility.
 </li><P>
 
 <li>
@@ -489,7 +480,7 @@ The service configurator is now used to load protocol factories.
 &lt;key_string&gt; = &lt;string&gt; | empty_string<br>
 </code></blockquote>
 
-            In TAO, <code>iiop</code> URL style object references are
+            <code>iiop</code> URL style object references are
             equivalent to <code>iioploc</code> URL style object
             references.  <code>uiop</code> URL style object references
             have a similar syntax:
@@ -513,47 +504,13 @@ The service configurator is now used to load protocol factories.
             forward slash is needed to prevent ambiguities of
             where the rendezvous point ends and where the key
             string begins since both may contain forward
-            slashes in them.
+            slashes in them. 
 
             The <i>rendezvous point</i> for <code>uiop</code> is
             any valid path and filename that the ORB has permission to
-            read and write to.  However, UIOP rendezvous points have
-            the same restrictions that local IPC has:
-                <blockquote><li>
-                  To guarantee portability, local IPC rendezvous
-                  points (including the path and filename) should not
-                  be longer than 99 characters long. Some platforms
-                  may support longer rendezvous points, usually 108
-                  characters including the null terminator, but
-                  Posix.1g only requires that local IPC rendezvous
-                  point arrays contain a maximum of <b>at least</b>
-                  100 characters, including the null terminator.<P>
-
-                  If an endpoint is longer than what the platform
-                  supports then it will be truncated so that it fits,
-                  and a warning will be issued.<P>
-                </li>
-                <li>
-                  Avoid using <em>relative</em> paths in your UIOP endpoints.
-                  If possible, use <b><em>absolute</em></b> paths
-                  instead.  Imagine that the server is given an
-                  endpoint to create using <code>-ORBEndpoint
-                  uiop://foobar</code>.  A local IPC rendezvous
-                  point called <code>foobar</code> will be created
-                  in the current  working directory.  If the client
-                  is not started in the directory where the
-                  <code>foobar</code> rendezvous point exists then
-                  the client will not be able to communicate with
-                  the server since its point of communication, the
-                  rendezvous point, was not found. On the other
-                  hand, if an absolute path was used, the client
-                  would know exactly where to find the rendezvous
-                  point.<P>  It is up to the user to make sure that
-                  a given UIOP endpoint is accessible by both the
-                  server and the client.<P>
-                </li></blockquote>
-
-            The <code>-ORBEndpoint</code> option uses a syntax similar
+            read and write to.<P>
+
+            The <code>-ORBendpoint</code> option uses a syntax similar 
             to that of the URL style object reference shown above.
             The only difference is that the object key delimiter and
             the object key string are not specified.
@@ -566,6 +523,8 @@ Known Issues:
 
 <ul>
 <li>
+The ORB Core's resource factory needs to be enhanced to support the dynamic
+allocation of resources for different transport protocols.</li><p>
 </ul>
 Critical Work:
 
@@ -578,11 +537,11 @@ Complete support for multiple profiles.</li><p>
 Future Work:
 <ul>
 <li>
-Verify all of TAO's regression tests still work. This will be followed
+Verify all of TAO's regression tests still work. This will be followed 
 by performing a suite of tests to compare performance of with the unmodified
 TAO distribution. Also, we'll extensively retest TAO using Purify and
 Quantify.
-</li><p>
+</li><p> 
 
 <li>
 In parallel, we will add support for multiple profiles.</li><p>
@@ -841,6 +800,13 @@ Support for a load balancing feature similar to the one present in ORBIX.
 It will be possible to bind a group of objects under a single name, and when a client attempts to resolve the name in question, a preset policy (e.g., random, round robin, etc.) will determine which one of the object references from the group will be returned.
 </li>
 <li>
+Update to the 'destroy' method, once the POA restructuring effort is complete, to do the "Right Thing TM".
+</li>
+<li>
+Replication of the bindings to other Naming Service's currently running.
+It will probably be modeled after the LDAP Multi-Master Replication
+Protocol.</li>
+<li>
 Support for the Naming Service to handle the IIOP
 LocateRequest messages and respond with LocateReply messages with a
 LOCATION_FORWARD/OBJECT_NOT_EXIST status.
@@ -900,7 +866,7 @@ go through the test examples at $TAO/orbsvcs/tests/CosPropertyService.
 Property Service is has been used by the TAO's <a href="#av">Audio Video Streaming
 Service</a>developed for TAO. For general documentation of the
 Property Service, please read <a
-href="http://www.omg.org/corba/sectrans.html#prop">The Property Service
+href="http://www.omg.org/corba/sectrans.htm#prop">The Property Service
 Specification.</a>
 
 <P>Recent Work:
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index 6903647c1f3..adc0794d2a0 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -12,6 +12,7 @@
   <li><a href="#current">Current Status</a>
   <li><a href="#issues">Known Issues</a>
   <li><a href="#ongoing">Ongoing work</a>
+  <li><a href="#rework">Rework Notes</a>
   <li><a href="#future">Future Work</a>
   <li><a href="#completed">Completed Work</a>
 </ul>
@@ -56,7 +57,7 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
       request, the server will crash on NT.  This is because we are
       doing a blocking recv when a server connection handler acts as
       an active object, and the recv won't break out until the process
-      gets kill by the OS.  This is especially a problem on NT because
+      gets kill by the OS.  This is especially a problem on NT becuase
       on shutdown, NT close down the socket service, which cause the
       blocking recv to unblock at which point, these threads try to
       access the already destroyed ORB resources.  A temporary
@@ -92,6 +93,11 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
   <li><p>ORB Core overhaul.</p>
   </li>
 
+  <li><p>Identify/fix the problems in multithreaded client with TSS
+      resources. This could be done using the leader-follower model
+      (thread-pool.)</p>
+  </li>
+
   <li><p>Support new concurrency models, e.g., Thread-per-Request,
       thread pool, etc..</p>
   </li>
@@ -101,6 +107,19 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
 <!-- --------------------- -->
 
 <!-- ============================================================ -->
+<a name="rework"><h3>Rework Notes:</h3></a>
+
+Here are some thoughts/points of concern that we have regarding the
+new ORB Core structure.
+
+<ul>
+  <li>
+</ul>
+<!-- --------------------- -->
+<a href="#toc">Back to TOC</a>
+<!-- --------------------- -->
+
+<!-- ============================================================ -->
 <a name="future"><h3>Future work:</h3></a>
 
 <ul>
@@ -121,10 +140,21 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
         <li><p>Improve connection cache so that it won't crash when
             there are no more slots or sockets.
         </li>
+
+        <li><p>Add an option to the ORB core, e.g.,
+            <b>-ORBnameservicetimeout</b>, to allow specification of
+            an upper bound on the itime-to-wait for a response from
+            the ORB's multicast "search" for a running name server.<p>
+        </li>
       </ol>
 
   <li>New features:</li>
       <ol>
+        <li><p>Implement <code>ORB::perform_work</code> and
+            <code>ORB::work_pending</code> so that <code>ORB::run</code>
+            <em>could</em> be implemented in terms of them.</p>
+        </li>
+
         <li><p>Implement <code>RT-CORBA</code> spec. once it passes
             OMG member vote.</p>
         </li>
@@ -179,27 +209,6 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
 <!-- Please make sure you append new items at the end of the list -->
 <!-- ************************************************************ -->
 <ul>
-  <li><p><code>TAO_ORB_Core_instance()</code> returns the orb core
-      of the default orb (the first orb created by the user).  This
-      may not be the orb that the user is interested in.  The better
-      approach is <code>myorb->orb_core()</code>.</p>
-  </li>
-
-  <li><p>Added an optional argument to resolve_initial_references()
-      that allows the user to specify a timeout (an upper bound
-      on the time-to-wait for a response from the ORB's multicast
-      "search" for a running server). If no timeout value is
-      specified by the user,
-      <code>TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT</code> is
-      used.</p>
-  </li>
-
-  <li><p><code>ORB::perform_work</code> and
-      <code>ORB::work_pending</code> are now implemented.
-      <code>ORB::work_pending</code> may need some additional work
-      in the future (since it currently always returns true).</p>
-  </li>
-
   <li><p>Provides dynamically linked wholesale assignment of ORB
       strategies for communication, concurrency, demultiplexing,
       scheduling, and dispatching using the ACE Service Configurator
@@ -414,10 +423,10 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
   </li>
 
   <li><p>Added CORBA compliant collocated stubs implementation.  The new
-      implementation now query POA for permission to proceed thus fixed
-      many potentially subtle problems.  The original collocation implementation
+      implementation now query POA for permission to proceed thus fixed 
+      many potentially subtle problems.  The original collocation implementation 
       is still supported using by specifying the -ORBCollocationStrategy direct
-      command option (because the original scheme has slightly less method
+      command option (because the original scheme has slightly less method 
       invocation overhead.)
   </li>
 
diff --git a/TAO/examples/Borland/Broadcaster.idl b/TAO/examples/Borland/Broadcaster.idl
deleted file mode 100644
index fe1d52325e3..00000000000
--- a/TAO/examples/Borland/Broadcaster.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "Receiver.idl"
-
-interface Broadcaster
-{
-  // = TITLE
-  //   This interface is to be implemented by the simple chat server.
-  //   It broadcasts messages received from one registered client to
-  //   all its registered clients.
-
-  exception CannotAdd
-    {
-      string reason_;
-    };
-
-  exception CannotRemove
-    {
-      string reason_;
-    };
-
-  void add (in Receiver receiver, in string nickname)
-    raises (CannotAdd);
-  // Registers a Receiver with the chat server.  A registered client
-  // must call un_register before it goes away.
-
-  void remove (in Receiver receiver)
-    raises (CannotRemove);
-  // Unregisters a Receiver.
-
-  void say (in Receiver receiver, in string text);
-  // Say something to all registered clients.
-};
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
deleted file mode 100644
index 95d9f4e8e8e..00000000000
--- a/TAO/examples/Borland/ChatClient.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------
-#include "pch.h"
-#pragma hdrstop
-#include <ace/ace.h>
-#include <tao/corba.h>
-#include "ChatClientWnd.h"
-USERES("ChatClient.res");
-USEFORM("ChatClientWnd.cpp", ChatClientWindow);
-USEUNIT("BroadcasterC.cpp");
-USEUNIT("BroadcasterS.cpp");
-USEUNIT("ReceiverC.cpp");
-USEUNIT("ReceiverS.cpp");
-USEUNIT("ReceiverImpl.cpp");
-//---------------------------------------------------------------------------
-WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
-{
-  ACE::init ();
-
-  try
-    {
-      Application->Initialize ();
-      Application->Title = "CORBA Chat Client";
-      Application->CreateForm (__classid (TChatClientWindow), &ChatClientWindow);
-      Application->Run ();
-    }
-  catch (Exception &exception)
-    {
-      Application->ShowException (&exception);
-    }
-  catch (CORBA::Exception &exception)
-    {
-      ShowMessage (String ("CORBA exception: ") + exception._id ());
-    }
-  catch (...)
-    {
-      ShowMessage ("Unknown exception");
-    }
-
-  // Must explicitly free the window to ensure the orb is shut down
-  // before ACE::fini is called.
-  delete ChatClientWindow;
-
-  ACE::fini ();
-
-  return 0;
-}
-//---------------------------------------------------------------------------
diff --git a/TAO/examples/Borland/ChatClient.res b/TAO/examples/Borland/ChatClient.res
deleted file mode 100644
index eb29262eebf..00000000000
--- a/TAO/examples/Borland/ChatClient.res
+++ /dev/null
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
deleted file mode 100644
index 5a841a5407f..00000000000
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------
-#include "pch.h"
-#pragma hdrstop
-#include <cctype>
-#include <dos.h>
-#include <memory>
-
-#include "ChatClientWnd.h"
-//---------------------------------------------------------------------------
-#pragma package(smart_init)
-#pragma resource "*.dfm"
-TChatClientWindow *ChatClientWindow;
-//---------------------------------------------------------------------------
-__fastcall TChatClientWindow::TChatClientWindow(TComponent* Owner)
-   : TForm(Owner)
-{
-  nickname_ = InputBox ("Enter Nickname",
-                        "Enter the nickname you would like to use:",
-                        "noname");
-
-  if (!OpenDialog->Execute ())
-    throw Exception ("IOR file not selected - unable to continue");
-  ior_file_name_ = OpenDialog->FileName;
-                       
-  // Retrieve the ORB.
-  orb_ = CORBA::ORB_init (_argc, _argv, 0);
-
-  // Get reference to the Root POA
-  CORBA::Object_var obj =
-    orb_->resolve_initial_references ("RootPOA");
-  PortableServer::POA_var poa = PortableServer::POA::_narrow (obj);
-
-  // Activate the POA manager
-  PortableServer::POAManager_var mgr = poa->the_POAManager ();
-  mgr->activate ();
-
-  // set the orb in the receiver_i_ object.
-  receiver_i_.orb (orb_);
-
-  // read the ior from file
-  ReadIOR (ior_file_name_);
-
-  CORBA::Object_var server_object =
-    orb_->string_to_object (ior_.c_str ());
-
-  if (CORBA::is_nil (server_object.in ()))
-    throw Exception ("Invalid IOR " + ior_);
-
-  server_ = Broadcaster::_narrow (server_object);
-
-  receiver_var_ = receiver_i_._this ();
-
-  // Register ourselves with the server.
-  server_->add (receiver_var_, nickname_.c_str ());
-
-  Application->OnMessage = ApplicationMessage;
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::ReadIOR (String filename)
-{
-  std::auto_ptr<TStringList> ior (new TStringList);
-  ior->LoadFromFile (filename);
-  ior_ = ior->Text;
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::WMMessageReceived (TMessage& Message)
-{
-  String* str = (String*)Message.WParam;
-  for (int i = 1; i <= str->Length (); i++)
-    if (std::isspace ( (*str)[i]))
-      (*str)[i] = ' ';
-  OutputMemo->Lines->Append (str->Trim ());
-  delete str;
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::FormClose (TObject *Sender,
-      TCloseAction &Action)
-{
-  try
-    {
-      // Remove ourselves from the server.
-      server_->remove (receiver_var_);
-      receiver_i_.shutdown ();
-    }
-  catch (CORBA::Exception&)
-    {
-      ShowMessage ("Exception in TChatClientWindow::FormClose");
-    }
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::ApplicationMessage (MSG& msg, bool& Handled)
-{
-  if (orb_->work_pending ())
-    orb_->perform_work ();
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::InputMemoKeyPress (TObject *Sender, char &Key)
-{
-  if (Key == '\n' || Key == '\r')
-    {
-      try
-        {
-          // Call the server function <say> to pass the string typed by
-          // the server.
-          server_->say (receiver_var_, InputMemo->Text.c_str ());
-        }
-      catch (CORBA::Exception&)
-        {
-          ShowMessage ("Exception in TChatClientWindow::InputMemoKeyPress");
-        }
-
-      Key = 0;
-      InputMemo->Lines->Clear ();
-    }
-}
-//---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::TimerToEnsureRegularMessagesTimer (TObject *Sender)
-{
-  // We do nothing in this timer event handler. The purpose of the timer is
-  // to ensure that messages are sent regularly to the application, even if
-  // the system is otherwise idle. We need regular messages since we use the
-  // Application->OnMessage event to allow the ORB to perform pending work.  
-}
-//---------------------------------------------------------------------------
-
-
diff --git a/TAO/examples/Borland/ChatClientWnd.h b/TAO/examples/Borland/ChatClientWnd.h
deleted file mode 100644
index 1cc5a8c7365..00000000000
--- a/TAO/examples/Borland/ChatClientWnd.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------
-#ifndef ChatClientWndH
-#define ChatClientWndH
-//---------------------------------------------------------------------------
-#include <Classes.hpp>
-#include <Controls.hpp>
-#include <StdCtrls.hpp>
-#include <Forms.hpp>
-#include "ReceiverImpl.h"
-#include "BroadcasterC.h"
-#include <Dialogs.hpp>
-#include <ExtCtrls.hpp>
-//---------------------------------------------------------------------------
-// Message used to notify window of incoming data
-#define WM_MESSAGE_RECEIVED (WM_APP + 0x123)
-//---------------------------------------------------------------------------
-class TChatClientWindow : public TForm
-{
-  __published:	// IDE-managed Components
-  TMemo *OutputMemo;
-  TMemo *InputMemo;
-  TOpenDialog *OpenDialog;
-  TTimer *TimerToEnsureRegularMessages;
-  void __fastcall FormClose (TObject *Sender, TCloseAction &Action);
-  void __fastcall InputMemoKeyPress (TObject *Sender, char &Key);
-  void __fastcall TimerToEnsureRegularMessagesTimer (TObject *Sender);
-   
-private:
-  void __fastcall ReadIOR (String filename);
-  // Function to read the server ior from a file.
-
-  String ior_;
-  // IOR of the obj ref of the server.
-
-  String ior_file_name_;
-  // The filename that stores the ior of the server
-
-  String nickname_;
-  // Nickname of the user chatting.
-
-  CORBA::ORB_var orb_;
-  // Our orb. Order is important! The orb must have a longer lifetime than
-  // any of the servants or stub vars/ptrs. Therefore we declare the orb var
-  // first. There is probably a better way to do this, maybe by using a
-  // singleton.
-
-  Broadcaster_var server_;
-  // Server object ptr.
-
-  TReceiverImplementation receiver_i_;
-  // The receiver object.
-
-  Receiver_var receiver_var_;
-  // Pointer to the receiver object registered with the ORB.
-
-public:		// User declarations
-  __fastcall TChatClientWindow (TComponent* Owner);
-  void __fastcall ApplicationMessage (MSG& msg, bool& Handled);
-
-protected: // Message handlers
-  void __fastcall WMMessageReceived (TMessage& Message);
-  BEGIN_MESSAGE_MAP
-  VCL_MESSAGE_HANDLER (WM_MESSAGE_RECEIVED, TMessage, WMMessageReceived)
-    END_MESSAGE_MAP (TForm)
-    };
-//---------------------------------------------------------------------------
-extern PACKAGE TChatClientWindow *ChatClientWindow;
-//---------------------------------------------------------------------------
-#endif
-
diff --git a/TAO/examples/Borland/README b/TAO/examples/Borland/README
deleted file mode 100644
index 603ebd2b070..00000000000
--- a/TAO/examples/Borland/README
+++ /dev/null
@@ -1,6 +0,0 @@
-$Id$
-
-This directory illustrates how to write a Borland C++ Builder
-application using ACE+TAO.  Please contact Jody Hagins
-<jody@atdesk.com> if you have any questions.
-
diff --git a/TAO/examples/Borland/Receiver.idl b/TAO/examples/Borland/Receiver.idl
deleted file mode 100644
index 90ea6570071..00000000000
--- a/TAO/examples/Borland/Receiver.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-interface Receiver
-{
-  // = TITLE
-  //    The Receiver interface is implemented by the simple chat
-  //    clients.The interface functions are called by the chat server.
-
-  void message (in string msg);
-  // Displays the message in the client application.
-
-  oneway void shutdown ();
-  // Called by the chat server before it goes away.
-};
diff --git a/TAO/examples/Borland/ReceiverImpl.cpp b/TAO/examples/Borland/ReceiverImpl.cpp
deleted file mode 100644
index 77d2db41f71..00000000000
--- a/TAO/examples/Borland/ReceiverImpl.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------
-#include "pch.h"
-#pragma hdrstop
-
-#include "ReceiverImpl.h"
-#include "ChatClientWnd.h"
-//---------------------------------------------------------------------------
-TReceiverImplementation::TReceiverImplementation ()
-  : orb_ (0)
-{
-}
-//---------------------------------------------------------------------------
-TReceiverImplementation::~TReceiverImplementation ()
-{
-}
-//---------------------------------------------------------------------------
-void TReceiverImplementation::message (const char* msg) throw (CORBA::SystemException)
-{
-  ::PostMessage (ChatClientWindow->Handle,
-                 WM_MESSAGE_RECEIVED,
-                 (WPARAM) new String (msg),
-                 (LPARAM) 0);
-}
-//---------------------------------------------------------------------------
-void TReceiverImplementation::shutdown () throw (CORBA::SystemException)
-{
-  // Instruct the ORB to shutdown.
-  orb_->shutdown ();
-}
-//---------------------------------------------------------------------------
-void TReceiverImplementation::orb (CORBA::ORB_ptr o)
-{
-  orb_ = CORBA::ORB::_duplicate (o);
-}
-//---------------------------------------------------------------------------
diff --git a/TAO/examples/Borland/ReceiverImpl.h b/TAO/examples/Borland/ReceiverImpl.h
deleted file mode 100644
index bba6bf31db6..00000000000
--- a/TAO/examples/Borland/ReceiverImpl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------
-#ifndef ReceiverImplH
-#define ReceiverImplH
-//---------------------------------------------------------------------------
-#include "ReceiverS.h"
-//---------------------------------------------------------------------------
-class TReceiverImplementation : public POA_Receiver
-{
-public:
-  // = Initialization and termination methods.
-  TReceiverImplementation (void);
-  // Constructor.
-
-  ~TReceiverImplementation (void);
-  // Destructor.
-
-  virtual void message (const char* msg) throw (CORBA::SystemException);
-
-  virtual void shutdown (void) throw (CORBA::SystemException);
-  // Called when the chat server is going away.  The client
-  // implementation should shutdown the chat client in response to
-  // this.
-
-  void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
-
-private:
-  CORBA::ORB_var orb_;
-  // ORB pointer.
-};
-//---------------------------------------------------------------------------
-#endif
diff --git a/TAO/examples/Borland/build_idl.bat b/TAO/examples/Borland/build_idl.bat
deleted file mode 100644
index 66dbd454411..00000000000
--- a/TAO/examples/Borland/build_idl.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-..\..\..\bin\Dynamic\Release\tao_idl -g %ACE_ROOT%\bin\Dynamic\Release\gperf.exe -Wb,pch_include=pch.h Broadcaster.idl
-..\..\..\bin\Dynamic\Release\tao_idl -g %ACE_ROOT%\bin\Dynamic\Release\gperf.exe -Wb,pch_include=pch.h Receiver.idl
diff --git a/TAO/examples/Borland/pch.h b/TAO/examples/Borland/pch.h
deleted file mode 100644
index b990b334ca8..00000000000
--- a/TAO/examples/Borland/pch.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#ifndef INCLUDE_PCH_H
-#define INCLUDE_PCH_H
-
-#include <vcl.h>
-#include <tao/corba.h>
-#include <cctype>
-#include <dos.h>
-#include <memory>
-
-#endif
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor
deleted file mode 100644
index e7bea862d07..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Makefile for building the Callback_Quoter example 
-#
-
-NAME = Callback_Quoter_Consumer
-
-OBJFILES = \
-	$(OBJDIR)\ConsumerC.obj \
-	$(OBJDIR)\ConsumerS.obj \
-	$(OBJDIR)\NotifierC.obj \
-	$(OBJDIR)\NotifierS.obj \
-	$(OBJDIR)\consumer.obj \
-	$(OBJDIR)\Consumer_Input_Handler.obj \
-	$(OBJDIR)\Consumer_Signal_Handler.obj \
-	$(OBJDIR)\Consumer_Handler.obj \
-	$(OBJDIR)\Consumer_i.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor
deleted file mode 100644
index d798685200e..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Makefile for building the Callback_Quoter example
-#
-
-NAME = Callback_Quoter_Notifier
-
-OBJFILES = \
-	$(OBJDIR)\ConsumerC.obj \
-	$(OBJDIR)\ConsumerS.obj \
-	$(OBJDIR)\NotifierC.obj \
-	$(OBJDIR)\NotifierS.obj \
-	$(OBJDIR)\notifier.obj \
-	$(OBJDIR)\Notifier_i.obj \
-	$(OBJDIR)\Notifier_Input_Handler.obj
-        
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor
deleted file mode 100644
index 19d160d2c8b..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for building the Callback_Quoter example
-#
-
-NAME = Callback_Quoter_Supplier
-
-OBJFILES = \
-	$(OBJDIR)\ConsumerC.obj \
-	$(OBJDIR)\ConsumerS.obj \
-	$(OBJDIR)\NotifierC.obj \
-	$(OBJDIR)\NotifierS.obj \
-	$(OBJDIR)\supplier.obj \
-	$(OBJDIR)\Supplier_i.obj \
-	$(OBJDIR)\Supplier_Timer_Handler.obj \
-	$(OBJDIR)\Consumer_i.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-# 
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 5d8d9ed57b8..0ea7efa1002 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -34,8 +34,7 @@ Consumer_Handler::Consumer_Handler (void)
     unregistered_ (0),
     ior_ (0),
     shutdown_ (0),
-    use_naming_service_ (1),
-    interactive_ (1)
+    interactive_ (0)
 {
 
 }
@@ -44,15 +43,12 @@ Consumer_Handler::~Consumer_Handler (void)
 {
   // Make sure to cleanup the STDIN handler.
 
-  if (this->interactive_ == 1)
-    {
-      if (ACE_Event_Handler::remove_stdin_handler
-          (this->orb_->orb_core ()->reactor (),
-           this->orb_->orb_core ()->thr_mgr ()) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "remove_stdin_handler"));
-    }
+  if (ACE_Event_Handler::remove_stdin_handler
+      (TAO_ORB_Core_instance ()->reactor (),
+       TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
+    ACE_ERROR ((LM_ERROR,
+       	       "%p\n",
+       	       "remove_stdin_handler"));
 }
 
 // Reads the Server factory IOR from a file.
@@ -65,7 +61,7 @@ Consumer_Handler::read_ior (char *filename)
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading: %p\n",
+                       "Unable to open %s for writing: %p\n",
                        filename),
                       -1);
 
@@ -118,7 +114,7 @@ Consumer_Handler::parse_args (void)
 	this->use_naming_service_ = 0;
 	break;
 
-      case 'a': // to be given only on using run_test.pl
+      case 'a':
         this->stock_name_ = get_opts.optarg;
         this->interactive_ = 0;
         break;
@@ -127,7 +123,6 @@ Consumer_Handler::parse_args (void)
         this->threshold_value_ = ACE_OS::atoi (get_opts.optarg);
         break;
 
-
       case 'x':
         this->shutdown_ = 1;
         break;
@@ -185,9 +180,9 @@ Consumer_Handler::via_naming_service (void)
       ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY 
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer_Handler::via_naming_service\n");
+      ACE_TRY_ENV.print_exception ("Consumer_Handler::via_naming_service\n");
       return -1;
     }
   ACE_ENDTRY;
@@ -200,7 +195,6 @@ Consumer_Handler::via_naming_service (void)
 int
 Consumer_Handler::init (int argc, char **argv)
 {
-  
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -217,40 +211,68 @@ Consumer_Handler::init (int argc, char **argv)
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-    
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "parse_args failed\n"),
+			   -1);
+
+      // use the naming service.
+       if (this->use_naming_service_)
+	 return  via_naming_service ();
+
+
+       if (this->ior_ == 0)
+         ACE_ERROR_RETURN ((LM_ERROR,
+                            "%s: no ior specified\n",
+                            this->argv_[0]),
+                           -1);
+
+      CORBA::Object_var server_object =
+        this->orb_->string_to_object (this->ior_,
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid ior <%s>\n",
+                           this->ior_),
                           -1);
-      
-      if (this->interactive_ == 1)
+      // The downcasting from CORBA::Object_var to Notifier_var is
+      // done using the <_narrow> method.
+      this->server_ = Notifier::_narrow (server_object.in (),
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_NEW_RETURN (this->consumer_servant_,
+		      Consumer_i (),
+		      -1);
+      // Get the consumer stub (i.e consumer object) pointer.
+      this->consumer_var_ =
+	this->consumer_servant_->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (this->interactive_)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      " Services provided:\n "
-                      " * Registration <type 'r'>\n "
-                      " * Unregistration <type 'u'>\n "
-                      " * Quit <type 'q'>\n "));
-          
           ACE_NEW_RETURN (consumer_input_handler_,
                           Consumer_Input_Handler (this),
                           -1);
-      
+
           if (ACE_Event_Handler::register_stdin_handler
               (consumer_input_handler_,
-               this->orb_->orb_core ()->reactor (),
-               this->orb_->orb_core ()->thr_mgr ()) == -1)
+               TAO_ORB_Core_instance ()->reactor (),
+               TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "%p\n",
                                "register_stdin_handler"),
                               -1);
-          
+
           // Register the signal event handler for ^C
           ACE_NEW_RETURN (consumer_signal_handler_,
                           Consumer_Signal_Handler (this),
                           -1);
-          
-          if (this->reactor_used ()->register_handler
+
+          if( this->reactor_used ()->register_handler
               (SIGINT,
                consumer_signal_handler_) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -258,95 +280,17 @@ Consumer_Handler::init (int argc, char **argv)
                                "register_handler for SIGINT"),
                               -1);
         }
-      // use the naming service.
-      if (this->use_naming_service_)
-        {
-          if (via_naming_service () == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                                "via_naming_service failed\n"),
-                              -1);
-         }
       else
         {
-          
-          if (this->ior_ == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s: no ior specified\n",
-                               this->argv_[0]),
-                              -1);
-          
-          CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_,
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          if (CORBA::is_nil (server_object.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid ior <%s>\n",
-                               this->ior_),
-                              -1);
-          // The downcasting from CORBA::Object_var to Notifier_var is
-          // done using the <_narrow> method.
-          this->server_ = Notifier::_narrow (server_object.in (),
-                                             ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+          // @@ Encapsulate this in a little method...
 
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Consumer_Handler::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-Consumer_Handler::run (void)
-{
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Obtain and activate the RootPOA.
-     CORBA::Object_var obj = 
-            this->orb_->resolve_initial_references ("RootPOA");
-
-     PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-     ACE_TRY_CHECK;
-     
-     PortableServer::POAManager_var poa_manager=
-       root_poa->the_POAManager (ACE_TRY_ENV);
-     ACE_TRY_CHECK;
-
-     poa_manager->activate (ACE_TRY_ENV);
-     ACE_TRY_CHECK;
-
-     ACE_NEW_RETURN (this->consumer_servant_,
-                     Consumer_i (),
-                     -1);
-     // Set the orb in the consumer_ object.
-     this->consumer_servant_->orb (this->orb_.in ());
-     
-     // Get the consumer stub (i.e consumer object) pointer.
-     this->consumer_var_ =
-       this->consumer_servant_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;  
-      
-      if (this->interactive_ == 0)
-        {
-          
           // Register with the server.
           this->server_->register_callback (this->stock_name_,
                                             this->threshold_value_,
                                             this->consumer_var_.in (),
                                             ACE_TRY_ENV);
           ACE_TRY_CHECK;
-          
+
           // Note the registration.
           this->registered_ = 1;
           this->unregistered_ = 0;
@@ -355,22 +299,41 @@ Consumer_Handler::run (void)
                       "registeration done!\n"));
         }
 
-      // Run the ORB.
-      this->orb_->run ();
-  
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer_Handler::init");
+      ACE_TRY_ENV.print_exception ("Consumer_Handler::init");
       return -1;
     }
   ACE_ENDTRY;
-  
+
+  return 0;
+}
+
+int
+Consumer_Handler::run (void)
+{
+  // Set the orb in the consumer_ object.
+  this->consumer_servant_->orb (this->orb_.in ());
+
+  ACE_DEBUG ((LM_DEBUG,
+              " Services provided:\n "
+              " * Registration <type 'r'>\n "
+              " * Unregistration <type 'u'>\n "
+              " * Quit <type 'q'>\n "));
+
+  // Run the ORB.
+  this->orb_->run ();
   return 0;
 }
 
 ACE_Reactor *
 Consumer_Handler::reactor_used (void) const
 {
-  return this->orb_->orb_core ()->reactor ();
+  //*done* @@ Please check with Pradeep and see how to remove the reliance
+  // on <TAO_ORB_Core_instance()>.  This is non-portable and we want
+  // to try to use only CORBA-compliant code in our examples.
+
+  // Cant do anything as the reactor is not accessible in any other way.
+  return TAO_ORB_Core_instance ()->reactor ();
 }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index 770fbfb89b1..88010f8af84 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -31,6 +31,8 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
+  //  CORBA::Environment TAO_IN_ENV;
+
   // The string could read contains \n\0 hence using ACE_OS::read
   // which returns the no of bytes read and hence i can manipulate
   // and remove the devil from the picture i.e '\n' ! ;)
@@ -106,7 +108,9 @@ Consumer_Input_Handler::register_consumer ()
 
   ACE_TRY
     {
-     
+      // @@ The following code should be part of the Consumer_Handler
+      // class...
+
       // Register with the server.
       this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_,
                                                            this->consumer_handler_->threshold_value_,
@@ -142,6 +146,8 @@ Consumer_Input_Handler::unregister_consumer ()
   // Only if the consumer is registered can the
   // unregistration take place.
 
+  //CORBA::Environment ACE_TRY_ENV;
+
   if (consumer_handler_->registered_ == 1)
     {
       this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in());
@@ -186,15 +192,16 @@ Consumer_Input_Handler::quit_consumer_process ()
       this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
+
   ACE_CATCHANY
     {
-      this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV);
-
       // There would be an exception only if there is a communication
       // failure between the notifier and consumer. On catching the
       // exception proclaim the problem and do a graceful exit.
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Communication failed!\n");
+      ACE_DEBUG ((LM_DEBUG,
+                  "Communication failed!\n"));
+      this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV);
+
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 0615a632aa0..610489fea54 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -69,12 +69,11 @@ BIN2 = notifier \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -230,25 +229,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -296,9 +286,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -488,25 +482,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -554,9 +539,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -748,25 +737,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -814,9 +794,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1006,25 +990,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1072,9 +1047,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1264,25 +1243,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1330,9 +1300,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1552,25 +1526,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1618,9 +1583,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1841,25 +1810,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1907,9 +1867,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2125,25 +2089,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2191,9 +2146,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2408,25 +2367,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2474,9 +2424,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2694,25 +2648,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2760,9 +2705,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2981,25 +2930,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3047,9 +2987,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3242,25 +3186,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3308,9 +3243,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3504,25 +3443,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3570,9 +3500,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3793,25 +3727,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3859,9 +3784,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4081,25 +4010,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4147,9 +4067,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Callback_Quoter/Makefile.bor b/TAO/examples/Callback_Quoter/Makefile.bor
deleted file mode 100644
index b8a062276e4..00000000000
--- a/TAO/examples/Callback_Quoter/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for building the Callback Quoter example
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-     
-all: 
-	$(MAKE) -f Callback_Quoter_Notifier.bor $(MAKE_FLAGS)
-	$(MAKE) -f Callback_Quoter_Consumer.bor $(MAKE_FLAGS)
-	$(MAKE) -f Callback_Quoter_Supplier.bor $(MAKE_FLAGS)
-
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index a040da0ac6f..00f164e68d3 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -38,8 +38,8 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void)
    // Make sure to cleanup the STDIN handler.
 
   if (ACE_Event_Handler::remove_stdin_handler
-      (this->notifier_i_.orb_->orb_core ()->reactor (),
-       this->notifier_i_.orb_->orb_core ()->thr_mgr ()) == -1)
+      (TAO_ORB_Core_instance ()->reactor (),
+       TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
      ACE_ERROR ((LM_ERROR,
        	       "%p\n",
        	       "remove_stdin_handler"));
@@ -52,41 +52,34 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void)
 int
 Notifier_Input_Handler::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 {
-
   CORBA::ORB_var orb = this->orb_manager_.orb ();
-  PortableServer::POA_var child_poa = this->orb_manager_.child_poa ();
 
-  this->naming_server_.init (orb.in (),
-                             child_poa.in ());
-  // create the name for the naming service
+  PortableServer::POA_var child_poa
+    = this->orb_manager_.child_poa ();
+
+  int return_val =
+    this->naming_server_.init (orb.in (),
+                               child_poa.in ());
+  if (return_val == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Failed to initialize TAO_Naming_Server\n"),
+                      -1);
+
+  // Register the object implementation with the POA.
+  Notifier_var notifier_obj = this->notifier_i_._this (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
+  // Name the object.
   CosNaming::Name notifier_obj_name (1);
   notifier_obj_name.length (1);
   notifier_obj_name[0].id = CORBA::string_dup ("Notifier");
 
-  // (re)Bind the object.
-  ACE_TRY
-    {
-      Notifier_var notifier_obj = notifier_i_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      naming_server_->rebind (notifier_obj_name,
-                              notifier_obj.in(),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  ACE_CHECK_RETURN (-1);
 
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to bind %s \n",
-                         "Notifier"),
-                        -1);
-    }
-  ACE_ENDTRY;
+  // Now, attach the object name to the context.
+  this->naming_server_->bind (notifier_obj_name,
+                              notifier_obj.in (),
+                              ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -259,7 +252,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
     }
    ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Input_Handler::init");
+      ACE_TRY_ENV.print_exception ("Input_Handler::init");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index c57fb296c60..f2d7e27657c 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -55,10 +55,6 @@ public:
   // Handle the user input.
 
 private:
-
-  TAO_ORB_Manager orb_manager_;
-  // The tao orb manager object.
-
   int parse_args (void);
   // Parses the command line arguments.
 
@@ -82,6 +78,9 @@ private:
   // An instance of the name server, wherein the naming context
   // containg the factory of objects will be registered.
 
+  TAO_ORB_Manager orb_manager_;
+  // The tao orb manager object.
+
   Notifier_i notifier_i_;
   // The servant object registered with the orb.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 9fcae9f9eec..75e386f9037 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -68,6 +68,8 @@ Notifier_i::register_callback (const char *stock_name,
     {
      if ( consumers->insert (consumer_data) == -1)
        ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
+     //       ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Stock
+     //                       ("Insertion failed! Invalid Stock!\n"));
      else
       ACE_DEBUG ((LM_DEBUG,
 		  "Inserted map entry: stockname %s threshold %d",
@@ -86,7 +88,9 @@ Notifier_i::register_callback (const char *stock_name,
       // fails an exception is raised.
       if (consumers->insert (consumer_data) == -1)
         ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
-       
+        //ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Stock
+        //             ("Insertion failed! Invalid Stock!\n"));
+
       // The bond between the stockname <hash_key> and the consumers <hash_value>
       // is fused.
       if (this->consumer_map_.bind (stock_name, consumers) == -1)
@@ -147,6 +151,9 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer,
 
        if ((*iter).int_id_->remove (consumer_to_remove) == -1)
          ACE_THROW (Callback_Quoter::Invalid_Handle ( "Unregistration failed! Invalid Consumer Handle!\n"));
+         //	 ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Handle
+         //                     ("Unregistration failed! Invalid Consumer Handle!\n"));
+
        else
         ACE_DEBUG ((LM_DEBUG,
 		    "unregister_callback:consumer removed\n"));
@@ -204,6 +211,13 @@ Notifier_i::market_status (const char *stock_name,
   // Raising an exception caused problems as they were caught by the Market daemon
   // who exited prematurely.
 
+    // /*done*/@@ Please add a user defined exception called something like
+    // NOT_FOUND.
+
+      // Exception is raised when the stock doesnt exist in the Hash_map.
+    //  env.exception (new Callback_Quoter::Invalid_Stock (" Nonexistent Stock"));
+  //  stock_name,
+  //                                                     stock_value);
 }
 
 void
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index e6e225b33e7..13648c6fb6e 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -111,7 +111,8 @@ public:
 
   int notifier_exited_;
   //This marks the exit of the notifier. This should be taken care of
-  // before the consumer tries to unregister after the notifier quits. 
+  // before the consumer tries to unregister after the notifier quits.
+ 
 
   
 };
diff --git a/TAO/examples/Callback_Quoter/README b/TAO/examples/Callback_Quoter/README
index 783e23b87cd..e8b3e08d6a5 100644
--- a/TAO/examples/Callback_Quoter/README
+++ b/TAO/examples/Callback_Quoter/README
@@ -43,22 +43,15 @@ This is the callback feature in this example.
 Running the application:
 ________________________
 
-CASE I: USing the Naming Service
-================================
-
-a) Non-interactive
-
-  SImply execute the ./run_test.pl, ofcourse after you start off the Naming Service.
-
-b) Interactive
-
 There are 3  parts to it:
 
+----------------------------------------------------------------------------
+
 1) shell 1: type at the command prompt:
 
 ./notifier
 
-
+------------------------------------------------------------------------------
 
 2) shell 2: type at the command prompt:
 
@@ -70,7 +63,7 @@ Now wait for information to arrive.
 
 You can  unregister by typing 'u' and quit by typing 'q'.
 
-
+-----------------------------------------------------------------------------
 
 3) shell 3: type at the command prompt:
 
@@ -78,42 +71,6 @@ You can  unregister by typing 'u' and quit by typing 'q'.
 
 The -i option simply tells the daemon where to pick information from.
 TIP:: the contents of the input file per line should be: stockname and its price. 
-      Sample: ./example.stocks
-
-The other option includes setting the period for the stock feed.
-
-----------------------------------------------------------------------------
-
-CASE II: Without using the Naming Service.
-=========================================
-
-There are 3  parts to it:
-
-1) shell 1: type at the command prompt:
-
-./notifier -fior_file -s
-
-
-
-2) shell 2: type at the command prompt:
-
-./consumer -fior_file -s
-
-register yourself with 'r'
-Enter the stockname and value.
-Now wait for information to arrive.
-
-You can  unregister by typing 'u' and quit by typing 'q'.
-
-
-
-3) shell 3: type at the command prompt:
-
-./supplier -ifilename -fior_file -s
-
-The -i option simply tells the daemon where to pick information from.
-TIP:: the contents of the input file per line should be: stockname and its price. 
-      Sample: ./example.stocks
 
 The other option includes setting the period for the stock feed.
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 9c405c80786..8d9ada5664a 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -28,7 +28,6 @@ Supplier::Supplier (void)
   : ior_ (0),
     use_naming_service_ (1),
     notifier_ (),
-    f_ptr_ (0),
     loop_count_ (10),
     period_value_ (1)
 {
@@ -57,8 +56,8 @@ Supplier::read_ior (char *filename)
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading\n",
-                        filename),
+                       "Unable to open %s for writing: %p\n",
+                        filename,"file_open"),
                         -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -66,7 +65,8 @@ Supplier::read_ior (char *filename)
 
   if (data == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to read ior\n"),
+                       "Unable to read ior: %p\n",
+                       "read_file"),
                       -1);
 
   this->ior_ = ACE_OS::strdup (data);
@@ -82,7 +82,7 @@ Supplier::read_ior (char *filename)
 int
 Supplier::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:i:xk:xs");
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:fi:xk:xs");
 
   int c;
   int result;
@@ -156,22 +156,17 @@ Supplier::send_market_status (const char *stock_name,
 
   ACE_TRY
     {
-      
       // Make the RMI.
       this->notifier_->market_status (stock_name,
                                       value,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::send_market_status");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::send_market_status");
-      return -1;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Exception raised!\n"),
+                        -1);
     }
   ACE_ENDTRY;
   return 0;
@@ -202,6 +197,11 @@ Supplier::run (void)
                            "schedule_timer"),
                           -1);
 
+   // ACE_DEBUG ((LM_DEBUG,
+   //               "cancelling timer\n"));
+   //  this->reactor_used ()->cancel_timer (timer_id);
+
+
   // The reactor starts executing in a loop.
    this->reactor_used ()->run_event_loop ();
 
@@ -238,18 +238,14 @@ Supplier::via_naming_service (void)
                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::via_naming_service\n");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::via_naming_service\n");
+      ACE_TRY_ENV.print_exception ("Supplier::via_naming_service\n");
       return -1;
     }
   ACE_ENDTRY;
-    
+  ACE_CHECK_RETURN (-1);
+  
   return 0;
 }
 
@@ -282,7 +278,6 @@ Supplier::init (int argc, char **argv)
                                               this->reactor_used (),
                                               this->f_ptr_),
                       -1);
-
       if (this->use_naming_service_)
         return via_naming_service ();
 
@@ -307,18 +302,13 @@ Supplier::init (int argc, char **argv)
                                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::init");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::init");
+      ACE_TRY_ENV.print_exception ("Supplier::init");
       return -1;
     }
   ACE_ENDTRY;
- 
+  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 67cb49cd316..7e2fb150aac 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -27,12 +27,14 @@ main (int argc, char *argv[])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 27ee3dc1e89..4c8db13e479 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -67,8 +67,7 @@ Consumer_Handler::init (int argc,
     }
   ACE_CATCHANY
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Consumer_Handler::init\n");
+     ACE_TRY_ENV.print_exception ("Consumer_Handler::init\n");
      return -1;
    }
   ACE_ENDTRY;
@@ -106,8 +105,7 @@ Consumer_Handler::get_notifier (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Consumer_Handler::get_notifier\n");
+      ACE_TRY_ENV.print_exception ("Consumer_Handler::get_notifier\n");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 919726162e0..cc234899bb2 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -58,8 +58,7 @@ Consumer_Input_Handler::close (void)
         }
       ACE_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Consumer_Input_Handler::handle_close\n");
+          ACE_TRY_ENV.print_exception ("Consumer_Input_Handler::handle_close\n");
         }
       ACE_ENDTRY;
     }
@@ -141,7 +140,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
 	}
       ACE_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
+          ACE_TRY_ENV.print_exception("Unexpected exception\n");
         }
       ACE_ENDTRY;
     }
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index e9cda34c173..02abfd289c1 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -191,7 +191,9 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 	  // Inform the caller that the <Event_Comm::Consumer> * is
 	  // already being used.
 
-	  ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Duplicate consumer and filtering criteria found.\n"));
+	  ACE_TRY_ENV.exception (new Event_Comm::Notifier::CannotSubscribe
+				 ("Duplicate consumer and filtering criteria found.\n"));
+	  return;
 	}
     }
 
@@ -207,7 +209,8 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
     {
       // Prevent memory leaks.
       delete nr_entry;
-      ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Failed to add Consumer to internal map\n"));
+      ACE_TRY_ENV.exception (new Event_Comm::Notifier::CannotSubscribe
+			     ("Failed to add Consumer to internal map\n"));
     }
 }
 
@@ -255,14 +258,16 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 	  // @@ This is a hack, we need a better approach!
 	  if (this->map_.unbind (me->ext_id_,
 				 nr_entry) == -1)
-	    ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("Internal map unbind failed."));
+	    ACE_TRY_ENV.exception (new Event_Comm::Notifier::CannotUnsubscribe
+				   ("Internal map unbind failed."));
 	  else
 	    delete nr_entry;
 	}
     }
 
   if (found == 0)
-    ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("The Consumer and filtering criteria were not found."));
+    ACE_TRY_ENV.exception (new Event_Comm::Notifier::CannotUnsubscribe
+                           ("The Consumer and filtering criteria were not found."));
 }
 
 // Disconnect all the consumers, giving them the <reason>.
@@ -301,7 +306,7 @@ Notifier_i::disconnect (const char *reason,
         }
       ACE_CATCHANY
         {
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
+	  ACE_TRY_ENV.print_exception ("Unexpected exception\n");
         }
       ACE_ENDTRY;
 
@@ -365,8 +370,7 @@ Notifier_i::push (const Event_Comm::Event &event,
             }
 	  ACE_CATCHANY
             {
-	      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Unexpected exception\n");
+	      ACE_TRY_ENV.print_exception ("Unexpected exception\n");
               continue;
             }
 	  ACE_ENDTRY;
@@ -397,7 +401,7 @@ Consumer_i::~Consumer_i (void)
 
 void
 Consumer_i::push (const Event_Comm::Event &event,
-		  CORBA::Environment &)
+		  CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *tmpstr = event.tag_;
@@ -412,7 +416,7 @@ Consumer_i::push (const Event_Comm::Event &event,
 
 void
 Consumer_i::disconnect (const char *reason,
-			CORBA::Environment &)
+			CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index 9b1b165201e..dd0ee8dfb57 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -53,10 +53,9 @@ BIN2 = supplier \
        notifier \
        consumer
 
-TAO_IDLFLAGS += -Ge 1
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
@@ -222,25 +221,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -288,9 +278,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -481,25 +475,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -547,9 +532,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -629,7 +618,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Event_CommC.i
+ Event_CommC.i Event_CommS.h Event_CommS_T.h Event_CommS_T.i \
+ Event_CommS_T.cpp Event_CommS.i
 .obj/Consumer_Handler.o .obj/Consumer_Handler.so .shobj/Consumer_Handler.o .shobj/Consumer_Handler.so: Consumer_Handler.cpp Consumer_Handler.h \
  Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -744,25 +734,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -807,9 +788,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1029,25 +1014,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1092,9 +1068,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1312,25 +1292,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1375,9 +1346,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1576,25 +1551,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1639,9 +1605,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1859,25 +1829,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1922,9 +1883,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2146,25 +2111,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2209,9 +2165,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2430,25 +2390,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2493,9 +2444,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2719,25 +2674,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2782,9 +2728,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3004,25 +2954,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3067,9 +3008,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index f39c84037a6..582c13c6acf 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -121,8 +121,7 @@ Notifier_Handler::init (int argc,
   }
  ACE_CATCHANY
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Notifier_Handler::init\n");
+     ACE_TRY_ENV.print_exception ("Notifier_Handler::init\n");
      return -1;
    }
  ACE_ENDTRY;
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index c75e66c8e9f..eadbd0a8ede 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -90,8 +90,7 @@ Notifier_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Notifier_Server::init_naming_service\n");
+      ACE_TRY_ENV.print_exception ("Notifier_Server::init_naming_service\n");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index b6322eccd73..b82a857b9fb 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -58,7 +58,7 @@ Supplier_Input_Handler::initialize (Notifier_Handler *notifier)
 // Frame input events and notify <Consumers>.
 
 int
-Supplier_Input_Handler::handle_input (ACE_HANDLE)
+Supplier_Input_Handler::handle_input (ACE_HANDLE h)
 {
   char buf[BUFSIZ];
 
@@ -113,7 +113,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
         }
       ACE_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected Error\n");
+          ACE_TRY_ENV.print_exception ("Unexpected Error\n");
         }
       ACE_ENDTRY;
     }
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index f8cbc83c9bb..68237474aa3 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -41,8 +41,7 @@ Notifier::Notifier (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Notifier_Server.init failed\n ");
+      ACE_TRY_ENV.print_exception ("Notifier_Server.init failed\n ");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
deleted file mode 100644
index 31e512ea1b2..00000000000
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "Logging_Service_i.h"
-
-ACE_RCSID(Logging_Service, Logging_Service, "$Id$")
-
-int
-main (int argc, char *argv[])
-{
-  // Set TAO_debug_level to 0 to ensure silent running unless
-  // debugging is explicitly invoked
-  TAO_debug_level = 0;
-
-  Logger_Server log_server;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-   ACE_TRY
-    {
-      if (log_server.init (argc, argv, ACE_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          log_server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index 73f9ead9771..d195ad5816c 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -12,7 +12,6 @@
 
 DIRS  = Callback_Quoter \
         POA \
-	Logging \
 	Quoter \
 	Simple \
 	Event_Comm \
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 8cfe5ca47e4..23517560f11 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -161,8 +161,7 @@ Server<Servant>::init (const char *servant_name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Exception in activation of POA");
+      ACE_TRY_ENV.print_exception ("\tException in activation of POA");
       return -1;
     }
   ACE_ENDTRY;
@@ -284,7 +283,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    name,
+                                    0,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -319,7 +318,7 @@ Client<InterfaceObj, Var>::init (const char *name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ACE_TRY_ENV.print_exception ("Client_i::init");
       return -1;
     }
   ACE_ENDTRY;
@@ -330,7 +329,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &)
+Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV)
 {
 
   return 0;
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index 010267768a2..45eed87883d 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -6,9 +6,9 @@
 
 
 int
-Checkpoint_Client_i::run (const char *name,
-                          int argc,
-                          char *argv[])
+Checkpoint_Client_i::run (char *name,
+                    int argc,
+                    char *argv[])
 {
   // Initialize the client (read ior...).
   if (checkpoint.init (name,argc, argv) == -1)
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h
index 8a5d59a2c27..222c1ff5708 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.h
+++ b/TAO/examples/OBV/Typed_Events/Client_i.h
@@ -46,7 +46,7 @@ public:
   virtual  ~Checkpoint_Client_i (void);
   // Destructor
 
-  virtual int run (const char *,int, char** );
+  virtual int run (char *,int, char** );
   // Execute the methods
 
 private:
diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile
index 1d9829bc856..66f1c59993d 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile
+++ b/TAO/examples/OBV/Typed_Events/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,43 +14,42 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO
 
-IDL_SRC = Event_TypesC.cpp Event_TypesS.cpp
+IDL_SRC	= Event_TypesC.cpp Event_TypesS.cpp
 
 PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Server_i.cpp \
-        Client_i.cpp \
-        Event_Types_impl.cpp \
-        ../Simple_util.cpp
+	client.cpp \
+	server.cpp \
+	Server_i.cpp \
+	Client_i.cpp \
+	Event_Types_impl.cpp \
+	../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                Event_TypesC.o \
-                Event_TypesS.o \
-                Client_i.o \
-                Event_Types_impl.o \
-                ../Simple_util.o \
-                client.o
+		Event_TypesC.o \
+		Event_TypesS.o \
+	        Client_i.o \
+		Event_Types_impl.o \
+		../Simple_util.o \
+		client.o
 SIMPLE_SVR_OBJS = \
-                Event_TypesC.o \
-                Event_TypesS.o \
-                Server_i.o \
-                Event_Types_impl.o \
-                ../Simple_util.o \
-                server.o
+		Event_TypesC.o \
+		Event_TypesS.o \
+		Server_i.o \
+		Event_Types_impl.o \
+		../Simple_util.o \
+		server.o
 
 BIN = server \
       client
 
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
-
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -62,7 +61,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
@@ -73,18 +72,14 @@ override TAO_IDLFLAGS += -Gc -Gv
 .PRECIOUS: Event_TypesS.cpp Event_TypesS.i Event_TypesS.h
 .PRECIOUS: Event_TypesS_T.cpp Event_TypesS_T.i Event_TypesS_T.h
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) -r Event_TypesC.* Event_TypesS.* Event_TypesS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf Event_TypesC.* Event_TypesS.* Event_TypesS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -198,25 +193,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -264,9 +250,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -346,7 +336,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Event_TypesC.i
+ Event_TypesC.i Event_TypesS.h Event_TypesS_T.h Event_TypesS_T.i \
+ Event_TypesS_T.cpp Event_TypesS.i
 .obj/Event_TypesS.o .obj/Event_TypesS.so .shobj/Event_TypesS.o .shobj/Event_TypesS.so: Event_TypesS.cpp Event_TypesS.h Event_TypesC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -456,25 +447,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -522,9 +504,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -727,21 +713,12 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp \
- $(TAO_ROOT)/tao/debug.h \
- Event_TypesC.h \
+ ../Simple_util.cpp Event_TypesC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -792,6 +769,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -993,21 +972,12 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp \
- $(TAO_ROOT)/tao/debug.h \
- Server_i.h Event_TypesS.h Event_TypesC.h \
+ ../Simple_util.cpp Server_i.h Event_TypesS.h Event_TypesC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1058,6 +1028,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1248,25 +1220,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1314,9 +1277,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1519,21 +1486,12 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp \
- $(TAO_ROOT)/tao/debug.h \
- Event_TypesC.h \
+ ../Simple_util.cpp Event_TypesC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1584,6 +1542,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1774,25 +1734,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1840,9 +1791,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2044,19 +1999,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp \
- $(TAO_ROOT)/tao/debug.h
+ ../Simple_util.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 70f2dad443f..492e95bc893 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -104,7 +104,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 void
 Checkpoint_i::put_event (Event *event,
-                        CORBA::Environment &)
+                        CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In general this function would be a dispatcher which looks at the
@@ -134,7 +134,7 @@ Checkpoint_i::put_event (Event *event,
 
 
 Event_List *
-Checkpoint_i::get_critical_events (CORBA::Environment &)
+Checkpoint_i::get_critical_events (CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The skeleton should not steal our list by decrementing
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 80ca0fc570c..076099e93c9 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -29,12 +29,14 @@ main (int argc, char *argv[])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
@@ -47,3 +49,4 @@ template class Server<Checkpoint_i>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate Server<Checkpoint_i>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index 60444945ed6..6883298d0ff 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -17,7 +17,6 @@ BUILD = $(VBIN)
 
 INSTALL =
 
-#TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -153,25 +152,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -219,9 +209,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index abe914f82e4..851c2e48212 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -21,15 +21,13 @@ DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
     poa_ (PortableServer::POA::_duplicate (poa))
 {
   // Get the POA Current object reference
-  CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("POACurrent",
-                                            ACE_TRY_ENV);
+  CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent",
+                                                                  ACE_TRY_ENV);
   ACE_CHECK;
 
   // Narrow the object reference to a POA Current reference
-  this->poa_current_ =
-    PortableServer::Current::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  this->poa_current_ = PortableServer::Current::_narrow (obj.in (),
+                                                         ACE_TRY_ENV);
   ACE_CHECK;
 }
 
@@ -42,7 +40,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
                              CORBA::Environment &ACE_TRY_ENV)
 {
   // The servant determines the key associated with thex database
-  // entry represented by self.
+  // entry represented by self
   PortableServer::ObjectId_var oid =
     this->poa_current_->get_object_id (ACE_TRY_ENV);
   ACE_CHECK;
@@ -52,17 +50,17 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
     PortableServer::ObjectId_to_string (oid.in ());
 
   // Get the operation name for this request
-  const char *operation =
-    request->operation ();
+  const char *operation = request->operation ();
 
-  if (ACE_OS::strcmp (operation,
-                      "_is_a") == 0)
+  if (ACE_OS::strcmp (operation, "_is_a") == 0)
     {
       this->is_a (request, ACE_TRY_ENV);
       ACE_CHECK;
     }
   else
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    {
+      ACE_THROW (CORBA::NO_IMPLEMENT ());
+    }
 }
 
 void
@@ -84,22 +82,20 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
                       ACE_TRY_ENV);
   ACE_CHECK;
 
-  CORBA_NamedValue_ptr nv = list->item (0,
-                                        ACE_TRY_ENV);
+  CORBA_NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
   ACE_CHECK;
 
   CORBA::Any_ptr ap = nv->value ();
   char *value;
   *ap >>= value;
 
-  const char *object_id =
-    CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *object_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
   ACE_CHECK;
 
   CORBA::Boolean result;
-  if (ACE_OS::strcmp (value, "IDL:Database/Employee:1.0") == 0
-      || ACE_OS::strcmp (value, "IDL:Database/Entry:1.0") == 0
-      || ACE_OS::strcmp (value, object_id) == 0)
+  if (!ACE_OS::strcmp (value, "IDL:Database/Employee:1.0") ||
+      !ACE_OS::strcmp (value, "IDL:Database/Entry:1.0") ||
+      !ACE_OS::strcmp (value, object_id))
     result = 1;
   else
     result = 0;
@@ -156,58 +152,46 @@ DatabaseImpl::Agent::create_entry (const char *key,
                    Database::Duplicate_Key))
 {
   // Create a new entry in the database:
-  if (ACE_OS::strcmp (entry_type, "Employee") != 0 
-      || initial_attributes.length () != 2)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+  if (ACE_OS::strcmp (entry_type, "Employee") != 0 ||
+      initial_attributes.length () != 2)
+    {
+      ACE_THROW_RETURN (Database::Unknown_Type (),
+                        Database::Entry::_nil ());
+    }
 
   char *name = 0;
   CORBA::Long id = 0;
 
-  const Database::NamedValue &first =
-    initial_attributes[0];
-  const Database::NamedValue &second =
-    initial_attributes[1];
-
-  if (ACE_OS::strcmp (first.name.in (), "name") != 0 
-      || ACE_OS::strcmp (second.name.in (), "id") != 0)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+  const Database::NamedValue &first = initial_attributes[0];
+  const Database::NamedValue &second = initial_attributes[1];
+  if (ACE_OS::strcmp (first.name.in (), "name") != 0 ||
+      ACE_OS::strcmp (second.name.in (), "id") != 0)
+    {
+      ACE_THROW_RETURN (Database::Unknown_Type (),
+                        Database::Entry::_nil ());
+    }
 
   first.value >>= name;
   second.value >>= id;
 
-  Employee *new_employee;
-  // This attempts to create a new Employee and throws an exception
-  // and returns a null value if it fails
-  ACE_NEW_THROW_EX (new_employee,
-                    Employee (name, id),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
-
-  // @@ Should check the return value here and throw an exception if
-  // it fails.
-  DATABASE::instance ()->bind (key,
-                               new_employee);
+  Employee *new_employee = new Employee (name, id);
+  DATABASE::instance ()->bind (key, new_employee);
 
   ACE_DEBUG ((LM_DEBUG,
               "New employee created with name = %s and id = %d\n",
               name,
               id));
 
-  // Creates a reference to the CORBA object used to encapsulate
+  // creates a reference to the CORBA object used to encapsulate
   // access to the new entry in the database.  There is an interface
   // for each entry type:
-  PortableServer::ObjectId_var obj_id =
-    PortableServer::string_to_ObjectId (key);
-  CORBA::String_var repository_id =
-    DatabaseImpl::entry_type_to_repository_id ("Entry");
-
-  CORBA::Object_var obj =
-    this->poa_->create_reference_with_id (obj_id.in (),
-                                          repository_id.in (),
-                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
+  PortableServer::ObjectId_var obj_id = PortableServer::string_to_ObjectId (key);
+  CORBA::String_var repository_id = DatabaseImpl::entry_type_to_repository_id ("Entry");
+
+  CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (),
+                                                                repository_id.in (),
+                                                                ACE_TRY_ENV);
+  ACE_CHECK_RETURN (Database::Entry::_nil ()) ;
 
   Database::Entry_var entry = Database::Entry::_narrow (obj.in (),
                                                         ACE_TRY_ENV);
@@ -224,35 +208,32 @@ DatabaseImpl::Agent::find_entry (const char *key,
                    Database::Unknown_Type,
                    Database::Not_Found))
 {
-  if (ACE_OS::strcmp (entry_type,
-                      "Employee") != 0)
-    ACE_THROW_RETURN (Database::Unknown_Type (),
-                      Database::Entry::_nil ());
+  if (ACE_OS::strcmp (entry_type, "Employee") != 0)
+    {
+      ACE_THROW_RETURN (Database::Unknown_Type (),
+                        Database::Entry::_nil ());
+    }
 
   void *temp;
   Database::Entry_var entry;
   if (DATABASE::instance ()->find (key, temp) == 0)
     {
-      Employee *employee =
-        ACE_reinterpret_cast (Employee *,
-                              temp);
+      Employee *employee = (Employee *) temp;
+
       ACE_DEBUG ((LM_DEBUG,
                   "Employee with key = %s found: name = %s and id = %d\n",
                   key,
                   employee->name (),
                   employee->id ()));
 
-      // Creates a reference to the CORBA object used to encapsulate
-      // access to the new entry in the database.  There is an
-      // interface for each entry type:
-      PortableServer::ObjectId_var obj_id =
-        PortableServer::string_to_ObjectId (key);
-      CORBA::String_var repository_id =
-        DatabaseImpl::entry_type_to_repository_id ("Entry");
-      CORBA::Object_var obj =
-        this->poa_->create_reference_with_id (obj_id.in (),
-                                              repository_id.in (),
-                                              ACE_TRY_ENV);
+      // creates a reference to the CORBA object used to encapsulate
+      // access to the new entry in the database.  There is an interface
+      // for each entry type:
+      PortableServer::ObjectId_var obj_id = PortableServer::string_to_ObjectId (key);
+      CORBA::String_var repository_id = DatabaseImpl::entry_type_to_repository_id ("Entry");
+      CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (),
+                                                                    repository_id.in (),
+                                                                    ACE_TRY_ENV);
       ACE_CHECK_RETURN (Database::Entry::_nil ());
 
       entry = Database::Entry::_narrow (obj.in (),
@@ -265,7 +246,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
                   "Employee with key = %s not found\n",
                   key));
 
-      ACE_THROW_RETURN (Database::Not_Found (),
+      ACE_THROW_RETURN (Database::Unknown_Key (),
                         Database::Entry::_nil ());
     }
 
@@ -281,14 +262,15 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
                    Database::Unknown_Key))
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
-    ACE_THROW (Database::Unknown_Type ());
+    {
+      ACE_THROW (Database::Unknown_Type ());
+    }
 
   void *temp;
   if (DATABASE::instance ()->unbind (key, temp) == 0)
     {
-      Employee *employee =
-        ACE_reinterpret_cast (Employee *,
-                              temp);
+      Employee *employee = (Employee *) temp;
+
       ACE_DEBUG ((LM_DEBUG,
                   "Employee with key = %s will be removed from the database: "
                   "name = %s and id = %d \n",
@@ -369,12 +351,8 @@ DatabaseImpl::Employee::name (const char* name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DATABASE::instance ()->free (this->name_);
-
-  this->name_ = 
-    (char *) DATABASE::instance ()->malloc (ACE_OS::strlen (name) + 1);
-
-  ACE_OS::strcpy (this->name_,
-                  name);
+  this->name_ = (char *) DATABASE::instance ()->malloc (ACE_OS::strlen (name) + 1);
+  ACE_OS::strcpy (this->name_, name);
 }
 
 CORBA::Long
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index 3f788cfc943..802cb57d505 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -27,7 +27,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -165,25 +164,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -231,9 +221,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -313,7 +307,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- DatabaseC.i
+ DatabaseC.i DatabaseS.h DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp \
+ DatabaseS.i
 .obj/DatabaseS.o .obj/DatabaseS.so .shobj/DatabaseS.o .shobj/DatabaseS.so: DatabaseS.cpp DatabaseS.h DatabaseC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -423,25 +418,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -489,9 +475,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -681,25 +671,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -747,9 +728,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -946,25 +931,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1012,9 +988,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1204,25 +1184,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1270,9 +1241,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 523fadfc071..f320edadc25 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -156,7 +156,7 @@ main (int argc, char **argv)
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
       for (CORBA::ULong i = 0;
-           i < policies.length ();
+           i < policies.length () && ACE_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
@@ -203,6 +203,7 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+
       // Run the ORB
       if (orb->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
diff --git a/TAO/examples/POA/Default_Servant/File.idl b/TAO/examples/POA/Default_Servant/File.idl
index eeaa55e1d7e..0caa3792c23 100644
--- a/TAO/examples/POA/Default_Servant/File.idl
+++ b/TAO/examples/POA/Default_Servant/File.idl
@@ -26,28 +26,27 @@ module File
     {
       typedef sequence<octet> DataBuffer;
       
+	// write buffer to File
       long write (in DataBuffer buffer)
         raises (IOError);
-      // write buffer to File
 
+	// read num_bytes to DataBuffer
       DataBuffer read (in long num_bytes)
         raises (IOError);
-      // read num_bytes to DataBuffer
 
+	// seek to offset in File from whence
       unsigned long lseek (in unsigned long offset,
                            in long whence)
         raises (IOError);
-      // seek to offset in File from whence
 
+	// destroy the descriptor
       void destroy ();
-      // destroy the descriptor
     };
 
   interface System 
     {
-      Descriptor open (in string file_name,
-                       in long flags)
+	// File open operation
+      Descriptor open (in string file_name, in long flags)
         raises (IOError);
-      // File open operation
     };        
 };
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 5db5f5a5e07..e1b3ea6f16a 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -199,6 +199,11 @@ FileImpl::Descriptor::destroy (CORBA::Environment &ACE_TRY_ENV)
   ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
   ACE_CHECK;
 
-  // Close the file corresponding to this object reference.
-  ACE_OS::close (file_descriptor);
+  //close the file corresponding to this object reference
+  int result = ACE_OS::close (file_descriptor);
+
+  if (result != 0)
+    {
+      ACE_THROW (File::IOError ());
+    }
 }
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index cee4e41d63e..fdca0289a08 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -1,5 +1,4 @@
 // $Id$
-
 //===================================================================
 //
 // = FILENAME
@@ -14,88 +13,85 @@
 //
 //====================================================================
 
+
+
 #include "FileS.h"
 
 class FileImpl
+// FileImpl class provides the namespace for the File IDL module .
 {
-  // = TITLE
-  //   FileImpl class provides the namespace for the File IDL module .
 public:
   class Descriptor : public POA_File::Descriptor
+  // Descriptor implements the Descriptor interface in the File Module
+  // A single Descriptor servant can serve multiple object references
   {
-    // = TITLE
-    //   Descriptor implements the Descriptor interface in the File
-    //   Module A single Descriptor servant can serve multiple object
-    //   references
   public:
+    //Constructor
     Descriptor (PortableServer::POA_ptr poa);
-    // Constructor
 
+    //Destructor
     ~Descriptor (void);
-    // Destructor
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
     // Returns the default POA of this object
+    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
+    // write buffer to File corresponding to this Descriptor
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer,
                                CORBA::Environment &env)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
-    // write buffer to File corresponding to this Descriptor
 
+    // Reads num_bytes from the file and returns it
     virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes,
                                                 CORBA::Environment &env)
       ACE_THROW_SPEC ((CORBA::SystemException,
-    // Reads num_bytes from the file and returns it
                        File::IOError));
-
+    // seek to the offset in file from whence
     virtual CORBA::ULong lseek (CORBA::ULong offset,
                                 CORBA::Long whence,
                                 CORBA::Environment &env)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
-    // seek to the offset in file from whence
 
+    // closes the file corresponding to the requested ObjectID
     virtual void destroy (CORBA::Environment &env)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (CORBA::Environment &env);
     // Extracts the ACE_HANDLE from the objectID
+    ACE_HANDLE fd (CORBA::Environment &env);
 
     PortableServer::POA_var poa_;
   };
 
   class System : public POA_File::System
+  // File System implementation class
   {
-    // = TITLE
-    //   File System implementation class.
   public:
-    System (PortableServer::POA_ptr poa);
     // Constructor, Creates a single File Descriptor Servant and
     // registers it with the POA as the Default Servant
+    System (PortableServer::POA_ptr poa);
 
-    ~System (void);
     //Destructor
+    ~System (void);
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
     //Returns the default POA of this object
+    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
+    //Opens a file ,creates a Descriptor reference with the ACE_HANDLE
+    // and returns that reference
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags,
                                CORBA::Environment &env)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
-    // Opens a file ,creates a Descriptor reference with the
-    // ACE_HANDLE and returns that reference
 
   private:
     PortableServer::POA_var poa_;
 
+    // The single File Descriptor servant which serves requests for any
+    // Descriptor object under poa_.
     Descriptor fd_servant_;
-    // The single File Descriptor servant which serves requests for
-    // any Descriptor object under poa_.
   };
 };
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index 21ae6bbb59d..85b4a54f002 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -26,7 +26,7 @@ BIN = server client
 BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -164,25 +164,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -230,9 +221,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -312,7 +307,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- FileC.i
+ FileC.i FileS.h FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 .obj/FileS.o .obj/FileS.so .shobj/FileS.o .shobj/FileS.so: FileS.cpp FileS.h FileC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -422,25 +417,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -488,9 +474,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -683,25 +673,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -749,9 +730,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -946,25 +931,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1012,9 +988,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1204,25 +1184,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1270,9 +1241,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 2f2d91ec750..7b8a277c3b0 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -116,13 +116,15 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
-           i < policies.length ();
+           i < policies.length () && ACE_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          ACE_TRY_CHECK;  
         }
+      
+
 
       // Create a File System Implementation object in first_poa
       FileImpl::System file_system_impl (first_poa.in ());
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index a63b245298c..0468ff06cbe 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -16,7 +16,7 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 BUILD = $(VBIN)
 
 INSTALL =
-TAO_IDLFLAGS += -Ge 1
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -154,25 +154,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -220,9 +211,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 854f32710dd..2e7d1929fa3 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -322,6 +322,7 @@ main (int argc, char **argv)
                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+
       ACE_TIMEPROBE_PRINT;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index 4aa0505ee2a..03d6af1082f 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -21,7 +21,6 @@ BUILD = $(VBIN)
 
 INSTALL =
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -150,25 +149,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -216,9 +206,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index 28dd8b5b783..e6cfa81348a 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -27,7 +27,7 @@ BIN = server client
 BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -164,25 +164,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -230,9 +221,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -312,7 +307,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- FooC.i
+ FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -422,25 +417,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -488,9 +474,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -680,25 +670,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -746,9 +727,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -943,25 +928,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1009,9 +985,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1205,25 +1185,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1271,9 +1242,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1464,25 +1439,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1530,9 +1496,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 80d41c48e9a..afb11d01a92 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -124,15 +124,9 @@ sub run_test
     }
 
     # Now that the client has finished, kill off the servers
-    $SRV1->Terminate ();
-    $SRV2->Terminate ();
-    if ($SRV1->TimedWait (5) == -1 ||
-        $SRV2->TimedWait (5) == -1) {
-      print STDERR "ERROR: couldn't terminate the servers nicely\n";
-      $SRV1->Kill (); $SRV1->TimedWait (1);
-      $SRV2->Kill (); $SRV2->TimedWait (1);
-      $status = 1;
-    }
+
+    $SRV1->Kill (); $SRV1->TimedWait (1);
+    $SRV2->Kill (); $SRV2->TimedWait (1);
 
     if ($server3args ne "")
     {
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 70a00d29b70..2f4ec87b91f 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += -Wb,export_macro=GENERIC_SERVANT_Export \
-                         -Wb,export_include=generic_servant_export.h -Ge 1
+                         -Wb,export_include=generic_servant_export.h
 
 LDLIBS = -lTAO
 
@@ -179,25 +179,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -245,9 +236,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -327,7 +322,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- generic_servant_export.h FooC.i
+ generic_servant_export.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -437,25 +433,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -503,9 +490,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -695,25 +686,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -761,9 +743,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -965,25 +951,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1031,9 +1008,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index aa975e40338..afd347b97f8 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -13,6 +13,7 @@
 //     Irfan Pyarali
 //
 // ================================================================
+#define ACE_BUILD_SVC_EXPORT
 
 #include "MyFooServant.h"
 
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/examples/POA/Identity/Identity.cpp
index 0018fd2917c..dba044d394d 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/examples/POA/Identity/Identity.cpp
@@ -2,14 +2,14 @@
 
 // ==================================================
 // = LIBRARY
-//    TAO/test/POA/Identity
+//    TAO/examples/POA/Identity
 //
 // = FILENAME
 //    Identity.cpp
 //
 // = DESCRIPTION
-//    This program demonstrates and tests how to move between id,
-//    reference, and servants.
+//    This program demonstrates how to move between id, reference, and
+//    servants.
 //
 // = AUTHOR
 //    Irfan Pyarali
diff --git a/TAO/tests/POA/Identity/Identity.dsp b/TAO/examples/POA/Identity/Identity.dsp
index 3382bc003b3..3382bc003b3 100644
--- a/TAO/tests/POA/Identity/Identity.dsp
+++ b/TAO/examples/POA/Identity/Identity.dsp
diff --git a/TAO/tests/POA/Identity/Identity.dsw b/TAO/examples/POA/Identity/Identity.dsw
index cc5f350c703..cc5f350c703 100644
--- a/TAO/tests/POA/Identity/Identity.dsw
+++ b/TAO/examples/POA/Identity/Identity.dsw
diff --git a/TAO/tests/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
index f6ec39af176..e0cb684d498 100644
--- a/TAO/tests/POA/Identity/Makefile
+++ b/TAO/examples/POA/Identity/Makefile
@@ -158,25 +158,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -224,9 +215,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -306,7 +301,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
+ testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -416,25 +411,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -482,9 +468,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -674,25 +664,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -740,9 +721,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/POA/Identity/run_test.pl b/TAO/examples/POA/Identity/run_test.pl
index bf77e2157cf..bf77e2157cf 100755
--- a/TAO/tests/POA/Identity/run_test.pl
+++ b/TAO/examples/POA/Identity/run_test.pl
diff --git a/TAO/tests/POA/Identity/svc.conf b/TAO/examples/POA/Identity/svc.conf
index 21b46f90b5d..21b46f90b5d 100644
--- a/TAO/tests/POA/Identity/svc.conf
+++ b/TAO/examples/POA/Identity/svc.conf
diff --git a/TAO/tests/POA/Identity/test.idl b/TAO/examples/POA/Identity/test.idl
index ae2a5fd10d4..ae2a5fd10d4 100644
--- a/TAO/tests/POA/Identity/test.idl
+++ b/TAO/examples/POA/Identity/test.idl
diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index bb802913130..427a4bb9f6a 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -153,25 +153,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -219,9 +210,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -414,25 +409,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -480,9 +466,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -672,25 +662,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -738,9 +719,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -931,25 +916,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -997,9 +973,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index d7cef6ebcc2..6c9a7503f7f 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -32,32 +32,22 @@ ServantLocator_i::ServantLocator_i (CORBA::ORB_ptr orb,
                                     const char *garbage_collection_function)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
-  // The dll is opened using the dllname passed.
-  if (this->dll_.open (dllname) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%p",
-                this->dll_.error ()));
-
-  // Obtain the symbol for the function that will get the servant
-  // object.
-
-  //
-  // 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);
-
+ // The dll is opened using the dllname passed.
+   if (this->dll_.open (dllname) == -1)
+     ACE_ERROR ((LM_ERROR,
+                 "%p",
+                 this->dll_.error ()));
+
+  // Obtain the symbol for the function that will
+  // get the servant object.
   servant_supplier_ =
-    ACE_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);
+    (SERVANT_FACTORY) this->dll_.symbol (factory_function);
 
+  // Obtain tne symbol for the function which
+  // will destroy the servant.
   servant_garbage_collector_ =
-    ACE_reinterpret_cast (SERVANT_GARBAGE_COLLECTOR, function);
+    (SERVANT_GARBAGE_COLLECTOR) this->dll_.symbol (garbage_collection_function);
+
 }
 
 // This method associates an servant with the ObjectID.
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index c4df5e5ea24..2fb1ee10d7f 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -18,7 +18,7 @@ Server_i::~Server_i(void)
 // This method parses the input.
 
 int
-Server_i::parse_args (int argc,
+Server_i::parse_args (int argc, 
                       char **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:");
@@ -69,7 +69,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                                        "w");
   FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2,
                                        "w");
-  if (output_file_1 == 0
+  if (output_file_1 == 0 
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open output files for writing IORs: %s, %s\n",
@@ -116,7 +116,7 @@ Server_i::init (int argc, char **argv)
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0,
-                              ACE_TRY_ENV);
+                              ACE_TRY_ENV); 
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -129,21 +129,21 @@ Server_i::init (int argc, char **argv)
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);
+                                                ACE_TRY_ENV);  
       ACE_TRY_CHECK;
-
+  
       // Get the POAManager of RootPOA
       poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+    
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
       return 1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
@@ -161,40 +161,40 @@ Server_i::create_poa (const char *name,
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
-    {
+    {  
       policies_.length (4);
-
+      
       // ID Assignment Policy.
       policies_[0] =
-        root_poa_->create_id_assignment_policy
+        root_poa_->create_id_assignment_policy 
         (PortableServer::USER_ID,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
-        root_poa_->create_lifespan_policy
+        root_poa_->create_lifespan_policy 
         (PortableServer::PERSISTENT,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       // Request Processing Policy.
       policies_[2] =
-        root_poa_->create_request_processing_policy
+        root_poa_->create_request_processing_policy 
         (PortableServer::USE_SERVANT_MANAGER,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
       policies_[3] =
-        root_poa_->create_servant_retention_policy
+        root_poa_->create_servant_retention_policy 
         (PortableServer::RETAIN,
          ACE_TRY_ENV);
-
+      
       if (servant_retention_policy == 0)
       policies_[3] =
-        root_poa_->create_servant_retention_policy
+        root_poa_->create_servant_retention_policy 
         (PortableServer::NON_RETAIN,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -208,24 +208,23 @@ Server_i::create_poa (const char *name,
                                       policies_,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
       for (CORBA::ULong i = 0;
-           i < policies_.length ();
+           i < policies_.length () && ACE_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
           policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;  
   ACE_CHECK_RETURN (0);
 
   return my_poa;
@@ -237,11 +236,11 @@ int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
   // CORBA::Environment TAO_TRY_ENV;
-
+   
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
-    {
+    { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
       ACE_NEW_RETURN (servant_activator_impl_,
@@ -250,33 +249,33 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                                           "supply_servant",
                                           "destroy_servant"),
                       0);
-
+      
       PortableServer::ServantActivator_var servant_activator =
         servant_activator_impl_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (servant_activator.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       // Create a reference with user created ID in firstPOA which
-      // uses the MyFooServantActivator.
+      // uses the MyFooServantActivator. 
       PortableServer::ObjectId_var first_foo_oid =
         PortableServer::string_to_ObjectId ("firstFoo");
-
+                                                      
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
                                                         "IDL:Foo:1.0",
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;  
 
   return 0;
 }
@@ -290,8 +289,8 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
-    {
-      // An Servant Locator object is created which will activate
+    { 
+      // An Servant Locator object is created which will activate 
       // the servant on demand.
       ACE_NEW_RETURN (servant_locator_impl_,
                       ServantLocator_i (orb_.in (),
@@ -299,7 +298,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
                                         "supply_servant",
                                         "destroy_servant"),
                       0);
-
+      
       PortableServer::ServantLocator_var servant_locator =
         servant_locator_impl_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -310,39 +309,39 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_poa->set_servant_manager (servant_locator.in (),
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+        
       // Try to create a reference with user created ID in second_poa
-      // which uses MyFooServantLocator.
+      // which uses MyFooServantLocator. 
       PortableServer::ObjectId_var second_foo_oid =
         PortableServer::string_to_ObjectId ("secondFoo");
 
-      second_foo_ =
+      second_foo_ = 
         second_poa->create_reference_with_id (second_foo_oid.in (),
                                               "IDL:Foo:1.0",
                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;   
 
   return 0;
 }
 
 // The execution process of the server.
 
-int
-Server_i::run (void)
+int 
+Server_i::run (void) 
 {
   // CORBA::Environment TAO_TRY_ENV;
-
+   
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
-    {
+    { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
@@ -350,19 +349,19 @@ Server_i::run (void)
         orb_->object_to_string (first_foo_.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       // Print the ior's of first_foo and second_foo.
 
       ACE_DEBUG ((LM_DEBUG,"%s\n%s\n",
                   first_foo_ior.in (),
                   second_foo_ior.in ()));
 
-      int write_result =
+      int write_result = 
         this->write_iors_to_file (first_foo_ior.in (),
                                   second_foo_ior.in ());
       if (write_result != 0)
@@ -371,28 +370,29 @@ Server_i::run (void)
       // Set the poa_manager state to active, ready to process
       // requests.
       poa_manager_->activate (ACE_TRY_ENV);
-
+     
       ACE_TRY_CHECK;
-
+  
       // Run the ORB.
       if (orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "CORBA::ORB::run"),
                           -1);
-
+       
       // Destroy the root_poa_ and also first_poa and second_poa.
       root_poa_->destroy (1,
                           1,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:run ()");
       return 1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
+
diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile
index 5baca8405f4..716a58d8166 100644
--- a/TAO/examples/POA/Makefile
+++ b/TAO/examples/POA/Makefile
@@ -17,6 +17,7 @@ DIRS  = Generic_Servant \
 	Explicit_Activation \
 	FindPOA \
 	Forwarding \
+	Identity \
 	Loader \
 	NewPOA \
 	On_Demand_Activation \
diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index ceda2634492..b79527652d5 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -149,25 +149,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -215,9 +206,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index ee3f514e41f..9e383d185bb 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -34,12 +34,12 @@ main (int argc, char **argv)
   ACE_TRY
     {
       // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+                                            argv, 
+                                            0, 
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       // Obtain the object reference to the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA");
@@ -52,7 +52,7 @@ main (int argc, char **argv)
       // Policies for the new POAs
       CORBA::PolicyList policies (2);
       policies.length (2);
-
+      
       // Threading policy
       policies[0] =
         root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL, ACE_TRY_ENV);
@@ -93,7 +93,7 @@ main (int argc, char **argv)
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
-           i < policies.length ();
+           i < policies.length () && ACE_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
@@ -140,6 +140,6 @@ main (int argc, char **argv)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
+  
   return 0;
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index 1bd3f3d4540..0a8131d4d06 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -152,25 +152,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -218,9 +209,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -414,25 +409,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -480,9 +466,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -679,25 +669,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -745,9 +726,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index bbeaa488575..5b0409cd135 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -192,7 +192,7 @@ main (int argc, char **argv)
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
       for (CORBA::ULong i = 0;
-           i < policies.length ();
+           i < policies.length () && ACE_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
@@ -200,6 +200,7 @@ main (int argc, char **argv)
           ACE_TRY_CHECK;
         }
 
+
       MyFooServantActivator servant_activator_impl (orb.in ());
       PortableServer::ServantActivator_var servant_activator =
         servant_activator_impl._this (ACE_TRY_ENV);
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index 91c487ad3f0..ab0b4ef1664 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -157,25 +157,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -223,9 +214,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -418,25 +413,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -484,9 +470,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -677,25 +667,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -743,9 +724,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -934,25 +919,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1000,9 +976,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1195,25 +1175,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1261,9 +1232,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 85876ce40eb..5588e5f055c 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -179,12 +179,14 @@ ServantManager_i::destroy_servant (PortableServer::Servant servant,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<PortableServer::ObjectId, ACE_DLL *>;
+template class ACE_Equal_To<PortableServer::ObjectId>;
 template class ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<PortableServer::ObjectId, ACE_DLL *>
+#pragma instantiate ACE_Equal_To<PortableServer::ObjectId>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 93c7af2a4b3..5adb40ceab2 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -17,7 +17,7 @@ Server_i::~Server_i(void)
 // This method parses the input.
 
 int
-Server_i::parse_args (int argc,
+Server_i::parse_args (int argc, 
                       char **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:");
@@ -68,7 +68,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                                        "w");
   FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2,
                                        "w");
-  if (output_file_1 == 0
+  if (output_file_1 == 0 
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open output files for writing IORs: %s, %s\n",
@@ -115,7 +115,7 @@ Server_i::init (int argc, char **argv)
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0,
-                              ACE_TRY_ENV);
+                              ACE_TRY_ENV); 
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -128,21 +128,21 @@ Server_i::init (int argc, char **argv)
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);
+                                                ACE_TRY_ENV);  
       ACE_TRY_CHECK;
-
+  
       // Get the POAManager of RootPOA
       poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+    
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
+      ACE_TRY_ENV.print_exception ("Server_i:init_poa ()");
       return 1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
@@ -155,44 +155,44 @@ Server_i::create_poa (const char *name,
                       int servant_retention_policy)
 {
   PortableServer::POA_ptr my_poa = 0;
-
+ 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
+    {  
       policies_.length (4);
-
+      
       // ID Assignment Policy.
       policies_[0] =
-        root_poa_->create_id_assignment_policy
+        root_poa_->create_id_assignment_policy 
         (PortableServer::USER_ID,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
-        root_poa_->create_lifespan_policy
+        root_poa_->create_lifespan_policy 
         (PortableServer::PERSISTENT,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       // Request Processing Policy.
       policies_[2] =
-        root_poa_->create_request_processing_policy
+        root_poa_->create_request_processing_policy 
         (PortableServer::USE_SERVANT_MANAGER,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
       policies_[3] =
-        root_poa_->create_servant_retention_policy
+        root_poa_->create_servant_retention_policy 
         (PortableServer::RETAIN,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (servant_retention_policy == 0)
       policies_[3] =
-        root_poa_->create_servant_retention_policy
+        root_poa_->create_servant_retention_policy 
         (PortableServer::NON_RETAIN,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -206,7 +206,7 @@ Server_i::create_poa (const char *name,
                                       policies_,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
       for (CORBA::ULong i = 0;
@@ -218,12 +218,12 @@ Server_i::create_poa (const char *name,
         ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_poa ()");
+      ACE_TRY_ENV.print_exception ("Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;  
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return my_poa;
@@ -236,23 +236,23 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
+    { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
       ACE_NEW_RETURN (servant_activator_impl_,
                       ServantActivator_i (orb_.in ()),
                       0);
-
+      
       PortableServer::ServantActivator_var servant_activator =
         servant_activator_impl_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (servant_activator.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+  
       // Create a reference with user created ID in firstPOA which
       // uses the MyFooServantActivator. The servant dll name as well
       // as the factory function in the dll are used in creating the
@@ -267,12 +267,12 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_activator ()");
+      ACE_TRY_ENV.print_exception ("Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;  
 
   return 0;
 }
@@ -284,13 +284,13 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      // An Servant Locator object is created which will activate
+    { 
+      // An Servant Locator object is created which will activate 
       // the servant on demand.
       ACE_NEW_RETURN (servant_locator_impl_,
                       ServantLocator_i (orb_.in ()),
                       0);
-
+      
       PortableServer::ServantLocator_var servant_locator =
         servant_locator_impl_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -301,39 +301,39 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_poa->set_servant_manager (servant_locator.in (),
                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+        
       // Try to create a reference with user created ID in second_poa
       // which uses MyFooServantLocator. The servant dll name as well
       // as the factory function in the dll are used in creating the
       // objectId.
       PortableServer::ObjectId_var second_foo_oid =
-        servant_locator_impl_->create_dll_object_id
+        servant_locator_impl_->create_dll_object_id 
         ("Generic_Servant",
          "create_MyFoo");
-      second_foo_ = second_poa->create_reference_with_id
+      second_foo_ = second_poa->create_reference_with_id 
         (second_foo_oid.in (),
          "IDL:Foo:1.0",
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_locator ()");
+      ACE_TRY_ENV.print_exception ("Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;
+  ACE_ENDTRY;   
 
   return 0;
 }
 
 // The execution process of the server.
 
-int
-Server_i::run (void)
+int 
+Server_i::run (void) 
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV; 
   ACE_TRY
-    {
+    { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
@@ -341,19 +341,19 @@ Server_i::run (void)
         orb_->object_to_string (first_foo_.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       // Print the ior's of first_foo and second_foo.
 
       ACE_DEBUG ((LM_DEBUG,"%s\n%s\n",
                   first_foo_ior.in (),
                   second_foo_ior.in ()));
 
-      int write_result =
+      int write_result = 
         this->write_iors_to_file (first_foo_ior.in (),
                                   second_foo_ior.in ());
       if (write_result != 0)
@@ -362,28 +362,29 @@ Server_i::run (void)
       // Set the poa_manager state to active, ready to process
       // requests.
       poa_manager_->activate (ACE_TRY_ENV);
-
+     
       ACE_TRY_CHECK;
-
+  
       // Run the ORB.
       if (orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "CORBA::ORB::run"),
                           -1);
-
+       
       // Destroy the root_poa_ and also first_poa and second_poa.
       root_poa_->destroy (1,
                           1,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:run ()");
+      ACE_TRY_ENV.print_exception ("Server_i:run ()");
       return 1;
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
 }
+
diff --git a/TAO/examples/POA/README b/TAO/examples/POA/README
index ca47b9044c0..eeb3dd50fa7 100644
--- a/TAO/examples/POA/README
+++ b/TAO/examples/POA/README
@@ -71,6 +71,11 @@ these applications further.
                 Shows off the standard TIE features of the new CORBA
                 2.2 specification.
 
+        . Identity
+
+                The example shows the identity between servants, ids,
+                and references.
+
         . On_Demand_Loading
 
                 This example illustrates how to dynamically link and
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
index 990273b45b8..91b72f0fa70 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile
@@ -154,25 +154,16 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -220,9 +211,13 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile
index e73b05f5043..94d4260a5ee 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -148,25 +148,16 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -214,9 +205,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 14e4947db34..30ad6a94a5c 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -27,7 +27,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -176,25 +175,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -242,9 +232,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -324,7 +318,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- FooC.i
+ FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -434,25 +428,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -500,9 +485,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -693,25 +682,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -759,9 +739,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -959,25 +943,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1025,9 +1000,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1217,25 +1196,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1283,9 +1253,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl
index a29847cd8a2..3e32f8942f7 100755
--- a/TAO/examples/POA/TIE/run_test.pl
+++ b/TAO/examples/POA/TIE/run_test.pl
@@ -8,8 +8,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../bin';
 require ACEutils;
 
-$status = 0;
-
 $iorfile = "ior";
 
 $iorfile_1 = $iorfile."_1";
@@ -36,24 +34,11 @@ if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
   exit 1;
 }
 
-$client  = Process::Create ($EXEPREFIX."client$EXE_EXT",
-                            "-a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4");
-
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimedWait (1);
-}
+ACE::waitforfile ($iorfile_1);
+$status  = Process::Create ($EXEPREFIX."client$EXE_EXT  -a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4");
 
 if (ACE::waitforfile_timed ($iorfile_5,1) == 0) {
-  $client  = Process::Create ($EXEPREFIX."client$EXE_EXT",
-                              " -e file://$iorfile_5 -f file://$iorfile_6");
-
-  if ($client->TimedWait (60) == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $status = 1;
-    $client->Kill (); $client->TimedWait (1);
-  }
+$status  = Process::Create ($EXEPREFIX."client$EXE_EXT  -e file://$iorfile_5 -f file://$iorfile_6");
 }
 
 unlink $iorfile_1;
@@ -63,10 +48,6 @@ unlink $iorfile_4;
 unlink $iorfile_5;
 unlink $iorfile_6;
 
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: couldn't terminate server nicely\n";
-  $status = 1;
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$SV->Kill ();$SV->Wait ();
 
-exit $status;
+exit $client;
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index 319e558116b..699ffbcbc7a 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -42,7 +42,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Could not unbind the Factor Finder from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "~Quoter_Factor_Finder_Server");
+      ACE_TRY_ENV.print_exception ("~Quoter_Factor_Finder_Server");
     }
   ACE_ENDTRY;
 }
@@ -146,7 +146,7 @@ Quoter_Factory_Finder_Server::init (int argc,
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Factor_Finder_Server::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
       return -1;
     }
   ACE_ENDTRY;
@@ -220,12 +220,14 @@ main (int argc, char *argv [])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index bf9f3a14844..486085f5bfb 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -41,11 +41,13 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
     }
   ACE_ENDTRY;
 }
@@ -78,8 +80,13 @@ Quoter_Generic_Factory_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_,
                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+
   // Failure while activating the Quoter Factory Finder object
+  if (ACE_TRY_ENV.exception () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "init: Failure while activating the Quoter Generic Factory Impl.\n"),
+                      -1);
 
 
   ACE_DEBUG ((LM_DEBUG,
@@ -181,11 +188,11 @@ Quoter_Generic_Factory_Server::init (int argc,
         ACE_DEBUG ((LM_DEBUG,
                     "Registered the Quoter GenericFactory to the Life Cycle Service.\n"));
       }
-
+            
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter_Generic_Factory_Server::init: Exception");
+      ACE_TRY_ENV.print_exception ("Quoter_Generic_Factory_Server::init: Exception");
     }
   ACE_ENDTRY;
 
@@ -194,7 +201,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (CORBA::Environment& /*env*/)
+Quoter_Generic_Factory_Server::run (CORBA::Environment& env)
 {
   if (orb_manager_.orb()->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -261,12 +268,14 @@ main (int argc, char *argv [])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index d55c44252ab..4a61e7a23cc 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -6,7 +6,7 @@
 //    Generic_Factory_i.cpp
 //
 // = DESCRIPTION
-//    The implementation of a LifeCycle Service GenericFactory for the
+//    The implementation of a LifeCycle Service GenericFactory for the 
 //    Quoter example.
 //
 // = AUTHOR
@@ -30,7 +30,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 {
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &,
                                     CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
@@ -42,131 +42,157 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &,
 
 CosNaming::NamingContext_ptr
 Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              CORBA::Environment &env_here,
+                                              CORBA::Environment &TAO_IN_ENV_there)
 {
-  CosNaming::NamingContext_var quoterNamingContext_var;
-  ACE_TRY
-    {
-      // @@ FIXME Get a reference to the ORB.
-      CORBA::ORB_ptr orb_ptr =
-        TAO_ORB_Core_instance ()->orb ();
- 
-      // Get the Naming Service object reference.
-      CORBA::Object_var namingObj_var =
-        orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (namingObj_var.in ()))
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) Unable get the Naming Service.\n"));
-
-      // Narrow the object reference to a Naming Context.
-      CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name quoterContextName (1);  // max = 1
-      quoterContextName.length (1);
-      quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-
-      // Get the IDL_Quoter naming context.
-      CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      quoterNamingContext_var =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Get a reference to the ORB.
+  CORBA::ORB_ptr orb_ptr =
+    TAO_ORB_Core_instance ()->orb ();
+
+  // Get the Naming Service object reference.
+  CORBA::Object_var namingObj_var = 
+    orb_ptr->resolve_initial_references ("NameService");
+
+  if (CORBA::is_nil (namingObj_var.in ())) 
+    ACE_ERROR ((LM_ERROR,
+                "(%P|%t) Unable get the Naming Service.\n"));
+
+  // Narrow the object reference to a Naming Context.
+  CosNaming::NamingContext_var namingContext_var =
+    CosNaming::NamingContext::_narrow (namingObj_var.in (),
+                                       env_here);
+
+  // See if there is an exception, if yes then throw the NoFactory
+  // exception.
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
     }
-  ACE_CATCHANY
-    {
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
-                        CosNaming::NamingContext::_nil ());
+
+  // Get the IDL_Quoter naming context.
+  CosNaming::Name quoterContextName (1);  // max = 1 
+  quoterContextName.length (1);
+  quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
+
+  CORBA::Object_var quoterNamingObj_var = 
+    namingContext_var->resolve (quoterContextName, env_here);
+
+  // See if there is an exception, if yes then throw the NoFactory
+  // exception.
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
     }
-  ACE_ENDTRY;
-  return quoterNamingContext_var._retn ();
-}
 
+  CosNaming::NamingContext_var quoterNamingContext_var = 
+    CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
+                                       env_here);
+  // See if there is an exception, if yes then throw the NoFactory
+  // exception.
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+
+
+  return CosNaming::NamingContext::_duplicate (quoterNamingContext_var.in ());
+}
 
 
+  
 CORBA::Object_ptr
-Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
+Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, 
                                          const CosLifeCycle::Criteria &,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         CORBA::Environment &TAO_IN_ENV_there)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
                        CosLifeCycle::CannotMeetCriteria))
 {
-  Stock::Quoter_var quoter_var;
-  ACE_TRY
-    {
-      CosNaming::NamingContext_var quoterNamingContext_var =
-        this->get_naming_context (factory_key,
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // ** now a proper reference to the quoter naming context is
-      // available
-
-      // Fill in the name of the Quoter Factory.
-      // Take the key supplied to search for a Quoter Factory
-      CosNaming::Name factory_Name = (CosNaming::Name) factory_key;
-
-      // Try to get a reference to a Quoter Factory
-      CORBA::Object_var quoterFactoryObject_var =
-        quoterNamingContext_var->resolve (factory_Name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // We were able to get a reference to Quoter Factory.
-      // Check if it is a valid Quoter Factory reference
-      if (CORBA::is_nil (quoterFactoryObject_var.in()))
-        { // throw a NoFactory exception
-          ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
-        }
+  CORBA::Environment env_here;
+
+  CosNaming::NamingContext_var quoterNamingContext_var = 
+    this->get_naming_context (factory_key,
+                              env_here, 
+                              TAO_IN_ENV_there);
+
+  // ** now a proper reference to the quoter naming context is
+  // available
+
+  // Fill in the name of the Quoter Factory.
+  // Take the key supplied to search for a Quoter Factory
+  CosNaming::Name factory_Name = (CosNaming::Name) factory_key;  
+
+  // Try to get a reference to a Quoter Factory
+  CORBA::Object_var quoterFactoryObject_var =  
+    quoterNamingContext_var->resolve (factory_Name, env_here);
+  
+  // See if there is an exception, if yes then throw the NoFactory
+  // exception.
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
 
-      Stock::Quoter_Factory_var factory_var =
-        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in (),
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // We were able to get a reference to Quoter Factory.
 
-      if (CORBA::is_nil (factory_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "invalid factory.\n"));
-          return CORBA::Object::_nil ();
+  // Check if it is a valid Quoter Factory reference
+  if (CORBA::is_nil (quoterFactoryObject_var.in())) 
+    { // throw a NoFactory exception  
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+  else 
+    { 
+      // Check if it is a valid Quoter Factory reference.
+      if (CORBA::is_nil (quoterFactoryObject_var.in ())) // throw a NoFactory exception.
+        {      
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+          return 0;
         }
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Factory reference OK.\n"));
+      Stock::Quoter_Factory_var factory_var = 
+        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in (), 
+                                        env_here);
 
+      // See if there is an exception, if yes then throw the NoFactory
+      // exception.
+      if (env_here.exception () != 0) // throw a NoFactory exception  
+        { 
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+          return 0;
+        }
+    
+      if (CORBA::is_nil (factory_var.in ()))      
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid factory.\n"),
+                          0);
+                       
+      ACE_DEBUG ((LM_DEBUG,
+                  "Factory reference OK.\n"));    
+      
       // Now retrieve the Quoter obj ref corresponding to the key.
-      quoter_var =
+      Stock::Quoter_var quoter_var =
         factory_var->create_quoter ("test",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                    TAO_IN_ENV_there);
       ACE_DEBUG ((LM_DEBUG,
                   "Quoter Created\n"));
-
+    
       if (CORBA::is_nil (quoter_var.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "null quoter objref returned by factory\n"));
-          return CORBA::Object::_nil ();
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "null quoter objref returned by factory\n"),
+                          0);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Return a object reference to a new object.\n"));
 
+      CORBA::Object_ptr object_ptr =
+        CORBA::Object::_duplicate ((CORBA::Object_ptr) quoter_var.ptr ());
+
+      return object_ptr;
     }
-  ACE_CATCHANY
-    {
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
-                        CORBA::Object::_nil ());
-    }
-  ACE_ENDTRY;
-  return quoter_var._retn ();
-}
+} 
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index 94c153d21fb..f66c5fedb70 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -48,7 +48,8 @@ public:
 
 private:
   CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key,
-                                                   CORBA::Environment &);
+                                                   CORBA::Environment &env_here,
+                                                   CORBA::Environment &_env_there);
   // a helper to get the proper naming context.
 
 };
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index bb79df20cea..481e6ca8692 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -6,7 +6,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # TAO_ROOT
 
-override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
+override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 # The following lines tell the souce code that the trading
 # service is available.
@@ -47,7 +47,7 @@ BIN2 = client server Factory_Finder Generic_Factory
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
     BIN = $(BIN2)
@@ -218,25 +218,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -284,9 +275,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -371,7 +366,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
- QuoterC.i
+ QuoterC.i QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
 .obj/QuoterS.o .obj/QuoterS.so .shobj/QuoterS.o .shobj/QuoterS.so: QuoterS.cpp QuoterS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
@@ -484,25 +490,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -550,9 +547,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -757,25 +758,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -823,9 +815,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1037,25 +1033,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1103,9 +1090,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1326,25 +1317,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1392,9 +1374,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1600,25 +1586,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1666,9 +1643,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1880,25 +1861,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1946,9 +1918,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2154,25 +2130,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2220,9 +2187,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2436,25 +2407,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2502,9 +2464,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 548278b9893..52ebab99cfd 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -75,7 +75,7 @@ int Quoter_Factory_i::init (CORBA::Environment &ACE_TRY_ENV)
         }
       ACE_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, location_string);
+          ACE_TRY_ENV.print_exception (location_string);
           return -1;
         }
       ACE_ENDTRY;
@@ -141,7 +141,7 @@ Quoter_i::get_quote (char const *,
 
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
-                const CosLifeCycle::Criteria &/*the_criteria*/,
+                const CosLifeCycle::Criteria &the_criteria,
                 CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
@@ -252,7 +252,7 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quoter_i::copy - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
 
       // Report a NoFactory exception back to the caller
       ACE_TRY_THROW (CosLifeCycle::NoFactory ());
@@ -353,7 +353,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr there,
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR,"Quoter_i::move: %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
       return;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 6fef5b30fb5..33b0a7acb04 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -143,7 +143,7 @@ Quoter_Client::run (void)
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter_Client::run");
+      ACE_TRY_ENV.print_exception ("Quoter_Client::run");
       return -1;
     }
   ACE_ENDTRY;
@@ -279,12 +279,12 @@ Quoter_Client::init_naming_service (void)
   ACE_CATCH (CosLifeCycle::NoFactory, excpt)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (excpt, "Quoter::init_naming_service: No Factory available!");
+      ACE_TRY_ENV.print_exception ("Quoter::init_naming_service: No Factory available!");
     }
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::init_naming_service - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter::init_naming_service");
+      ACE_TRY_ENV.print_exception ("Quoter::init_naming_service");
       return -1;
     }
   ACE_ENDTRY;
@@ -358,7 +358,7 @@ Quoter_Client::init (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter::init");
+      ACE_TRY_ENV.print_exception ("Quoter::init");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index e59ea061b85..0ee79286cbe 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -51,9 +51,6 @@ public:
   // Initialize the client communication endpoint with server.
 
 private:
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   int init_naming_service (void);
   // Function to initialize the naming service.
 
@@ -87,6 +84,9 @@ private:
   Stock::Quoter_var quoter_var_;
   // Quoter obj ref.
 
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
   int useLifeCycleService_;
   // Flag to tell if the a Generic Factory is going to be used
   // or the LifeCycle Service (0 means Generic Factory, 1 means LCS)
diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 72d6fbc2351..e4f26e66b5f 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -24,7 +24,6 @@ $sleeptime = 2;
 
 # other variables
 
-$status = 0;
 $n = 1;
 $leave = 1;
 $ior = 0;
@@ -91,17 +90,12 @@ sub generic_factory
 
 sub client
 {
-  my $exe = $EXEPREFIX."client$EXE_EXT";
-  my $args2 = "$other -l $debug $cm ".
+  my $exe = $EXEPREFIX."client$EXE_EXT $other -l $debug $cm ".
             "-ORBnameserviceior $ior -ORBsvcconf $c_conf";
+
   for ($j = 0; $j < $n; $j++)
   {
-    $client_ = Process::Create($exe, $args2);
-    if ( $client_->TimedWait (60) ) {
-      print STDERR "ERROR: a client has timedout\n";
-      $status = 1;
-      $client_->Kill (); $client_->TimedWait (1);
-    }
+    system ($exe);
   }
 }
 
@@ -113,7 +107,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
   {
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
     {
-      print "run_test [-n num] [-leave] [-onewin]".
+      print "run_test [-n num] [-leave] [-onewin]"
 	"[-twowin] [-d] [-h] [-nt] [-cm] [-sm] [-ns|sv|ff|cl|gf]\n";
       print "\n";
       print "-n num              -- runs the client num times\n";
@@ -238,31 +232,12 @@ client ();
 
 if ($leave)
 {
-  $GF->Terminate ();
-  $FF->Terminate ();
-  $SV->Terminate ();
-  $LC->Terminate ();
-  $NS->Terminate ();
-  if ($GF->TimedWait (5) == -1 ||
-      $FF->TimedWait (5) == -1 ||
-      $SV->TimedWait (5) == -1 ||
-      $LC->TimedWait (5) == -1 ||
-      $NS->TimedWait (5) == -1){
-    print STDERR "ERROR: couldn't terminate services nicely\n";
-    $status = 1;
-    $GF->Kill (); $GF->TimedWait (1);
-    $FF->Kill (); $FF->TimedWait (1);
-    $SV->Kill (); $SV->TimedWait (1);
-    $LC->Kill (); $LC->TimedWait (1);
-    $NS->Kill (); $NS->TimedWait (1);
-  }
+  $GF->Kill ();
+  $FF->Kill ();
+  $SV->Kill ();
+  $LC->Kill ();
+  $NS->Kill ();
+}
 
 
 unlink $nsiorfile;
-
-if ($status != 0)
-{
-    exit 1;
-}
-
-exit 0;
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index f954ca72f1f..3a4c64d1604 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -138,7 +138,7 @@ Quoter_Server::init (int argc,
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quote_Server::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
       ACE_RETHROW;
     }
   ACE_ENDTRY;
@@ -199,7 +199,7 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Quote_Server::init_naming_service - %s", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
       return -1;
     }
   ACE_ENDTRY;
@@ -242,7 +242,8 @@ Quoter_Server::~Quoter_Server (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Could not unbind Quoter Server from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "~Quoter_Server");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "~Quoter_Server");
     }
   ACE_ENDTRY;
 
@@ -269,12 +270,14 @@ main (int argc, char *argv[])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/README b/TAO/examples/README
index 8142a4cb25d..ee5528aec67 100644
--- a/TAO/examples/README
+++ b/TAO/examples/README
@@ -3,34 +3,15 @@ illustrate how to program with standard CORBA using TAO.  The
 individual directories contain READMEs on how to run the following
 examples:
 
-        . Borland 
-
-          This directory illustrates how to write a Borland C++
-          Builder application using ACE+TAO.
-
-        . Callback_Quoter
-
-          Illustrates how to implement distributed callbacks using
-          TAO.
-
-        . Event_Comm
-
-          Another illustration of how to implement distributed
-          callbacks using TAO.
-
-        . Logging 
-
-          This example implements a simple logging service using TAO.
-
         . POA
 
           Contains various small examples of POA features based on
           the OMG POA specification.
 
-        . OBV
+        . Callback_Quoter
 
-          This is a demonstration of the CORBA 2.3 valuetype feature from
-          the Object-by-Value specification.
+          Illustrates how to implement distributed callbacks using
+          TAO.
 
         . Quoter
         
@@ -40,14 +21,7 @@ examples:
                       
         . Simple
           
-          Contains a number of simple CORBA examples, which also
+          Contains a number of very simple examples, which also
           illustrate how to write canonical Orbix/VisiBroker/OmniORB
           examples in TAO using standard CORBA features rather than
           proprietary ORB features.
-
-        . Simulator
-
-          This is a demonstration of the TAO "Distributed Object
-          Visualization Environment" (DOVE), which shows how the TAO
-          Real-time Event Service can be used to transport monitoring
-          events.
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 92fb6658ca1..4cb71221113 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -178,7 +178,7 @@ Server<Servant>::init (const char *servant_name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\tException in activation of POA");
+      ACE_TRY_ENV.print_exception ("\tException in activation of POA");
       return -1;
     }
   ACE_ENDTRY;
@@ -220,9 +220,6 @@ Server<Servant>::register_name (void)
       CORBA::Object_var object = servant_._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       naming_server_->rebind (bindName,
                               object.in(),
                               ACE_TRY_ENV);
@@ -237,13 +234,13 @@ Server<Servant>::register_name (void)
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Unable to bind %s \n",
                          name),
                         -1);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -404,7 +401,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ACE_TRY_ENV.print_exception ("Client_i::init");
       return -1;
     }
   ACE_ENDTRY;
@@ -427,11 +424,11 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &AC
                            "the TAO_Naming_Client. \n"),
                           -1);
 
-
       CosNaming::Name server_name (1);
       server_name.length (1);
       server_name[0].id =
       CORBA::string_dup (this->name_);
+
       CORBA::Object_var obj =
         naming_client_->resolve (server_name,
                                 ACE_TRY_ENV);
@@ -443,7 +440,7 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &AC
     }
   ACE_CATCHANY
     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::obtain_initial_references");
+      ACE_TRY_ENV.print_exception ("Client::obtain_initial_references");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 5e9a2d38cc7..fdd8df7b895 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -73,7 +73,7 @@ AccountManager_i::open (const char *name,
       if (hash_map_.bind (name, result) == -1)
         {
           delete result;
-          ACE_THROW_RETURN (CORBA::UNKNOWN (),
+          TAO_THROW_RETURN (CORBA::UNKNOWN (),
                             Bank::Account::_nil ());
         }
     }
@@ -115,8 +115,7 @@ AccountManager_i::close (Bank::Account_ptr account,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Unable to close Account\n");
+      ACE_TRY_ENV.print_exception ("Unable to close Account\n");
     }
   ACE_ENDTRY;
   ACE_CHECK;
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index 0b0cf0d338f..4b944aea6aa 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -53,14 +53,14 @@ Account_i::deposit (CORBA::Float deposit,
 
 void
 Account_i::withdraw (CORBA::Float withdrawl,
-		     CORBA::Environment &ACE_TRY_ENV)
+		     CORBA::Environment &env)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Bank::Account::Overdraft))
 {
   if (balance_ >= withdrawl)
     balance_ -= withdrawl;
   else
-    ACE_THROW (Bank::Account::Overdraft ("Exception::Overdraft\n"));
+    env.exception (new Bank::Account::Overdraft ("Exception::Overdraft\n"));
 }
 
 char *
diff --git a/TAO/examples/Simple/bank/Bank_Client.bor b/TAO/examples/Simple/bank/Bank_Client.bor
deleted file mode 100644
index 5ac765c1748..00000000000
--- a/TAO/examples/Simple/bank/Bank_Client.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#
-# Makefile for building the Bank example
-# 
-
-NAME = Bank_Client
-  
-OBJFILES = \
-	$(OBJDIR)\BankC.obj \
-	$(OBJDIR)\BankS.obj \
-	$(OBJDIR)\Bank_Client_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\client.obj
-  
-CPPDIR = .;..
-
-IDLDIR = .
-  
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-  
-# 
-# IDL Build rules
-# 
-  
-$(IDLDIR)\BankC.cpp $(IDLDIR)\BankS.cpp: $(IDLDIR)\Bank.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index 75ebde8c975..9dd30909273 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -51,24 +51,24 @@ Bank_Client_i::check_accounts (void )
   ACE_TRY_NEW_ENV
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for account with same name\n"));
+                  "\nTests for account with same name"));
       this->test_for_same_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for account with different names\n"));
+                  "\nTests for account with different names"));
       this->test_for_different_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for overdrafts\n"));
+                  "\nTests for overdrafts"));
       this->test_for_overdraft (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "From Bank_Client_i::check_accounts()"));
+                  "(\nFrom Bank_Client_i::check_accounts()"));
     }
   ACE_ENDTRY;
   return 0;
diff --git a/TAO/examples/Simple/bank/Bank_Server.bor b/TAO/examples/Simple/bank/Bank_Server.bor
deleted file mode 100644
index cd051fc8ea1..00000000000
--- a/TAO/examples/Simple/bank/Bank_Server.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Makefile for building the Bank example
-# 
-
-NAME = Bank_Server
-  
-OBJFILES = \
-	$(OBJDIR)\BankC.obj \
-	$(OBJDIR)\BankS.obj \
-	$(OBJDIR)\Account_i.obj \
-	$(OBJDIR)\AccountManager_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\server.obj
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-# 
-# IDL Build rules
-# 
-
-$(IDLDIR)\BankC.cpp $(IDLDIR)\BankS.cpp: $(IDLDIR)\Bank.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index e8fcf27555b..34326baaa52 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -47,12 +47,11 @@ BIN2 = server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -202,25 +201,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -268,9 +258,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -350,7 +344,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- BankC.i
+ BankC.i BankS.h BankS_T.h BankS_T.i BankS_T.cpp BankS.i
 .obj/BankS.o .obj/BankS.so .shobj/BankS.o .shobj/BankS.so: BankS.cpp BankS.h BankC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -460,25 +454,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -526,9 +511,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -730,13 +719,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -789,6 +771,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1016,13 +1000,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1075,6 +1052,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1291,25 +1270,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1357,9 +1327,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1561,13 +1535,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  BankS.h BankC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1620,6 +1587,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1821,13 +1790,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1880,6 +1842,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2107,13 +2071,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2166,6 +2123,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/bank/Makefile.bor b/TAO/examples/Simple/bank/Makefile.bor
deleted file mode 100644
index c1449bea116..00000000000
--- a/TAO/examples/Simple/bank/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#
-# Makefile for building the Bank example
-# 
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	$(MAKE) -f Bank_Client.bor $(MAKE_FLAGS)
-	$(MAKE) -f Bank_Server.bor $(MAKE_FLAGS)
-
diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl
index 306d5b0a25d..f4948d43f2f 100755
--- a/TAO/examples/Simple/bank/run_test.pl
+++ b/TAO/examples/Simple/bank/run_test.pl
@@ -8,32 +8,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "../../../../bin";
 require ACEutils;
 require Process;
-$status = 0;
 
-$iorfile = "bank.ior";
-
-unlink $iorfile;
+$iorfile = "grid.ior";
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$client = Process::Create($EXEPREFIX."client$EXE_EXT","-f $iorfile");
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: the client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimedWait (1);
-}
-
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$EXE_EXT -f $iorfile");
+
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index cc7cca34f15..b72ba205331 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -25,17 +25,18 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-
   ACE_ENDTRY;
 
   return 0;
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index 5b36c2067c0..31ee1565565 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -43,7 +43,7 @@ Broadcaster_i::~Broadcaster_i (void)
 void
 Broadcaster_i::add (Receiver_ptr receiver,
                     const char *nickname,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_TRY_ENV)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -57,7 +57,8 @@ Broadcaster_i::add (Receiver_ptr receiver,
 
   // Insert the Receiver reference to the set
   if (receiver_set_.insert (receiver_data) == -1)
-    ACE_THROW (Broadcaster::CannotAdd ("failed to add to the receiver set\n"));
+    TAO_TRY_ENV.exception (new Broadcaster::CannotAdd
+                           ("failed to add to the receiver set\n"));
 
   // Tell everyone which person just joined the chat.
   ACE_CString broadcast_string =
@@ -65,24 +66,22 @@ Broadcaster_i::add (Receiver_ptr receiver,
     + ACE_CString (nickname)
     + ACE_CString (" has joined the chat ****\n");
 
-  ACE_TRY
+  TAO_TRY
     {
       this->broadcast (broadcast_string.fast_rep (),
-		       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+		       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Broadcaster_i::broadcast failed.\t\n");
+      TAO_TRY_ENV.print_exception ("Broadcaster_i::add\t\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Broadcaster_i::remove (Receiver_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_TRY_ENV)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -109,7 +108,8 @@ Broadcaster_i::remove (Receiver_ptr receiver,
 
   // Remove the reference from our list.
   if (this->receiver_set_.remove (receiver_data_to_remove) == -1)
-    ACE_THROW(Broadcaster::CannotRemove ("failed to remove from receiver set\n"));
+    TAO_TRY_ENV.exception(new Broadcaster::CannotRemove
+                          ("failed to remove from receiver set\n"));
 
   // Tell everyone, which person left the chat.
   ACE_CString broadcast_string = "**** "
@@ -118,19 +118,18 @@ Broadcaster_i::remove (Receiver_ptr receiver,
     + " ****\n";
 
   this->broadcast (broadcast_string.fast_rep (),
-                   ACE_TRY_ENV);
-  ACE_CHECK;
+                   TAO_TRY_ENV);
 }
 
 void
 Broadcaster_i::say (Receiver_ptr receiver,
                     const char *text,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &T)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_TRY
+  TAO_TRY
     {
       ACE_CString sender_nickname ("Sender Unknown");
 
@@ -152,21 +151,19 @@ Broadcaster_i::say (Receiver_ptr receiver,
       ACE_CString broadcast_string ("[" + sender_nickname + "] " + text);
 
       this->broadcast (broadcast_string.fast_rep (),
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Broadcaster_i::say\t\n");
+      TAO_TRY_ENV.print_exception ("Broadcaster_i::say\t\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Broadcaster_i::broadcast (const char *text,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &)
 {
   // Broadcast the message to all registered clients.
 
@@ -174,18 +171,17 @@ Broadcaster_i::broadcast (const char *text,
        iter != this->receiver_set_.end ();
        iter++)
     {
-      ACE_TRY
+      TAO_TRY
         {
           (*iter).receiver_->message (text,
-                                      ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Failed to send a message\n");
+          TAO_TRY_ENV.print_exception ("Failed to send a message\n");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
     }
 }
 
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index ceddecdd4eb..fd528d0ad45 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -46,7 +46,7 @@ public:
 
   virtual void add (Receiver_ptr receiver,
                     const char *nickname,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_TRY_ENV)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -54,7 +54,7 @@ public:
   // Saves receiver references in a list.
 
   virtual void remove (Receiver_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_TRY_ENV)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -63,7 +63,7 @@ public:
 
   virtual void say (Receiver_ptr receiver,
                     const char *text,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_TRY_ENV)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -74,7 +74,7 @@ public:
   // The ORB manager.
 
   void broadcast (const char* text,
-                  CORBA::Environment &ACE_TRY_ENV);
+                  CORBA::Environment &TAO_TRY_ENV);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
diff --git a/TAO/examples/Simple/chat/Chat_Client.bor b/TAO/examples/Simple/chat/Chat_Client.bor
deleted file mode 100644
index e368444e5f2..00000000000
--- a/TAO/examples/Simple/chat/Chat_Client.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Makefile for building the Chat example
-# 
-
-NAME = Chat_Client
-
-OBJFILES = \
-	$(OBJDIR)\ReceiverC.obj \
-	$(OBJDIR)\ReceiverS.obj \
-	$(OBJDIR)\BroadcasterC.obj \
-	$(OBJDIR)\BroadcasterS.obj \
-	$(OBJDIR)\Receiver_i.obj \
-	$(OBJDIR)\Client_i.obj \
-	$(OBJDIR)\client.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-  
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BroadcasterC.cpp $(IDLDIR)\BroadcasterS.cpp: $(IDLDIR)\Broadcaster.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\ReceiverC.cpp $(IDLDIR)\ReceiverS.cpp: $(IDLDIR)\Receiver.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/chat/Chat_Server.bor b/TAO/examples/Simple/chat/Chat_Server.bor
deleted file mode 100644
index e903c00d5da..00000000000
--- a/TAO/examples/Simple/chat/Chat_Server.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Makefile for building the Chat example
-# 
-
-NAME = Chat_Server
-
-OBJFILES = \
-	$(OBJDIR)\ReceiverC.obj \
-	$(OBJDIR)\ReceiverS.obj \
-	$(OBJDIR)\BroadcasterC.obj \
-	$(OBJDIR)\BroadcasterS.obj \
-	$(OBJDIR)\Broadcaster_i.obj \
-	$(OBJDIR)\Server_i.obj \
-	$(OBJDIR)\server.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-  
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BroadcasterC.cpp $(IDLDIR)\BroadcasterS.cpp: $(IDLDIR)\Broadcaster.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\ReceiverC.cpp $(IDLDIR)\ReceiverS.cpp: $(IDLDIR)\Receiver.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 5283f6b1b29..7c9c9f74806 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -81,14 +81,16 @@ Client_i::init (int argc, char *argv[])
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_TRY_NEW_ENV
+  CORBA::Environment TAO_TRY_ENV;
+
+  TAO_TRY
     {
       // Retrieve the ORB.
       this->orb_manager_.init (argc,
                                argv,
                                0,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::ORB_var orb = this->orb_manager_.orb ();
 
@@ -104,8 +106,8 @@ Client_i::init (int argc, char *argv[])
 
       CORBA::Object_var server_object =
 	orb->string_to_object (this->ior_,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (server_object.in ()))
 	ACE_ERROR_RETURN ((LM_ERROR,
@@ -114,16 +116,15 @@ Client_i::init (int argc, char *argv[])
 			  -1);
 
       this->server_ = Broadcaster::_narrow (server_object.in (),
-					    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+					    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client_i::init\n");
+      TAO_TRY_ENV.print_exception ("client_i::init\n");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Register our <Input_Handler> to handle STDIN events, which will
   // trigger the <handle_input> method to process these events.
@@ -146,34 +147,34 @@ Client_i::run (void)
 	      "\n============= Simple Chat =================\n"
 	      "========== type 'quit' to exit  ===========\n"));
 
-  ACE_TRY_NEW_ENV
+  CORBA::Environment TAO_TRY_ENV;
+
+  TAO_TRY
     {
-      PortableServer::POAManager_var poa_manager =
-        this->orb_manager_.poa_manager ();
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      PortableServer::POAManager_var poa_manager = this->orb_manager_.poa_manager ();
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->receiver_var_ =
-	this->receiver_i_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	this->receiver_i_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Register ourselves with the server.
       server_->add (this->receiver_var_.in (),
 		    this->nickname_,
-		    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+		    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the ORB.
-      this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->orb_manager_.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_i::run ()");
+      TAO_TRY_ENV.print_exception ("Client_i::run ()");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -186,7 +187,9 @@ Client_i::handle_input (ACE_HANDLE)
   if (ACE_OS::fgets (buf, BUFSIZ, stdin) == 0)
     return 0;
 
-  ACE_TRY_NEW_ENV
+  CORBA::Environment TAO_TRY_ENV;
+
+  TAO_TRY
     {
       // Check if the user wants to quit.
       if (ACE_OS::strncmp (buf,
@@ -195,9 +198,9 @@ Client_i::handle_input (ACE_HANDLE)
 	{
 	  // Remove ourselves from the server.
 	  this->server_->remove (this->receiver_var_.in ());
-	  this->receiver_i_.shutdown (ACE_TRY_ENV);
+	  this->receiver_i_.shutdown (TAO_TRY_ENV);
 
-	  ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
 	  return 0;
 	}
 
@@ -205,16 +208,15 @@ Client_i::handle_input (ACE_HANDLE)
       // the server.
       this->server_->say (this->receiver_var_.in (),
 			  buf,
-			  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Input_Handler::init");
+      TAO_TRY_ENV.print_exception ("Input_Handler::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 695f9ac3c97..90a6a02eba0 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -47,7 +47,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -192,25 +191,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -258,9 +248,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -340,7 +334,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- ReceiverC.i
+ ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \
+ ReceiverS.i
 .obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -450,25 +445,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -516,9 +502,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -708,25 +698,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -774,9 +755,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -856,7 +841,9 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- ReceiverC.h ReceiverC.i BroadcasterC.i
+ ReceiverC.h ReceiverC.i BroadcasterC.i BroadcasterS.h ReceiverS.h \
+ ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
+ BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i
 .obj/BroadcasterS.o .obj/BroadcasterS.so .shobj/BroadcasterS.o .shobj/BroadcasterS.so: BroadcasterS.cpp BroadcasterS.h ReceiverS.h \
  ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -967,25 +954,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1033,9 +1011,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1227,25 +1209,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1293,9 +1266,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1486,25 +1463,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1552,9 +1520,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1748,25 +1720,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1814,9 +1777,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2013,25 +1980,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2079,9 +2037,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2276,25 +2238,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2342,9 +2295,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2539,25 +2496,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2605,9 +2553,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/chat/Makefile.bor b/TAO/examples/Simple/chat/Makefile.bor
deleted file mode 100644
index 828f0dc2c93..00000000000
--- a/TAO/examples/Simple/chat/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the Chat example
-# 
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	$(MAKE) -f Chat_Client.bor $(MAKE_FLAGS)
-	$(MAKE) -f Chat_Server.bor $(MAKE_FLAGS)
-
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 20498d907a3..324abe03ffe 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -38,13 +38,13 @@ public:
   // Destructor.
 
   virtual void message (const char *msg,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &TAO_TRY_ENV)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
   // Receives a message string.
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (CORBA::Environment &TAO_TRY_ENV)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 5194253d1d5..b5e4baa2a71 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -60,7 +60,7 @@ Server_i::parse_args (int argc, char *argv[])
 int
 Server_i::init (int argc,
 		char *argv[],
-		CORBA::Environment &ACE_TRY_ENV)
+		CORBA::Environment &env)
 {
   // Parse the command line options.
   if (this-> parse_args(argc, argv) == -1)
@@ -68,34 +68,32 @@ Server_i::init (int argc,
 
   if (this->orb_manager_.init (argc,
 			       argv,
-			       ACE_TRY_ENV) == -1)
+			       env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "%p\n",
 		       "orb manager init failed\n"),
 		      -1);
-  ACE_CHECK_RETURN (-1);
-
+  TAO_CHECK_ENV_RETURN (env,
+			-1);
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Activate the servant.
   CORBA::String_var str =
     this->orb_manager_.activate (&this->broadcaster_i_,
-				 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+				 env);
   // Write the IOR to a file.
   this->write_IOR (str.in ());
   return 0;
 }
 
 int
-Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Server_i::run (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
 	      "Running chat server...\n"));
 
   // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+  if (this->orb_manager_.run (env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "Server_i::run"),
 		      -1);
diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp
index 7caf6e595a0..fb6f17aff2f 100644
--- a/TAO/examples/Simple/chat/client.cpp
+++ b/TAO/examples/Simple/chat/client.cpp
@@ -21,7 +21,7 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       Client_i client_i;
 
@@ -29,15 +29,14 @@ main (int argc, char *argv[])
 	  || client_i.run () == -1)
 	return -1;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client::main\t\n");
+      TAO_TRY_ENV.print_exception ("client::main\t\n");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index fe8731c6af8..65cb736e0c7 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -22,34 +22,35 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  CORBA::Environment TAO_TRY_ENV;
+
+  TAO_TRY
     {
       Server_i server_i;
 
-      if (server_i.init (argc, argv, ACE_TRY_ENV) != 0)
+      if (server_i.init (argc, argv, TAO_TRY_ENV) != 0)
 	{
-	  ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
 
 	  ACE_ERROR_RETURN ((LM_ERROR,
 			     "\n error in init.\n"),
 			    1);
 	}
-      if (server_i.run (ACE_TRY_ENV) != 0)
+      if (server_i.run (TAO_TRY_ENV) != 0)
 	{
-	  ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
 
 	  ACE_ERROR_RETURN ((LM_ERROR,
 			     "\n error in run.\n"),
 			    1);
 	}
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server::main\t\n");
+      TAO_TRY_ENV.print_exception ("server::main\t\n");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/echo/Echo_Client.bor b/TAO/examples/Simple/echo/Echo_Client.bor
deleted file mode 100644
index 0c713169e12..00000000000
--- a/TAO/examples/Simple/echo/Echo_Client.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Echo example
-# 
-
-NAME = Echo_Client
-
-OBJFILES = \
-	$(OBJDIR)\EchoC.obj \
-	$(OBJDIR)\EchoS.obj \
-	$(OBJDIR)\Echo_Client_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\client.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#       
-# IDL Build rules
-#
-
-$(IDLDIR)\EchoC.cpp $(IDLDIR)\EchoS.cpp: $(IDLDIR)\Echo.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/echo/Echo_Server.bor b/TAO/examples/Simple/echo/Echo_Server.bor
deleted file mode 100644
index 69cdc42b017..00000000000
--- a/TAO/examples/Simple/echo/Echo_Server.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Echo example
-# 
-
-NAME = Echo_Server
-
-OBJFILES = \
-	$(OBJDIR)\EchoC.obj \
-	$(OBJDIR)\EchoS.obj \
-	$(OBJDIR)\Echo_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\server.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#       
-# IDL Build rules
-#
-
-$(IDLDIR)\EchoC.cpp $(IDLDIR)\EchoS.cpp: $(IDLDIR)\Echo.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 50cbc84bdd0..907fbf503cc 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -31,8 +31,6 @@ Echo_i::echo_list (const char *message,
                    CORBA::Environment &)
  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (message);
-
   Echo::List *list;
   
   ACE_NEW_RETURN (list,
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index e6f81721987..cc418e42f1f 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -45,12 +45,11 @@ BIN2 = server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -199,25 +198,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -265,9 +255,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -347,7 +341,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- EchoC.i
+ EchoC.i EchoS.h EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
 .obj/EchoS.o .obj/EchoS.so .shobj/EchoS.o .shobj/EchoS.so: EchoS.cpp EchoS.h EchoC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -457,25 +451,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -523,9 +508,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -727,13 +716,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -786,6 +768,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1013,13 +997,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1072,6 +1049,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1288,25 +1267,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1354,9 +1324,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1558,13 +1532,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1617,6 +1584,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1844,13 +1813,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1903,6 +1865,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/echo/Makefile.bor b/TAO/examples/Simple/echo/Makefile.bor
deleted file mode 100644
index f8514256edc..00000000000
--- a/TAO/examples/Simple/echo/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#
-# Makefile for building the Echo example
-# 
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	$(MAKE) -f Echo_Client.bor $(MAKE_FLAGS)
-	$(MAKE) -f Echo_Server.bor $(MAKE_FLAGS)
-
diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index d5853ba10b8..ae10cef07a2 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -9,30 +9,14 @@ use lib "../../../../bin";
 require ACEutils;
 require Process;
 
-$status = 0;
 $iorfile = "echo.ior";
 
 $SV = Process::Create ("server$EXE_EXT", "-o $iorfile ");
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x");
-
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimedWait (1);
-}
-
-if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
 
+sleep ($ACE::sleeptime);
+$status = system ("client$EXE_EXT -f $iorfile -x");
+
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index e6a4b082018..e8100524fae 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -27,17 +27,18 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-
   ACE_ENDTRY;
 
   return 0;
diff --git a/TAO/examples/Simple/grid/Grid_Client.bor b/TAO/examples/Simple/grid/Grid_Client.bor
deleted file mode 100644
index 069a4fda830..00000000000
--- a/TAO/examples/Simple/grid/Grid_Client.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Grid example
-# 
-
-NAME = Grid_Client
-
-OBJFILES = \
-	$(OBJDIR)\GridC.obj \
-	$(OBJDIR)\GridS.obj \
-	$(OBJDIR)\Grid_Client_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\client.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#       
-# IDL Build rules
-#
-
-$(IDLDIR)\GridC.cpp $(IDLDIR)\GridS.cpp: $(IDLDIR)\Grid.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/grid/Grid_Server.bor b/TAO/examples/Simple/grid/Grid_Server.bor
deleted file mode 100644
index 2143d8e8338..00000000000
--- a/TAO/examples/Simple/grid/Grid_Server.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Grid example
-# 
-
-NAME = Grid_Server
-
-OBJFILES = \
-	$(OBJDIR)\GridC.obj \
-	$(OBJDIR)\GridS.obj \
-	$(OBJDIR)\Grid_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\server.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#       
-# IDL Build rules
-#
-
-$(IDLDIR)\GridC.cpp $(IDLDIR)\GridS.cpp: $(IDLDIR)\Grid.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index e4baa90e810..a46d8fbe68c 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -83,7 +83,7 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (CORBA::Environment &)
+Grid_i::width (CORBA::Environment &A)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
@@ -161,8 +161,7 @@ Grid_Factory_i::Grid_Factory_i (void)
 
 // Copy Constructor
 
-Grid_Factory_i::Grid_Factory_i (Grid_Factory_i &grid)
-  :POA_Grid_Factory (grid)
+Grid_Factory_i::Grid_Factory_i (Grid_Factory_i &)
 {
   // no-op
 }
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index 1bcd6f88adc..831b8e96999 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -45,12 +45,11 @@ BIN2 = server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -200,25 +199,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -266,9 +256,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -348,7 +342,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- GridC.i
+ GridC.i GridS.h GridS_T.h GridS_T.i GridS_T.cpp GridS.i
 .obj/GridS.o .obj/GridS.so .shobj/GridS.o .shobj/GridS.so: GridS.cpp GridS.h GridC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -458,25 +452,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -524,9 +509,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -728,13 +717,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -787,6 +769,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1014,13 +998,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1073,6 +1050,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1289,25 +1268,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1355,9 +1325,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1559,13 +1533,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1618,6 +1585,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1845,13 +1814,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1904,6 +1866,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/grid/Makefile.bor b/TAO/examples/Simple/grid/Makefile.bor
deleted file mode 100644
index 928d64225bc..00000000000
--- a/TAO/examples/Simple/grid/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the Grid example
-# 
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	$(MAKE) -f Grid_Client.bor $(MAKE_FLAGS)
-	$(MAKE) -f Grid_Server.bor $(MAKE_FLAGS)
-
diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl
index 31d1ba57a89..25622a4869f 100755
--- a/TAO/examples/Simple/grid/run_test.pl
+++ b/TAO/examples/Simple/grid/run_test.pl
@@ -9,30 +9,15 @@ use lib "../../../../bin";
 require ACEutils;
 require Process;
 
-$status = 0;
 $iorfile = "grid.ior";
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
-
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimedWait (1);
-}
-
-if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
+
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index e721da11e9f..0d31fd11cef 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -27,20 +27,19 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      //ACE_UNUSED_ARG (userex);
-      ACE_PRINT_EXCEPTION (userex, "User Exception in main");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      //ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex, "System Exception in main ");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile
index a8531bca24b..899dcfde611 100644
--- a/TAO/examples/Simple/time-date/Makefile
+++ b/TAO/examples/Simple/time-date/Makefile
@@ -49,12 +49,11 @@ BIN2 = server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -64,8 +63,8 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
@@ -75,7 +74,9 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), Time_Date$(ext))
+.PRECIOUS: Time_DateC.cpp Time_DateC.i Time_DateC.h
+.PRECIOUS: Time_DateS.cpp Time_DateS.i Time_DateS.h
+.PRECIOUS: Time_DateS_T.cpp Time_DateS_T.i Time_DateS_T.h
 
 server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS)) $(SHLIB)
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -86,7 +87,7 @@ client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 $(BIN):
 
 realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), Time_Date$(ext))
+	-$(RM) Time_DateC.* Time_DateS.* Time_DateS_T.*
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -213,25 +214,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -279,9 +271,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -478,25 +474,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -544,9 +531,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -737,25 +728,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -803,9 +785,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -996,25 +982,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1062,9 +1039,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1144,7 +1125,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Time_DateC.i
+ Time_DateC.i Time_DateS.h Time_DateS_T.h Time_DateS_T.i \
+ Time_DateS_T.cpp Time_DateS.i
 .obj/Time_DateC.o .obj/Time_DateC.so .shobj/Time_DateC.o .shobj/Time_DateC.so: Time_DateC.cpp Time_DateC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1254,25 +1236,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1320,9 +1293,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1402,7 +1379,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Time_DateC.i
+ Time_DateC.i Time_DateS.h Time_DateS_T.h Time_DateS_T.i \
+ Time_DateS_T.cpp Time_DateS.i
 .obj/Time_DateS.o .obj/Time_DateS.so .shobj/Time_DateS.o .shobj/Time_DateS.so: Time_DateS.cpp Time_DateS.h Time_DateC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1512,25 +1490,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1578,9 +1547,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1783,13 +1756,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1842,6 +1808,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2128,25 +2096,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2194,9 +2153,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2400,13 +2363,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2459,6 +2415,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2686,13 +2644,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2745,6 +2696,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 3f200cbfba2..9aa2f4efe4b 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -19,12 +19,14 @@ DLL_ORB::svc (void)
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
@@ -137,7 +139,7 @@ Time_Date_Servant::init (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "DLL_ORB::init");
+      ACE_TRY_ENV.print_exception ("DLL_ORB::init");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index d99e82b091f..c4e5eae31c1 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -19,8 +19,8 @@ Time_Date_Client_i::~Time_Date_Client_i (void)
 }
 
 int
-Time_Date_Client_i::parse_args (int,
-                                char *[])
+Time_Date_Client_i::parse_args (int argc,
+                                char *argv[])
 {
   return 0;
 }
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index b65fcbf3705..4927946eef7 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -22,8 +22,9 @@ Time_Date_i::~Time_Date_i (void)
 
 void
 Time_Date_i::bin_date (CORBA::Long_out time_date,
-                       CORBA::Environment &)
+                       CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
+
 {
   time_date = ACE_OS::time (0);
 }
@@ -32,7 +33,7 @@ Time_Date_i::bin_date (CORBA::Long_out time_date,
 
 void 
 Time_Date_i::str_date (CORBA::String_out time_date,
-                       CORBA::Environment &)
+                       CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const time_t time = ACE_OS::time (0);
diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl
index db51575ab5e..f28df1cc42f 100755
--- a/TAO/examples/Simple/time-date/run_test.pl
+++ b/TAO/examples/Simple/time-date/run_test.pl
@@ -9,31 +9,15 @@ use lib "../../../../bin";
 require ACEutils;
 require Process;
 
-$status = 0;
 $iorfile = "./ior";
 
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT");
 
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
+ACE::waitforfile ($iorfile);
 
-$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
-                            "-f $iorfile -ORBSkipServiceConfigOpen");
+$status  = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -ORBSkipServiceConfigOpen");
 
-if ($CL->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 43dd4327d32..05710db6f9b 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -45,12 +45,11 @@ BIN2 = server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -200,25 +199,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -266,9 +256,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -348,7 +342,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- TimeC.i
+ TimeC.i TimeS.h TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
 .obj/TimeS.o .obj/TimeS.so .shobj/TimeS.o .shobj/TimeS.so: TimeS.cpp TimeS.h TimeC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -458,25 +452,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -524,9 +509,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -728,13 +717,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -787,6 +769,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1014,13 +998,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1073,6 +1050,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1289,25 +1268,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1355,9 +1325,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1559,13 +1533,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1618,6 +1585,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1845,13 +1814,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1904,6 +1866,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/examples/Simple/time/Makefile.bor b/TAO/examples/Simple/time/Makefile.bor
deleted file mode 100644
index 270f4ed8322..00000000000
--- a/TAO/examples/Simple/time/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the Time example
-# 
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	$(MAKE) -f Time_Client.bor $(FLAGS)
-	$(MAKE) -f Time_Server.bor $(FLAGS)
-
diff --git a/TAO/examples/Simple/time/Time_Client.bor b/TAO/examples/Simple/time/Time_Client.bor
deleted file mode 100644
index 02c576ca036..00000000000
--- a/TAO/examples/Simple/time/Time_Client.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Time example
-# 
-
-NAME = Time_Client
-
-OBJFILES = \
-	$(OBJDIR)\TimeC.obj \
-	$(OBJDIR)\TimeS.obj \
-	$(OBJDIR)\Time_Client_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\client.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#       
-# IDL Build rules
-#
-
-$(IDLDIR)\TimeC.cpp $(IDLDIR)\TimeS.cpp: $(IDLDIR)\Time.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 7b355c10be8..6de676c9a34 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -47,7 +47,7 @@ Time_Client_i::run (const char *name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException");
+      ACE_TRY_ENV.print_exception ("\tException");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Simple/time/Time_Server.bor b/TAO/examples/Simple/time/Time_Server.bor
deleted file mode 100644
index 75f37ddc927..00000000000
--- a/TAO/examples/Simple/time/Time_Server.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for building the Time example
-# 
-
-NAME = Time_Server
-
-OBJFILES = \
-	$(OBJDIR)\TimeC.obj \
-	$(OBJDIR)\TimeS.obj \
-	$(OBJDIR)\Time_i.obj \
-	$(OBJDIR)\Simple_util.obj \
-	$(OBJDIR)\server.obj
-
-CPPDIR = .;.. 
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TimeC.cpp $(IDLDIR)\TimeS.cpp: $(IDLDIR)\Time.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 120cba137c8..0d3d95596f1 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -11,8 +11,7 @@ Time_i::Time_i (void)
 }
 
 // Copy  Constructor
-Time_i::Time_i (Time_i &t)
-  : POA_Time (t)
+Time_i::Time_i (Time_i & /* tim */)
 {
   // no-op
 }
diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl
index 1f9a7b4b9f4..83c8deddb96 100755
--- a/TAO/examples/Simple/time/run_test.pl
+++ b/TAO/examples/Simple/time/run_test.pl
@@ -9,29 +9,15 @@ unshift @INC, '../../../../bin';
 require ACEutils;
 require Process;
 
-$status = 0;
 $iorfile = "time.ior";
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$client = Process::Create ($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x");
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimeWait (1);
-}
-
-if ($SV->TimedWait (1) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -x");
+
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index d30839e572b..6b710f67f48 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -27,17 +27,20 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception in main");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception in main");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
+
   return 0;
 }
 
diff --git a/TAO/examples/Simulator/DOVEBrowser/Makefile b/TAO/examples/Simulator/DOVEBrowser/Makefile
index e05d9411af7..d3de3e5a12e 100644
--- a/TAO/examples/Simulator/DOVEBrowser/Makefile
+++ b/TAO/examples/Simulator/DOVEBrowser/Makefile
@@ -9,7 +9,7 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 #### VisiBroker 3.3
-JAVA_DIR = /project/doc/pkg/VisiJava3.4/bin/
+JAVA_DIR = /project/doc/pkg/VisiJava3.3/bin/
 IDL2JAVA = $(JAVA_DIR)idl2java
 JAVAC = $(JAVA_DIR)vbjc
 
diff --git a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp
index d8413060366..874c6125781 100644
--- a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp
@@ -16,6 +16,7 @@
 // ============================================================================
 
 #include "AnyAnalyser.h"
+#include "tao/Align.h"
 
 ACE_RCSID(DOVEMIB, AnyAnalyser, "$Id$")
 
@@ -74,13 +75,12 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
   CORBA::TypeCode_ptr param;
   const unsigned char *start_addr = value_ptr;
 
-  ACE_TRY_NEW_ENV
-  {
+  TAO_TRY {
     Node *node_ptr_ = 0;
 
     if (tc_ptr != 0) {
 
-      switch (tc_ptr->kind(ACE_TRY_ENV)) {
+      switch (tc_ptr->kind(TAO_TRY_ENV)) {
 
         case CORBA::tk_struct:
                 {
@@ -88,10 +88,10 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
             start_addr = value_ptr;
 
             // create a new Node
-                  StructNode *structNode_ptr_ = new StructNode (tc_ptr->name (ACE_TRY_ENV),
+                  StructNode *structNode_ptr_ = new StructNode (tc_ptr->name (TAO_TRY_ENV),
                                                                                    ri.recursion_level);
 
-            for (unsigned int i = 0; i < tc_ptr->member_count (ACE_TRY_ENV); i++) {
+            for (unsigned int i = 0; i < tc_ptr->member_count (TAO_TRY_ENV); i++) {
 
                     // get the TypeCode pointer to the ith parameter
                     // and analyse it recursively
@@ -102,16 +102,16 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
 
 
               // get the type code of the child i
-              param = tc_ptr->member_type (i, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              param = tc_ptr->member_type (i, TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               // get the size
-              /* size = */ param->size (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              /* size = */ param->size (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               // get the alignment
-              alignment = param->alignment (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              alignment = param->alignment (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               // calculate
               align_offset =
@@ -119,7 +119,7 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
                       - (ptr_arith_t) value_ptr
                       + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
                       - (ptr_arith_t) start_addr;
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
 
               // if both the start_addr and data are not aligned as per
               // the alignment, we do not add the offset
@@ -139,12 +139,12 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
           if (ri.kind == PARENT_IS_STRUCT) {
                   node_ptr_ = (Node *) new DoubleNode ((CORBA::Double *)value_ptr,
                                                                                ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               ACE_TRY_ENV),
+                                                                               TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
           else {
                   node_ptr_ = (Node *) new DoubleNode ((CORBA::Double *)value_ptr,
-                                                                               tc_ptr->name(ACE_TRY_ENV),
+                                                                               tc_ptr->name(TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
                 value_ptr += 8;
@@ -154,12 +154,12 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
           if (ri.kind == PARENT_IS_STRUCT) {
                 node_ptr_ = (Node *) new LongNode ((CORBA::Long *)value_ptr,
                                                                                ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               ACE_TRY_ENV),
+                                                                               TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
           else {
                   node_ptr_ = (Node *) new LongNode ((CORBA::Long *)value_ptr,
-                                                                           tc_ptr->name(ACE_TRY_ENV),
+                                                                           tc_ptr->name(TAO_TRY_ENV),
                                                                            ri.recursion_level);
           }
                 value_ptr += 4;
@@ -169,12 +169,12 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
           if (ri.kind == PARENT_IS_STRUCT) {
                 node_ptr_ = (Node *) new ULongNode ((CORBA::ULong *)value_ptr,
                                                                                ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               ACE_TRY_ENV),
+                                                                               TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
           else {
                   node_ptr_ = (Node *) new ULongNode ((CORBA::ULong *)value_ptr,
-                                                                              tc_ptr->name(ACE_TRY_ENV),
+                                                                              tc_ptr->name(TAO_TRY_ENV),
                                                                               ri.recursion_level);
           }
                 value_ptr += 4;
@@ -184,12 +184,12 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
           if (ri.kind == PARENT_IS_STRUCT) {
                 node_ptr_ = (Node *) new StringNode (*(CORBA::String_var *)value_ptr,
                                                                                ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               ACE_TRY_ENV),
+                                                                               TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
           else {
                 node_ptr_ = (Node *) new StringNode (*(CORBA::String_var *)value_ptr,
-                                                                               tc_ptr->name(ACE_TRY_ENV),
+                                                                               tc_ptr->name(TAO_TRY_ENV),
                                                                                ri.recursion_level);
           }
                   value_ptr += 4;
@@ -199,17 +199,17 @@ AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr,
                 exit (1);
                 break;
       }
-      ACE_TRY_CHECK;
-      return node_ptr_;
+      TAO_CHECK_ENV;
+            return node_ptr_;
     }
     else {
             ACE_DEBUG ((LM_ERROR, "AnyAnalyser::analyse: TypeCode pointer to member was Null!\n"));
     }
   }
-  ACE_CATCHANY {
+  TAO_CATCHANY {
     ACE_ERROR ((LM_ERROR, "(%t)AnyAnalyser::analyse: Error in analysing the any.\n"));
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp
index 726228024cc..ded0f6c359c 100644
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp
@@ -50,8 +50,7 @@ MIB_Consumer::MIB_Consumer (void)
 int 
 MIB_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                               const char *my_name) {
-  ACE_TRY_NEW_ENV
-	{
+  TAO_TRY {
     // Get a Scheduler.
 
     RtecScheduler::Scheduler_ptr server =
@@ -59,19 +58,19 @@ MIB_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
     // Define Real-time information.
 
-    rt_info_ = server->create (my_name, ACE_TRY_ENV);
+    rt_info_ = server->create (my_name, TAO_TRY_ENV);
 
       server->set (rt_info_,
-                   RtecScheduler::VERY_LOW_CRITICALITY,
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
-                   2500000,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero (),
-                   1,
-                   RtecScheduler::OPERATION,
-                   ACE_TRY_ENV);
+                        RtecScheduler::VERY_LOW_CRITICALITY,
+                       ORBSVCS_Time::zero,
+                       ORBSVCS_Time::zero,
+                       ORBSVCS_Time::zero,
+                       2500000,
+                       RtecScheduler::VERY_LOW_IMPORTANCE,
+                       ORBSVCS_Time::zero,
+                       1,
+                       RtecScheduler::OPERATION,
+                       TAO_TRY_ENV);
 
     // Create the event that we're registering for.
 
@@ -87,45 +86,44 @@ MIB_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
     // = Connect as a consumer.
 
-    this->consumer_admin_ = channel_admin_->for_consumers (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+    this->consumer_admin_ = channel_admin_->for_consumers (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // Obtain a pointer to a push supplier.  "suppliers" is
     // inherited from a base class.
 
-    this->suppliers_ = consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+    this->suppliers_ = consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // The _this function returns an object pointer. This is needed
     // because a consumer inherits from a Servant class that is no
     // CORBA::Object.
 
-    RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+    RtecEventComm::PushConsumer_var objref = this->_this (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     this->suppliers_->connect_push_consumer (objref.in (),
                                                dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+    TAO_CHECK_ENV;
   }
-  ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) {
+  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "MIB_Consumer::open: subscribe failed.\n"),
                         -1);
   }
-  ACE_CATCHANY {
+  TAO_CATCHANY {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "MIB_Consumer::open: unexpected exception.\n"),
                         -1);
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
 
 void
-MIB_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+MIB_Consumer::disconnect_push_consumer (CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Consumer received disconnect from channel.\n"));
@@ -137,8 +135,7 @@ MIB_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
 
 void
 MIB_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                        CORBA::Environment &)
 {
 
   if (events.length () == 0) {
@@ -168,7 +165,7 @@ MIB_Consumer::push (const RtecEventComm::EventSet &events,
         ACE_DEBUG ((LM_DEBUG, "MIB Consumer: received an event, going to be mute.\n"));
       }
  
-      ACE_TRY
+      TAO_TRY
       {
         // print the time stamps 
         ACE_hrtime_t creation;
@@ -187,10 +184,10 @@ MIB_Consumer::push (const RtecEventComm::EventSet &events,
 
         if (events[i].data.any_value.any_owns_data ())
         { 
-          void * void_ptr = ACE_OS::malloc (events[i].data.any_value.type()->size(ACE_TRY_ENV));
+          void * void_ptr = ACE_OS::malloc (events[i].data.any_value.type()->size(TAO_TRY_ENV));
 
           TAO_InputCDR stream ((ACE_Message_Block *)events[i].data.any_value.value ());
-          if (stream.decode (events[i].data.any_value.type(), void_ptr, 0, ACE_TRY_ENV)
+          if (stream.decode (events[i].data.any_value.type(), void_ptr, 0, TAO_TRY_ENV)
               != CORBA::TypeCode::TRAVERSE_CONTINUE)
           {
             cout << "MIB_Consumer::push: "
@@ -200,7 +197,7 @@ MIB_Consumer::push (const RtecEventComm::EventSet &events,
             ACE_OS::free(void_ptr);
             return;
           }
-	      ACE_TRY_CHECK;
+	        TAO_CHECK_ENV;
 
           // invoke the AnyAnalyser
           anyAnalyser_.printAny (events[i].data.any_value.type(), void_ptr);               
@@ -213,10 +210,10 @@ MIB_Consumer::push (const RtecEventComm::EventSet &events,
         }
           
       }
-      ACE_CATCHANY {
+      TAO_CATCHANY {
         ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
       }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
   }
 }
@@ -224,29 +221,29 @@ MIB_Consumer::push (const RtecEventComm::EventSet &events,
 void
 MIB_Consumer::shutdown (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // cause the AnyAnalyser to close the file 
       anyAnalyser_.close();
 
       // Disconnect from the push supplier.
-      this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ec = 0;
 
       TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR,
                  "(%t) MIB_Consumer::shutdown: unexpected exception.\n"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // function get_options
@@ -317,13 +314,13 @@ get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -334,12 +331,12 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager = 
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
@@ -351,8 +348,8 @@ main (int argc, char *argv [])
 
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 
@@ -367,12 +364,12 @@ main (int argc, char *argv [])
 
       CORBA::Object_var ec_obj =
         naming_context->resolve (channel_name,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (ec.ptr() == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -387,13 +384,13 @@ main (int argc, char *argv [])
                       -1);
 
       if (mIB_Consumer->open_consumer (ec.ptr (),
-                                       "MIB_Consumer") == -1)
+                                        "MIB_Consumer") == -1)
         ACE_ERROR_RETURN ((LM_ERROR, 
                            "Someone was feeling introverted.\n"),
                           -1);
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the ORB
 
@@ -402,21 +399,21 @@ main (int argc, char *argv [])
                            "%p\n",
                            "CORBA::ORB::run"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ec = 0;
 
       root_poa->destroy (1,
                          1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
index f15847160d1..90c6a1db6db 100644
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
+++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
@@ -36,14 +36,12 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &);
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile
index 92b4fc9299f..88ea73ab780 100644
--- a/TAO/examples/Simulator/DOVEMIB/Makefile
+++ b/TAO/examples/Simulator/DOVEMIB/Makefile
@@ -23,7 +23,7 @@ BIN2 = DOVEMIB
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
     ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
diff --git a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp
index c350f05783d..e76688418cd 100644
--- a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp
@@ -21,10 +21,10 @@ ACE_RCSID(DOVEMIB, PrintVisitor, "$Id$")
 
 PrintVisitor::PrintVisitor (const char *file_name) {
   
-  ACE_TRY {
+  TAO_TRY {
     if (file_name != 0) {
       output_ =  ACE_OS::fopen(file_name, "w");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
        // print it on the screen if file could be opened
       if (output_ == 0) {
@@ -45,11 +45,11 @@ PrintVisitor::PrintVisitor (const char *file_name) {
     }
 
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Failing when trying to open the output file.\n"));
     }
-  ACE_ENDTRY;  
+  TAO_ENDTRY;  
 }
 
 
diff --git a/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp b/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp
index d33b6f8c888..d6d0e98cc5c 100644
--- a/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp
@@ -33,15 +33,15 @@ Any_Test_i::~Any_Test_i (void)
 void 
 Any_Test_i::try_an_any (const CORBA::Any &a,  CORBA::Environment &env)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG, "Call to try_an_any succeeded!\n"));
       
       AnyAnalyser anyAnalyser_ = AnyAnalyser ("stdout");
-      ACE_TRY_CHECK;
 
+      TAO_CHECK_ENV;
         Weapons *weapons_ = 0; 
-      if (a.type()->equal(_tc_Weapons, ACE_TRY_ENV)) {
+      if (a.type()->equal(_tc_Weapons,TAO_TRY_ENV)) {
       
         CORBA::Any b;
         b = a;
@@ -51,7 +51,7 @@ Any_Test_i::try_an_any (const CORBA::Any &a,  CORBA::Environment &env)
 			        "ID: %d\n" "CompTime: %d\n"
 					"Adr number of weapons: %d\n"
 					"Adr CompTime: %d\n", 
-				    a.type()->id(ACE_TRY_ENV),
+				    a.type()->id(TAO_TRY_ENV),
                     weapons_->computation_time,
                     (u_long)(void *) &(weapons_->number_of_weapons),
                     (u_long)(void *) &(weapons_->computation_time)));
@@ -59,11 +59,11 @@ Any_Test_i::try_an_any (const CORBA::Any &a,  CORBA::Environment &env)
       
       anyAnalyser_.printAny (a.type(), a.value());      
     }
-  ACE_CATCHANY    
+  TAO_CATCHANY    
     {
       ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the data.\n"));
     }
-  ACE_ENDTRY;	    
+  TAO_ENDTRY;	    
 }
 
 
diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.cpp b/TAO/examples/Simulator/DOVEMIB/clnt.cpp
index 95fe3d7e5c7..6511a42d177 100644
--- a/TAO/examples/Simulator/DOVEMIB/clnt.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/clnt.cpp
@@ -35,8 +35,7 @@ int
 Any_Test_Client::init (int argc, char *argv [])
 {
   
-  ACE_TRY_NEW_ENV 
-  {
+  TAO_TRY {
      this->argc_ = argc;
      this->argv_ = argv;
             
@@ -44,19 +43,19 @@ Any_Test_Client::init (int argc, char *argv [])
       this->orb_ = CORBA::ORB_init (this->argc_,
 				                            this->argv_,
 				                            "internet",
-				                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+				                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->argc_ != 2)
 	    { 
 	      ACE_ERROR_RETURN ((LM_ERROR, "Expected an IOR as parameter\n"),-1);
 	    }
 
-      CORBA::Object_var any_test_object_ =  this->orb_->string_to_object (argv_[1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;  
+      CORBA::Object_var any_test_object_ =  this->orb_->string_to_object (argv_[1], TAO_TRY_ENV);
+      TAO_CHECK_ENV;  
 
-      this->any_test_ptr_ = Any_Test::_narrow (any_test_object_.in(), ACE_TRY_ENV);	
-      ACE_TRY_CHECK;
+      this->any_test_ptr_ = Any_Test::_narrow (any_test_object_.in(), TAO_TRY_ENV);	
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->any_test_ptr_))
 	    {
@@ -66,18 +65,18 @@ Any_Test_Client::init (int argc, char *argv [])
 	    }     
       return 0;
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+  TAO_CATCHANY {
+    TAO_TRY_ENV.print_exception ("SYS_EX");
     return 0;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 int
 Any_Test_Client::run ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::Any data; 
 
@@ -95,7 +94,7 @@ Any_Test_Client::run ()
       navigation_.completion_time = 5;
       navigation_.computation_time = 6;
 
-      data.replace (_tc_Navigation, &navigation_, 0, ACE_TRY_ENV);
+      data.replace (_tc_Navigation, &navigation_, 0, TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,"Starting test with Any: Navigation\n")); 
       //any_test_ptr_->try_an_any (data, TAO_TRY_ENV);
@@ -134,18 +133,18 @@ Any_Test_Client::run ()
       weapons_.completion_time = 5;
       weapons_.computation_time = 6;
       
-      data.replace (_tc_Weapons, &weapons_, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      data.replace (_tc_Weapons, &weapons_, 0, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       ACE_DEBUG ((LM_DEBUG,"Starting test with Any: Weapons\n")); 
-      any_test_ptr_->try_an_any (data, ACE_TRY_ENV);
+      any_test_ptr_->try_an_any (data, TAO_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,"Ending test with Any: Weapons\n"));   	
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error in Any_Test_Client::run");
+      TAO_TRY_ENV.print_exception ("Error in Any_Test_Client::run");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
       
   return 0;
@@ -159,23 +158,25 @@ int
 main (int argc, char *argv [])
 {
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       Any_Test_Client any_test_client_;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (any_test_client_.init (argc, argv) == -1)
 	return 1;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       return any_test_client_.run ();
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
+
+
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 
   return 0;
diff --git a/TAO/examples/Simulator/DOVEMIB/svr.cpp b/TAO/examples/Simulator/DOVEMIB/svr.cpp
index 650b0f12954..f894464cf9f 100644
--- a/TAO/examples/Simulator/DOVEMIB/svr.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/svr.cpp
@@ -61,10 +61,10 @@ main (int argc, char *argv[])
   structNode_ptr_->print ();
   */
   
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "Having the ORB\n"));
 
@@ -77,21 +77,21 @@ main (int argc, char *argv[])
 			  1);
 
       PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
   
       CORBA::PolicyList policies (2);
       policies.length (2);  
       policies[0] =
 	root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-					       ACE_TRY_ENV);
+					       TAO_TRY_ENV);
       policies[1] =
 	root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-					  ACE_TRY_ENV);
+					  TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG, "Having the rootPOA\n"));
 
@@ -101,8 +101,8 @@ main (int argc, char *argv[])
 	root_poa->create_POA ("child_poa",
 			      poa_manager.in (),
 			      policies,
-			      ACE_TRY_ENV);  
-      ACE_TRY_CHECK;
+			      TAO_TRY_ENV);  
+      TAO_CHECK_ENV;
 
       // Parse remaining command line and verify parameters.
       parse_args (argc, argv);
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
 
       // create a factory implementation
       Any_Test_i_ptr any_test_i_ptr_ = new Any_Test_i ();
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "Started the implementation\n"));
 
@@ -119,26 +119,26 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("Any_Test");
       good_poa->activate_object_with_id (id.in (),
                                          any_test_i_ptr_,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
       CORBA::Object_var obj =
-        good_poa->id_to_reference (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        good_poa->id_to_reference (id.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
         orb->object_to_string (obj.in (),
-                               ACE_TRY_ENV);
+                               TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n", str.in ()));
 
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
@@ -147,22 +147,22 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1, 
 			 1, 
-			 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			 TAO_TRY_ENV);
+      TAO_CHECK_ENV
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG(sysex);
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG(userex);
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index de2ba4e47c2..4b2713fd8b6 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -66,7 +66,7 @@ DOVE_Supplier::~DOVE_Supplier ()
 int 
 DOVE_Supplier::init (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
@@ -78,12 +78,12 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (poaObject_var.in (), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+       root_POA_var_->the_POAManager (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
@@ -96,16 +96,15 @@ DOVE_Supplier::init (void)
 
     this->namingContext_var_ =
       CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                         ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+    TAO_CHECK_ENV;
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::init");
+    TAO_TRY_ENV.print_exception ("DOVE_Supplier::init");
     return -1;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   initialized_ = 1;
   return 0;
@@ -249,7 +248,7 @@ DOVE_Supplier::notify (CORBA::Any &message)
       this->connected ();
     }
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     RtecEventComm::Event event;
     event.header.source = SOURCE_ID;
@@ -267,16 +266,16 @@ DOVE_Supplier::notify (CORBA::Any &message)
 
     // Now we invoke a RPC
     this->current_connection_params_->proxyPushConsumer_var_->push (events,
-                                                                    ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                                                    TAO_TRY_ENV);
+    TAO_CHECK_ENV;
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
     ACE_ERROR ((LM_ERROR,
                 "DOVE_Supplier::notify: "
                 "unexpected exception.\n"));
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -328,7 +327,7 @@ DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *im
 int
 DOVE_Supplier::get_Scheduler ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
@@ -337,15 +336,15 @@ DOVE_Supplier::get_Scheduler ()
 
       CORBA::Object_var objref =
           namingContext_var_->resolve (schedule_name,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->current_connection_params_->scheduler_var_ =
         RtecScheduler::Scheduler::_narrow(objref.in (),
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       current_connection_params_->scheduler_var_ = 0;
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -354,7 +353,7 @@ DOVE_Supplier::get_Scheduler ()
                          this->current_connection_params_->ss_name_),
                         -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -363,7 +362,7 @@ DOVE_Supplier::get_Scheduler ()
 int
 DOVE_Supplier::get_EventChannel ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     // Get a reference to the Event Service
     CosNaming::Name channel_name (1);
@@ -372,26 +371,25 @@ DOVE_Supplier::get_EventChannel ()
       CORBA::string_dup (this->current_connection_params_->es_name_);
 
     CORBA::Object_var eventServiceObj_var =
-      this->namingContext_var_->resolve (channel_name, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      this->namingContext_var_->resolve (channel_name, TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     this->current_connection_params_->eventChannel_var_ =
        RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in(),
-                                                   ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                                   TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          "The reference to the event channel is nil!"),
                          1);
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::get_EventChannel");
+    TAO_TRY_ENV.print_exception ("DOVE_Supplier::get_EventChannel");
     return -1;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -400,16 +398,16 @@ DOVE_Supplier::get_EventChannel ()
 int
 DOVE_Supplier::connect_Supplier ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     // Generate the Real-time information descriptor.
     this->current_connection_params_->rt_info_ = 
       this->current_connection_params_->
         scheduler_var_->
           create (this->current_connection_params_->pod_rt_info_.entry_point, 
-                  ACE_TRY_ENV);
+                  TAO_TRY_ENV);
 
-    ACE_TRY_CHECK;
+    TAO_CHECK_ENV;
 
     this->current_connection_params_->scheduler_var_->
       set (this->current_connection_params_->rt_info_,
@@ -425,9 +423,9 @@ DOVE_Supplier::connect_Supplier ()
            this->current_connection_params_->pod_rt_info_.threads,
            ACE_static_cast (RtecScheduler::Info_Type_t,
                             this->current_connection_params_->pod_rt_info_.info_type),
-           ACE_TRY_ENV);
+           TAO_TRY_ENV);
 
-    ACE_TRY_CHECK;
+    TAO_CHECK_ENV;
 
 
     // Set the publications to report them to the event channel.
@@ -444,42 +442,41 @@ DOVE_Supplier::connect_Supplier ()
     qos.publications[0].event.data.any_value.replace (CORBA::_tc_short,
 						      &x,
 						      0,
-						      ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+						      TAO_TRY_ENV);
+    TAO_CHECK_ENV;
     qos.publications[0].dependency_info.number_of_calls = 1;
     qos.publications[0].dependency_info.rt_info =
       this->current_connection_params_->rt_info_;
 
     // = Connect as a supplier.
     this->current_connection_params_->supplierAdmin_var_ =
-      this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     this->current_connection_params_->proxyPushConsumer_var_ =
-      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // In calling _this we get back an object reference and register
     // the servant with the POA.
     RtecEventComm::PushSupplier_var pushSupplier_var =
-      this->internal_DOVE_Supplier_ptr_->_this (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      this->internal_DOVE_Supplier_ptr_->_this (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // Connect the supplier to the proxy consumer.
     ACE_SupplierQOS_Factory::debug (qos);
     this->current_connection_params_->
       proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (),
                                                      qos,
-                                                     ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+    TAO_CHECK_ENV;
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::connect_supplier");
+    TAO_TRY_ENV.print_exception ("DOVE_Supplier::connect_supplier");
     return -1;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 1e65742113d..05c1d68dd39 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -78,7 +78,6 @@ private:
   public:
 
     virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index feed16d3360..87c6c01e5ca 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -78,34 +78,33 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
   nav_roll_ (0),
   nav_pitch_ (0)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       this->sched_hi_name_.length (1);
       this->sched_hi_name_[0].id = CORBA::string_dup ("DUAL_SCHED_HI");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       this->sched_lo_name_.length (1);
       this->sched_lo_name_[0].id = CORBA::string_dup ("DUAL_SCHED_LO");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       this->channel_hi_name_.length (1);
       this->channel_hi_name_[0].id = CORBA::string_dup ("DUAL_EC_HI");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       this->channel_lo_name_.length (1);
       this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      this->terminator_ = terminator_impl_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->terminator_ = terminator_impl_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "DualEC_Supplier::DualEC_Supplier : could "
-                           "not resolve reference to terminator");
+    TAO_TRY_ENV.print_exception ("DualEC_Supplier::DualEC_Supplier : could "
+                                 "not resolve reference to terminator");
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Initialize the high priority RT_Info data
   rt_info_nav_hi_.entry_point = "DUALEC_NAV_HI";
@@ -142,29 +141,28 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
 
 DualEC_Supplier::~DualEC_Supplier ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       this->navigation_Supplier_.disconnect ();
       this->weapons_Supplier_.disconnect ();
 
       // Unbind the schedulers from the NS.
-      this->naming_context_->unbind (this->sched_hi_name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->sched_lo_name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->sched_hi_name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      this->naming_context_->unbind (this->sched_lo_name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Unbind the ECs from the NS.
-      this->naming_context_->unbind (this->channel_hi_name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->channel_lo_name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->channel_hi_name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      this->naming_context_->unbind (this->channel_lo_name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "DualEC_Supplier::~DualEC_Supplier");
+      TAO_TRY_ENV.print_exception ("DualEC_Supplier::~DualEC_Supplier");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // @@TBD - destroy the ECs
   // @@TBD - destroy the schedulers
@@ -175,7 +173,7 @@ DualEC_Supplier::init ()
 {
   this->get_options (argc_, argv_);
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
@@ -187,12 +185,12 @@ DualEC_Supplier::init ()
                         1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (poaObject_var.in (), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+       root_POA_var_->the_POAManager (TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
@@ -205,17 +203,16 @@ DualEC_Supplier::init ()
 
     this->naming_context_ =
       CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                       ACE_TRY_ENV);
-    ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                         "DualEC_Supplier::init");
+    TAO_TRY_ENV.print_exception ("DualEC_Supplier::init");
     return -1;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Create two scheduling service instances.
   if (this->create_schedulers () == -1)
@@ -289,16 +286,16 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void 
-DualEC_Supplier::Terminator::shutdown (CORBA::Environment &ACE_TRY_ENV)
+DualEC_Supplier::Terminator::shutdown (CORBA::Environment &_env)
 {
-  ACE_TRY
+  TAO_TRY
     {
       TAO_ORB_Core_instance ()->orb ()->shutdown ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -307,14 +304,14 @@ DualEC_Supplier::Terminator::shutdown (CORBA::Environment &ACE_TRY_ENV)
 void *
 DualEC_Supplier::run_orb (void *) 
 {
-  ACE_TRY
+  TAO_TRY
     {
       TAO_ORB_Core_instance ()->orb ()->run (); 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -328,7 +325,7 @@ DualEC_Supplier::run_nav_thread (void *arg)
   DualEC_Supplier * sup = 
     ACE_static_cast (DualEC_Supplier *, arg);
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_Unbounded_Queue_Iterator<Navigation *>
         nav_iter (sup->navigation_data_);
@@ -351,7 +348,7 @@ DualEC_Supplier::run_nav_thread (void *arg)
 
         if ((nav_iter.next (nav)) && (nav) && (*nav))
           {
-            any.replace (_tc_Navigation, *nav, 0, ACE_TRY_ENV);
+            any.replace (_tc_Navigation, *nav, 0, TAO_TRY_ENV);
 
             // Sleep briefly to avoid too much livelock (a little is good). 
             ACE_OS::sleep (sup->nav_pause_);
@@ -392,10 +389,10 @@ DualEC_Supplier::run_nav_thread (void *arg)
       while (++total_sent < sup->total_messages_);
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -409,7 +406,7 @@ DualEC_Supplier::run_weap_thread (void *arg)
   DualEC_Supplier * sup = 
     ACE_static_cast (DualEC_Supplier *, arg);
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_Unbounded_Queue_Iterator<Weapons *>
         weap_iter (sup->weapons_data_);
@@ -432,7 +429,7 @@ DualEC_Supplier::run_weap_thread (void *arg)
 
         if ((weap_iter.next (weap)) && (weap) && (*weap))
           {
-            any.replace (_tc_Weapons, *weap, 0, ACE_TRY_ENV);
+            any.replace (_tc_Weapons, *weap, 0, TAO_TRY_ENV);
 
             // Sleep briefly to avoid too much livelock (a little is good). 
             ACE_OS::sleep (sup->weap_pause_);
@@ -462,10 +459,10 @@ DualEC_Supplier::run_weap_thread (void *arg)
       while (++total_sent < sup->total_messages_);
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -482,7 +479,7 @@ DualEC_Supplier::create_schedulers (void)
   // create either a runtime or a config scheduler for 
   // each instance
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       if (use_runtime_schedulers_)
         {
@@ -499,25 +496,25 @@ DualEC_Supplier::create_schedulers (void)
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_hi_ = sched_hi_impl_->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->sched_hi_ = sched_hi_impl_->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           ACE_NEW_RETURN (this->sched_lo_impl_,
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_lo_ = sched_lo_impl_->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->sched_lo_ = sched_lo_impl_->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Register Scheduling Service Implementations with Naming Service
 
           this->naming_context_->bind (this ->sched_hi_name_, 
-                                       this->sched_hi_.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                       this->sched_hi_.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           naming_context_->bind (this->sched_lo_name_, 
-                                 this->sched_lo_.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                 this->sched_lo_.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Register high and low priority rt_infos with the 
           // schedulers to force priority differentiation.
@@ -525,9 +522,9 @@ DualEC_Supplier::create_schedulers (void)
           this->sched_hi_rt_info_hi_ = 
             this->sched_hi_->
               create (this->rt_info_dummy_hi_.entry_point, 
-                      ACE_TRY_ENV);
+                      TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_hi_,
@@ -543,16 +540,16 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_hi_.info_type),
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_hi_rt_info_lo_ = 
             this->sched_hi_->
               create (this->rt_info_dummy_lo_.entry_point, 
-                      ACE_TRY_ENV);
+                      TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_lo_,
@@ -568,16 +565,16 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_lo_.info_type),
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_hi_rt_info_hi_ = 
             this->sched_lo_->
               create (this->rt_info_dummy_hi_.entry_point, 
-                      ACE_TRY_ENV);
+                      TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_hi_,
@@ -593,16 +590,16 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_hi_.info_type),
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_hi_rt_info_lo_ = 
             this->sched_lo_->
               create (this->rt_info_dummy_lo_.entry_point, 
-                      ACE_TRY_ENV);
+                      TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_lo_,
@@ -618,19 +615,18 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_lo_.info_type),
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "DualEC_Supplier::create_schedulers");
+      TAO_TRY_ENV.print_exception ("DualEC_Supplier::create_schedulers");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -642,7 +638,7 @@ DualEC_Supplier::create_schedulers (void)
 int 
 DualEC_Supplier::create_event_channels (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Create Event Service Implementations, passing in the respective
       // Scheduling Service Implementations (which must already be created).
@@ -653,8 +649,8 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_hi_ = ec_hi_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->ec_hi_ = ec_hi_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_NEW_RETURN (this->ec_lo_impl_,
                       ACE_EventChannel (sched_lo_.in (), 
@@ -663,27 +659,26 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_lo_ = ec_lo_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->ec_lo_ = ec_lo_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Register Event Service Implementations with Naming Service
 
       naming_context_->bind (this->channel_hi_name_, 
-                             this->ec_hi_.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                             this->ec_hi_.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       naming_context_->bind (this->channel_lo_name_, 
-		                     this->ec_lo_.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+		                     this->ec_lo_.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                         "DualEC_Supplier::create_event_channels");
+    TAO_TRY_ENV.print_exception ("DualEC_Supplier::create_event_channels");
     return -1;
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -691,7 +686,7 @@ DualEC_Supplier::create_event_channels (void)
 void
 DualEC_Supplier::compute_schedules (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
 #if defined (__SUNPRO_CC)
           // Sun C++ 4.2 warns with the code below:
@@ -713,8 +708,8 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_hi, configs_out_hi, anomalies_out_hi, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+             infos_out_hi, configs_out_hi, anomalies_out_hi, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_);
           RtecScheduler::Config_Info_Set_out configs_out_lo (this->configs_lo_);
@@ -724,8 +719,8 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_lo, configs_out_lo, anomalies_out_lo, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+             infos_out_lo, configs_out_lo, anomalies_out_lo, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
 #else  /* ! __SUNPRO_CC */
 
@@ -735,8 +730,8 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_hi_.out (), this->configs_hi_.out (), 
-             this->anomalies_hi_.out (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
+             this->anomalies_hi_.out (), TAO_TRY_ENV);
+           TAO_CHECK_ENV;
 
           sched_lo_->compute_scheduling
             (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -744,8 +739,8 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_lo_.out (), this->configs_lo_.out (), 
-             this->anomalies_lo_.out (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
+             this->anomalies_lo_.out (), TAO_TRY_ENV);
+           TAO_CHECK_ENV;
 
 #endif /* ! __SUNPRO_CC */
 
@@ -755,7 +750,7 @@ DualEC_Supplier::compute_schedules (void)
                                                 configs_hi_.in (),
                                                 anomalies_hi_.in (),
                                                 this->hi_schedule_file_name_);
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
 
       if (dump_schedule_headers_ && (this->lo_schedule_file_name_ != 0))
@@ -764,24 +759,24 @@ DualEC_Supplier::compute_schedules (void)
                                                 configs_lo_.in (),
                                                 anomalies_lo_.in (),
                                                 this->lo_schedule_file_name_);
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
 DualEC_Supplier::start_generating_events (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Activate the POA manager.
-      poa_manager_->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager_->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Spawn a thread that runs the orb event loop
       ACE_Thread_Manager orb_thread_manager;
@@ -816,7 +811,7 @@ DualEC_Supplier::start_generating_events (void)
 
       // Shut down the ORB via the termination servant
       this->terminator_->shutdown ();
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Wait for the thread that runs the orb event loop.
       orb_thread_manager.wait ();
@@ -841,11 +836,11 @@ DualEC_Supplier::start_generating_events (void)
         if (weap_iter.next (weap_temp) && weap_temp)
           delete (*weap_temp);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 }
 
@@ -1152,15 +1147,15 @@ main (int argc, char *argv [])
 
 
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
                         argv,
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
 
       // Create the demo supplier.
@@ -1179,13 +1174,13 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 1ad5f791034..e620ddcd557 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -46,7 +46,6 @@ struct Schedule_Viewer_Data
   u_long computation_time;
 };
 
-
 class DualEC_Supplier
 {
   // = TITLE
@@ -131,7 +130,7 @@ private:
   RtecScheduler::Scheduler_var sched_hi_;
   RtecScheduler::Scheduler_var sched_lo_;
 
-  // Handles for the dummy rt_infos registered with the
+  // Handles for the dummy rt_infos registered with the 
   // schedulers in order to force priority differentiation.
   RtecScheduler::handle_t sched_hi_rt_info_hi_;
   RtecScheduler::handle_t sched_hi_rt_info_lo_;
@@ -142,7 +141,7 @@ private:
   Terminator terminator_impl_;
   NavWeapTerminator_var terminator_;
 
-  // Default EC module factory for Event
+  // Default EC module factory for Event 
   // Service servant implementations.
   TAO_Default_Module_Factory default_module_factory_;
 
@@ -193,3 +192,4 @@ private:
 };
 
 #endif /* DUALEC_SUP_H */
+
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 4bbacabce77..5ada49615e9 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -57,7 +57,7 @@ int
 Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                               const char *my_name)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Get a Scheduler.
 
@@ -66,19 +66,19 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       // Define Real-time information.
 
-      rt_info_ = server->create (my_name, ACE_TRY_ENV);
+      rt_info_ = server->create (my_name, TAO_TRY_ENV);
 
       server->set (rt_info_,
-                   RtecScheduler::VERY_LOW_CRITICALITY,
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
-                   2500000,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero (),
-                   1,
-                   RtecScheduler::OPERATION,
-                   ACE_TRY_ENV);
+                       RtecScheduler::VERY_LOW_CRITICALITY,
+                       ORBSVCS_Time::zero,
+                       ORBSVCS_Time::zero,
+                       ORBSVCS_Time::zero,
+                       2500000,
+                       RtecScheduler::VERY_LOW_IMPORTANCE,
+                       ORBSVCS_Time::zero,
+                       1,
+                       RtecScheduler::OPERATION,
+                       TAO_TRY_ENV);
 
 
       // Create the event that we're registering for.
@@ -96,48 +96,48 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // = Connect as a consumer.
 
       this->consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        channel_admin_->for_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Obtain a pointer to a push supplier.  "suppliers" is
       // inherited from a base class.
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // The _this function returns an object pointer. This is needed
       // because a consumer inherits from a Servant class that is no
       // CORBA::Object.
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->suppliers_->connect_push_consumer (objref.in (),
                                                dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
+  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Demo_Consumer::open: subscribe failed.\n"),
                         -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Demo_Consumer::open: unexpected exception.\n"),
                         -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Demo_Consumer::disconnect_push_consumer (CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Consumer received disconnect from channel.\n"));
@@ -145,7 +145,7 @@ Demo_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
 
 void
 Demo_Consumer::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &)
 {
 
   if (events.length () == 0)
@@ -167,27 +167,27 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events,
         {
           ACE_DEBUG ((LM_DEBUG, "Demo Consumer: received ACE_ES_EVENT_NOTIFICATION event.\n"));
 
-          ACE_TRY
+          TAO_TRY
             {
-              cout << "ID: " << events[i].data.any_value.type()->id(ACE_TRY_ENV) << endl;
-              ACE_TRY_CHECK;
-              cout << "Name: " << events[i].data.any_value.type()->name(ACE_TRY_ENV) << endl;
-              ACE_TRY_CHECK;
-              cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_TRY_ENV) << endl;
-              ACE_TRY_CHECK;
-              cout << "TCKind: " << events[i].data.any_value.type()->kind(ACE_TRY_ENV) << endl;
-              ACE_TRY_CHECK;
-
-              if (_tc_Navigation->equal (events[i].data.any_value.type(), ACE_TRY_ENV))
+              cout << "ID: " << events[i].data.any_value.type()->id(TAO_TRY_ENV) << endl;
+              TAO_CHECK_ENV;
+              cout << "Name: " << events[i].data.any_value.type()->name(TAO_TRY_ENV) << endl;
+              TAO_CHECK_ENV;
+              cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_TRY_ENV) << endl;
+              TAO_CHECK_ENV;
+              cout << "TCKind: " << events[i].data.any_value.type()->kind(TAO_TRY_ENV) << endl;
+              TAO_CHECK_ENV;
+
+              if (_tc_Navigation->equal (events[i].data.any_value.type(), TAO_TRY_ENV))
                 {
-                  ACE_TRY_CHECK;
+                  TAO_CHECK_ENV;
                   Navigation *navigation_ = (Navigation*) events[i].data.any_value.value ();
 
                   cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl;
                 }
-              else if (_tc_Weapons->equal (events[i].data.any_value.type(), ACE_TRY_ENV))
+              else if (_tc_Weapons->equal (events[i].data.any_value.type(), TAO_TRY_ENV))
                 {
-                  ACE_TRY_CHECK;
+                  TAO_CHECK_ENV;
                   Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
 
                   cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl;
@@ -195,11 +195,11 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events,
 
 
             }
-          ACE_CATCHANY
+          TAO_CATCHANY
             {
               ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
             }
-          ACE_ENDTRY;
+          TAO_ENDTRY;
         }
     }
 }
@@ -207,25 +207,25 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events,
 void
 Demo_Consumer::shutdown (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Disconnect from the push supplier.
 
-      this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR,
                  "(%t) Demo_Consumer::shutdown: unexpected exception.\n"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // function get_options
@@ -271,13 +271,13 @@ get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -288,12 +288,12 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
@@ -305,8 +305,8 @@ main (int argc, char *argv [])
 
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 
@@ -321,12 +321,12 @@ main (int argc, char *argv [])
 
       CORBA::Object_var ec_obj =
         naming_context->resolve (channel_name,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (ec.ptr() == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -346,8 +346,8 @@ main (int argc, char *argv [])
                            "Someone was feeling introverted.\n"),
                           -1);
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the ORB
 
@@ -356,21 +356,21 @@ main (int argc, char *argv [])
                            "%p\n",
                            "CORBA::ORB::run"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       delete demo_consumer;
 
       root_poa->destroy (1,
                          1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 016cb17fe6b..cc8def57a38 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -184,7 +184,7 @@ Event_Supplier::load_schedule_data
     {
       ACE_NEW (data, Schedule_Viewer_Data);
 
-      const char *oper_name = 0;
+      char *oper_name = 0;
       switch (i % 4)
       {
       case 0:
@@ -241,7 +241,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
 {
   static u_long last_completion = 0;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     Schedule_Viewer_Data **sched_data;
 
@@ -282,7 +282,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
         navigation_.utilization = (double) (20.0 + ACE_OS::rand() % 10);
         navigation_.overhead = (double) (ACE_OS::rand() % 10);
 
-        data.replace (_tc_Navigation, &navigation_, 0, ACE_TRY_ENV);
+        data.replace (_tc_Navigation, &navigation_, 0, TAO_TRY_ENV);
       }
       else if ((strcmp((*sched_data)->operation_name, "high_10") == 0) ||
                (strcmp((*sched_data)->operation_name, "low_10") == 0)  ||
@@ -327,7 +327,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
         weapons_.utilization = (double) (20.0 + ACE_OS::rand() % 10);
         weapons_.overhead = (double) (ACE_OS::rand() % 10);
 
-        data.replace (_tc_Weapons, &weapons_, 0, ACE_TRY_ENV);
+        data.replace (_tc_Weapons, &weapons_, 0, TAO_TRY_ENV);
       }
       else {
         ACE_ERROR ((LM_ERROR,
@@ -336,7 +336,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
                     (*sched_data)->operation_name));
       }
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
 
             if (last_completion > (*sched_data)->completion_time)
@@ -361,12 +361,12 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
     if (schedule_iter.done ())
       schedule_iter.first ();
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
     ACE_ERROR ((LM_ERROR,
                 "(%t)Error in Event_Supplier::insert_event_data.\n"));
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -440,15 +440,15 @@ Event_Supplier::get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
                         argv,
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
 
       // Create the demo supplier.
@@ -467,14 +467,14 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 70352a56e4a..2565d39232f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -192,7 +192,7 @@ Logging_Supplier::load_schedule_data
     {
       ACE_NEW (data, Schedule_Viewer_Data);
 
-      const char *oper_name = 0;
+      char *oper_name = 0;
       switch (i % 4)
       {
       case 0:
@@ -254,7 +254,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
   const TimeBase::TimeT TEN_HZ_PERIOD = ONE_HZ_PERIOD / 10;
   const TimeBase::TimeT TWENTY_HZ_PERIOD = ONE_HZ_PERIOD / 20;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
   {
     Schedule_Viewer_Data **sched_data;
 
@@ -304,7 +304,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
         navigation_.utilization = (double) (20.0 + ACE_OS::rand() % 10);
         navigation_.overhead = (double) (ACE_OS::rand() % 10);
 
-        data.replace (_tc_Navigation, &navigation_, 0, ACE_TRY_ENV);
+        data.replace (_tc_Navigation, &navigation_, 0, TAO_TRY_ENV);
       }
       else if ((strcmp((*sched_data)->operation_name, "high_10") == 0) ||
                (strcmp((*sched_data)->operation_name, "low_10") == 0)  ||
@@ -356,7 +356,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
         weapons_.update_data =       update_data_;
 
 
-        data.replace (_tc_Weapons, &weapons_, 0, ACE_TRY_ENV);
+        data.replace (_tc_Weapons, &weapons_, 0, TAO_TRY_ENV);
       }
       else {
         ACE_ERROR ((LM_ERROR,
@@ -365,7 +365,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
                     (*sched_data)->operation_name));
       }
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
 
             if (last_completion > (*sched_data)->completion_time)
@@ -390,12 +390,12 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
     if (schedule_iter.done ())
       schedule_iter.first ();
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
   {
     ACE_ERROR ((LM_ERROR,
                 "(%t)Error in Logging_Supplier::insert_event_data.\n"));
   }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -486,15 +486,15 @@ Logging_Supplier::get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
                         argv,
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
 
       // Create the demo supplier.
@@ -513,14 +513,14 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile
index 3f2ab875168..3c50e09c0f4 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile
+++ b/TAO/examples/Simulator/Event_Supplier/Makefile
@@ -8,7 +8,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-TAO_IDLFLAGS +=  -Ge 1 -I$(TAO_ROOT)/orbsvcs/orbsvcs -I$(TAO_ROOT)
+TAO_IDLFLAGS +=  -I$(TAO_ROOT)/orbsvcs/orbsvcs
 IDL_SRC = NavWeapC.cpp NavWeapS.cpp
 IDL_HDR = NavWeapC.h
 EVENT_TEST_SRCS = Event_Sup.cpp Logging_Sup.cpp DualEC_Sup.cpp Event_Con.cpp DOVE_Supplier.cpp
@@ -26,7 +26,7 @@ BIN2 = Event_Sup Logging_Sup DualEC_Sup Event_Con
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
     ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
@@ -86,25 +86,25 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 .obj/NavWeapC.o .obj/NavWeapC.so .shobj/NavWeapC.o .shobj/NavWeapC.so: NavWeapC.cpp NavWeapC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  NavWeapC.i NavWeapS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  NavWeapS_T.h NavWeapS_T.i NavWeapS_T.cpp NavWeapS.i
 .obj/NavWeapS.o .obj/NavWeapS.so .shobj/NavWeapS.o .shobj/NavWeapS.so: NavWeapS.cpp NavWeapS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  NavWeapC.h NavWeapC.i NavWeapS_T.h NavWeapS_T.i NavWeapS_T.cpp \
  NavWeapS.i
 .obj/Event_Sup.o .obj/Event_Sup.so .shobj/Event_Sup.o .shobj/Event_Sup.so: Event_Sup.cpp \
@@ -269,6 +269,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -327,6 +328,8 @@ realclean: clean
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
@@ -344,9 +347,14 @@ realclean: clean
  $(TAO_ROOT)/tao/default_client.h \
  $(TAO_ROOT)/tao/default_client.i \
  $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
  $(TAO_ROOT)/tao/CDR_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
@@ -361,8 +369,8 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -377,11 +385,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Event_Sup.h NavWeapC.h NavWeapC.i DOVE_Supplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
@@ -548,6 +556,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -606,6 +615,8 @@ realclean: clean
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
@@ -623,9 +634,14 @@ realclean: clean
  $(TAO_ROOT)/tao/default_client.h \
  $(TAO_ROOT)/tao/default_client.i \
  $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
  $(TAO_ROOT)/tao/CDR_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
@@ -640,8 +656,8 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -656,11 +672,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Logging_Sup.h NavWeapC.h NavWeapC.i DOVE_Supplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
@@ -827,6 +843,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -885,6 +902,8 @@ realclean: clean
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
@@ -902,9 +921,14 @@ realclean: clean
  $(TAO_ROOT)/tao/default_client.h \
  $(TAO_ROOT)/tao/default_client.i \
  $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
  $(TAO_ROOT)/tao/CDR_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
@@ -919,8 +943,8 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -931,11 +955,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -1030,8 +1054,8 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -1047,11 +1071,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Event_Con.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
@@ -1219,6 +1243,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -1277,6 +1302,8 @@ realclean: clean
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
@@ -1294,9 +1321,14 @@ realclean: clean
  $(TAO_ROOT)/tao/default_client.h \
  $(TAO_ROOT)/tao/default_client.i \
  $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
  $(TAO_ROOT)/tao/CDR_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
@@ -1307,18 +1339,18 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index 8e423299e65..6e50c245637 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -240,6 +240,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "POA Loader Server"=.\POA\Loader\server.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index b55790fb095..438270f49e2 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -34,11 +34,11 @@ Concurrency_Service::Concurrency_Service (void)
 
 Concurrency_Service::Concurrency_Service (int argc,
                                           char** argv,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          CORBA::Environment& TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::Concurrency_Service (...)\n"));
-  this->init (argc, argv, ACE_TRY_ENV);
+  this->init (argc, argv, TAO_IN_ENV);
 }
 
 int
@@ -84,19 +84,19 @@ Concurrency_Service::parse_args (void)
 int
 Concurrency_Service::init (int argc,
                            char **argv,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::init\n"));
   if (this->orb_manager_.init_child_poa (argc,
                                         argv,
                                         "child_poa",
-                                        ACE_TRY_ENV) == -1)
+                                        TAO_IN_ENV) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init_child_poa"),
-                      -1);
-  ACE_CHECK_RETURN (-1);
+		       "%p\n",
+		       "init_child_poa"),
+		      -1);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV,-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -107,7 +107,7 @@ Concurrency_Service::init (int argc,
                      -1);
   CORBA::String_var str =
     this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory (),
-                                ACE_TRY_ENV);
+                                TAO_IN_ENV);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -119,28 +119,28 @@ Concurrency_Service::init (int argc,
     }
 
   if (this->use_naming_service_)
-    return this->init_naming_service (ACE_TRY_ENV);
+    return this->init_naming_service (TAO_IN_ENV);
 
   return 0;
 }
 
 int
-Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Concurrency_Service::init_naming_service (CORBA::Environment &TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
   PortableServer::POA_var child_poa;
-
+  
   orb = this->orb_manager_.orb ();
   child_poa = this->orb_manager_.child_poa ();
-
+  
   int result = this->my_name_server_.init (orb.in (),
                                            child_poa.in ());
   if (result == -1)
     return result;
   lockset_factory_ =
-    this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    this->my_concurrency_server_.GetLockSetFactory ()->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   CosNaming::Name concurrency_context_name (1);
   concurrency_context_name.length (1);
@@ -148,28 +148,28 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
   this->concurrency_context_ =
     this->my_name_server_->bind_new_context (concurrency_context_name,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                             TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
+  
   CosNaming::Name lockset_name (1);
   lockset_name.length (1);
   lockset_name[0].id = CORBA::string_dup ("LockSetFactory");
   this->concurrency_context_->bind (lockset_name,
                                    lockset_factory_.in (),
-                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                   TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
   return 0;
 }
 
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (CORBA_Environment& ACE_TRY_ENV)
+Concurrency_Service::run (CORBA_Environment& TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
 
-  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+  if (this->orb_manager_.run (TAO_IN_ENV) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                       "Concurrency_Service::run"),
                      -1);
@@ -192,30 +192,31 @@ main (int argc, char ** argv)
   ACE_DEBUG ((LM_DEBUG,
               "\n \t Concurrency Service:SERVER \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      int r = concurrency_service.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
+      if (concurrency_service.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
-
-      concurrency_service.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      else
+        {
+          concurrency_service.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
     }
-
-  ACE_CATCH (CORBA::SystemException, sysex)
+  
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-
-  ACE_ENDTRY;
+  
+  TAO_ENDTRY;
   return 0;
 }
+
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 4076ae993a2..a1674157bab 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -17,7 +17,7 @@ BIN2 = Concurrency_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Concurrency
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 40f789a8585..cf87f55089f 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -113,8 +113,8 @@ CosEvent_Service::startup (int argc, char *argv[],
   this->resolve_naming_service (ACE_TRY_ENV);
   ACE_CHECK;
 
-  this->init (this->poa_.in (),
-              this->poa_.in (),
+  this->init (this->poa_,
+              this->poa_,
               this->eventTypeIds_,
               this->eventSourceIds_,
               this->source_type_pairs_,
@@ -175,6 +175,7 @@ CosEvent_Service::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
     {
       // Try to locate a remote rtec.
       this->locate_rtec (ACE_TRY_ENV);
+      ACE_CHECK;
 
       // Use the return value to check success.
       if (CORBA::is_nil (this->rtec_.in ()))
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index f0e10fb2695..ea096eb1ee0 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -12,7 +12,7 @@ BIN2 = CosEvent_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
     BIN = $(BIN2)
@@ -161,25 +161,16 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -227,9 +218,13 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/CosEvent_Service/README b/TAO/orbsvcs/CosEvent_Service/README
index 8d7fd8f95b3..2904f62c291 100644
--- a/TAO/orbsvcs/CosEvent_Service/README
+++ b/TAO/orbsvcs/CosEvent_Service/README
@@ -20,16 +20,17 @@ To run the Event Channel:
 
 Command line parameters:
 ------------------------
-       -n <COS Event Service name>
+      -n <COS Event Service name>
         specifies the name with which to register the Event Service.
 
+      -e <Real Time Event Service name>
+        specifies the name with which to *look* for the RtEC.
+
        -r
         specifies that a local Real Time Event Channel (Rtec) should be
         created and used.
-
-        -t <Real Time Event Service name>
-        specifies the name with which to *look* for the RtEC.This option is
-        only useful along with the -r option.
+        If you specify this option but Rtec is not already running, then the
+        CosEvent_Service starts its own Rtec.
 
 The next 3 options are used to introduce a filtering mechanism for the
 Event Channel based on event types and source ids.
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index fb577f93764..19c24641ebb 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -14,12 +14,12 @@ ACE_RCSID(Dump_Schedule, Dump_Schedule, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -29,12 +29,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
@@ -44,8 +44,8 @@ main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       const char *name = 0;
       if (argc > 1)
@@ -77,28 +77,28 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV);
+         infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
 	(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
 					 ACE_SCOPE_THREAD),
 	 ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
 					 ACE_SCOPE_THREAD),
-	 infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV);
+	 infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      ACE_Scheduler_Factory::dump_schedule (infos.in (),
+      ACE_Scheduler_Factory::dump_schedule (infos.in (), 
                                             configs.in (),
                                             anomalies.in (),
                                             "Scheduler_Runtime.cpp");
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Dump_Schedule");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 0cbb299afdf..ce689257eb3 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -13,7 +13,7 @@ BIN2 = Dump_Schedule
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
@@ -159,25 +159,16 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -225,9 +216,13 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 9e4f82deb8d..1c6c3a6b62d 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -33,7 +33,7 @@ Event_Service::Event_Service (void)
     service_name_ (0),
     ior_file_name_ (0),
     pid_file_name_ (0),
-    event_service_type_ (ES_NEW),
+    event_service_type_ (ES_OLD_MT),
     global_scheduler_ (0)
 {
 }
@@ -76,9 +76,6 @@ Event_Service::run (int argc, char* argv[])
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       CORBA::Object_var naming_obj =
         this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
@@ -194,6 +191,9 @@ Event_Service::run (int argc, char* argv[])
       naming_context->rebind (channel_name, ec.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
       if (this->orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
@@ -210,7 +210,7 @@ Event_Service::run (int argc, char* argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC");
+      ACE_TRY_ENV.print_exception ("EC");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 428a032e308..ecdd66b354d 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -9,7 +9,7 @@ BIN2 = Event_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
     ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
@@ -174,19 +174,10 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -232,9 +223,13 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
index 033ad9be7ab..5a50e899fef 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
@@ -12,33 +12,34 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "TAO Implementation Repository\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      TAO_TRY_ENV.print_exception ("Unknown Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.dsw b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.dsw
index 1100304a4c8..1b926108d2e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.dsw
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.dsw
@@ -15,18 +15,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "tao_ir"=.\tao_ir.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 96047089eec..b0256b0f023 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -9,7 +9,6 @@
 #include "tao/Acceptor_Registry.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Process.h"
-#include "ace/Auto_Ptr.h"
 
 // Constructor
 
@@ -20,193 +19,242 @@ ImplRepo_i::ImplRepo_i (void)
   // Nothing
 }
 
-// Starts the server defined by the POA name <server> if it is 
-// not already started and if it can be started.
+// Starts up the server associated with the object pointer and returns
+// an updated pointer.
 
-void
+CORBA::Object_ptr
+ImplRepo_i::activate_object (CORBA::Object_ptr obj,
+                             CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Implementation_Repository::Not_Found,
+                     Implementation_Repository::Cannot_Activate))
+{
+  /* Implementation_Repository::INET_Addr *new_addr; */
+  TAO_Stub *new_stub_obj = 0;
+
+  if (OPTIONS::instance()->debug () >= 1)
+    {
+      CORBA::ORB_var orb = this->orb_manager_.orb ();
+      ACE_DEBUG ((LM_DEBUG,
+                  "Activating Object: %s\n",
+                  orb->object_to_string (obj)));
+    }
+
+  ACE_TRY
+    {
+      // @@ Where to get the poa name from?
+      /* new_addr = */ this->activate_server (0, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // @@ Use auto_ptr<> to avoid memory leaks!
+      TAO_Stub *stub_obj = obj->_stubobj ();
+      TAO_IIOP_Profile *iiop_pfile =
+                ACE_dynamic_cast (TAO_IIOP_Profile *,
+                                  stub_obj->profile_in_use ());
+
+      TAO_MProfile mp(1);
+
+      TAO_Profile *new_pfile;
+      // @@ Would new_addr->host_ be different from object_addr()?
+      // if so I will add another ctor  fred
+      ACE_NEW_RETURN (new_pfile,
+                      TAO_IIOP_Profile (iiop_pfile->object_addr (),
+                                        iiop_pfile->object_key (),
+                                        iiop_pfile->version (),
+                                        stub_obj->orb_core ()),
+                      CORBA::Object::_nil ());
+
+      mp.give_profile (new_pfile);
+
+      // create new obj, pfile will be copied!
+      new_stub_obj = new TAO_Stub (stub_obj->type_id,
+                                   mp,
+                                   stub_obj->orb_core ());
+
+      if (new_stub_obj == 0)
+        return CORBA::Object::_nil ();
+    }
+  ACE_CATCHANY
+    {
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  return new CORBA_Object (new_stub_obj,
+                           obj->_servant ());
+}
+
+// Starts the server <server> if it is not already started
+
+Implementation_Repository::INET_Addr *
 ImplRepo_i::activate_server (const char *server,
                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound,
-                     ImplementationRepository::Administration::CannotActivate))
+                     Implementation_Repository::Not_Found,
+                     Implementation_Repository::Cannot_Activate))
 {
   int start = 0;
-  ACE_TString server_object_ior, host;
-  unsigned short port;
+  ASYS_TCHAR *ping_ior;
+  Implementation_Repository::INET_Addr *address =
+    new Implementation_Repository::INET_Addr;
+  address->port_ = 0;
+  address->host_ = CORBA::string_dup ("");
 
   if (OPTIONS::instance()->debug () >= 1)
-    ACE_DEBUG ((LM_DEBUG, "Activating Server: %s\n", server));
+    ACE_DEBUG ((LM_DEBUG,
+                "Activating Server: %s\n",
+                server));
 
   // Find out if it is already running
-  if (this->repository_.get_running_info (server, host, port, server_object_ior) != 0)
+  if (this->repository_.get_ping_ior (server, ping_ior) != 0)
     {
-      // If we had problems getting the server_object_ior, probably meant that
+      // If we had problems getting the ping_ior, probably meant that
       // there is no <server> registered
       ACE_ERROR ((LM_ERROR,
-                  "Error: Cannot find ServerObject IOR for server <%s>\n",
+                  "Error: Cannot find ping IOR for server <%s>\n",
                   server));
-      ACE_THROW (ImplementationRepository::Administration::NotFound ());
+      ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+                        address);
     }
 
-  // Check to see if there is one running (if there is a server_object_ior)
-  if (server_object_ior.length () != 0)
+  // if length is 0, then none is running yet.
+  if (ACE_OS::strlen (ping_ior) != 0)
     {
-      // It is running
       ACE_TRY
         {
           CORBA::ORB_var orb = this->orb_manager_.orb ();
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str (),
+            orb->string_to_object (ping_ior,
                                    ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          ImplementationRepository::ServerObject_var server_object = 
-            ImplementationRepository::ServerObject::_narrow (object.in (), ACE_TRY_ENV);
+          Ping_Object_var ping_object = Ping_Object::_narrow (object.in (),
+                                                              ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          if (CORBA::is_nil (server_object.in ()))
+          if (CORBA::is_nil (ping_object.in ()))
             {
               ACE_ERROR ((LM_ERROR,
-                          "Error: Invalid ServerObject IOR: <%s>\n",
-                          server_object_ior.c_str ()));
-              ACE_THROW (ImplementationRepository::Administration::NotFound ());
+                          "Error: Invalid Ping Object ior: <%s>\n",
+                          ping_ior));
+              ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+                                address);
             }
 
-          // Check to see if we can ping it
-          server_object->ping (ACE_TRY_ENV);
+          ping_object->ping (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
-          // If we got an exception, then we have to restart it.
           start = 1;
         }
       ACE_ENDTRY;
     }
   else
-    // We need to restart
     start = 1;
 
   // Start it up...
   if (start == 1)
     {
-      // 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,
-                      "Error: Cannot find startup info for server <%s>\n",
-                      server));
-          ACE_THROW(ImplementationRepository::Administration::NotFound ());
-        }
-      
-      if (startup_val == 0)
-        {
-          ACE_TString logical, startup, working;
-          if (this->repository_.get_startup_info (server, logical, startup, working) != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "Error: Cannot find startup info for server <%s>\n",
-                          server));
-              ACE_THROW(ImplementationRepository::Administration::NotFound ());
-            }
-
-          if (startup.length () == 0)
-            {
-              // If there is no startup information, throw a transient exception
-              ACE_ERROR ((LM_ERROR,
-                          "Error: No startup information for server <%s>\n",
-                          server));
-              ACE_THROW (CORBA::TRANSIENT ());
-            }
+      // Start it up
+      char *cl;
 
+      int status = this->repository_.get_comm_line (server,
+                                                    cl);
 
+      if (status == 0)
+        {
           if (OPTIONS::instance()->debug () >= 1)
-            ACE_DEBUG ((LM_DEBUG, "Starting %s\n", server));
-      
+            ACE_DEBUG ((LM_DEBUG,
+                        "Starting %s\n",
+                        server));
           ACE_Process_Options proc_opts;
 
-          proc_opts.command_line (startup.c_str ());
-          proc_opts.working_directory (working.c_str ());
+          proc_opts.command_line (cl);
 
           ACE_Process proc;
 
           if (proc.spawn (proc_opts) == -1)
             {
-              ACE_ERROR ((LM_ERROR, 
-                         "Error: Cannot activate server <%s> using <%s>\n",
+              ACE_ERROR ((LM_ERROR,
+                          "Error: Cannot activate server <%s> using <%s>\n",
                           server,
-                          startup.c_str ()));
-              ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("N/A")));
+                          cl));
+              delete [] cl;
+              ACE_THROW_RETURN (Implementation_Repository::Cannot_Activate (CORBA::string_dup ("N/A")),
+                                address);
             }
+
+          delete [] cl;
         }
-      
-      // 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 = TAO_ORB_Core_instance ();
-
-      int starting_up;
-      
-      while ((starting_up = this->repository_.starting_up (server)) == 1)
-        {
-          if (OPTIONS::instance()->debug () >= 2)
-            ACE_DEBUG ((LM_DEBUG, "activate_server: Going into handle_events\n"));
-          orb_core->reactor ()->handle_events ();
-        }
-      if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "activate_server: Got out of handle_events loop\n"));
-      
-      // Check to see if it disappeared on us
-      if (starting_up == -1)
+      else
         {
           ACE_ERROR ((LM_ERROR,
-                      "Error: Cannot find startup info for server <%s>\n",
+                      "Error: Cannot find commandline for server <%s>\n",
                       server));
-          ACE_THROW (ImplementationRepository::Administration::NotFound ());
+          ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+                            address);
         }
 
-      // Now it should be started.
+      // @@ Here is where we need to wait for the response so we can
+      // find out where (host/port) the server started
+      ACE_OS::sleep (3);
     }
 
-  if (this->repository_.get_running_info (server, host, port, server_object_ior) != 0)
+  char *host;
+  u_short port;
+
+  if (this->repository_.get_hostport (server, host, port) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "ImplRepo_i::activate_server: "
                   "cannot resolve server <%s>\n",
                   server));
+      return address;
     }
+
+  address->host_ = CORBA::string_dup (host);
+  address->port_ = port;
+
+  return address;
 }
 
 // Adds an entry to the Repository about this <server>
 
 void
 ImplRepo_i::register_server (const char *server,
-                             const ImplementationRepository::StartupOptions &options,
+                             const Implementation_Repository::Process_Options &options,
                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::AlreadyRegistered))
+                     Implementation_Repository::Already_Registered))
 {
   if (OPTIONS::instance()->debug () >= 2)
         ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
                               "Command Line: %s\n"
+                              "Environment: %s\n"
                               "Working Directory: %s\n\n",
                               server,
-                              options.command_line.in (),
-                              options.working_directory.in ()));
-  
-  // Add the server
-  int status = this->repository_.add (server, 
-                                      "",
-                                      options.command_line.in (), 
-                                      options.working_directory.in ());
+                              options.command_line_.in (),
+                              options.environment_.in (),
+                              options.working_directory_.in ()));
+
+  Repository_Record rec (options.command_line_,
+                         options.environment_,
+                         options.working_directory_,
+                         "",
+                         0,
+                         "");
+
+  int status = this->repository_.add (server, rec);
 
   if (status == 1)
     {
       ACE_ERROR ((LM_ERROR,
                   "Error: Server %s Already Registered!\n",
                   server));
-      ACE_THROW (ImplementationRepository::Administration::AlreadyRegistered ());
+      ACE_THROW (Implementation_Repository::Already_Registered ());
     }
   else
     {
@@ -217,10 +265,12 @@ ImplRepo_i::register_server (const char *server,
       if (OPTIONS::instance()->debug () >= 2)
         ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
                               "Command Line: %s\n"
+                              "Environment: %s\n"
                               "Working Directory: %s\n\n",
                               server,
-                              options.command_line.in (),
-                              options.working_directory.in ()));
+                              rec.comm_line,
+                              rec.env,
+                              rec.wdir));
     }
 }
 
@@ -229,18 +279,19 @@ ImplRepo_i::register_server (const char *server,
 
 void
 ImplRepo_i::reregister_server (const char *server,
-                               const ImplementationRepository::StartupOptions &options,
+                               const Implementation_Repository::Process_Options &options,
                                CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  this->repository_.remove (server);
-
-  this->repository_.add (server, 
+  Repository_Record rec (options.command_line_,
+                         options.environment_,
+                         options.working_directory_,
                          "",
-                         options.command_line.in (),
-                         options.working_directory.in ());
+                         0,
+                         "");
+
+  this->repository_.update (server, rec);
 
   if (OPTIONS::instance()->debug () >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -249,10 +300,12 @@ ImplRepo_i::reregister_server (const char *server,
   if (OPTIONS::instance()->debug () >= 2)
     ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
                           "Command Line: %s\n"
+                          "Environment: %s\n"
                           "Working Directory: %s\n\n",
                           server,
-                          options.command_line.in (),
-                          options.working_directory.in ()));
+                          rec.comm_line,
+                          rec.env,
+                          rec.wdir));
 }
 
 // Remove the server entry from the Repository
@@ -261,7 +314,7 @@ void
 ImplRepo_i::remove_server (const char *server,
                            CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound))
+                     Implementation_Repository::Not_Found))
 {
   if (this->repository_.remove (server) == 0)
     {
@@ -274,34 +327,56 @@ ImplRepo_i::remove_server (const char *server,
       ACE_ERROR ((LM_ERROR,
                   "Error: Trying to remove unknown server <%s>\n",
                   server));
-      ACE_THROW (ImplementationRepository::Administration::NotFound ());
+      ACE_THROW (Implementation_Repository::Not_Found ());
     }
 }
 
 // Register the current location of the server
 
-ImplementationRepository::Address * 
-ImplRepo_i::server_is_running (const char * server,
-                               const ImplementationRepository::Address &addr,
-                               ImplementationRepository::ServerObject_ptr server_object,
+Implementation_Repository::INET_Addr *
+ImplRepo_i::server_is_running (const char *server,
+                               const Implementation_Repository::INET_Addr &addr,
+                               CORBA::Object_ptr ping,
                                CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound))
+                     Implementation_Repository::Not_Found))
 {
-  ImplementationRepository::Address *new_addr =
-    new ImplementationRepository::Address;
+  Implementation_Repository::INET_Addr *new_addr =
+    new Implementation_Repository::INET_Addr;
 
   if (OPTIONS::instance()->debug () >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "Server <%s> is running\n",
                 server));
 
-  // Get the stringified server_object_ior
+  // Update the record in the repository
+  Repository_Record rec;
+
+  if (this->repository_.resolve (server, rec) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Error: Unknown Server <%s>\n",
+                  server));
+      ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+                        new_addr);
+    }
+
+  // Delete the stuff that we will update
+  delete [] rec.ping_ior;
+  delete [] rec.host;
+
+  ACE_NEW_RETURN (rec.host, ASYS_TCHAR[ACE_OS::strlen (addr.host_.in ()) + 1], 0);
+  ACE_OS::strcpy (rec.host, addr.host_.in ());
+  rec.port = addr.port_;
+
   CORBA::ORB_var orb = this->orb_manager_.orb ();
-  ASYS_TCHAR *server_object_ior = orb->object_to_string (server_object, ACE_TRY_ENV);
+  ASYS_TCHAR *ping_ior = orb->object_to_string (ping, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  if (this->repository_.update (server, addr.host.in (), addr.port, server_object_ior) == 0)
+  ACE_NEW_RETURN (rec.ping_ior, ASYS_TCHAR[ACE_OS::strlen (ping_ior) + 1], 0);
+  ACE_OS::strcpy (rec.ping_ior, ping_ior);
+
+  if (this->repository_.update (server, rec) == 0)
     {
       if (OPTIONS::instance()->debug () >= 1)
         ACE_DEBUG ((LM_DEBUG,
@@ -311,11 +386,19 @@ ImplRepo_i::server_is_running (const char * server,
   else
     {
       ACE_ERROR ((LM_ERROR,
-                 "Error: Could not update running information for server <%s>\n",
+                 "Error: While updating Repository while server_is_running () %s\n",
                  server));
-      ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), new_addr);
+      return new_addr;
     }
 
+  if (OPTIONS::instance()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG,
+                "The old host/port was: %Lu:%hu\n",
+                rec.host,
+                rec.port));
+
+  // @@ Don't use the ORB_Core_instance() keep a pointer to the ORB
+  //    and use the orb_core() accessor
   TAO_Acceptor_Registry* registry =
     orb->orb_core ()->acceptor_registry ();
 
@@ -338,16 +421,15 @@ ImplRepo_i::server_is_running (const char * server,
   // Get our host and port and convert it to something we can use.
   const ACE_INET_Addr& my_addr  = iiop_acceptor->address ();
 
-  new_addr->host = CORBA::string_dup (my_addr.get_host_name ());
-  new_addr->port = my_addr.get_port_number ();
+  // @@ We are assuming that we are on the same machine right now
+  new_addr->host_ = CORBA::string_dup (my_addr.get_host_name ());
+  new_addr->port_ = my_addr.get_port_number ();
 
   if (OPTIONS::instance()->debug () >= 2)
     ACE_DEBUG ((LM_DEBUG,
                 "The new host/port is: %Lu:%hu\n",
-                new_addr->host.in (),
-                new_addr->port));
-
-  this->repository_.starting_up (server, 0);
+                new_addr->host_.inout (),
+                new_addr->port_));
 
   return new_addr;
 }
@@ -358,26 +440,40 @@ void
 ImplRepo_i::server_is_shutting_down (const char *server,
                                      CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound))
+                     Implementation_Repository::Not_Found))
 {
-  if (this->repository_.update (server, "", 0, "") == 0)
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  Repository_Record rec;
+
+  if (this->repository_.resolve (server, rec) == 0)
     {
-      if (OPTIONS::instance()->debug () >= 1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Successful server_is_shutting_down () of <%s>\n",
-                    server));
+      ACE_OS::strcpy (rec.host, ASYS_TEXT (""));
+      rec.port = 0;
+      ACE_OS::strcpy (rec.ping_ior, ASYS_TEXT (""));
+
+      if (this->repository_.update (server, rec) == 0)
+        {
+          if (OPTIONS::instance()->debug () >= 1)
+            ACE_DEBUG ((LM_DEBUG,
+                        "Successful server_is_shutting_down () of <%s>\n",
+                        server));
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR,
+                     "Error: While updating Repository while shutting down <%s>\n",
+                     server));
+        }
     }
   else
     {
       ACE_ERROR ((LM_ERROR,
-                 "Error: Could not update information for unknown server <%s>\n",
-                 server));
-      ACE_THROW (ImplementationRepository::Administration::NotFound ());
+                  "Error: Unknown Server <%s>\n",
+                  server));
+      ACE_THROW (Implementation_Repository::Not_Found ());
     }
 }
 
-
-
 int
 ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
 {
@@ -408,10 +504,8 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                                     this),
                       -1);
 
-      CORBA::String_var str =
-        this->orb_manager_.activate (this->forwarder_impl_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      CORBA::String_var str  =
+        this->orb_manager_.activate (this->forwarder_impl_);
       if (OPTIONS::instance()->debug () >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "The server IOR is: <%s>\n",
@@ -462,7 +556,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
+      ACE_TRY_ENV.print_exception ("Server_i::init");
       ACE_RETHROW;
     }
   ACE_ENDTRY;
@@ -484,24 +578,25 @@ ImplRepo_i::run (CORBA::Environment& env)
 CORBA::String
 ImplRepo_i::get_forward_host (const char *server)
 {
-  ACE_TString host, server_object_ior;
-  unsigned short port;
+  char *host;
+  u_short port;
 
-  if (this->repository_.get_running_info (server, host, port, server_object_ior) != 0)
+  if (this->repository_.get_hostport (server, host, port) != 0)
     return 0;
 
-  return CORBA::string_dup (host.c_str ());
+  return host;
 }
 
 CORBA::UShort
 ImplRepo_i::get_forward_port (const char *server)
 {
-  ACE_TString host, server_object_ior;
-  unsigned short port;
+  char *host;
+  u_short port;
 
-  if (this->repository_.get_running_info (server, host, port, server_object_ior) != 0)
+  if (this->repository_.get_hostport (server, host, port) != 0)
     return 0;
 
+  delete host;
   return port;
 }
 
@@ -514,215 +609,6 @@ ImplRepo_i::~ImplRepo_i (void)
     delete this->activator_;
 }
 
-
-// Returns the startup information for a server
-
-void 
-ImplRepo_i::find (const char * server,
-                  ImplementationRepository::ServerInformation_out info,
-                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::Administration::NotFound))
-{
-  ACE_TString logical, command_line, working_directory;
-  ACE_TString host, server_object_ior;
-  unsigned short port;
-
-  ACE_NEW_THROW_EX (info,
-                    ImplementationRepository::ServerInformation,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-  
-  // Get the information from the server repository.
-  if (this->repository_.get_startup_info (server, 
-                                          logical, 
-                                          command_line, 
-                                          working_directory) != 0)
-    ACE_THROW (ImplementationRepository::Administration::NotFound ());
-
-  if (this->repository_.get_running_info (server, host, port, server_object_ior) != 0)
-    ACE_THROW (ImplementationRepository::Administration::NotFound ());
-
-  // 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.working_directory = CORBA::string_dup (working_directory.c_str ());
-  info->location.host = CORBA::string_dup (host.c_str ());
-  info->location.port = port;
-}
-
-
-// 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 
-ImplRepo_i::list (CORBA::ULong how_many,
-                  ImplementationRepository::ServerInformationList_out server_list,
-                  ImplementationRepository::ServerInformationIterator_out server_iterator,
-                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // 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 ());
-  ACE_CHECK;
-
-  // Get a new iterator
-  auto_ptr<Server_Repository::HASH_IR_ITER> server_iter (this->repository_.new_iterator ());
-
-  // Check for a memory error.
-  if (server_iter.get () == 0)
-  {
-    ACE_THROW (CORBA::NO_MEMORY ());
-    ACE_CHECK;
-  }
-  
-  // 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 = this->repository_.get_repository_size ();
-  
-  // Now copy over to the server list.
-
-  server_list->length (n);
-
-  Server_Repository::HASH_IR_ENTRY *server_entry;
-
-  if (OPTIONS::instance()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "list: Filling ServerList with %d servers\n", n));
-
-  for (CORBA::ULong i = 0; i < n; i++)
-    {
-      server_iter->next (server_entry);
-      server_iter->advance ();
-
-      ACE_TString logical, server, command_line, working_directory, host, server_ior;
-      unsigned short port;
-
-      server_entry->int_id_->get_running_info (host, port, server_ior);
-      server_entry->int_id_->get_startup_info (logical, command_line, working_directory);
-
-      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.working_directory = CORBA::string_dup (working_directory.c_str ());
-      server_list[i].location.host = CORBA::string_dup (host.c_str ());
-      server_list[i].location.port = port;
-    }
-
-
-  // Now work on the iterator
-
-  // Only set up an iterator if we need to
-  if (this->repository_.get_repository_size () > how_many)
-    {
-      if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "list: Creating ServerInformationIterator\n"));
-
-      // Create an ir_iter and give it the server_iter pointer
-      IR_Iterator *ir_iter;
-
-      // @@ The iterator object should be put in their own POA (a transient poa)
-      ACE_NEW_THROW_EX (ir_iter,
-                        IR_Iterator (server_iter.release (), this->orb_manager_.root_poa ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      ACE_TRY
-        {
-          CORBA::String_var str =
-            this->orb_manager_.activate (ir_iter, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          server_iterator = ir_iter->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-
-// Attempts to gracefully shut down the server, if that fails, will try
-// to do it ungracefully.
-
-void 
-ImplRepo_i::shutdown_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::Administration::NotFound))
-{
-  ACE_TString server_object_ior, host;
-  unsigned short port;
-
-  // Find out if it is already running
-  if (this->repository_.get_running_info (server, host, port, 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,
-                  "Error: Cannot find ServerObject IOR for server <%s>\n",
-                  server));
-      ACE_THROW (ImplementationRepository::Administration::NotFound ());
-    }
-
-  // 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 =
-            this->orb_manager_.orb ()->string_to_object (server_object_ior.c_str (),
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ImplementationRepository::ServerObject_var server_object = 
-            ImplementationRepository::ServerObject::_narrow (object.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (server_object.in ()))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "Error: Invalid ServerObject IOR: <%s>\n",
-                          server_object_ior.c_str ()));
-              ACE_TRY_THROW (ImplementationRepository::Administration::NotFound ());
-            }
-
-          // Call shutdown
-          server_object->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Remove running info from repository
-          if (this->repository_.update (server, "", 0, "") != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                         "Error: Could not update information for unknown server <%s>\n",
-                         server));
-              ACE_TRY_THROW (ImplementationRepository::Administration::NotFound ());
-            }          
-        }
-      ACE_CATCHANY
-        {
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-    }
-}
-
-
 IR_Adapter_Activator::IR_Adapter_Activator (IR_Forwarder *servant,
                                             PortableServer::POAManager_ptr poa_manager)
   : servant_ (servant),
@@ -796,7 +682,7 @@ IR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
   ACE_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "IR_Adapter_Activator::unknown_adapter - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "System Exception");
+      ACE_TRY_ENV.print_exception ("SYS_EX");
       return 0;
     }
   ACE_ENDTRY;
@@ -816,15 +702,15 @@ IR_Forwarder::IR_Forwarder (CORBA::ORB_ptr orb_ptr,
 }
 
 CORBA::RepositoryId
-IR_Forwarder::_primary_interface (const PortableServer::ObjectId &,
-                                  PortableServer::POA_ptr,
+IR_Forwarder::_primary_interface (const PortableServer::ObjectId & /* oid */,
+                                  PortableServer::POA_ptr /* poa */,
                                   CORBA::Environment &)
 {
   return 0;
 }
 
 void
-IR_Forwarder::invoke (CORBA::ServerRequest_ptr ,
+IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
                       CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_ORB_Core *orb_core = this->orb_var_->orb_core ();
@@ -843,17 +729,10 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr ,
 
   // Now FORWARD!!!
 
-  ACE_TRY
-    {
-      this->ir_impl_->activate_server (poa->the_name (),
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
+  Implementation_Repository::INET_Addr *new_addr = 0;
+  new_addr = this->ir_impl_->activate_server (poa->the_name (),
+                                              ACE_TRY_ENV);
+  ACE_CHECK;
 
   CORBA_Object_ptr forward_object =
     this->orb_var_->key_to_object (poa_current_impl->object_key (),
@@ -868,8 +747,8 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr ,
             ACE_dynamic_cast (TAO_IIOP_Profile *,
                               stub_obj->profile_in_use ());
 
-  iiop_pfile->port (this->ir_impl_->get_forward_port (poa->the_name ()));
-  iiop_pfile->host (this->ir_impl_->get_forward_host (poa->the_name ()));
+  iiop_pfile->port (new_addr->port_);
+  iiop_pfile->host (new_addr->host_);
 
   if (!CORBA::is_nil (forward_object))
     ACE_THROW (PortableServer::ForwardRequest (forward_object));
@@ -877,92 +756,3 @@ IR_Forwarder::invoke (CORBA::ServerRequest_ptr ,
     ACE_ERROR ((LM_ERROR,
                 "Error: Forward_to reference is nil.\n"));
 }
-
-
-// Plain old constructor
-
-IR_Iterator::IR_Iterator (Server_Repository::HASH_IR_ITER *iterator,
-                          PortableServer::POA_ptr poa)
-  : iterator_ (iterator),
-    poa_ (poa)
-{
-  // Nothing
-}
-
-
-// Destructor
-
-IR_Iterator::~IR_Iterator ()
-{
-  delete iterator_;
-}
-
-
-// Returns the next list of up to <how_many> servers.  If empty, will return
-// false.
-
-CORBA::Boolean 
-IR_Iterator::next_n (CORBA::ULong how_many,
-                     ImplementationRepository::ServerInformationList_out server_list,
-                     CORBA::Environment &ACE_TRY_ENV)
-  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_IR_ENTRY *server_entry;
-  
-  // Iterate and populate the BindingList.
-  
-  for (CORBA::ULong i = 0; i < how_many; i++)
-    {
-      this->iterator_->next (server_entry);
-    
-      ACE_TString logical, server, command_line, working_directory, host, server_ior;
-      unsigned short port;
-
-      server_entry->int_id_->get_running_info (host, port, server_ior);
-      server_entry->int_id_->get_startup_info (logical, command_line, working_directory);
-
-      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.working_directory = CORBA::string_dup (working_directory.c_str ());
-      server_list[i].location.host = CORBA::string_dup (host.c_str ());
-      server_list[i].location.port = port;
-
-      if (this->iterator_->advance () == 0)
-        {
-          // If no more server left, reset length to the actual
-          // number servers and get out of the loop.
-          server_list->length (i + 1);
-          break;
-        }
-    }
-  return 1;
-}
-
-
-// Destroys the iterator.
-
-void IR_Iterator::destroy (CORBA::Environment &)
-   ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
-template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index 009ec7aeb52..f3470b5e0de 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -49,7 +49,7 @@ public:
   virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                           const char *name,
                                           CORBA_Environment &ACE_TRY_ENV
-                                            = TAO_default_environment ());
+                                            = CORBA_Environment::default_environment ());
   // Called by the POA when the incoming requested object/POA isn't found.  This will
   // create POAs when needed and will also put a DSI object (IR_Forwarder) in that POA
   // as a default servant to handle that request
@@ -61,13 +61,14 @@ private:
   // POA Manager
 };
 
-class ImplRepo_i : public POA_ImplementationRepository::Administration
+class ImplRepo_i : public POA_Implementation_Repository
 {
   // = TITLE
   //    Implementation Repository
   //
   // = DESCRIPTION
-  //    This provides the interface to Administer the Implementation Repository.
+  //    This provides the interface to communicate directly with the
+  //    Implementation Repository.
 public:
   // = Constructor and destructor
   ImplRepo_i (void);
@@ -75,78 +76,70 @@ public:
 
   // = Interface methods
 
-  virtual void activate_server (const char * server,
-                                CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::Object_ptr activate_object (CORBA::Object_ptr obj,
+                                             CORBA_Environment &ACE_TRY_ENV
+                                               = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound,
-                     ImplementationRepository::Administration::CannotActivate));
+                     Implementation_Repository::Not_Found,
+                     Implementation_Repository::Cannot_Activate));
+  // Starts up the server containing the object <obj> if not already running.
+
+  virtual Implementation_Repository::INET_Addr *activate_server (const char *server,
+                                                                 CORBA::Environment &env = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Implementation_Repository::Not_Found,
+                     Implementation_Repository::Cannot_Activate));
   // Starts up the server <server> if not already running.
 
   virtual void register_server (const char *server,
-                                const ImplementationRepository::StartupOptions &options,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                const Implementation_Repository::Process_Options &options,
+                                CORBA_Environment &ACE_TRY_ENV
+                                  = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::AlreadyRegistered));
-  // Adds the server to the repository and registers the startup information about 
-  // the server <server>.
+                     Implementation_Repository::Already_Registered));
+  // Adds the server to the repository and registers the startup
+  // information about the server <server>.
 
   virtual void reregister_server (const char *server,
-                                  const ImplementationRepository::StartupOptions &options,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                  const Implementation_Repository::Process_Options &options,
+                                  CORBA_Environment &ACE_TRY_ENV
+                                    = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Updates the startup information about the server <server>.
 
   virtual void remove_server (const char *server,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                              CORBA_Environment &ACE_TRY_ENV
+                                = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound));
+                     Implementation_Repository::Not_Found));
   // Removes the server <server> from the repository.
 
-  virtual void shutdown_server (const char * server,
-                                CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound));
-  // Attempts to gracefully shut down the server, if that fails, will try
-  // to do it ungracefully.
-  
-  virtual ImplementationRepository::Address * 
-    server_is_running (const char * server,
-                       const ImplementationRepository::Address &addr,
-                       ImplementationRepository::ServerObject_ptr server_object,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual Implementation_Repository::INET_Addr
+    *server_is_running (const char *server,
+                        const Implementation_Repository::INET_Addr &addr,
+                        CORBA::Object_ptr ping,
+                        CORBA_Environment &ACE_TRY_ENV
+                          = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound));
-  // Called by the server to update transient information such as current location of
-  // the <server> and its ServerObject.
+                     Implementation_Repository::Not_Found));
+  // Called by the server to update transient information such as
+  // current location of the <server> and its ping object.
 
   virtual void server_is_shutting_down (const char * server,
-                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                        CORBA_Environment &ACE_TRY_ENV
+                                          = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound));
-  // What the server should call before it shuts down.
-
-  virtual void find (const char * server,
-                     ImplementationRepository::ServerInformation_out info,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::Administration::NotFound));
-  // Returns the startup information for a server
-
-  virtual void list (CORBA::ULong how_many,
-                     ImplementationRepository::ServerInformationList_out server_list,
-                     ImplementationRepository::ServerInformationIterator_out server_iterator,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // 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.
+                     Implementation_Repository::Not_Found));
+  // What the server should call before it shutsdown.
 
   // = Other methods
 
-  int init (int argc, char **argv, 
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int init (int argc, char **argv,
+            CORBA_Environment &ACE_TRY_ENV
+              = TAO_default_environment ());
   // Initialize the Server state - parsing arguments and waiting.
 
-  int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (CORBA_Environment &ACE_TRY_ENV = CORBA_Environment::default_environment ());
   // Runs the orb.
 
   CORBA::String get_forward_host (const char *server);
@@ -162,7 +155,7 @@ private:
   IR_Adapter_Activator *activator_;
   // Used for the forwarding of any type of POA.
 
-  Server_Repository repository_;
+  Repository repository_;
   // Repository containing information about each server.
 
   TAO_ORB_Manager orb_manager_;
@@ -181,13 +174,7 @@ private:
   // The command line arguments.
 };
 
-class IR_Forwarder: public PortableServer::DynamicImplementation
-  // = TITLE
-  //    Implementation Repository Forwarder
-  //
-  // = DESCRIPTION
-  //    This class is provides a DSI implementation that is used to handle
-  //    arbitrary calls and forward them to the correct place.
+class IR_Forwarder: public  PortableServer::DynamicImplementation
 {
 public:
   IR_Forwarder (CORBA::ORB_ptr orb_ptr,
@@ -203,7 +190,7 @@ public:
 
   CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                           PortableServer::POA_ptr poa,
-                                          CORBA::Environment &env = TAO_default_environment ());
+                                          CORBA::Environment &env);
   // DynamicImplementation stuff
 
 private:
@@ -217,34 +204,4 @@ private:
   // POA reference.
 };
 
-class IR_Iterator : public POA_ImplementationRepository::ServerInformationIterator
-{
-public:
-  IR_Iterator (Server_Repository::HASH_IR_ITER *iterator,
-               PortableServer::POA_ptr poa);
-  // Constructor
-  // Ownership of iterator is transfered to this class (we'll delete it)
-
-  ~IR_Iterator ();
-  // Destructor
-
-  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 ImplementationRepository::ServerInformationList_out server_list,
-                                 CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Returns the next list of up to <how_many> servers.  If empty, will return
-  // false.
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Destroys the iterator.
-
-private:
-  Server_Repository::HASH_IR_ITER *iterator_;
-  // Our very own iterator for transversing the server repository.
-
-  PortableServer::POA_var poa_;
-  // Our lovely POA.
-};
-
 #endif /* IMPLREPO_I_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index ca808c50bac..4784e44b5f2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -18,30 +18,23 @@ PROG_SRCS = \
         ImplRepo.cpp \
         ImplRepo_i.cpp \
         Repository.cpp \
-        Options.cpp \
-	tao_ir.cpp \
-	tao_ir_i
+        Options.cpp
 
 SRC = $(PROG_SRCS)
 
-IMPLREPO_SVR_OBJS = \
-	ImplRepo.o \
-	ImplRepo_i.o \
-	Repository.o \
-	Options.o
-
-TAO_IR_OBJS = \
-	tao_ir.o \
-	tao_ir_i.o
+SIMPLE_SVR_OBJS = \
+                ImplRepo.o \
+                ImplRepo_i.o \
+                Repository.o \
+                Options.o
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = ImplRepo_Service \
-	tao_ir
+BIN2 = ImplRepo_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # ImplRepo
@@ -66,10 +59,7 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-ImplRepo_Service: $(addprefix $(VDIR),$(IMPLREPO_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
+ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
@@ -81,7 +71,8 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
 
 .obj/ImplRepo.o .obj/ImplRepo.so .shobj/ImplRepo.o .shobj/ImplRepo.so: ImplRepo.cpp ImplRepo_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -190,25 +181,16 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -256,9 +238,13 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -339,6 +325,12 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
@@ -348,7 +340,8 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(TAO_ROOT)/tao/TAO.h
 .obj/ImplRepo_i.o .obj/ImplRepo_i.so .shobj/ImplRepo_i.o .shobj/ImplRepo_i.so: ImplRepo_i.cpp ImplRepo_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -457,25 +450,16 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -523,9 +507,13 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -606,6 +594,12 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
@@ -656,8 +650,6 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
@@ -668,10 +660,7 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ $(ACE_ROOT)/ace/Process.i
 .obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -795,265 +784,5 @@ tao_ir: $(addprefix $(VDIR),$(TAO_IR_OBJS))
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
-.obj/tao_ir.o .obj/tao_ir.so .shobj/tao_ir.o .shobj/tao_ir.so: tao_ir.cpp tao_ir_i.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
index b74092d7808..146f6cff0ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Options.h"
 #include "ace/Get_Opt.h"
-
+ 
 // Default Constructor
 Options::Options ()
 : debug_ (1),
@@ -29,7 +29,7 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
                              "Error: Unable to open %s for writing: %p\n",
                              get_opts.optarg), -1);
         break;
-      case '?':  // display help for use of the server.
+      case '?':  // display help for use of the server.*/
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s"
@@ -44,9 +44,9 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
   return 0;
 }
 
-// Returns the debug level for the IR.
+// Returns the debug level for the IR.  
 
-int
+int 
 Options::debug (void) const
 {
   return this->debug_;
@@ -63,5 +63,5 @@ Options::output_file (void) const
 #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>
+#pragme instantiate ACE_Singleton <Options, ACE_Null_Mutex>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
index 10da79c6d87..4f6d2303a82 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
@@ -6,239 +6,249 @@
 
 ACE_RCSID(ImplRepo_Service, Repository, "$Id$")
 
-
-
-// Initialize the command_line and working_dir.
-
-Server_Info::Server_Info (const ACE_TString POA_name,
-                          const ACE_TString logical_server_name,
-                          const ACE_TString startup_command,
-                          const ACE_TString working_dir)
-: starting_up_ (0),
-  logical_server_name_ (logical_server_name),
-  POA_name_ (POA_name),
-  startup_command_ (startup_command),
-  working_dir_ (working_dir),
-  host_ (""),
-  port_ (0),
-  server_object_ior_ ("")
+Repository_Record::Repository_Record ()
+: comm_line (ACE::strnew ("")),
+  env (ACE::strnew ("")),
+  wdir (ACE::strnew ("")),
+  host (ACE::strnew ("")),
+  port (0),
+  ping_ior (ACE::strnew (""))
 {
   // Nothing
 }
 
-
-Server_Info::~Server_Info ()
+Repository_Record::Repository_Record (const Repository_Record &r)
+: comm_line (ACE::strnew (r.comm_line)),
+  env (ACE::strnew (r.env)),
+  wdir (ACE::strnew (r.wdir)),
+  host (ACE::strnew (r.host)),
+  port (r.port),
+  ping_ior (ACE::strnew (r.ping_ior))
 {
   // Nothing
 }
 
-
-// Updates information that is relevant only when an instance
-// of the server is running.
-
-void
-Server_Info::update_running_info (const ACE_TString host,
-                                  const unsigned short port,
-                                  const ACE_TString server_object_ior)
+Repository_Record::Repository_Record (const ASYS_TCHAR *c,
+                                      const ASYS_TCHAR *e,
+                                      const ASYS_TCHAR *w,
+                                      const ASYS_TCHAR *h,
+                                      const unsigned short p,
+                                      const ASYS_TCHAR *pi)
+: comm_line (ACE::strnew (c)),
+  env (ACE::strnew (e)),
+  wdir (ACE::strnew (w)),
+  host (ACE::strnew (h)),
+  port (p),
+  ping_ior (ACE::strnew (pi))
 {
-  this->host_ = host;
-  this->port_ = port;
-  this->server_object_ior_ = server_object_ior;
 }
 
-
-// Returns startup information.
-
-void
-Server_Info::get_startup_info (ACE_TString &logical_server_name,
-                               ACE_TString &startup_command,
-                               ACE_TString &working_dir)
+Repository_Record::~Repository_Record ()
 {
-  logical_server_name = this->logical_server_name_;
-  startup_command = this->startup_command_;
-  working_dir = this->working_dir_;
+  delete [] this->comm_line;
+  delete [] this->env;
+  delete [] this->wdir;
+  delete [] this->host;
+  delete [] this->ping_ior;
 }
 
-
-// Returns information about a running instance.
-
-void
-Server_Info::get_running_info (ACE_TString &host,
-                               unsigned short &port,
-                               ACE_TString &server_object_ior)
+Repository_Record &
+Repository_Record::operator= (Repository_Record &r)
 {
-  host = this->host_;
-  port = this->port_;
-  server_object_ior = this->server_object_ior_;
+  if (this == &r)
+    return *this;
+
+  delete [] this->comm_line;
+  delete [] this->env;
+  delete [] this->wdir;
+  delete [] this->host;
+  delete [] this->ping_ior;
+
+  this->comm_line = ACE::strnew (r.comm_line);
+  this->env = ACE::strnew (r.env);
+  this->wdir = ACE::strnew (r.wdir);
+  this->host = ACE::strnew (r.host);
+  this->port = r.port;
+  this->ping_ior = ACE::strnew (r.ping_ior);
+  
+  return *this;
 }
 
 // Default Constructor
-
-Server_Repository::Server_Repository ()
+Repository::Repository ()
 {
   // Nothing
 }
 
-
 // Add a new server to the Repository
-
 int
-Server_Repository::add (const ACE_TString POA_name,
-                        const ACE_TString logical_server_name,
-                        const ACE_TString startup_command,
-                        const ACE_TString working_dir)
+Repository::add (ACE_TString key, const Repository_Record &rec)
 {
-  Server_Info *new_server;
-  ACE_NEW_RETURN (new_server,
-                  Server_Info (POA_name, logical_server_name, startup_command, working_dir),
-                  -1);
-
-  return this->repository_.bind (POA_name, new_server);
-}
+  if (OPTIONS::instance ()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG, "Repository: Adding key %s\n", key.c_str ()));
 
+  Repository_Record *new_rec = new Repository_Record (rec);
 
-// Update the associated process information.
+  // Store the record in the repository.
+  return this->repository_.bind (key, new_rec);
+}
 
-int
-Server_Repository::update (const ACE_TString POA_name,
-                           const ACE_TString host,
-                           const unsigned short port,
-                           const ACE_TString server_object_ior)
+int 
+Repository::update (ACE_TString key, const Repository_Record &rec)
 {
-  Server_Info *server;
-  int retval = this->repository_.find (POA_name, server);
+  if (OPTIONS::instance ()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG, "Repository: Updating key %s\n", key.c_str ()));
 
-  // Only fill in data if it was found
-  if (retval == 0)
-    server->update_running_info (host, port, server_object_ior);
+  Repository_Record *new_rec = new Repository_Record (rec);
+  Repository_Record *old_rec;
 
-  return retval;
+  // Store the record in the repository.
+  int retval = this->repository_.rebind (key, new_rec, old_rec);
+  
+  if (retval == 1)
+    delete old_rec;
+
+  return retval >= 0 ? 0 : -1;
 }
 
+// Removes the server from the Repository
+int
+Repository::remove (ACE_TString key)
+{
+  if (OPTIONS::instance ()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG, "Repository: Removing key %s\n", key.c_str ()));
+  return this->repository_.unbind (key.c_str ());
+}
 
-// Returns information related to startup.
 
+// Find the key record in the Repository
 int
-Server_Repository::get_startup_info (const ACE_TString POA_name,
-                                     ACE_TString &logical_server_name,
-                                     ACE_TString &startup_command,
-                                     ACE_TString &working_dir)
+Repository::resolve (ACE_TString key, Repository_Record &rec)
 {
-  Server_Info *server;
-  int retval = this->repository_.find (POA_name, server);
+  if (OPTIONS::instance ()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG, "Repository: Resolving key %s\n", key.c_str ()));
+
+  Repository_Record *rep_rec;
+  int retval = this->repository_.find (key, rep_rec);
 
-  // Only fill in data if it was found
   if (retval == 0)
-    server->get_startup_info (logical_server_name, startup_command, working_dir);
+    rec = *rep_rec;
 
   return retval;
 }
-
-
-// Returns information related to a running copy.
+// = Accessor methods
 
 int
-Server_Repository::get_running_info (const ACE_TString POA_name,
-                                     ACE_TString &host,
-                                     unsigned short &port,
-                                     ACE_TString &server_object_ior)
+Repository::get_comm_line (ACE_TString key, ASYS_TCHAR *&comm_line)
 {
-  Server_Info *server;
-  int retval = this->repository_.find (POA_name, server);
+  Repository_Record *rec;
+  int retval = this->repository_.find (key, rec);
 
-  // Only fill in data if it was found
   if (retval == 0)
-    server->get_running_info (host, port, server_object_ior);
+    {
+      ACE_NEW_RETURN (comm_line, ASYS_TCHAR [ACE_OS::strlen (rec->comm_line) + 1], -1);
+      ACE_OS::strcpy (comm_line, rec->comm_line);
+    }
 
   return retval;
 }
 
 
-// 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_TString POA_name, int new_value)
+Repository::get_env (ACE_TString key, ASYS_TCHAR *&env)
 {
-  Server_Info *server;
-  int retval = this->repository_.find (POA_name, server);
+  Repository_Record *rec;
+  int retval = this->repository_.find (key, rec);
 
-  // Only fill in data if it was found
   if (retval == 0)
-  {
-    retval = server->starting_up_;
-    server->starting_up_ = new_value;
-  }
+    {
+      ACE_NEW_RETURN (env, ASYS_TCHAR [ACE_OS::strlen (rec->env) + 1], -1);
+      ACE_OS::strcpy (env, rec->env);
+    }
 
   return retval;
 }
 
-
-// Same as above but does not alter the value
-
 int
-Server_Repository::starting_up (const ACE_TString POA_name)
+Repository::get_wdir (ACE_TString key, ASYS_TCHAR *&wdir)
 {
-  Server_Info *server;
-  int retval = this->repository_.find (POA_name, server);
+  Repository_Record *rec;
+  int retval = this->repository_.find (key, rec);
 
-  // Only fill in data if it was found
   if (retval == 0)
-    retval = server->starting_up_;
+    {
+      ACE_NEW_RETURN (wdir, ASYS_TCHAR [ACE_OS::strlen (rec->wdir) + 1], -1);
+      ACE_OS::strcpy (wdir, rec->wdir);
+    }
 
   return retval;
 }
 
-
-// Removes the server from the Repository.
-
 int
-Server_Repository::remove (const ACE_TString POA_name)
+Repository::get_hostport (ACE_TString key, ASYS_TCHAR *&host, unsigned short &port)
 {
-  return this->repository_.unbind (POA_name);
-}
+  Repository_Record *rec;
+  int retval = this->repository_.find (key, rec);
 
+  if (retval == 0)
+    {
+      host = rec->host;
+      port = rec->port;
+    }
 
-// Returns a new iterator that travels over the repository.
+  return retval;
+}
 
-Server_Repository::HASH_IR_ITER *
-Server_Repository::new_iterator ()
+int
+Repository::get_ping_ior (ACE_TString key, ASYS_TCHAR *&ping_ior)
 {
-  HASH_IR_ITER *hash_iter;
-  ACE_NEW_RETURN (hash_iter,
-                  Server_Repository::HASH_IR_ITER (this->repository_),
-                  0);
-  return hash_iter;
-}
+  Repository_Record *rec;
+  int retval = this->repository_.find (key, rec);
 
+  if (retval == 0)
+    {
+      ACE_NEW_RETURN (ping_ior, ASYS_TCHAR [ACE_OS::strlen (rec->ping_ior) + 1], -1);
+      ACE_OS::strcpy (ping_ior, rec->ping_ior);
+    }
 
-// Returns the number of entries in the repository.
+  return retval;
+}
 
-size_t
-Server_Repository::get_repository_size ()
+void
+Repository::dump (void)
 {
-  return this->repository_.current_size ();
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Total size: %d\n"), this->repository_.total_size ()));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Current size: %d\n"), this->repository_.current_size ()));
+  HASH_IR_ENTRY *entry;
+  size_t i = 0;
+
+  for (HASH_IR_ITER hash_iter (this->repository_);
+       hash_iter.next (entry) != 0;
+       hash_iter.advance ())
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("Record %d has server name \"%s\"\n"),
+                  i,
+                  ((ACE_TString) entry->ext_id_).c_str ()));
+      i++;
+    }
+
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Entry<ACE_TString, Server_Info *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-// The ACE_CString case is covered in TAO
-template class ACE_Equal_To<ACE_CString>;
-
+template class ACE_Hash_Map_Entry<ACE_TString, Repository_Record *>;
+template class ACE_Hash_Map_Manager_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, Server_Info *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-// The ACE_CString case is covered in TAO
-#pragma instantiate ACE_Equal_To<ACE_CString>
-
+#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, Repository_Record *>;
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.h b/TAO/orbsvcs/ImplRepo_Service/Repository.h
index 8bf8a156f9e..1253be51e7b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.h
@@ -20,156 +20,86 @@
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
-#include "ace/Functor.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Synch.h"
 #include "ace/SString.h"
 
+#if defined (UNICODE)
+#define ACE_TString ACE_WString
+#else /* UNICODE */
+#define ACE_TString ACE_CString
+#endif /* UNICODE */
 
-class Server_Info
-  // = TITLE
-  //   Information about IR registered servers.
-  //
-  // = DESCRIPTION
-  //   Contains all the necessary information about the server including
-  //   Information on how to start it up and where it is running.
+struct Repository_Record
 {
-public:
-  // = Constructors
-
-  Server_Info (const ACE_TString POA_name,
-               const ACE_TString logical_server_name,
-               const ACE_TString startup_command,
-               const ACE_TString working_dir);
-  // Initialize the command_line and working_dir.
-
-  // = Destructors
-
-  ~Server_Info ();
-  // The only destructor there is.
-
-  void update_running_info (const ACE_TString host,
-                            const unsigned short port,
-                            const ACE_TString server_object_ior);
-  // Updates information that is relevant only when an instance
-  // of the server is running.
-
-  void get_startup_info (ACE_TString &logical_server_name,
-                         ACE_TString &startup_command,
-                         ACE_TString &working_dir);
-  // Returns startup information.
-
-  void get_running_info (ACE_TString &host,
-                         unsigned short &port,
-                         ACE_TString &server_object_ior);
-  // Returns information about a running instance.
-
-  // @@ 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)
-
-  int starting_up_;
-  // This is a flag to determine if the process has already been spawned
-  // and we are just waiting for it to start up.
-
-private:
-  ACE_TString logical_server_name_;
-  // Which server process this poa is grouped in.
-
-  ACE_TString POA_name_;
-  // The name of the POA.
-
-  ACE_TString startup_command_;
-  // The command line startup command (program and arguments).
-
-  ACE_TString working_dir_;
-  // The working directory.
-
-  ACE_TString host_;
-  // Current hostname used by the server.
-
-  unsigned short port_;
-  // Current port used by the server.
-
-  ACE_TString server_object_ior_;
-  // IOR of the server object in the server.
-
-  // No copying allowed.
-  void operator= (Server_Info &);
-  Server_Info (Server_Info &);
+  // Constructors
+  Repository_Record ();
+  Repository_Record (const Repository_Record &);
+  Repository_Record (const ASYS_TCHAR *c,
+                     const ASYS_TCHAR *e,
+                     const ASYS_TCHAR *w,
+                     const ASYS_TCHAR *h,
+                     const unsigned short p,
+                     const ASYS_TCHAR *pi);
+
+
+  // Destructor
+  ~Repository_Record ();
+
+  // Assignment Operator
+  Repository_Record &operator= (Repository_Record &);
+
+  // Fields
+  ASYS_TCHAR *comm_line;
+  ASYS_TCHAR *env;
+  ASYS_TCHAR *wdir;
+  ASYS_TCHAR *host;
+  unsigned short port;
+  ASYS_TCHAR *ping_ior;
 };
 
-
-
-
-class Server_Repository
-  // = TITLE
-  //   Repository of Server_Infos.
-  //
-  // = DESCRIPTION
-  //   Handles the storage, updating, and startup of servers.
+class Repository
 {
 public:
-  Server_Repository ();
+  Repository ();
   // Default Constructor
 
   typedef ACE_Hash_Map_Entry<ACE_TString,
-                             Server_Info *> HASH_IR_ENTRY;
+                             Repository_Record *> HASH_IR_ENTRY;
 
   typedef ACE_Hash_Map_Manager_Ex<ACE_TString,
-                                  Server_Info *,
+                                  Repository_Record *,
                                   ACE_Hash<ACE_TString>,
                                   ACE_Equal_To<ACE_TString>,
                                   ACE_Null_Mutex> HASH_IR_MAP;
 
   typedef ACE_Hash_Map_Iterator_Ex<ACE_TString,
-                                   Server_Info *,
+                                   Repository_Record *,
                                    ACE_Hash<ACE_TString>,
                                    ACE_Equal_To<ACE_TString>,
                                    ACE_Null_Mutex> HASH_IR_ITER;
 
-  int add (const ACE_TString POA_name,
-           const ACE_TString logical_server_name,
-           const ACE_TString startup_command,
-           const ACE_TString working_dir);
+  int add (ACE_TString key, const Repository_Record &rec);
   // Add a new server to the Repository
 
-  int update (const ACE_TString POA_name,
-              const ACE_TString host,
-              const unsigned short port,
-              const ACE_TString server_object_ior);
-  // Update the associated process information.
-
-  int get_startup_info (const ACE_TString POA_name,
-                        ACE_TString &logical_server_name,
-                        ACE_TString &startup_command,
-                        ACE_TString &working_dir);
-  // Returns information related to startup.
-
-  int get_running_info (const ACE_TString POA_name,
-                        ACE_TString &host,
-                        unsigned short &port,
-                        ACE_TString &server_object_ior);
-  // Returns information related to a running copy.
-
-  int starting_up (const ACE_TString POA_name, int new_value);
-  // Checks the starting_up_ variable in the Server_Info and
-  // returns the previous value or -1 if the POA_name wasn't found
+  int update (ACE_TString key, const Repository_Record &rec);
+  // Updates an existing key with <rec>
 
-  int starting_up (const ACE_TString POA_name);
-  // Same as above but does not alter the value.
+  int remove (ACE_TString key);
+  // Removes the server from the Repository
 
-  int remove (const ACE_TString POA_name);
-  // Removes the server from the Repository.
+  int resolve (ACE_TString key, Repository_Record &rec);
+  // Find the key record in the Repository
 
-  HASH_IR_ITER *new_iterator ();
-  // Returns a new iterator that travels over the repository.
+  // = Accessor methods
+  int get_comm_line (ACE_TString key, ASYS_TCHAR *&comm_line);
+  int get_env (ACE_TString key, ASYS_TCHAR *&env);
+  int get_wdir (ACE_TString key, ASYS_TCHAR *&wdir);
+  int get_ping_ior (ACE_TString key, ASYS_TCHAR *&ping_ior);
+  int get_hostport (ACE_TString key, ASYS_TCHAR *&host, unsigned short &port);
 
-  size_t get_repository_size ();
-  // Returns the number of entries in the repository.
+  // Dump method
+  void dump (void);
 
 private:
   HASH_IR_MAP repository_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_ir.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_ir.cpp
deleted file mode 100644
index 24f542c2c02..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/tao_ir.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "tao_ir_i.h"
-
-ACE_RCSID(ImplRepo_Service, tao_ir, "$Id$")
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  TAO_IR_i tao_ir_i;
-
-  if (tao_ir_i.init (argc, argv) == -1)
-    return 1;
-  else
-    return tao_ir_i.run ();
-}
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.cpp
deleted file mode 100644
index bbfa7b7ee6c..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.cpp
+++ /dev/null
@@ -1,793 +0,0 @@
-// $Id$
-
-#include "tao_ir_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-ACE_RCSID(ImplRepo_Service, tao_ir_i, "$Id:")
-
-// How many servers should we get at once?
-const size_t IR_LIST_CHUNK = 4;
-
-
-// Constructor
-
-TAO_IR_i::TAO_IR_i (void)
-: implrepo_ (ImplementationRepository::Administration::_nil ()),
-  op_ (0)
-{
-  // Nothing
-}
-
-
-// Destructor
-
-TAO_IR_i::~TAO_IR_i (void)
-{
-  delete this->op_;
-}
-
-int
-TAO_IR_i::run ()
-{
-  if (this->op_ == 0)
-  {
-    ACE_ERROR ((LM_ERROR, "Unknown operation"));
-    return -1;
-  }
-
-  return this->op_->run ();
-}
-
-int
-TAO_IR_i::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  const char *exception_message = "Null Message";
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the ImplRepo object
-
-      CORBA::Object_var implrepo_object =
-        orb_->resolve_initial_references ("ImplRepoService");
-
-      if (CORBA::is_nil (implrepo_object.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to resolve the Implementation Repository.\n"));
-          ACE_OS::exit (-1);
-        }
-
-      exception_message = "While narrowing ImplRepo";
-      this->implrepo_ =
-        ImplementationRepository::Administration::_narrow (implrepo_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "TAO_IR_i::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-// Go through and figure out which operation we should do.
-
-int
-TAO_IR_i::parse_args (void)
-{
-  // Make sure one command was given
-  if (this->argc_ < 2)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  this->op_ = TAO_IR_Op::make_op (this->argv_[1], this->implrepo_.in ());
-
-  // Check for unrecognized operation
-
-  if (this->op_ == 0)
-  {
-    ACE_ERROR ((LM_ERROR, "ERROR: Unrecognized command: <%s>\n", this->argv_[1]));
-    this->print_usage ();
-    return -1;
-  }
-
-  // Adjust argc and argv so only the command specific args are passed
-  return this->op_->parse (this->argc_ - 2, this->argv_ + 2);
-}
-
-
-// Print out information about all operations.
-
-void
-TAO_IR_i::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Usage: tao_ir [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"
-                        "    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"));
-}
-
-
-// Factory for operations
-
-TAO_IR_Op *
-TAO_IR_Op::make_op (const ASYS_TCHAR *op_name, ImplementationRepository::Administration_ptr ir)
-{
-  if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("activate")) == 0)
-    return new TAO_IR_Op_Activate (ir);
-  else if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("add")) == 0)
-    return new TAO_IR_Op_Add (ir);
-  else if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("list")) == 0)
-    return new TAO_IR_Op_List (ir);
-  else if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("remove")) == 0)
-    return new TAO_IR_Op_Remove (ir);
-  else if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("shutdown")) == 0)
-    return new TAO_IR_Op_Shutdown (ir);
-  else if (ACE_OS::strcasecmp (op_name, ASYS_TEXT ("update")) == 0)
-    return new TAO_IR_Op_Update (ir);
-
-  return 0;
-}
-
-
-// ============================================================================
-// = Constructors.
-
-
-TAO_IR_Op::TAO_IR_Op (ImplementationRepository::Administration_ptr implrepo)
-: implrepo_ (implrepo)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Activate::TAO_IR_Op_Activate (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Add::TAO_IR_Op_Add (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo)
-{
-  // Nothing
-}
-
-TAO_IR_Op_List::TAO_IR_Op_List (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo),
-  verbose_server_information_ (0)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Remove::TAO_IR_Op_Remove (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Shutdown::TAO_IR_Op_Shutdown (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Update::TAO_IR_Op_Update (ImplementationRepository::Administration_ptr implrepo)
-: TAO_IR_Op (implrepo),
-  set_command_line_ (0),
-  set_working_dir_ (0)
-{
-  // Nothing
-}
-
-
-// ============================================================================
-// = Virtual Destructors.
-
-
-TAO_IR_Op::~TAO_IR_Op ()
-{
-  // Nothing
-}
-
-TAO_IR_Op_Activate::~TAO_IR_Op_Activate (void)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Add::~TAO_IR_Op_Add (void)
-{
-  // Nothing
-}
-
-TAO_IR_Op_List::~TAO_IR_Op_List (void)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Remove::~TAO_IR_Op_Remove (void)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Shutdown::~TAO_IR_Op_Shutdown (void)
-{
-  // Nothing
-}
-
-TAO_IR_Op_Update::~TAO_IR_Op_Update (void)
-{
-  // Nothing
-}
-
-
-// ============================================================================
-// = Parse methods
-
-
-int
-TAO_IR_Op_Activate::parse (int argc, ASYS_TCHAR **argv)
-{
-  // Check for enough arguments (we need at least one for the server name)
-  if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  // Skip both the program name and the "activate" command
-  ACE_Get_Opt get_opts (argc, argv, "h");
-
-  this->server_name_ = argv[0];
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Add::parse (int argc, ASYS_TCHAR **argv)
-{
-  // Check for enough arguments (we need at least one for the server name)
-  if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  // Skip both the program name and the "add" command
-  ACE_Get_Opt get_opts (argc, argv, "hc:w:");
-
-  this->server_name_ = argv[0];
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'c':  // Command line arguments
-        this->command_line_ = get_opts.optarg;
-        break;
-      case 'w':  // Working Directory
-        this->working_dir_ = get_opts.optarg;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_List::parse (int argc, ASYS_TCHAR **argv)
-{
-  int server_flag = 0;
-
-  if (argc > 0 && argv[0][0] != '-')
-  {
-    this->server_name_ = argv[0];
-    server_flag = 1;
-  }
-
-  // Skip both the program name and the "list" command
-  ACE_Get_Opt get_opts (argc, argv, "vh", server_flag);
-
-  int c;
-
-  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;
-      }
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Remove::parse (int argc, ASYS_TCHAR **argv)
-{
-  // Check for enough arguments (we need at least one for the server name)
-  if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  // Skip both the program name and the "remove" command
-  ACE_Get_Opt get_opts (argc, argv, "h");
-
-  this->server_name_ = argv[0];
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Shutdown::parse (int argc, ASYS_TCHAR **argv)
-{
-  // Check for enough arguments (we need at least one for the server name)
-  if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  // Skip both the program name and the "shutdown" command
-  ACE_Get_Opt get_opts (argc, argv, "h");
-
-  this->server_name_ = argv[0];
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Update::parse (int argc, ASYS_TCHAR **argv)
-{
-  // Check for enough arguments (we need at least one for the server name)
-  if (argc < 1)
-  {
-    this->print_usage ();
-    return -1;
-  }
-
-  // Skip both the program name and the "update" command
-  ACE_Get_Opt get_opts (argc, argv, "hc:w:");
-
-  this->server_name_ = argv[0];
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'c':  // Command line arguments
-        this->set_command_line_ = 1;
-        this->command_line_ = get_opts.optarg;
-        break;
-      case 'w':  // Working Directory
-        this->set_working_dir_ = 1;
-        this->working_dir_ = get_opts.optarg;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-
-// ============================================================================
-// = Run methods
-
-
-int
-TAO_IR_Op_Activate::run (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->implrepo_->activate_server (this->server_name_.c_str (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Successfully Activated server <%s>\n", this->server_name_.c_str ()));
-    }
-  ACE_CATCH (ImplementationRepository::Administration::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Add::run (void)
-{
-  ImplementationRepository::StartupOptions startup_options;
-
-  startup_options.command_line = CORBA::string_dup (this->command_line_.c_str ());
-  // @@ add environment
-  startup_options.working_directory = CORBA::string_dup (this->working_dir_.c_str ());
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->implrepo_->register_server (this->server_name_.c_str (), startup_options, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Successfully registered server <%s>\n", this->server_name_.c_str ()));
-    }
-  ACE_CATCH (ImplementationRepository::Administration::AlreadyRegistered, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Server <%s> already registered!\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Adding server");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_List::run (void)
-{
-  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)
-        {
-          this->implrepo_->list (IR_LIST_CHUNK, server_list, server_iter, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (size_t 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)
-              {
-                flag = server_iter->next_n (IR_LIST_CHUNK, server_list, ACE_TRY_ENV);
-                ACE_TRY_CHECK;
-
-                for (size_t i = 0; i < server_list->length (); i++)
-                  this->display_server_information (server_list[i]);
-              }
-
-            // We are done with the iterator, so it can go away now.
-            server_iter->destroy ();
-          }
-      }
-      else
-        {
-          ImplementationRepository::ServerInformation_var server_information;
-
-          this->implrepo_->find (this->server_name_.c_str (), server_information, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Display verbosely
-          this->verbose_server_information_ = 1;
-
-          this->display_server_information (server_information.in ());
-      }
-    }
-  ACE_CATCH (ImplementationRepository::Administration::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-int
-TAO_IR_Op_Remove::run (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->implrepo_->remove_server (this->server_name_.c_str (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", this->server_name_.c_str ()));
-    }
-  ACE_CATCH (ImplementationRepository::Administration::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Shutdown::run (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->implrepo_->shutdown_server (this->server_name_.c_str (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", this->server_name_.c_str ()));
-    }
-  ACE_CATCH (ImplementationRepository::Administration::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // Success
-  return 0;
-}
-
-int
-TAO_IR_Op_Update::run (void)
-{
-  ImplementationRepository::ServerInformation_var server_information;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->implrepo_->find (this->server_name_.c_str (), server_information, ACE_TRY_ENV);
-      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 ());
-      if (this->set_working_dir_ == 1)
-        server_information->startup.working_directory =
-          CORBA::string_dup (this->working_dir_.c_str ());
-      // @@ add environment and logical server
-
-      this->implrepo_->reregister_server (this->server_name_.c_str (),
-                                          server_information->startup,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->display_server_information (server_information.in ());
-    }
-  ACE_CATCH (ImplementationRepository::Administration::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // Success
-  return 0;
-}
-
-
-// ============================================================================
-// = Print Usage methods
-
-
-void
-TAO_IR_Op_Activate::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Activates a server\n"
-                        "\n"
-                        "Usage: tao_ir [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"
-                        "    -h            Displays this\n"));
-}
-
-void
-TAO_IR_Op_Add::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Usage: tao_ir [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"
-                        "    -h            Displays this\n"
-                        "    -c command    Startup command\n"
-                        "    -w dir        Working directory\n"));
-}
-
-void
-TAO_IR_Op_List::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n"
-                        "\n"
-                        "Usage: tao_ir [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"));
-}
-
-void
-TAO_IR_Op_Remove::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Removes a server entry\n"
-                        "\n"
-                        "Usage: tao_ir [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"
-                        "    -h            Displays this\n"));
-}
-
-void
-TAO_IR_Op_Shutdown::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Shuts down a server\n"
-                        "\n"
-                        "Usage: tao_ir [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"
-                        "    -h            Displays this\n"));
-}
-
-void
-TAO_IR_Op_Update::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Updates a server entry\n"
-                        "\n"
-                        "Usage: tao_ir [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"
-                        "    -c command    Startup command\n"
-                        "    -w dir        Working directory\n"));
-}
-
-
-
-// Prints out information in a ServerInformation structure.
-
-void
-TAO_IR_Op::display_server_information (const ImplementationRepository::ServerInformation &info)
-{
-  // Print out information
-  ACE_DEBUG ((LM_DEBUG, "Server <%s>\n", info.server.in ()));
-  ACE_DEBUG ((LM_DEBUG,
-              "  Command Line: %s\n"
-              "  Working Directory: %s\n",
-              info.startup.command_line.in (),
-              info.startup.working_directory.in ()));
-  // @@ add environment and logical server once implemented
-
-  // I am assuming that a blank host means currently not running.
-  if (ACE_OS::strlen (info.location.host) > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "  Running at \n"
-                "    Host: %s\n"
-                "    Port: %d\n",
-                info.location.host.in (),
-                info.location.port));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "  Not currently running\n"));
-}
-
-
-// ============================================================================
-// = Display Server Information methods
-
-void
-TAO_IR_Op_List::display_server_information (const ImplementationRepository::ServerInformation &info)
-{
-  if (this->verbose_server_information_)
-    TAO_IR_Op::display_server_information (info);
-  else
-    ACE_DEBUG ((LM_DEBUG, "<%s>\n", info.server.in ()));
-}
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.h
deleted file mode 100644
index ad424c2e313..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/tao_ir_i.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/ImplRepo_Service
-//
-// = FILENAME
-//    tao_ir_i.h
-//
-// = DESCRIPTION
-//    This class implements the Implementation Repository helper application.
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (TAO_IR_I_H)
-#define TAO_IR_I_H
-
-#include "tao/corba.h"
-#include "orbsvcs/ImplRepoC.h"
-
-class TAO_IR_Op;
-// Forward Declaration
-
-class TAO_IR_i
-{
-  // = TITLE
-  //     TAO's command line helper application
-  //
-  // = DESCRIPTION
-  //     This class talks to the IR and registers/lists/etc.
-public:
-  // = Constructor and destructor.
-  TAO_IR_i (void);
-  ~TAO_IR_i (void);
-
-  int run (void);
-  // Execute client code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  void print_usage (void);
-  // Print out information about all operations.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  ASYS_TCHAR **argv_;
-  // arguments from command line.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  ImplementationRepository::Administration_var implrepo_;
-  // Reference to our implementation repository.
-
-  TAO_IR_Op *op_;
-  // What we need to do.
-};
-
-class TAO_IR_Op
-{
-public:
-  static TAO_IR_Op *make_op (const ASYS_TCHAR *op_name, ImplementationRepository::Administration_ptr ir);
-  // Factory.
-  
-  TAO_IR_Op (ImplementationRepository::Administration_ptr implrepo);
-  // Constructor.
-  
-  virtual ~TAO_IR_Op (void);
-  // Virtual Destructor.
-
-  virtual int parse (int argc, ASYS_TCHAR **argv) = 0;
-  // Parse arguments.
-
-  virtual int run (void) = 0;
-  // Do the work.
-
-protected:
-  ImplementationRepository::Administration_ptr implrepo_;
-  // Reference to our implementation repository.
-
-  // = Helper methods
-
-  void display_server_information (const ImplementationRepository::ServerInformation &info);
-  // Prints out the information contained in a ServerInformation structure.
-};
-
-class TAO_IR_Op_Activate : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_Activate (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_Activate (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage
-
-  ACE_TString server_name_;
-  // POA server name.
-};
-
-class TAO_IR_Op_Add : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_Add (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_Add (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage.
-
-  ACE_TString server_name_;
-  // POA server name.
-
-  ACE_TString command_line_;
-  // Command line.
-
-  ACE_TString working_dir_;
-  // Working directory.
-};
-
-
-// Used to list the entries in the IR
-
-class TAO_IR_Op_List : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_List (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_List (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage
-
-  ACE_TString server_name_;
-  // POA server name.
-
-  int verbose_server_information_;
-  // If true, more server information is displayed.
-
-  void display_server_information (const ImplementationRepository::ServerInformation &info);
-  // Prints out the information contained in a ServerInformation structure.
-  // Specialized to only print server information
-};
-
-class TAO_IR_Op_Remove : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_Remove (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_Remove (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage
-
-  ACE_TString server_name_;
-  // POA server name.
-};
-
-class TAO_IR_Op_Shutdown : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_Shutdown (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_Shutdown (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage
-
-  ACE_TString server_name_;
-  // POA server name.
-};
-
-class TAO_IR_Op_Update : public TAO_IR_Op
-{
-public:
-  TAO_IR_Op_Update (ImplementationRepository::Administration_ptr implrepo);
-  ~TAO_IR_Op_Update (void);
-
-  virtual int parse (int argc, ASYS_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  void print_usage (void);
-  // Prints a message about the usage.
-
-  ACE_TString server_name_;
-  // POA server name.
-
-  int set_command_line_;
-  // True if the command_line_ needs to be updated.
-  
-  ACE_TString command_line_;
-  // Startup command.
-
-  int set_working_dir_;
-  // True if the working_dir_ needs to be updated.
-
-  ACE_TString working_dir_;
-  // Working directory.
-};
-
-#endif /* TAO_IR_I_H */
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 19738fe304a..ad8cddd58a5 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -27,7 +27,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
+Criteria_Evaluator::getInitialization (CORBA::Environment &env)
 {
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair_ptr sequence_ptr = 0;
 
@@ -35,9 +35,10 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
     this->getCriteriaMember ("initialization");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                         ("No initialization member found.\n"),
-                      0);
+    {
+      env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No initialization member found.\n"));
+      return 0;
+    }
 
   *any_ptr >>= sequence_ptr;  
 
@@ -45,16 +46,17 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
 }
 
 char *
-Criteria_Evaluator::getFilter (CORBA::Environment &ACE_TRY_ENV)
+Criteria_Evaluator::getFilter (CORBA::Environment &env)
 {
   CORBA::String string;
   CORBA::Any value;
   CORBA::Any_ptr any_ptr = this->getCriteriaMember ("filter");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                        ("No filter member found.\n"),
-                      0);
+    {
+      env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No filter member found.\n"));
+      return 0;
+    }
   *any_ptr >>= string;
   return string;
 }
@@ -75,8 +77,6 @@ Criteria_Evaluator::getCriteriaMember (const char *member_name)
                         criteria_[i].name) == 0)
       {
         CORBA::Any_ptr value_ptr;
-
-        // @@ We should use ACE_NEW_THROW_EX + ACE_CHECK_RETURN here.
         ACE_NEW_RETURN (value_ptr,
                         CORBA::Any(criteria_[i].value),
                         0);
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index b55af2bd9e0..9bd63602442 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -28,9 +28,9 @@ public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
   ~Criteria_Evaluator (void);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &);
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &_tao_environment);
 
-  char * getFilter (CORBA::Environment &);
+  char * getFilter (CORBA::Environment &_tao_environment);
 
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &)
     {
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 103fb35a510..f70a833fc5d 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -34,7 +34,7 @@ Factory_Trader::Factory_Trader ()
     trading_Components_ptr_ (0),
     support_Attributes_ptr_(0)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       int argc = 0;
       // create the trader
@@ -45,19 +45,18 @@ Factory_Trader::Factory_Trader ()
       // this pointer is deleted when the trader_ptr is deleted
 
       // Set the service type repository
-      support_Attributes_ptr_->type_repos (this->repository_._this (ACE_TRY_ENV));
-      ACE_TRY_CHECK;
+      support_Attributes_ptr_->type_repos (this->repository_._this (TAO_TRY_ENV));
+      TAO_CHECK_ENV;
 
       // Add the "Factory" type to the repository
       this->add_type ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Factory_Trader constructor: Failed adding a new type.\n");
+      ACE_ERROR ((LM_ERROR, "Factory_Trader constructor: Failed adding a new type."));
+      TAO_TRY_ENV.print_exception ("Factory_Trader constructor: Exception.\n");
     }
-  ACE_ENDTRY;
-  // @@ ACE_CHECK?  No way to pass back any exceptions.
+  TAO_ENDTRY;
 }
 
 Factory_Trader::~Factory_Trader ()
@@ -69,7 +68,7 @@ Factory_Trader::~Factory_Trader ()
 void
 Factory_Trader::add_type ()
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // define the new type
       CosTradingRepos::ServiceTypeRepository::PropStruct propStruct_name;
@@ -100,16 +99,24 @@ Factory_Trader::add_type ()
                                   GENERIC_FACTORY_INTERFACE_REPOSITORY_ID,
                                   propStructSeq,
                                   superTypeSeq,
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Factory_Trader::init.\n");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::init: User Exception.\n");
     }
-  ACE_ENDTRY;
-  // @@ ACE_CHECK
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::init: System Exception.\n");
+    }
+  TAO_CATCHANY
+    {
+      ACE_ERROR ((LM_ERROR, "Factory_Trader::init: Failed adding a new type."));
+    }
+  TAO_ENDTRY;
 }
 
 
@@ -119,7 +126,7 @@ Factory_Trader::_cxx_export (const char * name,
 	       const char * description,
 	       const CORBA::Object_ptr object_ptr)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       if (CORBA::is_nil(object_ptr))
 	{
@@ -142,26 +149,34 @@ Factory_Trader::_cxx_export (const char * name,
 
       // invoke the export method on the Register interface of the Trading Service
       register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
-                                 CORBA::string_dup("Factory"),
-                                 propertySeq,
-                                 ACE_TRY_ENV);
+			    CORBA::string_dup("Factory"),
+			    propertySeq,
+			    TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::export: User Exception.\n");
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Factory_Trader::export: Failed to export factory.\n");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::export: System Exception.\n");
     }
-  ACE_ENDTRY;
-  // @@ ACE_CHECK*
+  TAO_CATCHANY
+    {
+      ACE_ERROR ((LM_ERROR, "Factory_Trader::export: Failed to export factory.\n"));
+    }
+  TAO_ENDTRY;
 }
 
 
 CORBA::Object_ptr
 Factory_Trader::query (const CORBA::String constraint)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CosTrading::Lookup::SpecifiedProps specifiedProps;
       specifiedProps._d(CosTrading::Lookup::all);
@@ -188,8 +203,8 @@ Factory_Trader::query (const CORBA::String constraint)
 			 CosTrading::OfferSeq_out(offerSeq_ptr),               // results
 			 CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
 			 CosTrading::PolicyNameSeq_out(policyNameSeq_ptr),     // Policies
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Initialize
       CORBA::Object_ptr object_ptr = 0;
@@ -219,11 +234,20 @@ Factory_Trader::query (const CORBA::String constraint)
 	}
       return object_ptr;
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::query: User Exception");
+    }
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("Factory_Trader::query: System Exception");
+    }
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Factory_Trader::query: Failed.\n");
+      ACE_ERROR ((LM_ERROR, "Factory_Trader::query: Failed.\n"));
     }
-  ACE_ENDTRY;
-  // @@ ACE_CHECK_RETURN (?)
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index c76406a16e5..c187953e7bc 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -26,36 +26,40 @@ Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
 
 Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Unbind the Factory Finder.
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
-      this->namingContext_var_->unbind (generic_Factory_Name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->namingContext_var_->unbind (generic_Factory_Name,TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "User Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
     }
-  ACE_ENDTRY;
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+    }
+  TAO_ENDTRY;
 }
 
 int
 Life_Cycle_Service_Server::init (int argc,
                                      char *argv[],
-                                     CORBA::Environment& ACE_TRY_ENV)
+                                     CORBA::Environment& env)
 {
   if (this->orb_manager_.init (argc,
                                argv,
-                               ACE_TRY_ENV) == -1)
+                               env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init"),
                       -1);
-  // @@ Oh well.  This should actually come before "if".
-  ACE_CHECK_RETURN (-1);
 
   // Copy them, because parse_args expects them there.
   this->argc_ = argc;
@@ -71,25 +75,32 @@ Life_Cycle_Service_Server::init (int argc,
   // Activate the object.
   CORBA::String_var str  =
     this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                 env);
 
   // Failure while activating the  Factory Finder object
+  // @@ TODO Is this the right way to check this? Shouldn't env
+  // contain an exception?
+  if (env.exception () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "init: Failure while activating the LifeCycle Service Impl.\n"),
+                      -1);
+
 
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
 
   // Register the LifeCycle Service with the Naming Service.
-  ACE_TRY
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Trying to get a reference to the Naming Service.\n"));
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb_manager_.orb()->resolve_initial_references ("NameService");
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -97,14 +108,14 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Narrow the object reference to a Naming Context.
       namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in (),
-							      ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
+							      TAO_TRY_ENV);
 
       if (CORBA::is_nil (namingContext_var_.in ()))
         ACE_ERROR ((LM_ERROR,
                    " (%P|%t) Unable get the Naming Service.\n"));
 
+
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Have a proper reference to the Naming Service.\n"));
 
@@ -112,22 +123,19 @@ Life_Cycle_Service_Server::init (int argc,
       life_Cycle_Service_Name.length (1);
       life_Cycle_Service_Name[0].id = CORBA::string_dup ("Life_Cycle_Service");
 
-      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       namingContext_var_->bind (life_Cycle_Service_Name,
-                                tmp,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			       this->life_Cycle_Service_i_ptr_->_this(TAO_TRY_ENV),
+			       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Bound the LifeCycle Service to the Naming Context.\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Life_Cycle_Service_Server::init");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -136,7 +144,6 @@ Life_Cycle_Service_Server::init (int argc,
 int
 Life_Cycle_Service_Server::run (CORBA::Environment &)
 {
-  
   if (orb_manager_.orb()->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -186,27 +193,31 @@ main (int argc, char *argv [])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tIDL_LifeCycleService: Life_Cycle_Service_Server \n\n"));
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      int check = life_Cycle_Service_Server.init (argc,
-                                                  argv,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (check)
+      if (life_Cycle_Service_Server.init (argc,
+					  argv,
+					  TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          life_Cycle_Service_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK
+          life_Cycle_Service_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 7e103fabe55..8691ee6547d 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -39,10 +39,10 @@ public:
 
   int init (int argc,
             char *argv[],
-            CORBA::Environment& ACE_TRY_ENV);
+            CORBA::Environment& env);
   // Initialize the Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& ACE_TRY_ENV);
+  int run (CORBA::Environment& env);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 723b735a437..e5923faebd6 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -33,17 +33,19 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 
 CORBA::Boolean
-Life_Cycle_Service_i::supports (const CosLifeCycle::Key &,
-                                       CORBA::Environment &)
+Life_Cycle_Service_i::supports (const CosLifeCycle::Key &factory_key,
+                                       CORBA::Environment &TAO_IN_ENV_there)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_UNUSED_ARG (factory_key);
+  ACE_UNUSED_ARG (TAO_IN_ENV_there);
   return 0;
 }
 
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
                                             const CosLifeCycle::Criteria &the_criteria,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &TAO_IN_ENV_there)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -59,8 +61,12 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
 
-      CORBA::String filter = criteria_Evaluator.getFilter (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::String filter = criteria_Evaluator.getFilter (TAO_IN_ENV_there);
+
+      if (TAO_IN_ENV_there.exception() != 0)
+	{
+	  return 0;
+	}
 
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter));
 
@@ -81,25 +87,24 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Check if it is a valid Generic Factory reference
       if (CORBA::is_nil (genericFactoryObj_ptr))
-        ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+	{ // throw a NoFactory exception
+	  TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));
+	  return 0;
+	}
       else
 	{
-          CosLifeCycle::GenericFactory_var genericFactory_var;
-          ACE_TRY
-            {
-              genericFactory_var =
-                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr,
-                                                       ACE_TRY_ENV);
-              // ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // see if there is an exception, if yes then throw the
-              // NoFactory exception throw a NoFactory exception
-	      ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
+	  CORBA::Environment env_here;
+
+	  CosLifeCycle::GenericFactory_var genericFactory_var =
+	    CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr,
+					    env_here);
+
+	  // see if there is an exception, if yes then throw the NoFactory exception
+	  if (env_here.exception () != 0) // throw a NoFactory exception
+	    {
+	      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));
+	      return 0;
 	    }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (0);
 
 	  if (CORBA::is_nil (genericFactory_var.in()))
 	    ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,8 +116,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 	  // Now retrieve the Object obj ref corresponding to the key.
 	  CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
 									    the_criteria,
-                                                                            ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+									    TAO_IN_ENV_there);
 
 	  ACE_DEBUG ((LM_DEBUG,
 		      "Life_Cycle_Service_i::create_object: Forwarded request.\n"));
@@ -139,10 +143,9 @@ Life_Cycle_Service_i::register_factory (const char * name,
 					   const char * location,
 					   const char * description,
 					   CORBA::Object_ptr object,
-					   CORBA::Environment &)
+					   CORBA::Environment &TAO_IN_ENV_there)
       ACE_THROW_SPEC (( CORBA::SystemException))
 {
-
   if (factory_trader_ptr_ == 0)
     {
       ACE_NEW (factory_trader_ptr_, Factory_Trader());
@@ -159,6 +162,3 @@ Life_Cycle_Service_i::register_factory (const char * name,
 	      "     description: %s\n",
 	      name, location, description));
 }
-
-
-
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 0e1a1c971bd..4ad461ee3c0 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -30,14 +30,14 @@ public:
   ~Life_Cycle_Service_i (void);
 
   CORBA::Boolean supports (const CosLifeCycle::Key &factory_key,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &_env_there)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &_env_there)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -50,7 +50,7 @@ public:
                          const char * location,
                          const char * description,
                          CORBA::Object_ptr object,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &_env_there)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   // Registers a factory with specified properties
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 73e7721bf17..3970f8cb275 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -30,7 +30,7 @@ BIN2 = LifeCycle_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # LifeCycle
@@ -172,25 +172,16 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -238,9 +229,13 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -483,25 +478,16 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -549,9 +535,13 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -788,25 +778,16 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -854,9 +835,13 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1074,25 +1059,16 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1140,9 +1116,13 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
new file mode 100644
index 00000000000..e867e7daabe
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
@@ -0,0 +1,43 @@
+// $Id$
+
+#include "Logging_Service_i.h"
+
+ACE_RCSID(Logging_Service, Logging_Service, "$Id$")
+
+int
+main (int argc, char *argv[])
+{
+  // Set TAO_debug_level to 0 to ensure silent running unless
+  // debugging is explicitly invoked
+  TAO_debug_level = 0;
+  
+  Logger_Server log_server; 
+
+   TAO_TRY
+    {
+      if (log_server.init (argc, argv, TAO_TRY_ENV) == -1)
+        return 1;
+      else
+        {
+          log_server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp
index de5610eb901..1b7dd52711a 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp
@@ -43,7 +43,7 @@ Logger_Server::parse_args (void)
 int
 Logger_Server::init (int argc,
 		     char *argv[],
-		     CORBA::Environment &ACE_TRY_ENV)
+		     CORBA::Environment &env)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -53,17 +53,14 @@ Logger_Server::init (int argc,
   if (this->orb_manager_.init_child_poa (argc,
 					 argv,
 					 "child_poa",
-					 ACE_TRY_ENV) == -1)
+					 env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "%p\n",
 		       "init_child_poa"),
 		      -1);
   
-  ACE_CHECK_RETURN (-1);
-
-  this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  TAO_CHECK_ENV_RETURN (env,-1);
+  
   // Parse the command line arguments.
   if (this->parse_args () != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -75,14 +72,14 @@ Logger_Server::init (int argc,
   CORBA::String_var str =
     this->orb_manager_.activate_under_child_poa ("logger_factory",
 						 &this->factory_impl_,
-						 ACE_TRY_ENV);
+						 env);
     if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"The IOR is: <%s>\n",
 		str.in ()));
 
     // Initialize the naming service
-  if (this->init_naming_service (ACE_TRY_ENV) != 0)
+  if (this->init_naming_service (env) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "%p\n",
 		       "init_naming_service"),
@@ -96,7 +93,7 @@ Logger_Server::init (int argc,
 // and logger_factory object.
 
 int
-Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
+Logger_Server::init_naming_service (CORBA::Environment& env)
 {
   // Get pointers to the ORB and child POA
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -108,8 +105,8 @@ Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
     return -1;
 
   // Create an instance of the Logger_Factory
-  Logger_Factory_var factory = this->factory_impl_._this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  Logger_Factory_var factory = this->factory_impl_._this (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   //Register the logger_factory
   CosNaming::Name factory_name (1);
@@ -117,16 +114,16 @@ Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
   this->my_name_server_->bind (factory_name,
 			       factory.in (),
-			       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+			       env);
+  TAO_CHECK_ENV_RETURN (env, -1);
   
   return 0;
 }
 
 int
-Logger_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Logger_Server::run (CORBA::Environment& env)
 {
-  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+  if (this->orb_manager_.run (env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Logger_Server::run"),
                       -1);
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
index 7db0c6cf9cd..c14ba770922 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
@@ -32,12 +32,10 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS.h"
 #include "tao/TAO.h"
-#include "tao/POAManager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
-#include "Logger_i.h"
-#include "LoggerS.h"
-#include "LoggerC.h"
+#include "orbsvcs/Log/Logger_i.h"
+#include "orbsvcs/LoggerS.h"
 
 class Logger_Server
 {
@@ -59,14 +57,14 @@ public:
 
   int init (int argc,
             char **argv,
-            CORBA::Environment &ACE_TRY_ENV);
+            CORBA::Environment& env);
   // Initialize the Logger_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (CORBA::Environment& env);
   // Run the ORB.
 
   Logger_ptr make_logger (const char *name,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          CORBA::Environment &_env);
   // This function creates and returns a logger with the given <name>.
   // Currently, <name> is unused.
 
@@ -74,7 +72,7 @@ private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  int init_naming_service (CORBA::Environment &env);
   // Initialises the name server and registers logger_factory with the
   // name server.
 
diff --git a/TAO/tests/POA/Deactivation/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 2844b446fcd..307a9aa9fd0 100644
--- a/TAO/tests/POA/Deactivation/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -1,59 +1,64 @@
 #----------------------------------------------------------------------------
+#       $Id$
 #
-#	$Id$
+#       Top-level Makefile for the Logging Service of the TAO ORB
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
+SRC     = Logging_Service_i.cpp Logging_Service.cpp
 
-LDLIBS = -lTAO
+LDLIBS  = -lorbsvcs -lTAO
 
-IDL_SRC	= testC.cpp testS.cpp
-PROG_SRCS =	$(IDL_SRC) Deactivation.cpp
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-LSRC = $(PROG_SRCS)
+LOGGING_OBJS =  Logging_Service_i.o Logging_Service.o
 
-SVR_OBJS = testC.o testS.o Deactivation.o
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
 
-BIN = Deactivation
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
+BIN2 = Logging_Service
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Log,$(findstring Log,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Log
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.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
-include $(TAO_ROOT)/taoconfig.mk
 
+TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 
-.PRECIOUS: testC.h testC.i testC.cpp testS.h testS.i testS.cpp testS_T.h testS_T.i testS_T.cpp
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
 
-Deactivation:	$(addprefix $(VDIR),$(SVR_OBJS))
+Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Logging_Service_i.o .obj/Logging_Service_i.so .shobj/Logging_Service_i.o .shobj/Logging_Service_i.so: Logging_Service_i.cpp Logging_Service_i.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -63,10 +68,11 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -120,39 +126,18 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -160,229 +145,11 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -411,34 +178,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -488,6 +231,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -567,9 +312,39 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/Deactivation.o .obj/Deactivation.so .shobj/Deactivation.o .shobj/Deactivation.so: Deactivation.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.i
+.obj/Logging_Service.o .obj/Logging_Service.so .shobj/Logging_Service.o .shobj/Logging_Service.so: Logging_Service.cpp Logging_Service_i.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -579,10 +354,11 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -636,11 +412,30 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -669,34 +464,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -746,6 +517,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -825,6 +598,35 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
new file mode 100644
index 00000000000..93e3437fbb5
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -0,0 +1,37 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Logging Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  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
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Logging_Service
+
+Logging_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Logging_Service_SOURCES = \
+        Logging_Service.cpp \
+        Logging_Service_i.cpp
+
+noinst_HEADERS = \
+        Logging_Service_i.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
+
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
index ecbf4af2688..d88ef1d5de3 100644
--- a/TAO/orbsvcs/Makefile
+++ b/TAO/orbsvcs/Makefile
@@ -13,18 +13,16 @@ DIRS  =	orbsvcs \
 	Scheduling_Service \
 	Event_Service \
 	Dump_Schedule \
+	Concurrency_Service \
 	LifeCycle_Service \
 	Trading_Service \
+	Logging_Service \
 	Time_Service \
 	ImplRepo_Service \
 	CosEvent_Service \
 	tests \
 	examples
 
-# Not compiled by default
-#	Concurrency_Service \
-
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index c0aa2f883ca..3de7195f3cb 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -18,7 +18,7 @@ BIN2 = Naming_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
@@ -175,13 +175,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -234,6 +227,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.bor b/TAO/orbsvcs/Naming_Service/Makefile.bor
deleted file mode 100644
index 7a541087dfb..00000000000
--- a/TAO/orbsvcs/Naming_Service/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for building the Naming Service executable
-# 
-
-NAME = Naming_Service
-
-OBJFILES = \
-	$(OBJDIR)\Naming_Service.obj
-        
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
-        
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
-
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 9e0ceeace94..9edb245c7ed 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -159,22 +159,12 @@ int
 TAO_Naming_Service::run (CORBA_Environment& ACE_TRY_ENV)
 {
   if (time_ == 0)
-    {
-      this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-    }
+      return this->orb_manager_.run (ACE_TRY_ENV);
   else
     {
-      ACE_Time_Value t (time_);
-      this->orb_manager_.run (ACE_TRY_ENV, &t);
-      ACE_CHECK_RETURN (-1);
+      ACE_Time_Value *t = new ACE_Time_Value (time_);
+      return this->orb_manager_.run (ACE_TRY_ENV, t);
     }
-  // Clean up after we exit from the loop.
-  PortableServer::POA_var poa = this->orb_manager_.root_poa ();
-  poa->destroy (1, 1, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
 }
 
 // Destructor.
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
index 55db915353a..c5814b5883a 100644
--- a/TAO/orbsvcs/Naming_Service/README
+++ b/TAO/orbsvcs/Naming_Service/README
@@ -1,171 +1,135 @@
 // $Id$
 
-This directory contains the files that implement the TAO
-Naming server.
-
+        This directory contains the files that implement the TAO
+Naming server.  The TAO Naming Service uses IP Multicast to process
+client "resolve_initial_references()" requests.
 
 To Run:
 ======
 
-% Naming_Service [-ORBnameserviceport nsport]
+% Naming_Service [-ORBobjrefstyle url]
+                 [-ORBnameserviceport nsport]
                  [-o ior_output_file]
                  [-p pid_file_name]
                  [-s context_size]
                  [-t time]
                  [-f persitence_file_name]
 
-Optional Command-line Arguments:
-===============================
+Arguments:
+==========
+        port
+                 The ORB port.
+
         nsport
-                Multicast port for listening for requests from
-                clients trying to bootstrap to a Naming Service
-                through the use of multicast.
+                Multicast port.
+
 
         output_file
-                The name of the file, in which to store the IOR of the
-                root Naming Service context.
+                The name of the file, in which to store IOR of the
+                root Naming Service context.  (This file can then be
+                used by clients instead of multicast, to obtain the
+                Naming Service IOR).
 
        pid_file_name
                 The name of the file, in which to store the process id
                 of the Naming Service server.
 
         context_size
-                 Size of the hash table allocated for
+                 Size of the hash table allocated upon the creation of
                  the root Naming Context (if one is created).  All
                  contexts created under the root will use the same
                  size for their hash tables.  The default is 1024.
 
         time
-                How long (in seconds) the server should listen for
-                client requests before terminating.
+                How long the server should listen for requests before
+                exiting.
 
         persistence_file_name
-                The name of the file to use to store/retrieve
-                persistent state of the Naming Service.  Without this
-                option, Naming Service is started in non-persistent mode.
+                The name of the file to use to store/read from the
+                persistent state of the Naming Service.
 
 Environment Variables:
 =====================
 
-        NameServicePort
-                Multicast port for listening for requests from
-                clients trying to bootstrap to a Naming Service
-                through the use of multicast.
-
+        NameServicePort - Multicast port to listen on for
+        "resolve_initial_references" requests.
 
 Persistence:
 ===========
 TAO Naming Service has an optional persistence capability.  By
-default, the Naming Service is started in a non-persistent mode.
+default, a non-persistent version of the Naming Service is used.
 Supplying "-f" command-line option to the server causes a persistent
 version of the Naming Service to run.
 
-The file specified with the "-f" option is used to store the
+The file, which name is supplied along with the "-f" option, is used to store the
 persistent state of the Naming Service, i.e., all Naming Contexts and
-their bindings.  When "-f" option is specified:
+all their bindings.  When "-f" option is specified:
 
-    1. If the specified file does not exist, it is created
+    1. If the specified file does not exist, the file is created
        and used to store the state of the Naming Service.  An initial
        (root) Naming Context is also created.
 
     2. If the specified file exists, it is scanned and:
                         a) If any inconsistency is detected in the
-                        stored state, or the file is not recognized by
-                        the Naming Service, the server exits.  (This
-                        may happen, for example, if a server or host
-                        crashed in the middle of writing a record to
-                        this file on a previous run).  A
-                        noncorrupted version of the file must be used instead.
-
-                        b) If the file is recognized and is ok, the
-                        state stored in the file becomes the current state of
+                        stored state or the file is not recognized by
+                        the Naming Service, the server exits.  A
+                        noncorrupted version of the file must be used.
+
+                        b) If no Naming Contexts exist, an initial
+                        (root) Naming Context is created.
+
+                        c) If one or more Naming Contexts exist, the
+                        state stored in the file becomes the state of
                         the Naming Service.
 
+Sample Run:
+==========
+
+% Naming_Service -ORBobjrefstyle url -ORBnameserviceport 19999
+starting up daemon <unknown>
+opening dynamic service Resource_Factory
+did dynamic on Resource_Factory, error = 0
+opening dynamic service Client_Strategy_Factory
+did dynamic on Client_Strategy_Factory, error = 0
+opening dynamic service Server_Strategy_Factory
+did dynamic on Server_Strategy_Factory, error = 0
+listening as object <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
+The multicast server setup is done.
+
+NameService Client:
+==================
+
+A client of the TAO Naming Service will use the ORB
+resolve_initial_references() method to resolve the "NamingService"
+object service.  By default, this resolution is performed using
+Multicast.  This behavior can be overridden in the following ways:
+
+        1. Pass the argument -ORBnameserviceior ior.
+           This ior is got from the output of the Naming_Service from
+           line 'listening as object <iiop:..>'.
+
+           For example, If a client wants to use the Naming_Service
+           from the sample run it could use:
+
+           % client -ORBnameserviceior <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
+
+        2. Set the environment variable `NameServiceIOR' (minus the
+           quotes), as follows in csh or tcsh:
+
+           % setenv NameServiceIOR <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
+
+           and then run the client,
+
+           % client <.. client's arguments>
+
+These two techniques may be needed in an environment where
+
+        1. There is more than one NamingService, to avoid the
+           confusion of a server registering its object with one
+           NamingService and the client getting the reply from some
+           other NamingService.
+
+        2. The OS platform doesn't support multicast.
 
-Implementation Policies:
-=======================
-
-- Destroying Binding Iterators
-             A binding iterator is destroyed when client invokes
-             <destroy> operation either on the iterator itself or on
-             the naming context it is iterating over.  In both cases,
-             subsequent calls on the binding iterator object will
-             cause OBJECT_NOT_EXIST exception.
-
-- Dealing with orphaned contexts
-             This implementation of the Naming Service does not
-             include any form of 'garbage collection' for orphaned
-             naming contexts.  It is solely the responsibility of
-             clients to clean up after themselves and not leak server
-             resources.  All the resources, including orphaned
-             contexts, are released during the Naming Server
-             shutdown.
-
-Clients: ways to bootstrap to the Naming Service:
-================================================
-
-There are several methods for a client to bootstrap to a Naming
-Service, i.e., there are several mechanisms <resolve_initial_references> can use
-when asked for "NameService".
-
-       1. By default (unless other options are specified - see items 2
-          and 3 below), ip multicast is used to locate a Naming
-          Service. TAO Naming Server is listening for client multicast
-          requests on a specified port.  On the client side,
-          <resolve_initial_references> sends out a multicast request
-          on the network, trying to locate a Naming Service.  When a
-          Naming Server receives a multicast request from a client, it
-          replies to the sender with the ior of its root
-          Naming Context.  Note, the port used for this bootstrapping
-          process, i.e., 'multicast port', has nothing to do with the
-          ORB port used for CORBA communication.  Other points worth
-          mentioning:
-
-          - A client and a server will only click through this
-            multicast protocol if they are using the same multicast
-            port.  For both client and server -ORBnameserviceport
-            command-line option and NameServicePort environment
-            variable can be used to specify the multicast port to use.
-            If none is specified, the default port is used.  (The
-            ability to specify multicast ports can be used to match
-            certain clients with certain Naming Servers, when there
-            are more than one Naming Server running on the network).
-
-          - If there are several Naming Servers running on the
-            network, each listening on the same port for
-            multicast requests, each will send a reply to a client's
-            request.  The client's orb will use the first response it
-            receives, so the Naming Service will, in fact, be selected at
-            random.
-
-          Since this mechanism is proprietary to TAO (i.e.,
-          non-standard), it only works when both client and server are
-          written using TAO.  There is no way to turn multicasting
-          off, but it is used only as a last resort, i.e., any of the
-          options below will override it.
-
-          When OS platform doesn't support multicast, or client or
-          server isn't written using TAO, or a more reliable location
-          method is desired, etc., one of the options below can be
-          used to bootstrap to the Naming Service.
-
-        2. Command-line option -ORBnameserviceior or environment
-           variable NameServiceIOR can be used on the client side to
-           specify the object that the call to
-           <resolve_initial_references> should return to the client.
-           (On the server side, -o option can be used to get the ior).
-
-           Example (Unix, same host):
-
-           % TAO_ROOT/orbsvcs/Naming_Service -o ior_file
-           % my_client -ORBnameserviceior file://ior_file
-
-           On the first line, we start the Naming Service, and output
-           its ior to <ior_file>.  On the second line, we start some
-           client, and specify the ior <resolve_initial_references>
-           should return for the Naming Service in a file format.
-
-        3. TAO implements Interoperable Naming Service.  So, most of the
-           initialzation options provided by INS can be used to
-           bootstrap to the Naming Service (see TAO's releasenotes for the
-           status of INS implementation).
+        3. The client or server isn't written using TAO, and therefore
+           doesn't use TAO's multicast NameService resolution protocol.
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index c67e0d10799..6dba027ecd1 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -12,7 +12,7 @@ BIN2 = Scheduling_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
@@ -33,8 +33,7 @@ ifndef TAO_ROOT
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched -I$(TAO_ROOT)/orbsvcs \
-            -I$(TAO_ROOT) $(TSS_ORB_FLAG)
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -157,25 +156,16 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -223,9 +213,13 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 4d45539f9a7..096e0b13227 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -1,187 +1,24 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "orbsvcs/CosNamingC.h"
-
-#include "Scheduling_Service.h"
-
-ACE_RCSID(Scheduling_Service, Scheduling_Service, "$Id$")
-
-// Default Constructor.
-
-TAO_Scheduling_Service::TAO_Scheduling_Service (void)
-  : scheduler_impl_ (0),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
-    service_name_ ("ScheduleService"),
-    scheduler_type_ (CONFIG)
-{
-}
-
-
-// Constructor taking the command-line arguments.
-
-TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, char *argv[])
-  : scheduler_impl_ (0),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
-    service_name_ ("ScheduleService"),
-    scheduler_type_ (CONFIG)
-{
-  this->init (argc, argv);
-}
-
-// Destructor.
-
-TAO_Scheduling_Service::~TAO_Scheduling_Service (void)
-{
-}
-
-
-// Initialize the Scheduling Service with the arguments.
-
-int
-TAO_Scheduling_Service::init (int argc, char *argv[])
-{
-  int result;
-  CORBA::ORB_var orb;
-  PortableServer::POAManager_ptr poa_manager;
-
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize ORB manager.
-      this->orb_manager_.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      orb = this->orb_manager_.orb ();
-      ACE_TRY_CHECK;
-
-      poa_manager = this->orb_manager_.poa_manager ();
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Check the non-ORB arguments.  this needs to come before we
-      // initialize the scheduler implementation so that we know which
-      // type of scheduler to use.
-
-      result = this->parse_args (argc, argv);
-      if (result < 0)
-        return result;
-
-      // Construct a scheduler implementation of the specified type.
-      switch (this->scheduler_type_)
-	{
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-          case RECONFIG:
-            ACE_NEW_THROW_EX (scheduler_impl_,
-                              RECONFIG_SCHED_TYPE,
-                              CORBA::NO_MEMORY ());
-            ACE_TRY_CHECK;
-            break;
-
-#endif  /* __GNUC__ */
-
-          case CONFIG:
-            ACE_NEW_THROW_EX (scheduler_impl_,
-                              CONFIG_SCHED_TYPE,
-                              CORBA::NO_MEMORY ());
-            ACE_TRY_CHECK;
-            break;
-
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "TAO_Scheduling_Service::init: "
-                               "unrecognized Scheduler_Type"), -1);
-	}
-
-      // Locate the naming service.
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to locate the Naming Service.\n"),
-                          -1);
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecScheduler::Scheduler_var scheduler =
-        this->scheduler_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var scheduler_ior_string =
-        orb->object_to_string (scheduler.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n",
-                            scheduler_ior_string.in ()));
-
-      // Register the servant with the Naming Context....
-      CosNaming::Name schedule_name (1);
-      schedule_name.length (1);
-      schedule_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (schedule_name, scheduler.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->ior_file_name_ != 0)
-        {
-          FILE *iorf = fopen (this->ior_file_name_, "w");
-          if (iorf != 0)
-            {
-              ACE_OS::fprintf (iorf,
-                               "%s\n",
-                               scheduler_ior_string.in ());
-              ACE_OS::fclose (iorf);
-            }
-        }
-
-      if (this->pid_file_name_ != 0)
-        {
-          FILE *pidf = fopen (this->pid_file_name_, "w");
-          if (pidf != 0)
-            {
-              ACE_OS::fprintf (pidf,
-                               "%d\n",
-                               ACE_OS::getpid ());
-              ACE_OS::fclose (pidf);
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Scheduling_Service::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
+#include "tao/corba.h"
 
+#include "orbsvcs/CosNamingC.h"
 
-// Runs the TAO_Scheduling_Service.
+#if defined (TAO_USES_STRATEGY_SCHEDULER)
+#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
 
-int
-TAO_Scheduling_Service::run (CORBA_Environment& ACE_TRY_ENV)
-{
-  // Run the ORB manager.
-  return this->orb_manager_.run (ACE_TRY_ENV);
-}
+#include "orbsvcs/Sched/Config_Scheduler.h"
 
+ACE_RCSID(Scheduling_Service, Scheduling_Service, "$Id$")
 
-// Parses the command line arguments.
+const char* service_name = "ScheduleService";
 
 int
-TAO_Scheduling_Service::parse_args (int argc, char *argv[])
+parse_args (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "n:p:s:");
+  ACE_Get_Opt get_opt (argc, argv, "n:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -189,77 +26,15 @@ TAO_Scheduling_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = get_opt.optarg;
-          break;
-
-        case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          service_name = get_opt.optarg;
           break;
-
-        case 'o':
-          this->ior_file_name_ = get_opt.optarg;
-          break;
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-        case 's':
-          if (ACE_OS::strcasecmp ("CONFIG", get_opt.optarg) == 0)
-            {
-              this->scheduler_type_ = CONFIG;
-            }
-          else if (ACE_OS::strcasecmp ("RECONFIG", get_opt.optarg) == 0)
-            {
-              this->scheduler_type_ = RECONFIG;
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Usage: %s "
-                          "[-n service_name] "
-                          "[-p pid_file_name] "
-                          "[-o ior_file_name] "
-                          "[-s <CONFIG | reconfig>]"
-                          "\n",
-                          argv[0]));
-
-              return -1;
-            }
-          break;
-
-#endif /* __GNUC__ */
-
         case '?':
         default:
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "[-n service_name] "
-                      "[-p pid_file_name] "
-                      "[-o ior_file_name] "
-                      "[-s <CONFIG | reconfig>]"
-                      "\n",
-                      argv[0]));
-
-#else /* __GNUC__ <= 2.8 */
-
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
-                      "[-n service_name] "
-                      "[-p pid_file_name] "
-                      "[-o ior_file_name] "
+                      "-n service_name "
                       "\n",
                       argv[0]));
-
-#endif /* __GNUC__ */
-
           return -1;
         }
     }
@@ -269,107 +44,76 @@ TAO_Scheduling_Service::parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      TAO_Scheduling_Service scheduling_service;
+      // Initialize ORB.
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s; initializing scheduling service\n", __FILE__));
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      if (scheduling_service.init (argc, argv) < 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), 1);
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s; running scheduling service\n", __FILE__));
+      CORBA::Object_var naming_obj =
+        orb->resolve_initial_references ("NameService");
+      if (CORBA::is_nil (naming_obj.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      CosNaming::NamingContext_var naming_context =
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Create an Scheduling service servant...
+      ACE_Config_Scheduler scheduler_impl;
+      TAO_CHECK_ENV;
+
+      RtecScheduler::Scheduler_var scheduler =
+        scheduler_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      CORBA::String_var str =
+        orb->object_to_string (scheduler.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n", str.in ()));
+
+      // Register the servant with the Naming Context....
+      CosNaming::Name schedule_name (1);
+      schedule_name.length (1);
+      schedule_name[0].id = CORBA::string_dup (service_name);
+      naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "%s; running scheduling service\n", __FILE__));
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
-      scheduling_service.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "schedule_service");
-	  return 1;
+      TAO_TRY_ENV.print_exception ("schedule_service");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-template class auto_ptr<RtecScheduler::Config_Info>;
-template class auto_ptr<RtecScheduler::RT_Info>;
-template class auto_ptr<TAO_Reconfig_Scheduler_Entry>;
-template class ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>;
-template class ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>;
-template class ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>;
-template class ACE_Equal_To<int>;
-template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>;
-template class ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>;
-template class ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>;
-template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>;
-template class ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>;
-template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>;
-template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX>;
-template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>;
-template class TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>;
-template class TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>;
-template class TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>;
-template class TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy>;
-template class TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>;
-template class TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>;
-template class TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>;
-#  endif /* __GNUC__ */
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-#pragma instantiate auto_ptr<RtecScheduler::Config_Info>
-#pragma instantiate auto_ptr<RtecScheduler::RT_Info>
-#pragma instantiate auto_ptr<TAO_Reconfig_Scheduler_Entry>
-#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>
-#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>
-#pragma instantiate ACE_Equal_To<int>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>
-#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>
-#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>
-#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>
-#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy>
-#pragma instantiate TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>
-#  endif /* __GNUC__ */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
index 35852891aef..d41d3e00ea8 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
@@ -13,16 +13,18 @@ CFG=Scheduling_Service - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Scheduling_Service.mak" CFG="Scheduling_Service - Win32 Debug"

+!MESSAGE NMAKE /f "Scheduling_Service.mak"\

+ CFG="Scheduling_Service - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Scheduling_Service - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Scheduling_Service - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Scheduling_Service - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Scheduling_Service - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -107,9 +109,5 @@ SOURCE=.\Scheduler.h
 SOURCE=.\Scheduler_Generic.h

 # End Source File

 # End Group

-# Begin Source File

-

-SOURCE=.\Scheduling_Service.h

-# End Source File

 # End Target

 # End Project

diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
deleted file mode 100644
index dbc855263ff..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Scheduling_Service/Scheduling_Service
-//
-// = FILENAME
-//    Scheduling_Service.h
-//
-// = DESCRIPTION
-//      This class implements the functionality of a Scheduling Service in
-//      a stand-alone process.
-//
-// = AUTHORS 
-//      Chris Gill (cdgill@cs.wustl.edu) Based on the original
-//      Scheduling Service program by David Levine
-//      (levine@cs.wustl.edu) and Carlos O'Ryan (coryan@cs.wustl.edu),
-//      and on the Naming Service program implementation by Marina
-//      Spivak (marina@cs.wustl.edu) and Nagarajan Surendran
-//      (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_SCHEDULING_SERVICE_H
-#define TAO_SCHEDULING_SERVICE_H
-
-#include "tao/TAO.h"
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
-#if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
-#endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
-#include "orbsvcs/Sched/Config_Scheduler.h"
-
-class TAO_Scheduling_Service
-{
-  // = TITLE
-  //   Defines a class that encapsulates the implementation of the
-  //   TAO Scheduling Service.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <TAO_Reconfig_Scheduler> and
-  //   <ACE_Config_Scheduler> classes to implement the Scheduling Service.
-public:
-  TAO_Scheduling_Service (void);
-  // Default Constructor.
-
-  TAO_Scheduling_Service (int argc, char *argv[]);
-  // Constructor taking the command-line arguments.
-
-  int init (int argc, char *argv[]);
-  // Initialize the Scheduling Service with the arguments.
-
-  int run (CORBA_Environment& ACE_TRY_ENV);
-  // Run the TAO_Scheduling_Service.
-
-  ~TAO_Scheduling_Service (void);
-  // Destructor.
-
-private:
-  typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE;
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-  typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy,
-                                 ACE_SYNCH_MUTEX> RECONFIG_SCHED_TYPE;
-
-#endif  /* __GNUC__ */
-
-  enum Scheduler_Type {CONFIG, RECONFIG};
-
-  int parse_args (int argc, char *argv[]);
-  // parses the arguments.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.  This must be the first thing in the
-
-  POA_RtecScheduler::Scheduler *scheduler_impl_;
-  // Scheduler instance.
-
-  const char *ior_file_name_;
-  // Name of the IOR output file.
-
-  const char *pid_file_name_;
-  // Name of the process id output file.
-
-  const char *service_name_;
-  // Name used to register the service.
-
-  Scheduler_Type scheduler_type_;
-  // Type of scheduler with which to instantiate the service.
-
-  CORBA::ORB_var orb_;
-  // A reference to the ORB, to shut it down properly.
-};
-
-#endif /* TAO_SCHEDULING_SERVICE_H */
-
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index a80fb4611c6..6669042b71c 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -51,8 +51,7 @@ Clerk_i::read_ior (const char *filename)
 
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       for (char *str = ACE_OS::strtok (data, "\n");
            str != 0 ;
@@ -64,8 +63,8 @@ Clerk_i::read_ior (const char *filename)
 
           CORBA::Object_var objref =
             this->orb_->string_to_object (str,
-					  ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+					  TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Return if the server reference is nil.
           if (CORBA::is_nil (objref.in ()))
@@ -78,17 +77,17 @@ Clerk_i::read_ior (const char *filename)
 
           CosTime::TimeService_ptr server =
             CosTime::TimeService::_narrow (objref.in (),
-                                           ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
 	  this->insert_server (server);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      TAO_TRY_ENV.print_exception ("Exception");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_OS::close (f_handle);
   ior_buffer.alloc ()->free (data);
@@ -161,8 +160,7 @@ Clerk_i::parse_args (void)
 int
 Clerk_i::get_first_IOR (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       char host_name[MAXHOSTNAMELEN];
 
@@ -179,14 +177,14 @@ Clerk_i::get_first_IOR (void)
       // Resolve name.
       CORBA::Object_var temp_object =
         this->my_name_server_->resolve (server_context_name,
-                                        ACE_TRY_ENV);
+                                        TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       CosNaming::NamingContext_var server_context =
         CosNaming::NamingContext::_narrow (temp_object.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (server_context.in ()))
         ACE_DEBUG ((LM_DEBUG,
@@ -204,13 +202,13 @@ Clerk_i::get_first_IOR (void)
 
       temp_object =
         server_context->resolve (server_name,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosTime::TimeService_var obj =
         CosTime::TimeService::_narrow (temp_object.in (),
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -230,12 +228,12 @@ Clerk_i::get_first_IOR (void)
                            "[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs "),
                           -1);;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      TAO_TRY_ENV.print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -248,17 +246,16 @@ int
 Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
                       CosNaming::NamingContext_var server_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Binding_var binding;
 
       if (!CORBA::is_nil (iter.in ()))
         {
           while (iter->next_one (binding.out (),
-                                 ACE_TRY_ENV))
+                                 TAO_TRY_ENV))
             {
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
 
               ACE_DEBUG ((LM_DEBUG,
                           "Getting IOR of the server: %s\n\n",
@@ -270,29 +267,28 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 
               CORBA::Object_var temp_object =
                 server_context->resolve (server_name,
-                                         ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               CosTime::TimeService_ptr server =
                 CosTime::TimeService::_narrow (temp_object.in (),
-                                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               this->insert_server (server);
             }
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in next_n_IORs\n");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in next_n_IORs\n");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -300,16 +296,16 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 // Initialise the Naming Service.
 
 int
-Clerk_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Clerk_i::init_naming_service (CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize the POA.
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
                                          "my_child_poa",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POA_ptr child_poa
         = this->orb_manager_.child_poa ();
@@ -324,12 +320,12 @@ Clerk_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
                                       child_poa) == -1)
         return -1;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      TAO_TRY_ENV.print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -339,8 +335,7 @@ Clerk_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 int
 Clerk_i::create_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
 
       // Create a new clerk object. Pass it the timer value, the set
@@ -357,8 +352,8 @@ Clerk_i::create_clerk (void)
       // Convert the clerk reference to a string.
       CORBA::String_var objref_clerk =
         this->orb_->object_to_string (this->time_service_clerk_.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Print the clerk IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -377,12 +372,12 @@ Clerk_i::create_clerk (void)
       // Register the clerk implementation with the Interface
       // Repository.  init_IR();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      TAO_TRY_ENV.print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -393,19 +388,18 @@ Clerk_i::create_clerk (void)
 int
 Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->my_name_server_->resolve
-	(clerk_context_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	(clerk_context_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -415,8 +409,7 @@ Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 int
 Clerk_i::register_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Bind the Clerk in its appropriate Context.
 
@@ -428,13 +421,13 @@ Clerk_i::register_clerk (void)
 
       if (if_first_clerk (clerk_context_name))
 	{
-	  clerk_context = this->my_name_server_->new_context (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+	  clerk_context = this->my_name_server_->new_context (TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
 
 	  this->my_name_server_->rebind_context (clerk_context_name,
 						 clerk_context.in (),
-						 ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+						 TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
 	}
 
       char host_name[MAXHOSTNAMELEN];
@@ -455,16 +448,15 @@ Clerk_i::register_clerk (void)
 
       this->my_name_server_->rebind (clerk_name,
 				     this->time_service_clerk_.in (),
-				     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+				     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+ TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception from init_naming_service ()\n");
+      TAO_TRY_ENV.print_exception ("(%P|%t) Exception from init_naming_service ()\n");
     }
-  ACE_ENDTRY;
+ TAO_ENDTRY;
 
   return 0;
 }
@@ -474,9 +466,9 @@ Clerk_i::register_clerk (void)
 int
 Clerk_i::init (int argc,
                char *argv[],
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
       this->argc_ = argc;
       this->argv_ = argv;
@@ -491,19 +483,19 @@ Clerk_i::init (int argc,
 
       this->orb_manager_.init (argc,
                                argv,
-                               ACE_TRY_ENV);
+                               TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
                                              "child_poa",
-                                             ACE_TRY_ENV) == -1)
+                                             TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init_child_poa"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Get the ORB.
       this->orb_ = this->orb_manager_.orb ();
@@ -521,7 +513,7 @@ Clerk_i::init (int argc,
                       "IOR file not specified. Using the Naming Service instead\n"));
 
           // Initialize the Naming Service.
-          if (this->init_naming_service (ACE_TRY_ENV) !=0 )
+          if (this->init_naming_service (TAO_TRY_ENV) !=0 )
             return -1;
 
           // Get a reference to the Server Naming context and the
@@ -546,37 +538,33 @@ Clerk_i::init (int argc,
       // Close the open file handler.
       // ACE_OS::fclose (this->ior_fp_);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception in Clerk_i::init ()\n");
+      TAO_TRY_ENV.print_exception ("(%P|%t) Exception in Clerk_i::init ()\n");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
 
 int
-Clerk_i::run (CORBA::Environment &ACE_TRY_ENV)
+Clerk_i::run (CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
       // Run the main event loop for the ORB.
-      int r = this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
+      if (this->orb_manager_.run (TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run"),
                           -1);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception in Clerk_i::run ()\n");
+      TAO_TRY_ENV.print_exception ("(%P|%t) Exception in Clerk_i::run ()\n");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/IR_Helper.cpp b/TAO/orbsvcs/Time_Service/IR_Helper.cpp
new file mode 100644
index 00000000000..5ee0027c84d
--- /dev/null
+++ b/TAO/orbsvcs/Time_Service/IR_Helper.cpp
@@ -0,0 +1,241 @@
+// $Id$
+
+#include "IR_Helper.h"
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+#include "tao/IIOP_Profile.h"
+#include "tao/IIOP_Acceptor.h"
+#include "tao/Acceptor_Registry.h"
+#include "orbsvcs/PingS.h"
+
+class Ping_i: public POA_Ping_Object
+  // = TITLE
+  //    Ping Object Implementation
+  //
+  // = DESCRIPTION
+  //    Implementation Repository uses this to check to see if the server
+  //    is still running.
+{
+public:
+  Ping_i (int debug = 0) : debug_ (debug) {}
+
+  virtual void ping (CORBA::Environment &env = CORBA_Environment::default_environment ())
+  ACE_THROW_SPEC (( CORBA::SystemException ))
+    {
+      if (this->debug_)
+        ACE_DEBUG ((LM_DEBUG, "Pong!\n"));
+
+      ACE_UNUSED_ARG (env);
+      // Does nothing, just returns.
+    }
+private:
+  int debug_;
+};
+
+IR_Helper::IR_Helper (const char *server_name,
+                      PortableServer::POA_ptr poa,
+                      CORBA::ORB_ptr orb,
+                      int debug)
+  : name_ (ACE::strnew (server_name)),
+    ir_key_ (0),
+    ir_addr_ (0),
+    ping_ (new Ping_i (debug)),
+    implrepo_ (0),
+    poa_ (poa),
+    orb_ (orb),
+    debug_ (debug)
+{
+
+  TAO_TRY
+    {
+      this->read_ir_ior (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Resolve the IR.
+      CORBA::Object_var implrepo_object =
+        this->orb_->string_to_object (this->ir_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (CORBA::is_nil (implrepo_object.in ()))
+        ACE_ERROR ((LM_ERROR,
+                    "invalid implrepo key <%s>\n",
+                    this->ir_key_));
+
+      this->implrepo_ =
+        Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Now register the Ping Object
+       PortableServer::ObjectId_var ping_id =
+      PortableServer::string_to_ObjectId ("ping");
+
+      this->poa_->activate_object_with_id (ping_id.in (),
+                                           this->ping_,
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->ping_ptr_ =
+        this->poa_->id_to_reference (ping_id.in (),
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("IR_Helper::IR_Helper");
+      return;
+    }
+  TAO_ENDTRY;
+}
+
+IR_Helper::~IR_Helper ()
+{
+  delete this->name_;
+  delete this->ir_key_;
+
+  // @@ Delete the two objects
+}
+
+int
+IR_Helper::register_server (const char *comm_line,
+                            const char *environment,
+                            const char *working_dir,
+                            CORBA_Environment &)
+{
+  TAO_TRY
+    {
+      CORBA::Object_var implrepo_object =
+        this->orb_->string_to_object (this->ir_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      Implementation_Repository *ImplRepo =
+        Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (CORBA::is_nil (implrepo_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid implrepo key <%s>\n",
+                           this->ir_key_),
+                          -1);
+
+      Implementation_Repository::Process_Options proc_opts;
+
+      proc_opts.command_line_ = CORBA::string_dup (comm_line);
+      proc_opts.environment_ = CORBA::string_dup (environment);
+      proc_opts.working_directory_ = CORBA::string_dup (working_dir);
+
+      ImplRepo->reregister_server (this->name_, proc_opts, TAO_TRY_ENV);
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("IR_Helper::register_server");
+      return -1;
+    }
+  TAO_ENDTRY;
+  return 0;
+}
+
+int
+IR_Helper::read_ir_ior (CORBA_Environment &_env)
+{
+  ACE_UNUSED_ARG (_env);
+
+  // Open the file for reading.
+  // @@ Hard-coded name is bad.  Need to fix.
+  ACE_HANDLE f_handle_ = ACE_OS::open ("implrepo.ior", 0);
+
+  if (f_handle_ == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: implrepo.ior\n"),
+                      -1);
+
+  ACE_Read_Buffer ior_buffer (f_handle_);
+  this->ir_key_ = ior_buffer.read ();
+
+  if (this->ir_key_ == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
+
+  ACE_OS::close (f_handle_);
+  return 0;
+}
+
+
+void
+IR_Helper::notify_startup (CORBA_Environment &ACE_TRY_ENV)
+{
+  // @@ Don't use the ORB_Core_instance() keep a pointer to the ORB
+  //    and use the orb_core() accessor
+  TAO_Acceptor_Registry* registry =
+    TAO_ORB_Core_instance ()->acceptor_registry ();
+
+  TAO_Acceptor *acceptor = 0;
+  TAO_AcceptorSetItor end = registry->end ();
+  for (TAO_AcceptorSetItor i = registry->begin (); i != end; ++i)
+    {
+      if ((*i)->tag () == TAO_IOP_TAG_INTERNET_IOP)
+        {
+          acceptor = (*i);
+          break;
+        }
+    }
+  if (acceptor == 0)
+    ACE_THROW (CORBA::NO_IMPLEMENT());
+
+  TAO_IIOP_Acceptor* iiop_acceptor =
+    ACE_dynamic_cast (TAO_IIOP_Acceptor*,acceptor);
+
+  // Get our host and port and convert it to something we can use.
+  const ACE_INET_Addr& my_addr  = iiop_acceptor->address ();
+
+  Implementation_Repository::INET_Addr my_ir_addr;
+  my_ir_addr.port_ = my_addr.get_port_number ();
+  my_ir_addr.host_ = CORBA::string_dup (my_addr.get_host_name ());
+
+  // @@ Shouldn't we use a T_var for this?
+  delete this->ir_addr_;
+  this->ir_addr_ = this->implrepo_->server_is_running (this->name_,
+                                                       my_ir_addr,
+                                                       this->ping_ptr_,
+                                                       ACE_TRY_ENV);
+}
+
+
+// Notify the IR that the server has been shut down.
+void
+IR_Helper::notify_shutdown (CORBA_Environment &TAO_IN_ENV)
+{
+  TAO_TRY
+    {
+      this->implrepo_->server_is_shutting_down (this->name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
+}
+
+
+void
+IR_Helper::change_object (CORBA::Object_ptr obj, CORBA_Environment &)
+{
+  if ( obj
+    && obj->_stubobj ()
+    && obj->_stubobj ()->profile_in_use ()
+    && this->implrepo_
+    && this->implrepo_->_stubobj ()
+    && this->implrepo_->_stubobj ()->profile_in_use ()  )
+    {
+      TAO_IIOP_Profile *implrepo_pfile =
+          ACE_dynamic_cast (TAO_IIOP_Profile *,
+                            this->implrepo_->_stubobj ()->profile_in_use ());
+      TAO_IIOP_Profile *iiop_pfile =
+          ACE_dynamic_cast (TAO_IIOP_Profile *,
+                            obj->_stubobj ()->profile_in_use ());
+
+      // @@ Only same host for now
+      iiop_pfile->port (implrepo_pfile->port ());
+    }
+}
diff --git a/TAO/orbsvcs/Time_Service/IR_Helper.h b/TAO/orbsvcs/Time_Service/IR_Helper.h
new file mode 100644
index 00000000000..a5dbbf9010c
--- /dev/null
+++ b/TAO/orbsvcs/Time_Service/IR_Helper.h
@@ -0,0 +1,81 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/orbsvcs/tests/ImplRepo
+//
+// = FILENAME
+//    IR_Helper.h
+//
+// = DESCRIPTION
+//    Class which contains basic operations needed by a server to use the IR.
+//
+// = AUTHORS
+//    Darrell Brunsch <brunsch@cs.wustl.edu>
+//
+// ============================================================================
+
+#if !defined (IR_HELPER_H)
+#define IR_HELPER_H
+
+#include "tao/TAO.h"
+#include "orbsvcs/ImplRepoC.h"
+
+class POA_Ping_Object;
+
+class IR_Helper
+  // = TITLE
+  //   Implementation Repository Helper Class
+  //
+  // = DESCRIPTION
+  //   Contains basic IR operations required by a server.
+  //
+{
+public:
+  IR_Helper (const char *server_name,
+             PortableServer::POA_ptr poa,
+             CORBA::ORB_ptr orb, int debug = 0);
+  // Constructor
+  ~IR_Helper ();
+  // Destructor
+
+  void notify_startup (CORBA_Environment &_env =
+                           TAO_default_environment ());
+  // Notify the IR that the server is  now running.
+
+  void notify_shutdown (CORBA_Environment &_env =
+                            TAO_default_environment ());
+  // Notify the IR that the server has been shut down.
+
+  int register_server (const char *comm_line,
+                       const char *environment = "",
+                       const char *working_dir = "",
+                       CORBA_Environment &_env =
+                           TAO_default_environment ());
+  // Tell the IR how to start yourself up.
+
+  void change_object (CORBA::Object_ptr obj,
+                      CORBA_Environment &_env =
+                          TAO_default_environment ());
+  // Convert an object into a IR controlled object.
+private:
+  int read_ir_ior (CORBA_Environment &_env =
+                       TAO_default_environment ());
+
+  char *name_;
+  char *ir_key_;
+
+  Implementation_Repository::INET_Addr *ir_addr_;
+
+  POA_Ping_Object *ping_;
+  CORBA::Object_ptr ping_ptr_;
+
+  Implementation_Repository *implrepo_;
+  PortableServer::POA_var poa_;
+  CORBA::ORB_var orb_;
+  int debug_;
+};
+
+#endif /* IR_HELPER_H */
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index cadedc7e8e8..5b3c1f04c0c 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -18,11 +18,13 @@ PROG_SRCS = \
         Time_Service_Server.cpp \
         Time_Service_Clerk.cpp \
         Clerk_i.cpp \
-        Server_i.cpp 
+        Server_i.cpp \
+        IR_Helper.cpp \
 
 SRC = $(PROG_SRCS)
 
-SIMPLE_SVR_OBJS = Server_i.o \
+SIMPLE_SVR_OBJS = IR_Helper.o \
+        Server_i.o \
         Time_Service_Server.o \
 
 SIMPLE_CRK_OBJS = Clerk_i.o \
@@ -35,7 +37,7 @@ BIN2 = Time_Service_Server \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Time
@@ -196,13 +198,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -255,6 +250,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -371,14 +368,11 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
 .obj/Time_Service_Clerk.o .obj/Time_Service_Clerk.so .shobj/Time_Service_Clerk.o .shobj/Time_Service_Clerk.so: Time_Service_Clerk.cpp Clerk_i.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -502,13 +496,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -561,6 +548,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -804,13 +793,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -863,6 +845,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1104,13 +1088,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1163,6 +1140,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1279,13 +1258,326 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ IR_Helper.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
+.obj/IR_Helper.o .obj/IR_Helper.so .shobj/IR_Helper.o .shobj/IR_Helper.so: IR_Helper.cpp IR_Helper.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.h \
+ $(TAO_ROOT)/tao/Acceptor_Impl.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+ $(TAO_ROOT)/tao/Acceptor_Registry.h \
+ $(TAO_ROOT)/tao/Acceptor_Registry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 8a1f78f6fa4..8a8f0662ae1 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -8,7 +8,8 @@ ACE_RCSID(Time_Service, Server_i, "$Id$")
 // Constructor.
 Server_i::Server_i (void)
   : ior_output_file_ (0),
-    use_ir_ (0)
+    use_ir_ (0),
+    register_with_ir_ (0)
 {
   // no-op.
 }
@@ -25,7 +26,7 @@ Server_i::~Server_i (void)
 int
 Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:i");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ir");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,6 +47,9 @@ Server_i::parse_args (void)
       case 'i': // Use the Implementation Repository.
         this->use_ir_ = 1;
         break;
+      case 'r': // Register with the Implementation repository.
+        this->register_with_ir_ = 1;
+        break;
       case '?':  // display help for use of the server.
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -68,16 +72,17 @@ Server_i::parse_args (void)
 // with it.
 
 int
-Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Server_i::init_naming_service (CORBA::Environment &)
 {
-  ACE_TRY
+
+  TAO_TRY
     {
       // Initialize the POA.
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "time_server",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         "my_child_poa",
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POA_ptr child_poa
         = this->orb_manager_.child_poa ();
@@ -92,13 +97,13 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
                                       child_poa) == -1)
         return -1;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception from init_naming_service ()\n");
+      TAO_TRY_ENV.print_exception ("(%P|%t) Exception from init_naming_service ()\n");
+      TAO_TRY_ENV.clear ();
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -108,30 +113,32 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 int
 Server_i::init_IR (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       if (this->use_ir_ == 1)
         {
           ACE_NEW_RETURN (this->ir_helper_,
-                          IR_Helper ("time_server",
+                          IR_Helper ("child_poa",
                                      this->orb_manager_.child_poa (),
                                      this->orb_manager_.orb (),
                                      TAO_debug_level),
                           -1);
 
+          if (this->register_with_ir_ == 1)
+            this->ir_helper_->register_server ("server -i -ORBobjrefstyle url");
+
           this->ir_helper_->change_object (this->time_service_server_.in (),
-                                           ACE_TRY_ENV);
+                                           TAO_TRY_ENV);
         }
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Convert the IR server reference to a string.
       CORBA::String_var objref_server =
         this->orb_manager_.orb ()->object_to_string (this->time_service_server_.in (),
-                                                     ACE_TRY_ENV);
+                                                     TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       // Print the IR server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -147,12 +154,12 @@ Server_i::init_IR (void)
                 ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -163,8 +170,7 @@ Server_i::init_IR (void)
 int
 Server_i::create_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
 
       // Create a new server object.
@@ -182,21 +188,21 @@ Server_i::create_server (void)
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
                                                      this->time_service_server_impl_,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
 
       CORBA::Object_var server_ref =
         this->orb_manager_.child_poa ()->id_to_reference (id.in (),
-                                                          ACE_TRY_ENV);
+                                                          TAO_TRY_ENV);
 
       this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in (),
-                                                                  ACE_TRY_ENV);
+                                                                  TAO_TRY_ENV);
 
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       // All this !! just to register a servant with the child poa.
       // Instead of using _this ().
@@ -205,7 +211,7 @@ Server_i::create_server (void)
 
       CORBA::String_var objref_server =
         this->orb_->object_to_string (server_ref.in (),
-                                      ACE_TRY_ENV);
+                                      TAO_TRY_ENV);
 
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -226,13 +232,12 @@ Server_i::create_server (void)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Server_i::create_server ()");
-      return -1;
+      TAO_TRY_ENV.print_exception ("Exception in Server_i::create_server ()");
+       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -244,19 +249,18 @@ Server_i::create_server (void)
 int
 Server_i::if_first_server (CosNaming::Name &server_context_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->my_name_server_->resolve
-        (server_context_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        (server_context_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -266,8 +270,7 @@ Server_i::if_first_server (CosNaming::Name &server_context_name)
 int
 Server_i::register_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name server_context_name;
       server_context_name.length (1);
@@ -282,14 +285,14 @@ Server_i::register_server (void)
         {
           // Get context.
           server_context =
-            this->my_name_server_->new_context (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            this->my_name_server_->new_context (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Bind.
           this->my_name_server_->rebind_context (server_context_name,
                                                  server_context.in (),
-                                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                 TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       char host_name[MAXHOSTNAMELEN];
@@ -308,20 +311,19 @@ Server_i::register_server (void)
 
       this->my_name_server_->rebind (server_name,
                                      this->time_service_server_.in (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Binding ServerContext -> %s\n",
                   server_name[1].id.in ()));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Exception from init_naming_service ()\n");
+      TAO_TRY_ENV.print_exception ("(%P|%t) Exception from init_naming_service ()\n");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -333,12 +335,12 @@ Server_i::register_server (void)
 int
 Server_i::init (int argc,
                 char *argv[],
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Environment &)
 {
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY
+  TAO_TRY
     {
 
       // Call the init of <TAO_ORB_Manager> to initialize the ORB and
@@ -346,13 +348,13 @@ Server_i::init (int argc,
 
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
-                                             "time_server",
-                                             ACE_TRY_ENV) == -1)
+                                             "child_poa",
+                                             TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                                  "%p\n",
                                  "init_child_poa"),
                                 -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       int result = this->parse_args ();
 
@@ -364,9 +366,9 @@ Server_i::init (int argc,
 
       // Use the Naming Service Register the above implementation with the Naming Service.
       if (this->use_ir_ == 0)
-        this->init_naming_service (ACE_TRY_ENV);
+        this->init_naming_service (TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Create the server object.
       this->create_server ();
@@ -380,12 +382,12 @@ Server_i::init (int argc,
         this->register_server ();
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -394,34 +396,34 @@ Server_i::init (int argc,
 // Initialize the IR Helper and run the event loop for ORB.
 
 int
-Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Server_i::run (CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
 
       if (this->use_ir_ == 1)
         {
-          this->ir_helper_->notify_startup (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ir_helper_->notify_startup (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
-      if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+      if (this->orb_manager_.run (TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "[SERVER] Process/Thread Id : (%P/%t) Server_i::run"),
                           -1);
 
-      if (this->use_ir_ == 1)
+      if (this->register_with_ir_ == 1)
         {
-          this->ir_helper_->notify_shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ir_helper_->notify_shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index aea7f41ce4c..759b98ff3d0 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -23,7 +23,8 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/Time/TAO_Time_Service_Server.h"
-#include "orbsvcs/IR_Helper.h"
+
+#include "IR_Helper.h"
 
 class Server_i
 {
@@ -99,6 +100,9 @@ private:
   int use_ir_;
   // Use the Implementation Repository.
 
+  int register_with_ir_;
+  // Register with the Implementation Repository.
+
   int argc_;
   // Number of command line arguments.
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 2981d3cf77f..debf4a123f3 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -14,30 +14,29 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      int r = clerk.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (r == -1)
+      if (clerk.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          clerk.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          clerk.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
index 2f99b60f71d..d7269a9f4a3 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"Release/clerk.exe" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Service_Clerk - Win32 Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib taod.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"clerk.exe" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index aa52590160f..efcfe4b27d3 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -14,31 +14,29 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      int r = server.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
index 77e3086f495..9ebae4cde8d 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Service_Server - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib taod.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

@@ -89,6 +89,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp"

 # Begin Source File

 

+SOURCE=.\IR_Helper.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Server_i.cpp

 # End Source File

 # Begin Source File

@@ -101,6 +105,10 @@ SOURCE=.\Time_Service_Server.cpp
 # PROP Default_Filter "h"

 # Begin Source File

 

+SOURCE=.\IR_Helper.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Server_i.h

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 73dc532d84f..5fdd447eb93 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -16,7 +16,7 @@ BIN2 = Trading_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Trader
@@ -172,13 +172,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
@@ -234,6 +227,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.bor b/TAO/orbsvcs/Trading_Service/Makefile.bor
deleted file mode 100644
index 46ba64f7096..00000000000
--- a/TAO/orbsvcs/Trading_Service/Makefile.bor
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for building the Trading Service executable
-#
-
-NAME = Trading_Service
-
-OBJFILES = \
-	$(OBJDIR)\Trading_Service.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 2baf5dda8b4..bdb8d3cd6cc 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -64,65 +64,72 @@ Trading_Service::~Trading_Service (void)
 }
 
 int
-Trading_Service::init (int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV)
+Trading_Service::init (int argc, char* argv[])
 {
-  this->orb_manager_.init (argc, argv, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->parse_args (argc, argv) == -1)
-    return -1;
+  TAO_TRY
+    {
+      this->orb_manager_.init (argc, argv, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  CORBA::ORB_ptr orb = this->orb_manager_.orb ();
+      if (this->parse_args (argc, argv) == -1)
+        return -1;
 
-  this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+      CORBA::ORB_ptr orb = this->orb_manager_.orb ();
 
-  // Create a Trader Object and set its Service Type Repository.
-  auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
-  this->trader_ = auto_trader;
-  TAO_Support_Attributes_i& sup_attr = this->trader_->support_attributes ();
-  TAO_Trading_Components_i& trd_comp = this->trader_->trading_components ();
-  sup_attr.type_repos (this->type_repos_._this (ACE_TRY_ENV));
-  ACE_CHECK_RETURN (-1);
+      // Create a Trader Object and set its Service Type Repository.
+      auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
+      this->trader_ = auto_trader;
+      TAO_Support_Attributes_i& sup_attr = this->trader_->support_attributes ();
+      TAO_Trading_Components_i& trd_comp = this->trader_->trading_components ();
+      sup_attr.type_repos (this->type_repos_._this (TAO_TRY_ENV));
+      TAO_CHECK_ENV;
 
       // The Spec says: return a reference to the Lookup interface
       // from the resolve_initial_references method.
-  CosTrading::Lookup_ptr lookup = trd_comp.lookup_if ();
-  this->ior_ = orb->object_to_string (lookup, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+      CosTrading::Lookup_ptr lookup = trd_comp.lookup_if ();
+      this->ior_ = orb->object_to_string (lookup, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  // Dump the ior to a file.
-  if (this->ior_output_file_ != 0)
-    {
-      ACE_OS::fprintf (this->ior_output_file_, "%s", this->ior_.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
+      // Dump the ior to a file.
+      if (this->ior_output_file_ != 0)
+        {
+          ACE_OS::fprintf (this->ior_output_file_, "%s", this->ior_.in ());
+          ACE_OS::fclose (this->ior_output_file_);
+        }
 
-  if (this->federate_)
-    {
-      // Only become a multicast server if we're the only trader
-      // on the multicast network.
-      // @@ Could do other things. For example, every timeout
-      // period try to federate again, but let's not hardcode that
-      // policy.
-      if (this->bootstrap_to_federation (ACE_TRY_ENV) == -1)
+      if (this->federate_)
+        {
+          // Only become a multicast server if we're the only trader
+          // on the multicast network.
+          // @@ Could do other things. For example, every timeout
+          // period try to federate again, but let's not hardcode that
+          // policy.
+          if (this->bootstrap_to_federation () == -1)
+            this->init_multicast_server ();
+        }
+      else
         this->init_multicast_server ();
     }
-  else
-    this->init_multicast_server ();
+    TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Trading Service");
+    }
+  TAO_ENDTRY;
+
   return 0;
 }
 
 
 int
-Trading_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Trading_Service::run (void)
 {
   int return_value;
+  CORBA::Environment TAO_IN_ENV;
   Trading_Shutdown trading_shutdown (*this);
 
   // Run the Trading Service.
-  return_value = this->orb_manager_.run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  return_value = this->orb_manager_.run (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   return return_value;
 }
@@ -176,7 +183,7 @@ Trading_Service::init_multicast_server (void)
 }
 
 int
-Trading_Service::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
+Trading_Service::bootstrap_to_federation (void)
 {
   // If all traders follow this strategy, it creates a complete graph
   // of all known traders on a multicast network.
@@ -192,79 +199,87 @@ Trading_Service::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
                        "Unable to link to other traders.\n"),
                       -1);
 
-  ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
-  CosTrading::Lookup_var lookup_if =
-    CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, "*** Obtaining the link interface.\n"));
-  CosTrading::Link_var link_if =  lookup_if->link_if (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  TAO_Trading_Components_i& trd_comp =
-    this->trader_->trading_components ();
-  CosTrading::Lookup_ptr our_lookup = trd_comp.lookup_if ();
-  CosTrading::Link_ptr our_link = trd_comp.link_if ();
-
-  ACE_DEBUG ((LM_DEBUG, "*** Linking found trader to self.\n"));
-  link_if->add_link (this->name_.in (),
-                     our_lookup,
-                     CosTrading::always,
-                     CosTrading::always,
-                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, "*** Linking self to found trader.\n"));
-  our_link->add_link ("Bootstrap",
-                      lookup_if.in (),
-                      CosTrading::always,
-                      CosTrading::always,
-                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, "*** Retrieving list of known linked traders.\n"));
-  CosTrading::LinkNameSeq_var link_name_seq =
-    link_if->list_links (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, "*** Linking self to all linked traders.\n"));
-  for (int i = link_name_seq->length () - 1; i >= 0; i--)
+  TAO_TRY
     {
-      // Avoid linking to ourselves.
-      if (ACE_OS::strcmp (ACE_static_cast (const char*, link_name_seq[i]),
-                          this->name_.in ()) != 0)
+      ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
+      CosTrading::Lookup_var lookup_if =
+        CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "*** Obtaining the link interface.\n"));
+      CosTrading::Link_var link_if =  lookup_if->link_if (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      TAO_Trading_Components_i& trd_comp =
+        this->trader_->trading_components ();
+      CosTrading::Lookup_ptr our_lookup = trd_comp.lookup_if ();
+      CosTrading::Link_ptr our_link = trd_comp.link_if ();
+
+      ACE_DEBUG ((LM_DEBUG, "*** Linking found trader to self.\n"));
+      link_if->add_link (this->name_.in (),
+                         our_lookup,
+                         CosTrading::always,
+                         CosTrading::always,
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "*** Linking self to found trader.\n"));
+      our_link->add_link ("Bootstrap",
+                          lookup_if.in (),
+                          CosTrading::always,
+                          CosTrading::always,
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "*** Retrieving list of known linked traders.\n"));
+      CosTrading::LinkNameSeq_var link_name_seq =
+        link_if->list_links (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG ((LM_DEBUG, "*** Linking self to all linked traders.\n"));
+      for (int i = link_name_seq->length () - 1; i >= 0; i--)
         {
-          ACE_DEBUG ((LM_DEBUG, "*** Getting info for link %s.\n",
-                      ACE_static_cast (const char*, link_name_seq[i])));
-          CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
-
-          CosTrading::Lookup_ptr remote_lookup;
-          remote_lookup = link_info->target.in ();
-
-          ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n"));
-          CosTrading::Link_var remote_link =
-            remote_lookup->link_if (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
-
-          ACE_DEBUG ((LM_DEBUG, "*** Creating a link to me from it.\n"));
-          remote_link->add_link (this->name_.in (),
-                                 our_lookup,
-                                 CosTrading::always,
-                                 CosTrading::always,
-                                 ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
-
-          ACE_DEBUG ((LM_DEBUG, "*** Creating a link to it from me.\n"));
-          our_link->add_link (link_name_seq[i],
-                              remote_lookup,
-                              CosTrading::always,
-                              CosTrading::always,
-                              ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
+          // Avoid linking to ourselves.
+          if (ACE_OS::strcmp (ACE_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])));
+              CosTrading::Link::LinkInfo_var link_info =
+                link_if->describe_link (link_name_seq[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+
+              CosTrading::Lookup_ptr remote_lookup;
+              remote_lookup = link_info->target.in ();
+
+              ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n"));
+              CosTrading::Link_var remote_link =
+                remote_lookup->link_if (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+
+              ACE_DEBUG ((LM_DEBUG, "*** Creating a link to me from it.\n"));
+              remote_link->add_link (this->name_.in (),
+                                     our_lookup,
+                                     CosTrading::always,
+                                     CosTrading::always,
+                                     TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+
+              ACE_DEBUG ((LM_DEBUG, "*** Creating a link to it from me.\n"));
+              our_link->add_link (link_name_seq[i],
+                                  remote_lookup,
+                                  CosTrading::always,
+                                  CosTrading::always,
+                                  TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+            }
         }
     }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Trading Service");
+    }
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -272,55 +287,55 @@ Trading_Service::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
 int
 Trading_Service::shutdown (void)
 {
-  ACE_TRY_NEW_ENV
+  CORBA::Environment TAO_IN_ENV;
+
+  if (this->trader_.get () != 0)
     {
-      if (this->trader_.get () != 0)
-        {
-          TAO_Trading_Components_i& trd_comp
-            = this->trader_->trading_components ();
-          CosTrading::Link_ptr our_link = trd_comp.link_if ();
+      TAO_Trading_Components_i& trd_comp
+        = this->trader_->trading_components ();
+      CosTrading::Link_ptr our_link = trd_comp.link_if ();
 
-          CosTrading::LinkNameSeq_var link_name_seq =
-            our_link->list_links (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      CosTrading::LinkNameSeq_var link_name_seq =
+        our_link->list_links (TAO_IN_ENV);
 
-          ACE_DEBUG ((LM_DEBUG, "*** Unlinking from federated traders.\n"));
-          for (int i = link_name_seq->length () - 1; i >= 0; i--)
+      ACE_DEBUG ((LM_DEBUG, "*** Unlinking from federated traders.\n"));
+      for (int i = link_name_seq->length () - 1; i >= 0; i--)
+        {
+          TAO_TRY
             {
               ACE_DEBUG ((LM_DEBUG, "*** Describing the next link.\n"));
               CosTrading::Link::LinkInfo_var link_info =
-                our_link->describe_link (link_name_seq[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                our_link->describe_link (link_name_seq[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               ACE_DEBUG ((LM_DEBUG, "*** Removing link to %s.\n",
                           ACE_static_cast (const char*, link_name_seq[i])));
-              our_link->remove_link (link_name_seq[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              our_link->remove_link (link_name_seq[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               CosTrading::Lookup_ptr remote_lookup;
               remote_lookup = link_info->target.in ();
 
               ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
-                remote_lookup->link_if (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                remote_lookup->link_if (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               ACE_DEBUG ((LM_DEBUG, "*** Removing its link to us.\n"));
 
               if (this->bootstrapper_)
-                remote_link->remove_link ("Bootstrap", ACE_TRY_ENV);
+                remote_link->remove_link ("Bootstrap", TAO_TRY_ENV);
               else
-                remote_link->remove_link (this->name_.in (), ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
+                remote_link->remove_link (this->name_.in (), TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
+          TAO_CATCHANY
+            {
+              //              TAO_TRY_ENV.print_exception ("Trading Service");
+            }
+          TAO_ENDTRY;
         }
     }
-  ACE_CATCHANY
-    {
-      // ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service shutting down");
-    }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -371,28 +386,15 @@ main (int argc, char** argv)
 {
   Trading_Service trader;
 
-  ACE_TRY_NEW_ENV
-    {
-      int check = trader.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (check != -1)
-        {
-          trader.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Failed to initialize the trader.\n"),
-                            -1);
-        }
-    }
-  ACE_CATCHANY
+  if (trader.init (argc, argv) != -1)
+    trader.run ();
+  else
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Failed to initialize the trader.\n"),
+                        -1);
     }
-  ACE_ENDTRY;
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index d11c6a2a54a..d52d80be5f2 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -56,10 +56,10 @@ public:
   ~Trading_Service (void);
   // Destructor
 
-  int init (int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV);
+  int init (int argc, char* argv[]);
   // Initialize the Trading Service with arguments.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (void);
   // Run the Trading Service.
 
   int shutdown (void);
@@ -69,7 +69,7 @@ private:
   int init_multicast_server (void);
   // Enable the Trading Service to answer multicast requests for its IOR.
 
-  int bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV);
+  int bootstrap_to_federation (void);
   // Bootstrap to another trader, and attach to its trader network.
 
   int parse_args (int& argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 48f994f415c..8c16736b872 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -165,8 +165,10 @@ FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV)
 CosEventChannelFactory::ChannelFactory_ptr
 FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV)
 {
+  // TBD:
   ACE_THROW_RETURN (CORBA::UNKNOWN (),
                     CosEventChannelFactory::ChannelFactory::_nil ());
+  return 0;
 }
 
 CosEventChannelAdmin::EventChannel_ptr
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index 93591bc8696..88803cd7c04 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -43,7 +43,7 @@ BIN2 = factory \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
     BIN = $(BIN2)
@@ -70,7 +70,7 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs -Ge 1
+override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs
 
 factory: $(addprefix $(VDIR),$(FACTORY_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -198,25 +198,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -264,9 +255,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -351,7 +346,19 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- CosEventChannelFactoryC.i
+ CosEventChannelFactoryC.i CosEventChannelFactoryS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+ CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.i \
+ CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS.i
 .obj/CosEventChannelFactoryS.o .obj/CosEventChannelFactoryS.so .shobj/CosEventChannelFactoryS.o .shobj/CosEventChannelFactoryS.so: CosEventChannelFactoryS.cpp \
  CosEventChannelFactoryS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
@@ -465,25 +472,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -531,9 +529,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -741,25 +743,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -807,9 +800,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1052,25 +1049,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1118,9 +1106,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1321,25 +1313,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1387,9 +1370,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1621,25 +1608,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1687,9 +1665,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/examples/Makefile b/TAO/orbsvcs/examples/Makefile
index 87b27545b4d..2439a158d51 100644
--- a/TAO/orbsvcs/examples/Makefile
+++ b/TAO/orbsvcs/examples/Makefile
@@ -8,8 +8,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-DIRS  =	CosEC \
-	RtEC
+DIRS  =	CosEC
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/examples/RtEC/Makefile b/TAO/orbsvcs/examples/RtEC/Makefile
deleted file mode 100644
index 6a0f3f9ded2..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Simple
-
-#----------------------------------------------------------------------------
-#	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.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
deleted file mode 100644
index 514841dc716..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
-
-int
-main (int argc, char* argv[])
-{
-  Consumer consumer;
-
-  return consumer.run (argc, argv);
-}
-
-// ****************************************************************
-
-Consumer::Consumer (void)
-  : event_count_ (0)
-{
-}
-
-int
-Consumer::run (int argc, char* argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // ORB initialization boiler plate...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Do *NOT* make a copy because we don't want the ORB to outlive 
-      // the 
-      this->orb_ = orb.in ();
-
-      if (argc <= 1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Usage: Consumer <event_channel_ior>\n"));
-          return 1;
-        }
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain the event channel, we could use a naming service, a
-      // command line argument or resolve_initial_references(), but
-      // this is simpler...
-      object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // The canonical protocol to connect to the EC
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Simple subscription, but usually the helper classes in
-      // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
-      RtecEventChannelAdmin::ConsumerQOS qos;
-      qos.dependencies.length (2);
-      RtecEventComm::EventHeader& h0 =
-        qos.dependencies[0].event.header;
-      h0.type   = ACE_ES_DISJUNCTION_DESIGNATOR;
-      h0.source = ACE_ES_EVENT_SOURCE_ANY;
-
-      RtecEventComm::EventHeader& h1 =
-        qos.dependencies[1].event.header;
-      h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
-      h1.source = ACE_ES_EVENT_SOURCE_ANY;
-
-      supplier->connect_push_consumer (consumer.in (), qos,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Wait for events, using work_pending()/perform_work() may help 
-      // or using another thread, this example is too simple for that.
-      orb->run ();
-
-      // We don't do any cleanup, it is hard to do it after shutdown,
-      // and would complicate the example; plus it is almost
-      // impossible to do cleanup after ORB->run() because the POA is
-      // in the holding state.  Applications should use
-      // work_pending()/perform_work() to do more interesting stuff.
-      // Check the supplier for the proper way to do cleanup.
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Consumer (%P|%t) no events\n"));
-      return;
-    }
-
-  this->event_count_ += events.length ();
-  if (this->event_count_ % 100 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Consumer (%P|%t): %d events received\n",
-                  this->event_count_));
-    }
-}
-
-void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // In this example we shutdown the ORB when we disconnect from the
-  // EC (or rather the EC disconnects from us), but this doesn't have
-  // to be the case....
-  this->orb_->shutdown (0, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-#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/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
deleted file mode 100644
index 50588a1afa9..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef CONSUMER_H
-#define CONSUMER_H
-
-#include "orbsvcs/RtecEventCommS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Consumer : public POA_RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
-public:
-  Consumer (void);
-  // Constructor
-
-  int run (int argc, char* argv[]);
-  // Run the test
-
-  // = The RtecEventComm::PushConsumer methods
-
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The skeleton methods.
-
-private:
-  CORBA::ULong event_count_;
-  // Keep track of the number of events received.
-
-  CORBA::ORB_ptr orb_;
-  // The orb, just a pointer because the ORB does not outlive the
-  // run() method...
-};
-
-#endif /* CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.dsp b/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.dsp
deleted file mode 100644
index bff640c98fc..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="EC_Simple_Supplier" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=EC_Simple_Supplier - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Supplier.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Supplier.mak"\

- CFG="EC_Simple_Supplier - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "EC_Simple_Supplier - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "EC_Simple_Supplier - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "EC_Simple_Supplier - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Supplier.exe" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "EC_Simple_Supplier - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "EC_Simple_Supplier - Win32 Release"

-# Name "EC_Simple_Supplier - Win32 Debug"

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Supplier.h

-# End Source File

-# End Group

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Supplier.cpp

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
deleted file mode 100644
index ee0b055a4a9..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-BIN2 =   Service \
-	Consumer \
-	Supplier
-
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event2
-
-PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lorbsvcs -lTAO
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-#----------------------------------------------------------------------------
-#       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
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/README b/TAO/orbsvcs/examples/RtEC/Simple/README
deleted file mode 100644
index fff86abc12f..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/README
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id$
-
-	This directory containts possibly the most simple example of
-the real-time event service.  It contains three executables; a
-consumer, supplier and a program to create the event channel itself.
-
-	Run using the run_test.pl script or:
-
-$ ./Service -o ec.ior
-$ ./Consumer file://ec.ior
-$ ./Supplier file://ec.ior
-
-	more advanced tests are available in
-$TAO_ROOT/orbsvcs/tests/Event and $TAO_ROOT/orbsvcs/EC_*
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
deleted file mode 100644
index 82d7280c387..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// $Id$
-
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(EC_Examples, Service, "$Id$")
-
-const char *ior_output_file = "ec.ior";
-
-int parse_args (int argc, char *argv[]);
-
-int
-main (int argc, char* argv[])
-{
-  TAO_EC_Default_Factory::init_svcs ();
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // ORB initialization boiler plate...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Usage: Service [-o IOR_file_name]\n"));
-          return 1;
-        }
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      TAO_EC_Event_Channel_Attributes attributes (poa.in (),
-                                                  poa.in ());
-      
-      TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-	orb->object_to_string (event_channel.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      // Wait for events, using work_pending()/perform_work() may help 
-      // or using another thread, this example is too simple for that.
-      orb->run ();
-
-      // We don't do any cleanup, it is hard to do it after shutdown,
-      // and would complicate the example; plus it is almost
-      // impossible to do cleanup after ORB->run() because the POA is
-      // in the holding state.  Applications should use
-      // work_pending()/perform_work() to do more interesting stuff.
-      // Check the supplier for the proper way to do cleanup.
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 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.optarg;
-	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;
-}
-
-// ****************************************************************
-
-#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/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
deleted file mode 100644
index 8bf5c6348e5..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
-
-int
-main (int argc, char* argv[])
-{
-  Supplier supplier;
-
-  return supplier.run (argc, argv);
-}
-
-// ****************************************************************
-
-Supplier::Supplier (void)
-{
-}
-
-int
-Supplier::run (int argc, char* argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // ORB initialization boiler plate...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (argc <= 1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Usage: Supplier <event_channel_ior>\n"));
-          return 1;
-        }
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain the event channel, we could use a naming service, a
-      // command line argument or resolve_initial_references(), but
-      // this is simpler...
-      object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // The canonical protocol to connect to the EC
-      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Simple publication, but usually the helper classes in
-      // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
-      RtecEventChannelAdmin::SupplierQOS qos;
-      qos.publications.length (1);
-      RtecEventComm::EventHeader& h0 =
-        qos.publications[0].event.header;
-      h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
-      h0.source = 1;                      // first free event source
-
-      consumer->connect_push_supplier (supplier.in (), qos,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Push the events...
-      ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
-
-      RtecEventComm::EventSet event (1);
-      event.length (1);
-      event[0].header.type   = ACE_ES_EVENT_UNDEFINED;
-      event[0].header.source = 1;
-      event[0].header.ttl    = 1;
-
-      for (int i = 0; i != 2000; ++i)
-        {
-          consumer->push (event, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          ACE_OS::sleep (sleep_time);
-        }
-
-      // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Destroy the EC....
-      event_channel->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Deactivate this object...
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Destroy the POA
-      poa->destroy (1, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-// ****************************************************************
-
-#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/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
deleted file mode 100644
index 8a858f353c1..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef SUPPLIER_H
-#define SUPPLIER_H
-
-#include "orbsvcs/RtecEventCommS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Supplier : public POA_RtecEventComm::PushSupplier
-{
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
-public:
-  Supplier (void);
-  // Constructor
-
-  int run (int argc, char* argv[]);
-  // Run the test
-
-  // = The RtecEventComm::PushSupplier methods
-
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The skeleton methods.
-
-private:
-};
-
-#endif /* SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf b/TAO/orbsvcs/examples/RtEC/Simple/ec.conf
deleted file mode 100644
index 7d8d203c610..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECPushSupplierSet delayed -ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerAdminLock null -ECSupplierAdminLock thread"
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl
deleted file mode 100755
index 5b00af5aab4..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl
+++ /dev/null
@@ -1,56 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../../bin';
-require Process;
-require ACEutils;
-
-$iorfile = "ec.ior";
-
-unlink $iorfile;
-
-$T = Process::Create ($EXEPREFIX."Service".$EXE_EXT,
-		      " -ORBsvcconf ec.conf -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-
-$C = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
-		      " file://$iorfile");
-
-sleep 5;
-
-$S = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
-		      " file://$iorfile");
-
-if ($S->TimedWait (120) == -1) {
-  print STDERR "ERROR: supplier timedout\n";
-  $S->Kill (); $S->TimedWait (1);
-  $C->Kill (); $C->TimedWait (1);
-  $T->Kill (); $T->TimedWait (1);
-  exit 1;
-}
-
-if ($C->TimedWait (15) == -1) {
-  print STDERR "ERROR: consumer timedout\n";
-  $C->Kill (); $C->TimedWait (1);
-  $T->Kill (); $T->TimedWait (1);
-  exit 1;
-}
-
-$T->Terminate (); if ($T->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate service\n";
-  $T->Kill (); $T->TimedWait (1);
-  exit 1;
-}
-
-unlink $iorfile;
-
-exit 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 4c0bcdb02ce..26e33300366 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -231,13 +231,11 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
       // Request a_party to create the endpoint and vdev
       CORBA::Boolean met_qos;
       CORBA::String_var named_vdev;
-      AVStreams::StreamCtrl_var streamctrl =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+
       if (!CORBA::is_nil (a_party))
         {
           this->sep_a_ =
-            a_party-> create_A (streamctrl.in (),
+            a_party-> create_A (this->_this (ACE_TRY_ENV),
                                 this->vdev_a_.out (),
                                 the_qos,
                                 met_qos,
@@ -255,7 +253,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
       if (!CORBA::is_nil (b_party))
         {
           this->sep_b_ =
-            b_party-> create_B (streamctrl.in (),
+            b_party-> create_B (this->_this (ACE_TRY_ENV),
                                 this->vdev_b_.out (),
                                 the_qos,
                                 met_qos,
@@ -284,7 +282,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               ACE_TRY_CHECK;
             }
           // Multicast source being added.
-          CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (streamctrl.in (),
+          CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->_this (ACE_TRY_ENV),
                                                                  this->mcastconfigif_ptr_,
                                                                  the_qos,
                                                                  the_flows,
@@ -314,7 +312,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
       if (!CORBA::is_nil (a_party) && !CORBA::is_nil (b_party))
         {
           // Tell the 2 VDev's about one another
-          this->vdev_a_->set_peer (streamctrl.in (),
+          this->vdev_a_->set_peer (this->_this (ACE_TRY_ENV),
                                    this->vdev_b_.in (),
                                    the_qos,
                                    the_flows,
@@ -322,7 +320,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
 
           ACE_TRY_CHECK;
 
-          this->vdev_b_->set_peer (streamctrl.in (),
+          this->vdev_b_->set_peer (this->_this (ACE_TRY_ENV),
                                    this->vdev_a_.in (),
                                    the_qos,
                                    the_flows,
@@ -645,10 +643,8 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       AVStreams::flowSpec flow_spec (the_spec);
       this->handle_preconnect (flow_spec);
 
-      AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
       // Use the base class implementation of connect
-      responder->request_connection (streamendpoint.in (),
+      responder->request_connection (this->_this (ACE_TRY_ENV),
                                      0,
                                      qos_spec,
                                      flow_spec,
@@ -1069,7 +1065,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name,
       CORBA::Object_ptr fep_entry = 0;
       // Remove the fep from the hash table.
       if (this->fep_map_.unbind (fep_name_key,fep_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
+        TAO_THROW_ENV (AVStreams::streamOpFailed (),ACE_TRY_ENV);
       // redefine the "Flows" property
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0,j=0 ; i <this->flows_.length (); i++)
@@ -1398,11 +1394,8 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
       ACE_NEW_RETURN (stream_ctrl,
                       TAO_StreamCtrl,
                       0);
-      AVStreams::MMDevice_var mmdevice = 
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
       stream_ctrl->bind_devs (peer_device,
-                              mmdevice.in (),
+                              AVStreams::MMDevice::_duplicate (this->_this (ACE_TRY_ENV)),
                               the_qos,
                               the_spec,
                               ACE_TRY_ENV);
@@ -1788,16 +1781,13 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr flow_producer,
       this->producer_ = flow_producer;
       this->consumer_ = flow_consumer;
 
-      AVStreams::FlowConnection_var flowconnection =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->producer_->set_peer (flowconnection.in (),
+      this->producer_->set_peer (this->_this (ACE_TRY_ENV),
                                  this->consumer_,
                                  the_qos,
                                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      this->consumer_->set_peer (flowconnection.in (),
+      this->consumer_->set_peer (this->_this (ACE_TRY_ENV),
                                  this->producer_,
                                  the_qos,
                                  ACE_TRY_ENV);
@@ -2363,62 +2353,44 @@ TAO_FDev::create_producer (AVStreams::FlowConnection_ptr the_requester,
 
 // hook for the applications to override the creation process.
 AVStreams::FlowProducer_ptr
-TAO_FDev::make_producer (AVStreams::FlowConnection_ptr /* the_requester */,
-                         AVStreams::QoS & /* the_qos */,
-                         CORBA::Boolean_out /* met_qos */,
-                         char *& /* named_fdev */,
+TAO_FDev::make_producer (AVStreams::FlowConnection_ptr the_requester,
+                         AVStreams::QoS & the_qos,
+                         CORBA::Boolean_out met_qos,
+                         char *& named_fdev,
                          CORBA::Environment &ACE_TRY_ENV)
 {
-  AVStreams::FlowProducer_ptr flow_producer = AVStreams::FlowProducer::_nil ();
-  ACE_TRY
-    {
-      // memory leak??
-      TAO_FlowProducer *producer;
-      ACE_NEW_RETURN (producer,
-                      TAO_FlowProducer,
-                      0);
+  ACE_UNUSED_ARG (the_requester);
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (met_qos);
+  ACE_UNUSED_ARG (named_fdev);
 
-      flow_producer = producer->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_producer");
-      return flow_producer;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (flow_producer);
-  return flow_producer;
+  // memory leak??
+  TAO_FlowProducer *producer;
+  ACE_NEW_RETURN (producer,
+                  TAO_FlowProducer,
+                  0);
+  return producer->_this (ACE_TRY_ENV);
 }
 
 // hook for the applications to override the consumer creation.
 AVStreams::FlowConsumer_ptr
-TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr /* the_requester */,
-                         AVStreams::QoS & /* the_qos */,
-                         CORBA::Boolean_out /* met_qos */,
-                         char *& /* named_fdev */,
+TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr the_requester,
+                         AVStreams::QoS & the_qos,
+                         CORBA::Boolean_out met_qos,
+                         char *& named_fdev,
                          CORBA::Environment &ACE_TRY_ENV)
 {
-  AVStreams::FlowConsumer_ptr  flow_consumer = AVStreams::FlowConsumer::_nil ();
-  ACE_TRY
-    {
+  ACE_UNUSED_ARG (the_requester);
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (met_qos);
+  ACE_UNUSED_ARG (named_fdev);
 
   // memory leak??
   TAO_FlowConsumer *consumer;
   ACE_NEW_RETURN (consumer,
                   TAO_FlowConsumer,
                   0);
-  flow_consumer = consumer->_this (ACE_TRY_ENV);
-  ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_consumer");
-      return flow_consumer;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (flow_consumer);
-  return flow_consumer;
+  return consumer->_this (ACE_TRY_ENV);
 }
 
 AVStreams::FlowConsumer_ptr
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index ac5827ab49c..616552b1f05 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -375,7 +375,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
   }
   ACE_CATCHANY
     { 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
+      ACE_TRY_ENV.print_exception ("TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 799f50837eb..56f02d1fad8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -43,7 +43,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
   ACE_ENDTRY;
@@ -185,7 +185,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &/* ACE_TRY_ENV */)
+                                                                                      CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -285,7 +285,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &/* ACE_TRY_ENV */)
+                                                                                      CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -343,7 +343,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Child_Process");
+      ACE_TRY_ENV.print_exception ("TAO_Child_Process");
       return -1;
     }
   ACE_ENDTRY;
@@ -447,7 +447,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Object_ptr vdev_obj = CORBA::Object::_nil ();
+  CORBA::Object_ptr vdev_obj;
   ACE_TRY
     {
       char vdev_name [BUFSIZ];
@@ -528,7 +528,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"orb_manager_.run ()");
+      ACE_TRY_ENV.print_exception ("orb_manager_.run ()");
       return -1;
     }
   ACE_ENDTRY;
@@ -542,12 +542,11 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 {
   char sem_str [BUFSIZ];
 
-  long pid = this->pid_;
   sprintf (sem_str,
            "%s:%s:%ld",
            "TAO_AV_Process_Semaphore",
            this->host_,
-           pid);
+           this->pid_);
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) semaphore is %s\n",
@@ -599,7 +598,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
   ACE_ENDTRY;
@@ -641,17 +640,20 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_M
   return 0;
 }
 
-
+// %% its not clear whether we should be deleting the objects, since
+// if the application overrides the make_mediactrl methods etc.,
+// then, we may not own these objects.
+// For now, we dont delete the objects, since they exist for the
+// lifetime of the process anyway
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-int
-TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
+TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process ()
 {
   // Remove the names from the naming service
+  if (CORBA::is_nil (this->naming_context_.in ()) == 0)
+    return;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      if (CORBA::is_nil (this->naming_context_.in ()) == 0)
-        return 0;
       this->naming_context_->unbind (this->stream_endpoint_name_,
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -662,23 +664,10 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Process_Strategy::activate");
-      return -1;
+      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate");
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  return 0;
-}
 
-// %% its not clear whether we should be deleting the objects, since
-// if the application overrides the make_mediactrl methods etc.,
-// then, we may not own these objects.
-// For now, we dont delete the objects, since they exist for the
-// lifetime of the process anyway
-template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process ()
-{
-  this->unbind_names ();
 //  if (this->stream_endpoint_ != 0)
 //    delete this->stream_endpoint_;
 //  if (this->vdev_ != 0)
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index d88b3330638..8483ce20a34 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -126,8 +126,6 @@ public:
   // Service, so the parent can pick the IOR's and
   // return them to the client
 
-  int unbind_names (void);
-  // Removes the vdev and streamendpoint names from the naming service.
 
   int bind_to_naming_service (CORBA::Environment &env);
   // Binds to the naming service
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index bf08d0a3b74..57718e763f8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -442,7 +442,7 @@ TAO_SFP::send_frame (ACE_Message_Block *frame)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_SFP::send_frame");
+      ACE_TRY_ENV.print_exception ("TAO_SFP::send_frame");
       return -1;
     }
   ACE_ENDTRY;
@@ -558,7 +558,7 @@ TAO_SFP::send_startReply (void)
 
 int
 TAO_SFP::handle_timeout (const ACE_Time_Value &/* tv */,
-                         const void * /* arg */)
+                         const void *arg)
 {
   int result;
   // Handle the timeout for timeout1 and timeout2.
@@ -600,7 +600,7 @@ TAO_SFP::handle_timeout (const ACE_Time_Value &/* tv */,
 int
 TAO_SFP::handle_input (ACE_HANDLE /* fd */)
 {
-  //  ACE_DEBUG ((LM_DEBUG,"TAO_SFP::handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG,"TAO_SFP::handle_input\n"));
   flowProtocol::MsgType msg_type = flowProtocol::Start_Msg;
   ACE_INET_Addr sender;
   char peek_buffer [MAGIC_NUMBER_LEN+2];// 2 is for flags + message_type.
@@ -630,7 +630,7 @@ TAO_SFP::handle_input (ACE_HANDLE /* fd */)
     }
   else if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_MAGIC_NUMBER) == 0)
     {
-      //      ACE_DEBUG ((LM_DEBUG,"(%P|%t) frameHeader received\n"));
+      ACE_DEBUG ((LM_DEBUG,"(%P|%t) frameHeader received\n"));
       //      msg_type = flowProtocol::SimpleFrame;
       msg_type = (flowProtocol::MsgType)peek_buffer [MESSAGE_TYPE_OFFSET];
       ACE_DEBUG ((LM_DEBUG,"Message Type = %d\n",msg_type));
@@ -786,7 +786,7 @@ TAO_SFP::end_stream (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_SFP::end_stream ()\n");
+      ACE_TRY_ENV.print_exception ("TAO_SFP::end_stream ()\n");
       return result;
     }
   ACE_ENDTRY;
@@ -909,7 +909,7 @@ TAO_SFP::read_simple_frame (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"read_simple_frame");
+      ACE_TRY_ENV.print_exception ("read_simple_frame");
       return 0;
     }
   ACE_ENDTRY;
@@ -948,7 +948,7 @@ TAO_SFP::read_frame_header (flowProtocol::frameHeader &frame_header)
         ACE_ERROR_RETURN ((LM_ERROR,"Message_Block::copy failed\n"),0);
       // buf[4] is the byte order.
       int byte_order = buf[4] & 0x1;
-      //      ACE_DEBUG ((LM_DEBUG,"mb len = %d,byte_order=%d\n",mb.length (),byte_order));
+      ACE_DEBUG ((LM_DEBUG,"mb len = %d,byte_order=%d\n",mb.length (),byte_order));
       TAO_InputCDR cdr (&mb,byte_order);
       //  cdr >>= frame_header;
       cdr.decode (flowProtocol::_tc_frameHeader,
@@ -1071,7 +1071,7 @@ TAO_SFP::read_fragment (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_SFP::read_fragment");
+      ACE_TRY_ENV.print_exception ("TAO_SFP::read_fragment");
       return 0;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
deleted file mode 100644
index 2f04c91261e..00000000000
--- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$ 
-
-// IDL for Control and Management of Audio/Video Streams
-// Revised Submission
-
-// Additional IDL for full profile
-#include "AVStreams.idl"
-
-#pragma prefix "omg.org"
-
-module AVStreams_Full
-{
-  exception protocolNotSupported{};
-  exception formatNotSupported{};
-  exception formatMismatch{};
-  exception FEPMismatch{};
-  exception alreadyConnected{};
-  exception invalidSettings{string settings;};
-  exception notConnected{};
-  exception deviceQosMismatch{};
-  exception failedToConnect{string reason;};
-  exception failedToListen{string reason;};
-
-
-  interface FlowProducer;
-  interface FlowConsumer;
-  interface FlowEndPoint;
-  interface FDev;
-
-  interface FlowConnection : PropertyService::PropertySet
-    {
-      void stop();
-      void start();
-      void destroy();
-
-      boolean modify_QoS(
-		
-                         inout AVStreams::QoS new_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-      boolean use_flow_protocol(
-                                in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      oneway void push_event(in AVStreams::streamEvent the_event);
-
-      boolean connect_devs(in FDev a_party, in FDev b_party,
-                           inout AVStreams::QoS the_qos)
-        raises (AVStreams::streamOpFailed, 
-                AVStreams::streamOpDenied, 
-                AVStreams::QoSRequestFailed);
-
-      boolean connect(
-                      in FlowProducer flow_producer,
-                      in FlowConsumer flow_consumer,
-                      inout AVStreams::QoS the_qos)
-        raises (formatMismatch, FEPMismatch, alreadyConnected);
-
-      boolean disconnect();
-
-      // The notSupported exception is raised where
-      // flow cannot have multiple producers
-      boolean add_producer(in FlowProducer flow_producer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected, AVStreams::notSupported);
-
-      boolean add_consumer(in FlowConsumer flow_consumer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected);
-
-      boolean drop(in FlowEndPoint target)
-        raises (notConnected);
-    };
-
-  interface FlowEndPoint : PropertyService::PropertySet
-    {
-      boolean lock();
-      void unlock();
-
-      void stop();
-      void start();
-      void destroy();
-
-      // Default is a nil object reference
-      attribute AVStreams::StreamEndPoint related_sep;
-      attribute FlowConnection related_flow_connection;
-
-      FlowEndPoint get_connected_fep()
-        raises (notConnected,
-                AVStreams::notSupported);
-
-      // syntax of fp_name is <flowProtocol>
-      boolean use_flow_protocol(in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      // set_format() initializes 'format' 
-      // as current media format e.g. MPEG.
-      void set_format(in string format)
-        raises (AVStreams::notSupported);
-
-      void set_dev_params(
-                          in PropertyService::Properties new_settings)
-        raises (PropertyService::PropertyException, 
-                AVStreams::streamOpFailed);
-
-      void set_protocol_restriction(in AVStreams::protocolSpec 
-                                    the_spec)
-        raises (AVStreams::notSupported);
-
-      boolean is_fep_compatible(in FlowEndPoint fep) 
-        raises (formatMismatch, deviceQosMismatch);
-
-      boolean set_peer(
-                       in FlowConnection the_fc,
-		
-                       in FlowEndPoint the_peer_fep,
-                       inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed,
-                AVStreams::streamOpFailed);
-
-      boolean set_Mcast_peer(
-                             in FlowConnection the_fc,
-                             in AVStreams::MCastConfigIf a_mcastconfigif,
-                             inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
-      boolean connect_to_peer(inout AVStreams::QoS the_qos,
-                              in string address,
-
-                              in string use_flow_protocol) // syntax <flowProtocol>
-        raises(failedToConnect,
-               AVStreams::FPError, AVStreams::QoSRequestFailed);
-
-      string connect_mcast(inout AVStreams::QoS the_qos,
-                           out boolean is_met,
-                           in string address,
-                           in string use_flow_protocol)
-        raises (failedToConnect,
-                AVStreams::notSupported,
-                AVStreams::FPError,
-                AVStreams::QoSRequestFailed);
-
-      string get_rev_channel(in string pcol_name);
-
-      void set_key(in AVStreams::key the_key);
-      void set_source_id(in long source_id);
-    };
-
-  interface FlowConsumer : FlowEndPoint
-    {
-
-
-      // Needs to know its peer to choose its protocol correctly
-      // Also to ask for a reverse channel for credit-based flow
-      // control, if one is required
-      string go_to_listen(
-                          inout AVStreams::QoS the_qos,
-                          in boolean is_mcast,
-                          in FlowProducer peer,
-                          inout string flowProtocol)// syntax <flowProtocol>
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FDev : PropertyService::PropertySet {
-    FlowProducer create_producer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConsumer create_consumer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConnection bind(in FDev peer_device,
-                        inout AVStreams::QoS the_qos,
-                        out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    FlowConnection bind_mcast(in FDev first_peer,
-                              inout AVStreams::QoS the_qos,
-                              out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    void destroy(in FlowEndPoint the_ep, in string fdev_name)
-      // ie FDev not found
-      raises (AVStreams::notSupported);
-  };
-
-  enum PositionOrigin {
-    AbsolutePosition, RelativePosition, ModuloPosition
-  };
-
-  enum PositionKey {
-    ByteCount, SampleCount, MediaTime
-  };
-
-  struct Position {
-    PositionOrigin origin;
-    PositionKey key;
-    long value;
-  };
-
-  exception PostionKeyNotSupported { PositionKey key;};
-  exception InvalidPosition { PositionKey key;};
-
-  // MediaControl interface is similar to
-  // ControlledStream interface in MSS.
-  // It can be inherited by flow endpoints or
-  // FlowConnection interfaces.
-  interface MediaControl{
-
-    exception PostionKeyNotSupported { PositionKey key;};
-
-    Position get_media_position(
-                                in PositionOrigin an_origin,
-                                in PositionKey a_key)
-      raises (PostionKeyNotSupported);
-
-    void set_media_position(in Position a_position)
-      raises (PostionKeyNotSupported, InvalidPosition);
-
-    void start(in Position a_position)
-      raises(InvalidPosition);
-    void pause(in Position a_position)
-      raises(InvalidPosition);
-    void resume(in Position a_position)
-      raises(InvalidPosition);
-    void stop(in Position a_position)
-      raises(InvalidPosition);
-  };
-};
-
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 55b51bd98fd..aaa6ddd4387 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -44,13 +44,14 @@ CC_Lock::lock (CORBA::Environment &)
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
   lock_held_++;
+
+  //  if (semaphore_.acquire () == -1)
+  //    TAO_THROW (CORBA::INTERNAL ());
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::try_lock (CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
 
@@ -73,7 +74,7 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
           return 0;
         }
       else
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
+        TAO_THROW_RETURN (CORBA::INTERNAL (),
                           0);
     }
   ACE_DEBUG ((LM_DEBUG,
@@ -84,17 +85,17 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::unlock (CORBA::Environment &TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    TAO_THROW (CosConcurrencyControl::LockNotHeld());
 
   int success = 0; //semaphore_.release ();
 
   if (success == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL ());
 
   lock_held_--;
 
@@ -105,9 +106,8 @@ CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
 
 void
 CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
 
@@ -116,7 +116,7 @@ CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode,
   // write lock
 
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    TAO_THROW (CosConcurrencyControl::LockNotHeld());
 
   this->mode_ = new_mode;
 }
@@ -146,24 +146,21 @@ CC_Lock::GetMode (void)
 }
 
 int
-CC_Lock::GetLocksHeld (void)
+CC_Lock::GetLocksHeld(void)
 {
   return this->lock_held_;
 }
 
 void
-CC_Lock::DecLocksHeld (void)
+CC_Lock::DecLocksHeld(void)
 {
   this->lock_held_--;
 }
 
 void
-CC_Lock::dump (void)
+CC_Lock::dump(void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "mode_ %i, lock_held_: %i\n",
-              mode_,
-              lock_held_));
+  printf("mode_ %i, lock_held_: %i\n", mode_, lock_held_);
 }
 
 // The check of compatibility is a hard coded table statically
@@ -190,23 +187,23 @@ CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]
 
 // CC_LockModeterator
 
-CC_LockModeIterator::CC_LockModeIterator (void)
+CC_LockModeIterator::CC_LockModeIterator(void)
   : current_ (CosConcurrencyControl::intention_read)
 {
 }
 
-CC_LockModeIterator::~CC_LockModeIterator (void)
+CC_LockModeIterator::~CC_LockModeIterator(void)
 {
   // Do nothing
 }
-void CC_LockModeIterator::First (void)
+void CC_LockModeIterator::First(void)
 {
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV)
+void CC_LockModeIterator::Next(CORBA::Environment &TAO_IN_ENV)
 {
-  switch (current_)
+  switch(current_)
     {
     case CosConcurrencyControl::intention_read:
       current_ = CosConcurrencyControl::read;
@@ -221,23 +218,23 @@ void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV)
       current_ = CosConcurrencyControl::write;
       break;
     case CosConcurrencyControl::write:
-      ACE_THROW (CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL ());
     default:
-      ACE_THROW (CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL ());
     }
 }
 
 CORBA::Boolean
-CC_LockModeIterator::IsDone (void)
+CC_LockModeIterator::IsDone(void)
 {
-  if (current_==CosConcurrencyControl::write)
+  if(current_==CosConcurrencyControl::write)
     return 1;
   else
     return 0;
 }
 
 CosConcurrencyControl::lock_mode
-CC_LockModeIterator::GetLockMode (void)
+CC_LockModeIterator::GetLockMode(void)
 {
   return current_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index dc108b20904..dcbfb0e8b6c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -22,17 +22,16 @@ ACE_RCSID(Concurrency, CC_LockSet, "$Id$")
 CC_LockSet::CC_LockSet (void)
   : related_lockset_ (0)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      this->Init (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->Init (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_LockSet::CC_LockSet (void)");
+      TAO_TRY_ENV.print_exception ("CC_LockSet::CC_LockSet (void)");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // Constructor used to create related lock sets.
@@ -40,23 +39,22 @@ CC_LockSet::CC_LockSet (void)
 CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
   : related_lockset_ (related)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      this->Init (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->Init (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_LockSet::CC_LockSet (...)");
+      TAO_TRY_ENV.print_exception ("CC_LockSet::CC_LockSet (...)");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // Initialization.
 
 void
-CC_LockSet::Init (CORBA::Environment &ACE_TRY_ENV)
+CC_LockSet::Init (CORBA::Environment &TAO_IN_ENV)
 {
   // Set the mode of the statically allocated locks
   lock_[CC_IR] = 0;
@@ -67,7 +65,7 @@ CC_LockSet::Init (CORBA::Environment &ACE_TRY_ENV)
 
   // Acquire the semaphore in order to be able to put requests on hold
   if (semaphore_.acquire () == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL ());
 }
 
 // Destructor
@@ -93,7 +91,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 
 void
 CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
@@ -107,7 +105,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
   // the FIFO properties of ACE_Token!
   if (this->lock_i (lm) == 1)
     if (semaphore_.acquire () == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+      TAO_THROW (CORBA::INTERNAL ());
 }
 
 // Tries to lock. If it is not possible false is returned.
@@ -155,7 +153,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 
 void
 CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -166,32 +164,42 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
 
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mlock_);
 
-  if (lock_[lm] == 0) // This lock is not held.
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
-  else
-    lock_[lm]--;
-
-  // If we do not have a lock held in a weaker mode than the
-  // strongest held and we have requests on the semaphore signal
-  // the semaphore.
-  while (lock_queue_.size () > 0)
+  TAO_TRY
     {
-      CC_LockModeEnum lock_on_queue = CC_EM;
+      if (lock_[lm] == 0) // This lock is not held.
+        TAO_THROW (CosConcurrencyControl::LockNotHeld());
+      else
+        lock_[lm]--;
 
-      lock_queue_.dequeue_head (lock_on_queue);
+      TAO_CHECK_ENV;
 
-      if (compatible (lock_on_queue) == 1)
+      // If we do not have a lock held in a weaker mode than the
+      // strongest held and we have requests on the semaphore signal
+      // the semaphore.
+      while (lock_queue_.size () > 0)
         {
-          if (semaphore_.release () == -1)
-            ACE_THROW (CORBA::INTERNAL ());
-          lock_[lock_on_queue]++;
-        }
-      else
-        {
-          lock_queue_.enqueue_head (lock_on_queue);
-          break;
+          CC_LockModeEnum lock_on_queue = CC_EM;
+
+          lock_queue_.dequeue_head (lock_on_queue);
+
+          if (compatible (lock_on_queue) == 1)
+            {
+              if (semaphore_.release () == -1)
+                TAO_THROW (CORBA::INTERNAL ());
+              lock_[lock_on_queue]++;
+            }
+          else
+            {
+              lock_queue_.enqueue_head (lock_on_queue);
+              break;
+            }
         }
     }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
   this->dump ();
 }
 
@@ -200,7 +208,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
                          CosConcurrencyControl::lock_mode new_mode,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -209,16 +217,25 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
   CC_LockModeEnum lm_held = lmconvert (held_mode);
   CC_LockModeEnum lm_new = lmconvert (new_mode);
 
-  if (this->lock_held (lm_held) == 0) // This lock is not held
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
-  else if (this->change_mode_i (lm_held, lm_new)==1)
+  TAO_TRY
     {
-      this->unlock (held_mode, ACE_TRY_ENV);
-      ACE_CHECK;
+      if (this->lock_held (lm_held) == 0) // This lock is not held
+        TAO_THROW (CosConcurrencyControl::LockNotHeld());
+      else if (this->change_mode_i (lm_held, lm_new)==1)
+        {
+          this->unlock (held_mode, TAO_IN_ENV);
+          TAO_CHECK_ENV;
 
-      if (semaphore_.acquire () == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+          if (semaphore_.acquire () == -1)
+            TAO_THROW (CORBA::INTERNAL ());
+        }
     }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
+
   //  this->dump ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 1d857c61366..6c8d8d48641 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -36,6 +36,7 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
+  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet,
                     CORBA::NO_MEMORY());
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 25ac44f4314..6a376c9de47 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -41,44 +41,41 @@ int
 TAO_Concurrency_Server::init (CORBA::ORB_var &orb,
 			      PortableServer::POA_var &poa)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      // @@ Huh?!?
-
       // Get the naming context ptr to NameService.
-      //      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      PortableServer::ObjectId_var id =
+      PortableServer::ObjectId_var id = 
 	PortableServer::string_to_ObjectId ("ConcurrencyService");
 
       poa->activate_object_with_id (id.in (),
                                     &lock_set_factory_,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
-      CORBA::Object_var obj =
+      CORBA::Object_var obj = 
 	poa->id_to_reference (id.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
 	orb->object_to_string (obj.in (),
-			       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG,
+      ACE_DEBUG ((LM_DEBUG, 
                   "listening as object <%s>\n",
                   str.in ()));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Concurrency Service");
+      TAO_TRY_ENV.print_exception ("Concurrency Service");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -95,3 +92,5 @@ TAO_Concurrency_Server::GetLockSetFactory(void)
 TAO_Concurrency_Server::~TAO_Concurrency_Server (void)
 {
 }
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index e067efcc60e..112b433a9c3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -62,3 +62,4 @@ private:
 };
 
 #endif /* _CONCURRENCY_SERVER_H */
+
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
index 039ce3d8434..6270f2e7fb1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
@@ -136,7 +136,6 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
 
   this->proxypushconsumer_->push (events,
                                   ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
index 276baf913d2..605737a275e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
@@ -69,19 +69,8 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
   for (CORBA::ULong i = 0;
        i < set.length ();
        ++i)
-    {
-      ACE_TRY
-        {
-          this->consumer_->push (set[i].data.any_value,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // Ignore the exception...
-        }
-      ACE_ENDTRY;
-    }
+    this->consumer_->push (set[i].data.any_value,
+                           ACE_TRY_ENV);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
index 4830fd074c2..b25240072d0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
@@ -31,9 +31,9 @@ CosEC_ServantBase::~CosEC_ServantBase (void)
 void
 CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
                          PortableServer::POA_ptr poa,
-                         char *,
-                         char *,
-                         char *,
+                         char *eventTypeIds,
+                         char *eventSourceIds,
+                         char *source_type_pairs,
                          CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_ASSERT (!CORBA::is_nil (thispoa));
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index b8e26dd86c6..b0a177262c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -150,21 +150,19 @@ int
 ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
                                          u_long &command_action)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      up_->push (request, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       // No exceptions should be raised (push is a oneway) but we try
       // to print something useful anyway.
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_ES_Dispatching_Base::dispatch_event");
+      TAO_TRY_ENV.print_exception ("ACE_ES_Dispatching_Base::dispatch_event");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Tell our caller to release the request.
   command_action = ACE_RT_Task_Command::RELEASE;
@@ -239,10 +237,9 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
 
 void
 ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &TAO_IN_ENV)
 {
-  down_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
+  down_->connected (consumer, TAO_IN_ENV);
 
   // This code does dynamic allocation of channel dispatch threads.
   // It requires that consumer's priorities are known at connection
@@ -253,8 +250,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
   // We have to tell the lower portions of the channel about the
   // consumer first.  This is so that any changes to the consumer's
   // qos will take effect when we get the dispatch priority.
-  down_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
+  down_->connected (consumer, TAO_IN_ENV);
 
   RtecScheduler::OS_Priority priority =
     ACE_Scheduler::instance ().preemption_priority (consumer->qos ().rt_info_);
@@ -336,7 +332,7 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer)
 // <request> has been dynamically allocated by the filtering module.
 void
 ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
 {
   ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE);
 
@@ -346,6 +342,7 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
 
   if (request->rt_info () != 0)
     {
+      // @@ TODO use TAO_TRY&friends
       ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_REQUESTED);
 #if 1
       this->scheduler_->priority
@@ -353,17 +350,17 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
          thread_priority,
          subpriority,
          preemption_priority,
-         ACE_TRY_ENV);
+         TAO_IN_ENV);
 #else
       ACE_Scheduler_Factory::server ()->priority
         (request->rt_info (),
          thread_priority,
          subpriority,
          preemption_priority,
-         ACE_TRY_ENV);
+         TAO_IN_ENV);
 #endif
       ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED);
-      ACE_CHECK;
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
   else
     {
@@ -385,7 +382,7 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
                   " dropping event.\n", preemption_priority));
       return;
 #if 0
-      ACE_THROW (SYNC_ERROR (0, , "ACE_ES_Priority_Dispatching::push"));
+      TAO_THROW (SYNC_ERROR (0, , "ACE_ES_Priority_Dispatching::push"));
 #endif /* 0 */
     }
 
@@ -400,7 +397,7 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
                     " release failed.\n"));
       if (errno != EPIPE)
         {
-          ACE_THROW (CORBA::NO_MEMORY ());
+          TAO_THROW (CORBA::NO_MEMORY ());
           // @@ Orbix parameters
           // 0, ,
           // "ACE_ES_Priority_Dispatching::push enqueue failed"));
@@ -620,8 +617,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                          "ACE_ES_Dispatch_Queue::open_queue"), -1);
     case 0:
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
+        TAO_TRY
           {// @@ TODO: Handle exceptions...
 #if 1
             this->scheduler_->set
@@ -635,7 +631,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               TAO_TRY_ENV);
 #else
             ACE_Scheduler_Factory::server()->set (rt_info_,
                                                   RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -647,17 +643,16 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                                                   ORBSVCS_Time::zero (),
                                                   1,
                                                   RtecScheduler::OPERATION,
-                                                  ACE_TRY_ENV);
+                                                  TAO_TRY_ENV);
 #endif
-            ACE_TRY_CHECK;
+            TAO_CHECK_ENV;
           }
-        ACE_CATCHANY
+        TAO_CATCHANY
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "ACE_ES_Dispatch_Queue::exception");
-            return -1;
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "ACE_ES_Dispatch_Queue::exception"), -1);
           }
-        ACE_ENDTRY;
+        TAO_ENDTRY;
       }
       // FALLTHROUGH
     case 1:
@@ -728,21 +723,19 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
   // Store the priority of the task currently running.
   channel_->rtu_manager ()->priority (request->priority ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      up_->push (request, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       // No exceptions should be raised (push is a oneway) but we try
       // to print something useful anyway.
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_ES_Dispatching_Base::dispatch_event");
+      TAO_TRY_ENV.print_exception ("ACE_ES_Dispatching_Base::dispatch_event");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Reset the priority.
   channel_->rtu_manager ()->priority (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_PROCESS));
@@ -760,11 +753,10 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
 
 void
 ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
   // First enqueue the message in the proper queue.
-  ACE_ES_Priority_Dispatching::push (request, ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_ES_Priority_Dispatching::push (request, TAO_IN_ENV);
 
   // If the current event is higher priority (lower value) than the
   // current running task, then tell the task to preempt itself.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 72610fade57..31c65a2a770 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -109,7 +109,7 @@ TAO_EC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x)
 }
 
 TAO_EC_Timeout_Generator*
-TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel *)
+TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
 {
   // @@ TODO fixme
   TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index aad9716d134..65e2d57e452 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -52,7 +52,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
     {
       char *arg = arg_shifter.get_current ();
 
-      if (ACE_OS::strcasecmp (arg, "-ECDispatching") == 0)
+      if (ACE_OS::strcmp (arg, "-ECdispatching") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -82,7 +82,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECDispatchingThreads") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECdispatchingthreads") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -94,7 +94,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECFiltering") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECfiltering") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -124,7 +124,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECSupplierFiltering") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECsupplierfiltering") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -150,7 +150,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECTimeout") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECtimeout") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -178,7 +178,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECObserver") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECobserver") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -204,7 +204,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECScheduling") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECscheduling") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -230,7 +230,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECPushSupplierSet") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECpushsupplierset") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -260,7 +260,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECProxyConsumerLock") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECproxyconsumerlock") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -290,7 +290,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECProxySupplierLock") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECproxysupplierlock") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -320,7 +320,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECConsumerAdminLock") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECconsumeradminlock") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -350,7 +350,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (arg, "-ECSupplierAdminLock") == 0)
+      else if (ACE_OS::strcmp (arg, "-ECsupplieradminlock") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -504,7 +504,7 @@ TAO_EC_Default_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x
 }
 
 TAO_EC_Timeout_Generator*
-TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel *)
+TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
 {
   if (this->timeout_ == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 2759cb2c0a1..ab66a4195eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -32,7 +32,7 @@ TAO_EC_Reactive_Dispatching::shutdown (void)
 void
 TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info&,
+                                   TAO_EC_QOS_Info& qos_info,
                                    CORBA::Environment& ACE_TRY_ENV)
 {
   proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
@@ -41,7 +41,7 @@ TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
 void
 TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info&,
+                                          TAO_EC_QOS_Info& qos_info,
                                           CORBA::Environment& ACE_TRY_ENV)
 {
   proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
index d7bd3d86dbc..550d4859ce8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
@@ -3,8 +3,7 @@
 ACE_INLINE
 TAO_EC_Dispatching_Task::
 TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager)
-  :  ACE_Task<ACE_SYNCH> (thr_manager),
-     allocator_ (0)
+  :  ACE_Task<ACE_SYNCH> (thr_manager)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 815677f653f..a640bae0cbe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -150,6 +150,19 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
         RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
     }
 
+  if (this->supplier_is_active_)
+    {
+      PortableServer::POA_var poa =
+        this->supplier_._default_POA (ACE_TRY_ENV);
+      ACE_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
+      ACE_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_CHECK;
+      this->supplier_is_active_ = 0;
+    }
+
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
@@ -158,6 +171,19 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
       this->supplier_proxy_ =
         RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
+
+  if (this->consumer_is_active_)
+    {
+      PortableServer::POA_var poa =
+        this->consumer_._default_POA (ACE_TRY_ENV);
+      ACE_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (&this->consumer_, ACE_TRY_ENV);
+      ACE_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_CHECK;
+      this->consumer_is_active_ = 0;
+    }
 }
 
 void
@@ -438,32 +464,6 @@ TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV)
   this->close_i (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  if (this->supplier_is_active_)
-    {
-      PortableServer::POA_var poa =
-        this->supplier_._default_POA (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      this->supplier_is_active_ = 0;
-    }
-
-  if (this->consumer_is_active_)
-    {
-      PortableServer::POA_var poa =
-        this->consumer_._default_POA (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      this->consumer_is_active_ = 0;
-    }
-
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_nil ();
   this->rmt_ec_ =
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index 2d55ea4e707..f4eb2d78cbc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -29,7 +29,7 @@ void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
                           TAO_ECG_UDP_Out_Endpoint* endpoint,
-                          CORBA::Environment &)
+                          CORBA::Environment &TAO_IN_ENV)
 {
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -51,24 +51,24 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu)
 }
 
 void
-TAO_ECG_UDP_Sender::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::shutdown (CORBA::Environment& TAO_IN_ENV)
 {
-  this->close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->close (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
 }
 
 void
 TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
-    this->close (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->close (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   if (sub.dependencies.length () == 0)
     return;
@@ -77,24 +77,24 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
   //ACE_SupplierQOS_Factory::debug (pub);
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->lcl_ec_->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->lcl_ec_->for_consumers (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_this (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer "));
   //ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
                                                 sub,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 }
 
 void
@@ -306,8 +306,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                fragment_count,
                                iov,
                                iovcnt,
-                               ACE_TRY_ENV);
-          ACE_CHECK;
+                               TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
           fragment_id++;
           fragment_offset += fragment_size;
 
@@ -331,7 +331,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                    CORBA::ULong fragment_count,
                                    iovec iov[],
                                    int iovcnt,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong header[TAO_ECG_UDP_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
@@ -369,14 +369,14 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
       // @@ TODO Use a Event Channel specific exception
       ACE_DEBUG ((LM_DEBUG,
                   "ECG_UDP (%t) send failed %p\n", ""));
-      ACE_THROW(CORBA::COMM_FAILURE ());
+      TAO_THROW(CORBA::COMM_FAILURE ());
     }
   else if (n == 0)
     {
       // @@ TODO Use a Event Channel specific exception
       ACE_DEBUG ((LM_DEBUG,
                   "ECG_UDP (%t) EOF on send \n"));
-      ACE_THROW(CORBA::COMM_FAILURE ());
+      TAO_THROW(CORBA::COMM_FAILURE ());
     }
 }
 
@@ -612,11 +612,11 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset)
 
 void
 TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   CORBA::Environment& TAO_IN_ENV)
 {
   TAO_InputCDR cdr (&this->payload_,
                     ACE_static_cast(int,this->byte_order_));
-  cdr.decode (RtecEventComm::_tc_EventSet, &event, 0, ACE_TRY_ENV);
+  cdr.decode (RtecEventComm::_tc_EventSet, &event, 0, TAO_IN_ENV);
 }
 
 // ****************************************************************
@@ -648,7 +648,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                             ACE_Reactor *reactor,
                             const ACE_Time_Value &expire_interval,
                             int max_timeout,
-                            CORBA::Environment &)
+                            CORBA::Environment &TAO_IN_ENV)
 {
   this->ignore_from_ = ignore_from;
 
@@ -672,38 +672,38 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 
 void
 TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
-    this->close (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->close (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   if (pub.publications.length () == 0)
     return;
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->lcl_ec_->for_suppliers (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   RtecEventComm::PushSupplier_var supplier_ref =
-    this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_this (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier "));
   // ACE_SupplierQOS_Factory::debug (pub);
 
   this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
                                                 pub,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 }
 
 void
@@ -739,10 +739,10 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &)
 }
 
 void
-TAO_ECG_UDP_Receiver::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_UDP_Receiver::shutdown (CORBA::Environment& TAO_IN_ENV)
 {
-  this->close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->close (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
 
@@ -925,15 +925,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       RtecEventComm::EventSet event;
-      entry->int_id_->decode (event, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      entry->int_id_->decode (event, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->consumer_proxy_->push (event, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->consumer_proxy_->push (event, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       //      ACE_DEBUG ((LM_DEBUG,
       //                  "TAO_ECG_UDP_Received (%P|%t): push %d "
@@ -941,12 +940,11 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       //                  request_id,
       //                  from.get_ip_address (), from.get_port_number ()));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ECG_UDP_Receive_EH::handle_input");
+      TAO_TRY_ENV.print_exception ("ECG_UDP_Receive_EH::handle_input");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -1046,29 +1044,32 @@ TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv)
 
 int
 TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+                        CORBA::Environment& TAO_IN_ENV)
 {
   this->ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (ec);
   RtecEventChannelAdmin::Observer_var obs =
-    this->observer_._this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    this->observer_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
-  this->handle_ = this->ec_->append_observer (obs.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->handle_ = this->ec_->append_observer (obs.in (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   return 0;
 }
 
 int
-TAO_ECG_Mcast_EH::close (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_Mcast_EH::close (CORBA::Environment& TAO_IN_ENV)
 {
-  if (this->handle_ == 0)
-    return 0;
+  if (this->reactor ()->remove_handler (this,
+                                        ACE_Event_Handler::READ_MASK) == -1)
+    return -1;
 
-  RtecEventChannelAdmin::Observer_Handle h = this->handle_;
+  if (this->dgram_.unsubscribe () == -1)
+    return -1;
+
+  this->ec_->remove_observer (this->handle_, TAO_IN_ENV);
   this->handle_ = 0;
-  this->ec_->remove_observer (h, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   {
     PortableServer::POA_var poa =
@@ -1081,13 +1082,6 @@ TAO_ECG_Mcast_EH::close (CORBA::Environment& ACE_TRY_ENV)
     ACE_CHECK_RETURN (-1);
   }
 
-  if (this->reactor ()->remove_handler (this,
-                                        ACE_Event_Handler::READ_MASK) == -1)
-    return -1;
-
-  if (this->dgram_.close () == -1)
-    return -1;
-
   return 0;
 }
 
@@ -1118,7 +1112,7 @@ TAO_ECG_Mcast_EH::unsubscribe (const ACE_INET_Addr &mcast_addr)
 void
 TAO_ECG_Mcast_EH::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
-    CORBA::Environment& ACE_TRY_ENV)
+    CORBA::Environment& TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG,
@@ -1146,8 +1140,8 @@ TAO_ECG_Mcast_EH::update_consumer (
       must_register = 1;
       RtecUDPAdmin::UDP_Addr addr;
 
-      this->receiver_->get_addr (header, addr, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->receiver_->get_addr (header, addr, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
       if (this->subscribe (inet_addr) == -1)
@@ -1184,19 +1178,19 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
-    CORBA::Environment& ACE_TRY_ENV)
+    CORBA::Environment& TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_consumer (sub, ACE_TRY_ENV);
+  this->eh_->update_consumer (sub, TAO_IN_ENV);
 }
 
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS& pub,
-    CORBA::Environment& ACE_TRY_ENV)
+    CORBA::Environment& TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_supplier (pub, ACE_TRY_ENV);
+  this->eh_->update_supplier (pub, TAO_IN_ENV);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 3984307b4d6..396bb43f988 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -13,7 +13,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
                                               int thread_priority,
                                               int force_activate)
   :  nthreads_ (nthreads),
-     thread_creation_flags_ (thread_creation_flags),
+     thread_creation_flags_ (thread_creation_flags_),
      thread_priority_ (thread_priority),
      force_activate_ (force_activate),
      task_ (&this->thread_manager_),
@@ -28,7 +28,7 @@ TAO_EC_MT_Dispatching::activate (void)
 
   if (this->active_ != 0)
     return;
-
+  
   this->active_ = 1;
 
   if (this->task_.activate (this->thread_creation_flags_,
@@ -76,7 +76,7 @@ TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
 void
 TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&,
+                                    TAO_EC_QOS_Info& qos_info,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
   // Double checked locking....
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index cc6c74d6ef8..71acd51ec2e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -109,7 +109,7 @@ TAO_EC_Null_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x)
 }
 
 TAO_EC_Timeout_Generator*
-TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel *)
+TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
 {
   // @@ TODO fixme
   TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 012486f7628..3b99edfff07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -24,7 +24,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr,
+       RtecEventChannelAdmin::Observer_ptr obs,
        CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -38,7 +38,7 @@ TAO_EC_Null_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle,
+       RtecEventChannelAdmin::Observer_Handle handle,
        CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index d3b6b792e83..a48af969373 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -218,14 +218,14 @@ public:
                      const RtecEventComm::EventHeader& rhs) const;
   };
 
-protected:
+private:
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos,
                  CORBA::Environment &env);
   void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos,
                  CORBA::Environment &env);
   // Helper functions to compute the consumer and supplier QOS.
 
-protected:
+private:
   TAO_EC_Event_Channel* event_channel_;
   // The event channel.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
index 00f77ba6ea9..3d8d53be5ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
@@ -27,14 +27,14 @@ TAO_EC_ProxyPushSupplier_Set::connected_i (
       TAO_EC_ProxyPushSupplier *supplier,
       CORBA::Environment &ACE_TRY_ENV)
 {
-  if (this->all_suppliers_.insert (supplier) == -1)
+  if (this->all_suppliers_.insert (supplier) != 0)
     ACE_THROW (CORBA::NO_MEMORY ());
 }
 
 void
 TAO_EC_ProxyPushSupplier_Set::disconnected_i (
       TAO_EC_ProxyPushSupplier *supplier,
-      CORBA::Environment &)
+      CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->all_suppliers_.remove (supplier) != 0)
     return; // ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ());
@@ -43,7 +43,7 @@ TAO_EC_ProxyPushSupplier_Set::disconnected_i (
 
 void
 TAO_EC_ProxyPushSupplier_Set::shutdown_i (
-      CORBA::Environment &)
+      CORBA::Environment &ACE_TRY_ENV)
 {
   SupplierSetIterator end = this->end ();
   for (SupplierSetIterator i = this->begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index f6df18233df..913d05431d4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -372,17 +372,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (const RtecEventComm::EventSet& event
     // references,
   }
 
-  ACE_TRY
-    {
-      consumer->push (event, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // @@ This is where the policies for misbehaving consumers
-      //    should kick in.... for the moment just ignore them.
-    }
-  ACE_ENDTRY;
+  consumer->push (event, ACE_TRY_ENV);
 }
 
 void
@@ -405,18 +395,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
     ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
                         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
-
-    ACE_TRY
-      {
-        consumer->push (event, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        // @@ This is where the policies for misbehaving consumers
-        //    should kick in.... for the moment just ignore them.
-      }
-    ACE_ENDTRY;
+    consumer->push (event, ACE_TRY_ENV);
   }
 
   // The reference count was incremented just before delegating on the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 2258485e1de..77f15f3ea28 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -72,17 +72,17 @@ TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
 }
 
 int
-TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet&,
-                               TAO_EC_QOS_Info&,
-                               CORBA::Environment&)
+TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet& event,
+                               TAO_EC_QOS_Info& qos_info,
+                               CORBA::Environment& ACE_TRY_ENV)
 {
   return 0;
 }
 
 int
-TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet&,
-                                      TAO_EC_QOS_Info&,
-                                      CORBA::Environment&)
+TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet& event,
+                                      TAO_EC_QOS_Info& qos_info,
+                                      CORBA::Environment& ACE_TRY_ENV)
 {
   return 0;
 }
@@ -118,7 +118,7 @@ TAO_EC_Timeout_Filter::max_event_size (void) const
 
 int
 TAO_EC_Timeout_Filter::can_match (
-      const RtecEventComm::EventHeader&) const
+      const RtecEventComm::EventHeader& header) const
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 5c81c125452..82655af6334 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -86,7 +86,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description,
 static RtecScheduler::Preemption_Priority_t
 Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
                      RtecScheduler::handle_t rtinfo,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_IN_ENV)
 {
   RtecScheduler::OS_Priority thread_priority;
   RtecScheduler::Preemption_Subpriority_t subpriority;
@@ -100,16 +100,16 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
      thread_priority,
      subpriority,
      preemption_priority,
-     ACE_TRY_ENV);
+     TAO_IN_ENV);
 #else
   ACE_Scheduler_Factory::server ()->priority
     (rtinfo,
      thread_priority,
      subpriority,
      preemption_priority,
-     ACE_TRY_ENV);
+     TAO_IN_ENV);
 #endif
-  ACE_CHECK_RETURN (0);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
   return preemption_priority;
 }
 
@@ -154,36 +154,29 @@ public:
       // This is so the dispatching module can query us as a dispatch
       // request to get the appropriate preemption priority.
       ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
-
+      CORBA::Environment env;
       RtecScheduler::Preemption_Priority_t p =
         ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
       while (iter.advance_dependency () == 0)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              RtecEventComm::EventType &type = (*iter).event.header.type;
+          RtecEventComm::EventType &type = (*iter).event.header.type;
 
-              if (type != ACE_ES_GLOBAL_DESIGNATOR &&
-                  type != ACE_ES_CONJUNCTION_DESIGNATOR &&
-                  type != ACE_ES_DISJUNCTION_DESIGNATOR)
+          if (type != ACE_ES_GLOBAL_DESIGNATOR &&
+              type != ACE_ES_CONJUNCTION_DESIGNATOR &&
+              type != ACE_ES_DISJUNCTION_DESIGNATOR)
+            {
+              env.clear ();
+              RtecScheduler::Preemption_Priority_t q =
+                ::Preemption_Priority (scheduler, (*iter).rt_info, env);
+              if (env.exception () != 0)
+                continue;
+              if (rt_info_ == 0 || q < p)
                 {
-                  RtecScheduler::Preemption_Priority_t q =
-                    ::Preemption_Priority (scheduler, (*iter).rt_info,
-                                           ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-                  if (rt_info_ == 0 || q < p)
-                    {
-                      this->rt_info_ = ((*iter).rt_info);
-                      p = q;
-                    }
+                  this->rt_info_ = ((*iter).rt_info);
+                  p = q;
+                  continue;
                 }
             }
-          ACE_CATCHANY
-            {
-              // Ignore exceptions...
-            }
-          ACE_ENDTRY;
         }
     }
 
@@ -256,21 +249,19 @@ public:
 
   virtual int execute (void* /* arg = 0 */)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           ACE_ES_Dispatch_Request *request = request_;
-          dispatching_module_->push (request, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          dispatching_module_->push (request, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           delete this;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Flush_Queue_ACT::execute, "
-                               "unexpected exception");
+          ACE_ERROR ((LM_ERROR, "(%t) Flush_Queue_ACT::execute: "
+                      "Unknown exception..\n"));
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
       return 0;
     }
 
@@ -327,12 +318,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier (
   // not work: it usually results in some form of dead-lock.
   this->source_id_ = qos_.publications[0].event.header.source;
 
-  supplier_module_->connected (this, ACE_TRY_ENV);
+  supplier_module_->connected (this, TAO_IN_ENV);
 }
 
 void
 ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH);
@@ -349,13 +340,13 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
         ACE_const_cast (RtecEventComm::EventSet&, event);
 
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy, ACE_TRY_ENV);
+      this->supplier_module_->push (this, copy, TAO_IN_ENV);
     }
   else
     {
       RtecEventComm::EventSet copy = event;
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy, ACE_TRY_ENV);
+      this->supplier_module_->push (this, copy, TAO_IN_ENV);
     }
 }
 
@@ -372,33 +363,30 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event)
 
 void
 ACE_Push_Supplier_Proxy::disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   if (this->connected ())
     {
-      this->push_supplier_ = 0;
-      this->supplier_module_->disconnecting (this, ACE_TRY_ENV);
-      ACE_CHECK;
+      supplier_module_->disconnecting (this, TAO_IN_ENV);
+      push_supplier_ = 0;
     }
 }
 
 void
 ACE_Push_Supplier_Proxy::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      push_supplier_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      push_supplier_->disconnect_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_Push_Supplier_Proxy::shutdown failed.\n");
+      ACE_ERROR ((LM_ERROR, "ACE_Push_Supplier_Proxy::shutdown failed.\n"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // ************************************************************
@@ -415,7 +403,7 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void)
 
 void
 ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY);
 
@@ -426,8 +414,8 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
       return;
     }
 
-  push_consumer_->push (events, ACE_TRY_ENV);
-  ACE_CHECK;
+  push_consumer_->push (events, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
@@ -460,7 +448,7 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
 
 void
 ACE_Push_Consumer_Proxy::disconnect_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
@@ -485,18 +473,16 @@ ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &)
 void
 ACE_Push_Consumer_Proxy::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      this->push_consumer_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->push_consumer_->disconnect_push_consumer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_Push_Consumer_Proxy::shutdown failed.\n");
+      ACE_ERROR ((LM_ERROR, "ACE_Push_Consumer_Proxy::shutdown failed.\n"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // ************************************************************
@@ -578,18 +564,16 @@ ACE_EventChannel::~ACE_EventChannel (void)
   // @@ This should go away, it is too late to raise a CORBA
   // exception, at this point we should only be cleaning up memory,
   // not sending messages.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      this->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_EventChannel::~ACE_EventChannel");
+      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_EventChannel::~ACE_EventChannel"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   this->cleanup_observers ();
 
@@ -701,21 +685,20 @@ ACE_EventChannel::report_disconnect_i (u_long event)
 
 void
 ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
 {
-  RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  gw->observer_handle (this->append_observer (observer.in (), ACE_TRY_ENV));
-  ACE_CHECK;
+  gw->observer_handle (this->append_observer (observer.in (), TAO_IN_ENV));
 }
 
 void
 ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
 {
-  this->remove_observer (gw->observer_handle (), ACE_TRY_ENV);
-  ACE_CHECK;
+  this->remove_observer (gw->observer_handle (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   gw->observer_handle (0);
 }
@@ -752,19 +735,18 @@ ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_consumer (c_qos, ACE_TRY_ENV);
-      ACE_CHECK;
+      (*i).int_id_.observer->update_consumer (c_qos, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
-ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::update_supplier_gwys (CORBA::Environment& TAO_IN_ENV)
 {
   Observer_Map observers;
   {
-    ACE_GUARD_THROW_EX (ACE_ES_MUTEX, ace_mon, this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
+    TAO_GUARD_THROW (ACE_ES_MUTEX, ace_mon, this->lock_, TAO_IN_ENV,
+                     RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (this->observers_.current_size () == 0
         || this->state_ == ACE_EventChannel::SHUTDOWN)
@@ -788,60 +770,57 @@ ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_supplier (s_qos, ACE_TRY_ENV);
-      ACE_CHECK;
+      (*i).int_id_.observer->update_supplier (s_qos, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 RtecEventChannelAdmin::Observer_Handle
 ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  ACE_GUARD_THROW_EX (ACE_ES_MUTEX, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK_RETURN (0);
+  TAO_GUARD_THROW_RETURN (ACE_ES_MUTEX, ace_mon, this->lock_, 0, TAO_IN_ENV,
+                          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
   this->handle_generator_++;
   Observer_Entry entry (this->handle_generator_,
                         RtecEventChannelAdmin::Observer::_duplicate (obs));
 
   if (this->observers_.bind (entry.handle, entry) == -1)
-    ACE_THROW_RETURN (
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
-        0);
+    TAO_THROW_ENV_RETURN (RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
+                          TAO_IN_ENV, 0);
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
   this->consumer_module_->fill_qos (c_qos);
-  obs->update_consumer (c_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  obs->update_consumer (c_qos, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
   this->supplier_module_->fill_qos (s_qos);
-  obs->update_supplier (s_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  obs->update_supplier (s_qos, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   return entry.handle;
 }
 
 void
 ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  ACE_GUARD_THROW_EX (ACE_ES_MUTEX, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK;
+  TAO_GUARD_THROW (ACE_ES_MUTEX, ace_mon, this->lock_, TAO_IN_ENV,
+                   RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
   if (this->observers_.unbind (h) == -1)
-    ACE_THROW (
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+    TAO_THROW_ENV
+      (RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER(), TAO_IN_ENV);
 }
 
 void
@@ -853,58 +832,6 @@ ACE_EventChannel::cleanup_observers (void)
   this->observers_.close ();
 }
 
-int
-ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
-                                  const ACE_Command_Base *act,
-                                  RtecScheduler::Preemption_Priority_t preemption_priority,
-                                  const RtecScheduler::Time &delta,
-                                  const RtecScheduler::Time &interval)
-{
-  if (rt_info != 0)
-    {
-      // Add the timer to the task's dependency list.
-      RtecScheduler::handle_t timer_rtinfo =
-        this->timer_module ()->rt_info (preemption_priority);
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-#if 1
-          this->scheduler_->add_dependency (rt_info,
-                                            timer_rtinfo,
-                                            1,
-                                            RtecScheduler::ONE_WAY_CALL,
-                                            ACE_TRY_ENV);
-#else
-          ACE_Scheduler_Factory::server()->add_dependency
-            (rt_info,
-             timer_rtinfo,
-             1,
-             RtecScheduler::ONE_WAY_CALL,
-             ACE_TRY_ENV);
-#endif
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "add dependency failed");
-        }
-      ACE_ENDTRY;
-    }
-
-  // @@ We're losing resolution here.
-  ACE_Time_Value tv_delta;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta);
-
-  ACE_Time_Value tv_interval;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
-
-  return this->timer_module ()->schedule_timer (preemption_priority,
-                                                ACE_const_cast(ACE_Command_Base*,act),
-                                                tv_delta,
-                                                tv_interval);
-}
 
 // ****************************************************************
 
@@ -1196,18 +1123,17 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down)
 
 void
 ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "EC (%t) Consumer_Module - connecting consumer %x\n",
   //  consumer));
 
   this->channel_->report_connect (ACE_EventChannel::CONSUMER);
-  this->down_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->down_->connected (consumer, TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
   if (!consumer->qos ().is_gateway)
-    this->channel_->update_consumer_gwys (ACE_TRY_ENV);
+    this->channel_->update_consumer_gwys (TAO_IN_ENV);
 }
 
 void
@@ -1291,45 +1217,38 @@ ACE_ES_Consumer_Module::shutdown (void)
   {
     Consumer_Iterator iter (copy);
 
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    CORBA::Environment env;
+
+    for (ACE_Push_Consumer_Proxy **proxy = 0;
+         iter.next (proxy) != 0;
+         iter.advance ())
       {
-        for (ACE_Push_Consumer_Proxy **proxy = 0;
-             iter.next (proxy) != 0;
-             iter.advance ())
-          {
-            (*proxy)->shutdown ();
-            // @@ Cannnot use CORBA::release (*proxy), since it is a
-            // servant.
-            // Deactivate the proxy...
-            PortableServer::POA_var poa =
-              (*proxy)->_default_POA (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-            PortableServer::ObjectId_var id =
-              poa->servant_to_id (*proxy, ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-            poa->deactivate_object (id.in (), ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-
-            // Remove the consumer from our list.
-            {
-              ACE_Guard<ACE_ES_MUTEX> ace_mon (lock_);
-              if (ace_mon.locked () == 0)
-                ACE_ERROR ((LM_ERROR, "%p Failed to acquire lock.\n", "ACE_ES_Consumer_Module::shutdown"));
+        (*proxy)->shutdown ();
+        // @@ Cannnot use CORBA::release (*proxy), since it is a
+        // servant.
+        // Deactivate the proxy...
+        PortableServer::POA_var poa =
+          (*proxy)->_default_POA (env);
+        TAO_CHECK_ENV_RETURN_VOID (env);
+        PortableServer::ObjectId_var id =
+          poa->servant_to_id (*proxy, env);
+        TAO_CHECK_ENV_RETURN_VOID (env);
+        poa->deactivate_object (id.in (), env);
+        TAO_CHECK_ENV_RETURN_VOID (env);
+
+        // Remove the consumer from our list.
+        {
+          ACE_Guard<ACE_ES_MUTEX> ace_mon (lock_);
+          if (ace_mon.locked () == 0)
+            ACE_ERROR ((LM_ERROR, "%p Failed to acquire lock.\n", "ACE_ES_Consumer_Module::shutdown"));
 
-              if (all_consumers_.remove (*proxy) == -1)
-                ACE_ERROR ((LM_ERROR, "%p Failed to remove consumer.\n", "ACE_ES_Consumer_Module::shutdown"));
-            }
+          if (all_consumers_.remove (*proxy) == -1)
+            ACE_ERROR ((LM_ERROR, "%p Failed to remove consumer.\n", "ACE_ES_Consumer_Module::shutdown"));
+        }
 
-            // No need to delete it, owned by the POA
-            // delete *proxy;
-          }
+        // No need to delete it, owned by the POA
+        // delete *proxy;
       }
-    ACE_CATCHANY
-      {
-        // Ignore the exceptions...
-      }
-    ACE_ENDTRY;
   }
 
 DONE:
@@ -1356,7 +1275,6 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
   // in the Dispatching Module for this consumer, so no queues or
   // proxies can be deleted just yet.
   down_->disconnecting (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
 
   // Send a shutdown message through the system.  When this is
   // dispatched, the consumer proxy will be deleted.  <request> is
@@ -1403,7 +1321,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
 // can read the set we allocated off the stack.
 void
 ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n"));
 
@@ -1420,7 +1338,7 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
       RtecEventComm::Event& ev = event_set[i];
       ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send);
     }
-  request->consumer ()->push (event_set, ACE_TRY_ENV);
+  request->consumer ()->push (event_set, TAO_IN_ENV);
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
@@ -1452,7 +1370,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (
   }
 
   proxy = new_consumer->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxy);
+  TAO_CHECK_RETURN (proxy);
 
   // Give away ownership to the POA....
   new_consumer.release ()->_remove_ref ();
@@ -1565,11 +1483,11 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up,
 
 void
 ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Environment &TAO_IN_ENV)
 {
   // Initialize the consumer correlation filter.
   if (consumer->correlation ().connected (consumer, this) == -1)
-    ACE_THROW (RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR());
+    TAO_THROW (RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR());
 }
 
 void
@@ -1596,7 +1514,7 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr)
 void
 ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
                                  const TAO_EC_Event& event,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n"));
 
@@ -1608,10 +1526,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
   // If request == 0, then the event was queued for later.  Otherwise,
   // we need to push the event now.
   if (request != 0)
-    {
-      up_->push (request, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+    up_->push (request, TAO_IN_ENV);
 
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_PUSH_SOURCE_TYPE_DISPATCH_MODULE_ENQUEUING);
 }
@@ -2114,19 +2029,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void)
   // If we were forwarding events, disconnect as a supplier.
   if (connected_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          channel_->disconnect_push_consumer (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ES_Consumer_Correlation::"
-                               "disconnecting failed.\n");
-        }
-      ACE_ENDTRY;
+      CORBA::Environment env;
+      channel_->disconnect_push_consumer (env);
+      if (env.exception () != 0)
+        ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Correlation::disconnecting failed.\n"));
     }
 
   for (int j = 0; j < this->n_timer_reps_; ++j)
@@ -2286,23 +2192,22 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */)
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE);
   if (this->receiving_events ())
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           ACE_Time_Value tv = ACE_OS::gettimeofday ();
           ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv);
           correlation_->correlation_module_->push (this,
                                                    this->timeout_event_,
-                                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                   TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCH (CORBA::Exception, ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ES_Consumer_Rep_Timeout::execute: "
-                               "unexpected exception.\n");
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "ACE_ES_Consumer_Rep_Timeout::execute: "
+                             "unexpected exception.\n"), -1);
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
   return 0;
 }
@@ -2337,14 +2242,14 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void)
 // global type collection.
 void
 ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
 {
   RtecEventComm::EventSourceID sid = 0;
   // We will record the source_id for later usage.
-  {
+ {
     ACE_ES_WGUARD ace_mon (lock_);
     if (ace_mon.locked () == 0)
-      ACE_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
+      TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (all_suppliers_.insert (supplier) == -1)
       ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module insert failed.\n"));
@@ -2415,16 +2320,16 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
                    RtecScheduler::ONE_WAY_CALL,
-                   ACE_TRY_ENV);
+                   TAO_IN_ENV);
 #else
                 ACE_Scheduler_Factory::server()->add_dependency
                   ((*proxy)->dependency()->rt_info,
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
                    RtecScheduler::ONE_WAY_CALL,
-                   ACE_TRY_ENV);
+                   TAO_IN_ENV);
 #endif
-                ACE_CHECK;
+                TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
                 if (new_subscribers->consumers_.insert (*proxy) == -1)
                   {
@@ -2544,7 +2449,7 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *)
 int
 ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
                                          const TAO_EC_Event &event,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n"));
 
@@ -2578,8 +2483,8 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
         // and not disconnected.
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (-1);
+            up_->push (*consumer, event, TAO_IN_ENV);
+            if (TAO_IN_ENV.exception () != 0) return -1;
           }
         // If the consumer has disconnected, schedule it for
         // disconnection.  We can not modify our list now.  It
@@ -2627,7 +2532,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
 int
 ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
                                               const TAO_EC_Event &event,
-                                              CORBA::Environment& ACE_TRY_ENV)
+                                              CORBA::Environment& TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG,
   // "EC (%t) Subscription_Module::push_source_type: \n"));
@@ -2694,8 +2599,8 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
       {
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (-1);
+            up_->push (*consumer, event, TAO_IN_ENV);
+            if (TAO_IN_ENV.exception () != 0) return -1;
           }
         if ((*consumer)->disconnected ())
           {
@@ -2787,8 +2692,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                  iter2.next (temp) != 0;
                  iter2.advance ())
               {
-                ACE_DECLARE_NEW_CORBA_ENV;
-                ACE_TRY
+                TAO_TRY
                   {
 #if 1
                     this->scheduler_->add_dependency
@@ -2796,24 +2700,23 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
                        RtecScheduler::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       TAO_TRY_ENV);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency()->rt_info,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
                        RtecScheduler::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       TAO_TRY_ENV);
 #endif
-                    ACE_TRY_CHECK;
+                    TAO_CHECK_ENV;
                   }
-                ACE_CATCHANY
+                TAO_CATCHANY
                   {
-                    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                         "error adding dependency");
+                    TAO_TRY_ENV.print_exception ("error adding dependency");
                     return -1;
                   }
-                ACE_ENDTRY;
+                TAO_ENDTRY;
               }
           }
         }
@@ -2863,8 +2766,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
           // Success.  Add the supplier dependency info to the
           // consumer's dependency list.
           // @@ TODO handle exceptions.
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          TAO_TRY
             {
 #if 1
               this->scheduler_->add_dependency
@@ -2872,25 +2774,24 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
                  RtecScheduler::ONE_WAY_CALL,
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 #else
               ACE_Scheduler_Factory::server()->add_dependency
                 (consumer->dependency ()->rt_info,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
                  RtecScheduler::ONE_WAY_CALL,
-                 ACE_TRY_ENV);
+                 TAO_TRY_ENV);
 #endif
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
             }
-          ACE_CATCHANY
+          TAO_CATCHANY
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Subscription_Module::subscribe_type:"
-                                   " add_dependency failed.\n");
+              ACE_ERROR ((LM_ERROR, "Subscription_Module::subscribe_type:"
+                          " add_dependency failed.\n"));
               return -1;
             }
-          ACE_ENDTRY;
+          TAO_ENDTRY;
         }
     }
 
@@ -2934,8 +2835,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                 // Success.
                 // Add the supplier to the consumer's dependency list.
                 // @@ TODO handle exceptions.
-                ACE_DECLARE_NEW_CORBA_ENV;
-                ACE_TRY
+                TAO_TRY
                   {
 #if 1
                     this->scheduler_->add_dependency
@@ -2943,26 +2843,24 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
                        RtecScheduler::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       TAO_TRY_ENV);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency ()->rt_info,
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
                        RtecScheduler::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       TAO_TRY_ENV);
 #endif
-                    ACE_TRY_CHECK;
+                    TAO_CHECK_ENV;
                   }
-                ACE_CATCHANY
+                TAO_CATCHANY
                   {
-                    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                         "Subscription_Module::"
-                                         "subscribe_source_type:"
-                                         " add_dependency failed.\n");
-                    return -1;
+                    ACE_ERROR_RETURN ((LM_ERROR, "Subscription_Module::subscribe_source_type:"
+                                       " add_dependency failed.\n"),
+                                      -1);
                   }
-                ACE_ENDTRY;
+                TAO_ENDTRY;
               }
               /* FALLTHROUGH */
             case 1:
@@ -3171,25 +3069,19 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum
 void
 ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
                                   const TAO_EC_Event &event,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n"));
 
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE);
   // These are all inline function calls.
-  int result = this->push_source (source, event, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (result == -1)
+  if (this->push_source (source, event, TAO_IN_ENV) == -1)
     return;
 
   {
     ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE);
 
-    result = this->push_source_type (source, event, ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (result == -1)
+    if (this->push_source_type (source, event, TAO_IN_ENV) == -1)
       return;
   }
 }
@@ -3262,14 +3154,12 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up)
 
 void
 ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
 {
   channel_->report_connect (ACE_EventChannel::SUPPLIER);
-  up_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
-
+  up_->connected (supplier, TAO_IN_ENV);
   if (!supplier->qos ().is_gateway)
-    this->channel_->update_supplier_gwys (ACE_TRY_ENV);
+    this->channel_->update_supplier_gwys (TAO_IN_ENV);
 }
 
 void
@@ -3287,7 +3177,6 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
       ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
 
     up_->disconnecting (supplier, ACE_TRY_ENV);
-    ACE_CHECK;
 
     if (this->all_suppliers_.size () <= 0)
       {
@@ -3370,7 +3259,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
 void
 ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
                               RtecEventComm::EventSet &event_set,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
   // Steal the events from the EventSet and put them into a reference
   // counted event set.
@@ -3378,7 +3267,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
     TAO_EC_Event_Set::_create (event_set);
 
   if (event == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY ());
 
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Supplier_Module::push\n"));
   for (CORBA::ULong i = 0; i < event->length (); ++i)
@@ -3387,8 +3276,8 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
       // the scope.
       TAO_EC_Event event_copy (event, i);
       ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY);
-      up_->push (proxy, event_copy, ACE_TRY_ENV);
-      ACE_CHECK;
+      up_->push (proxy, event_copy, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
   TAO_EC_Event_Set::_release (event);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index bc78c9981b5..3183e507316 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -674,6 +674,57 @@ ACE_ES_Conjunction_Group::add_events (TAO_EC_Event_Array *outbox,
 // ************************************************************
 
 ACE_INLINE int
+ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
+                                  const ACE_Command_Base *act,
+                                  RtecScheduler::Preemption_Priority_t preemption_priority,
+                                  const RtecScheduler::Time &delta,
+                                  const RtecScheduler::Time &interval)
+{
+  if (rt_info != 0)
+    {
+      // Add the timer to the task's dependency list.
+      RtecScheduler::handle_t timer_rtinfo =
+        this->timer_module ()->rt_info (preemption_priority);
+
+      TAO_TRY
+        {
+#if 1
+          this->scheduler_->add_dependency (rt_info,
+                                            timer_rtinfo,
+                                            1,
+                                            RtecScheduler::ONE_WAY_CALL,
+                                            TAO_TRY_ENV);
+#else
+          ACE_Scheduler_Factory::server()->add_dependency
+            (rt_info,
+             timer_rtinfo,
+             1,
+             RtecScheduler::ONE_WAY_CALL,
+             TAO_TRY_ENV);
+#endif
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR, "add dependency failed"));
+        }
+      TAO_ENDTRY;
+    }
+
+  // @@ We're losing resolution here.
+  ACE_Time_Value tv_delta;
+  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta);
+
+  ACE_Time_Value tv_interval;
+  ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
+
+  return this->timer_module ()->schedule_timer (preemption_priority,
+                                                ACE_const_cast(ACE_Command_Base*,act),
+                                                tv_delta,
+                                                tv_interval);
+}
+
+ACE_INLINE int
 ACE_EventChannel::cancel_timer (RtecScheduler::OS_Priority preemption_priority,
                                 int id,
                                 ACE_Command_Base *&act)
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 76fd32baf95..96902d641ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -96,8 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void)
 int
 ACE_RT_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // @@ TODO It may be necessary to pass the options to this class
 
@@ -107,8 +106,8 @@ ACE_RT_Task::svc (void)
       };
       int argc = sizeof (argv)/sizeof (argv[0]);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 #endif
 
       RtecScheduler::OS_Priority thread_priority;
@@ -120,15 +119,15 @@ ACE_RT_Task::svc (void)
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority, ACE_TRY_ENV);
+         preemption_priority, TAO_TRY_ENV);
 #else
       ACE_Scheduler_Factory::server ()->priority
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority, ACE_TRY_ENV);
+         preemption_priority, TAO_TRY_ENV);
 #endif
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
       if (ACE_OS::thr_setprio (thread_priority) == -1)
         {
 #if defined (ACE_HAS_STHREADS)
@@ -167,11 +166,11 @@ ACE_RT_Task::svc (void)
 
       ACE_DEBUG ((LM_DEBUG, "EC (%t) thread exiting.\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR, "priority failed\n"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -255,22 +254,21 @@ ACE_RT_Task::open_task (const char* name)
       tempname = tempbuffer;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
 #if 1
       rt_info_ =
-        this->scheduler_->create (tempname, ACE_TRY_ENV);
+        this->scheduler_->create (tempname, TAO_TRY_ENV);
 #else
       rt_info_ =
         ACE_Scheduler_Factory::server()->create (tempname,
-                                                 ACE_TRY_ENV);
+                                                 TAO_TRY_ENV);
 #endif
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
       // @@ TODO: We do no initialization of the new rt_info, the
       // caller does, this is (IMnsHO) very error prone.
     }
-  ACE_CATCH (RtecScheduler::DUPLICATE_NAME, dn_ex)
+  TAO_CATCH (RtecScheduler::DUPLICATE_NAME, dn_ex)
     {
       // @@ TODO: Its already registered, IMHO this should at least
       // report a warning, but I'll stick to the previous code.
@@ -279,7 +277,7 @@ ACE_RT_Task::open_task (const char* name)
       // tempname), 0);
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -311,8 +309,7 @@ ACE_RT_Task::synch_threads (size_t threads)
       RtecScheduler::Preemption_Subpriority_t subpriority;
       RtecScheduler::Preemption_Priority_t preemption_priority;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           {
             // @@ TODO handle exceptions
@@ -322,15 +319,15 @@ ACE_RT_Task::synch_threads (size_t threads)
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority, ACE_TRY_ENV);
+               preemption_priority, TAO_TRY_ENV);
 #else
             ACE_Scheduler_Factory::server ()->priority
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority, ACE_TRY_ENV);
+               preemption_priority, TAO_TRY_ENV);
 #endif
-            ACE_TRY_CHECK;
+            TAO_CHECK_ENV;
           }
 
           ACE_DEBUG ((LM_DEBUG, "EC (%t) spawning %d threads at os thread"
@@ -395,12 +392,11 @@ ACE_RT_Task::synch_threads (size_t threads)
                 }
             }
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "priority failed\n");
-          return -1;
+          ACE_ERROR_RETURN ((LM_ERROR, "priority failed\n"), -1);
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
 
     }
   else
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 851cbe05b9e..729284fdf1d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -75,8 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
     case 0:
       // @@ TODO handle exceptions
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
+        TAO_TRY
           {
 #if 1
             this->scheduler_->set
@@ -90,7 +89,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               TAO_TRY_ENV);
 #else
             ACE_Scheduler_Factory::server()->set
               (rt_info_,
@@ -103,16 +102,15 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               TAO_TRY_ENV);
 #endif
-            ACE_TRY_CHECK;
+            TAO_CHECK_ENV;
           }
-        ACE_CATCHANY
+        TAO_CATCHANY
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "set failed\n");
+            ACE_ERROR_RETURN ((LM_ERROR, "set failed\n"), -1);
           }
-        ACE_ENDTRY;
+        TAO_ENDTRY;
       }
       break;
 
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 78983c10989..2595ed28c4d 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -58,6 +58,10 @@ TAO_IOR_Multicast::init (const char *ior,
                        "subscribe"),
                       -1);
 
+  // Initialise the IOR_LookupTable.
+
+  //  this->ior_lookup_table_.add_ior ("ObjectID1","iioploc://tango.cs.wustl.edu:9999/ObjectID1");
+
   return 0;
 }
 
@@ -71,19 +75,20 @@ TAO_IOR_Multicast::handle_timeout (const ACE_Time_Value &,
 int
 TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 {
-  ACE_DEBUG ((LM_DEBUG, "TAO_IOR_Multicast::Handle_input\n"));
-
-  // The length of the service name string that follows.
+  // The header has the length of the data following it.
   CORBA::Short header;
-  // Port to which to reply.
   ACE_UINT16 remote_port;
-  // Name of the service for which the client is looking.
-  char service_name[BUFSIZ];
+
+  char *name;
+  ACE_NEW_RETURN (name,
+                  char[BUFSIZ],
+                  0);
+
+  CORBA::String_var service_name (name);
 
   ACE_INET_Addr remote_addr;
 
-  // Take a peek at the header to find out how long is the service
-  // name string we should receive.
+  // Take a peek at the header and get the length of data in bytes.
   ssize_t n = this->mcast_dgram_.recv (&header,
                                        sizeof(header),
 				       remote_addr,
@@ -99,7 +104,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                        "Header value < 1\n"),
                       0);
 
-  // Receive full client multicast request.
+  // Construct an iovec to receive.
   const int iovcnt = 3;
   iovec iov[iovcnt];
 
@@ -108,7 +113,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   iov[1].iov_base = (char *) &remote_port;
   iov[1].iov_len  = sizeof (ACE_UINT16);
   iov[2].iov_base = (char *) service_name;
-  iov[2].iov_len  = ACE_NTOHS (header);
+  iov[2].iov_len  = ACE_NTOHS (header) - sizeof (ACE_UINT16);
 
   // Read the iovec.
   n = this->mcast_dgram_.recv (iov,
@@ -119,21 +124,21 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                        "TAO_IOR_Multicast::handle_input recv = %d\n",
 		       n),
 		      0);
+  // Null terminate.
+  service_name [ACE_NTOHS (header) - sizeof (ACE_UINT16)] = 0;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"(%P|%t) Received multicast.\n"
 		"Service Name received : %s\n"
 		"Port received : %u\n",
-		service_name,
+		service_name.in (),
 		ACE_NTOHS (remote_port)));
+  ACE_CString ior(this->ior_);
 
-  // Our reply data.
-  ACE_CString ior (this->ior_);
-
-  if (ACE_OS::strcmp (service_name,
+  if (ACE_OS::strcmp (service_name.in (),
                       "NameService") != 0
-      && ACE_OS::strcmp (service_name,
+      && ACE_OS::strcmp (service_name.in (),
                          "TradingService") != 0)
     {
       // The client has requested an IOR other than for the
@@ -141,7 +146,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
       // to find_ior will fill the ior for us if the service name is
       // found in the table.
 
-      ACE_CString service (service_name);
+      ACE_CString service (service_name.in ());
 
       if (this->ior_lookup_table_.find_ior (service, ior) != 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,7 +154,6 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 			  0);
     }
 
-  // Reply to the multicast message.
   ACE_SOCK_Connector connector;
   ACE_INET_Addr peer_addr (ACE_NTOHS (remote_port),
 			   remote_addr.get_host_name ());
@@ -161,28 +165,9 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
     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_HTONS (ior.length () + 1);
-
-  // Vector to be sent.
-  const int cnt = 2;
-  iovec iovp[cnt];
-
-  // The length of ior to be sent.
-  iovp[0].iov_base = (char *) &data_len;
-  iovp[0].iov_len  = sizeof (CORBA::Short);
-
-  // The ior.
-  iovp[1].iov_base = ACE_const_cast (char*, ior.c_str ());
-  iovp[1].iov_len  = ior.length () + 1;
-
-  ssize_t result = stream.sendv_n (iovp,
-                                   cnt);
-
+  // Send the IOR back to the client.
+  ssize_t result = stream.send_n (ior.c_str (),
+                                  ACE_OS::strlen (ior.c_str ()) + 1);
   // Close the stream.
   stream.close ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IR_Helper.cpp b/TAO/orbsvcs/orbsvcs/IR_Helper.cpp
deleted file mode 100644
index 6ec6810045f..00000000000
--- a/TAO/orbsvcs/orbsvcs/IR_Helper.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-// $Id$
-
-#include "orbsvcs/IR_Helper.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/Acceptor_Registry.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-class ServerObject_i: public POA_ImplementationRepository::ServerObject
-{
-  // = TITLE
-  //    IR Server Object Implementation
-  //
-  // = DESCRIPTION
-  //    Implementation Repository uses this to communicate with the IR
-  //    registered server.
-public:
-  ServerObject_i (CORBA::ORB_ptr orb, int debug = 0) 
-    : orb_ (orb),
-      debug_ (debug) {}
-
-  virtual void ping (CORBA::Environment &/*ACE_TRY_ENV = TAO_default_environment ()*/)
-    ACE_THROW_SPEC (())
-    {
-      if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG, "Pong!\n"));
-    }
-
-  virtual void shutdown (CORBA::Environment &/*ACE_TRY_ENV = TAO_default_environment ()*/)
-    ACE_THROW_SPEC (())
-    {
-      if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG, "ServerObject_i::Shutdown\n"));
- 
-      this->orb_->shutdown ();
-    }
-private:
-  CORBA::ORB_var orb_;
-
-  int debug_;
-};
-
-IR_Helper::IR_Helper (const char *server_name,
-                      PortableServer::POA_ptr poa,
-                      CORBA::ORB_ptr orb,
-                      int debug)
-  : name_ (ACE::strnew (server_name)),
-    ir_addr_ (0),
-    server_object_ (new ServerObject_i (orb, debug)),
-    implrepo_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    debug_ (debug)
-{
-  const char *exception_message = "Null Message";
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Object_var implrepo_object =
-        orb_->resolve_initial_references ("ImplRepoService");
-
-      if (CORBA::is_nil (implrepo_object.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to resolve the Implementation Repository.\n"));
-		  ACE_OS::exit (-1);
-        }
-
-      exception_message = "While narrowing ImplRepo";
-      this->implrepo_ =
-        ImplementationRepository::Administration::_narrow (implrepo_object.in(), 
-                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Now register the Ping Object
-      PortableServer::ObjectId_var server_object_id =
-        PortableServer::string_to_ObjectId ("server_object");
-
-      exception_message = "While activating server object";
-      this->poa_->activate_object_with_id (server_object_id.in (),
-                                           this->server_object_,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      exception_message = "While creating reference to ping object";
-      CORBA::Object_ptr svr_obj = 
-        this->poa_->id_to_reference (server_object_id.in (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    
-      this->server_object_ptr_ = 
-        ImplementationRepository::ServerObject::_narrow (svr_obj,
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "IR_Helper::IR_Helper - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
-      return;
-    }
-  ACE_ENDTRY;
-}
-
-IR_Helper::~IR_Helper (void)
-{
-  delete this->name_;
-
-  // @@ Delete the two objects
-}
-
-int
-IR_Helper::register_server (const char *comm_line,
-                            const char * /*environment*/,
-                            const char *working_dir,
-                            CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      CORBA::Object_var implrepo_object =
-        orb_->resolve_initial_references ("ImplRepoService");
-
-      if (CORBA::is_nil (implrepo_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to resolve the Implementation Repository.\n"),
-                          -1);
-
-      ImplementationRepository::Administration *ImplRepo =
-        ImplementationRepository::Administration::_narrow (implrepo_object.in(), 
-                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (implrepo_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "IR_Helper::register_server - Could not narrow IR::Admin\n"),
-                          -1);
-
-      ImplementationRepository::StartupOptions startup_options;
-
-      startup_options.command_line = CORBA::string_dup (comm_line);
-      // @@ Implement Environment
-      //      startup_options.environment = CORBA::string_dup (environment);
-      startup_options.working_directory = CORBA::string_dup (working_dir);
-
-      ImplRepo->reregister_server (this->name_, startup_options, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IR_Helper::register_server");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-IR_Helper::notify_startup (CORBA_Environment &ACE_TRY_ENV)
-{
-  // @@ Don't use the ORB_Core_instance() keep a pointer to the ORB
-  //    and use the orb_core() accessor
-  TAO_Acceptor_Registry* registry =
-    TAO_ORB_Core_instance ()->acceptor_registry ();
-
-  TAO_Acceptor *acceptor = 0;
-  TAO_AcceptorSetItor end = registry->end ();
-
-  for (TAO_AcceptorSetItor i = registry->begin (); i != end; ++i)
-    if ((*i)->tag () == TAO_IOP_TAG_INTERNET_IOP)
-      {
-        acceptor = (*i);
-        break;
-      }
-
-  if (acceptor == 0)
-    ACE_THROW (CORBA::NO_IMPLEMENT());
-
-  TAO_IIOP_Acceptor* iiop_acceptor =
-    ACE_dynamic_cast (TAO_IIOP_Acceptor*,acceptor);
-
-  // Get our host and port and convert it to something we can use.
-  const ACE_INET_Addr& my_addr  = iiop_acceptor->address ();
-
-  ImplementationRepository::Address my_ir_addr;
-  my_ir_addr.port = my_addr.get_port_number ();
-  my_ir_addr.host = CORBA::string_dup (my_addr.get_host_name ());
-
-  ACE_TRY
-    {
-      delete this->ir_addr_;
-
-      this->ir_addr_ = this->implrepo_->server_is_running (this->name_,
-                                                           my_ir_addr,
-                                                           ACE_dynamic_cast (ImplementationRepository::ServerObject *, this->server_object_ptr_),
-                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-}
-
-// Notify the IR that the server has been shut down.
-void
-IR_Helper::notify_shutdown (CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      this->implrepo_->server_is_shutting_down (this->name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-}
-
-void
-IR_Helper::change_object (CORBA::Object_ptr obj,
-                          CORBA_Environment &)
-{
-  if (obj
-      && obj->_stubobj ()
-      && obj->_stubobj ()->profile_in_use ()
-      && this->implrepo_
-      && this->implrepo_->_stubobj ()
-      && this->implrepo_->_stubobj ()->profile_in_use ()  )
-    {
-      TAO_IIOP_Profile *implrepo_pfile =
-        ACE_dynamic_cast (TAO_IIOP_Profile *,
-                          this->implrepo_->_stubobj ()->profile_in_use ());
-      TAO_IIOP_Profile *iiop_pfile =
-        ACE_dynamic_cast (TAO_IIOP_Profile *,
-                          obj->_stubobj ()->profile_in_use ());
-
-      // @@ Only same host for now
-      iiop_pfile->port (implrepo_pfile->port ());
-    }
-}
diff --git a/TAO/orbsvcs/orbsvcs/ImplRepo.idl b/TAO/orbsvcs/orbsvcs/ImplRepo.idl
index f560c727dd6..8e2fed102de 100644
--- a/TAO/orbsvcs/orbsvcs/ImplRepo.idl
+++ b/TAO/orbsvcs/orbsvcs/ImplRepo.idl
@@ -1,182 +1,98 @@
 // $Id$
 
-module ImplementationRepository
+#include "Ping.idl"
+
+interface Implementation_Repository
+  // = TITLE
+  //    Interface for communicating with the Implementation Repository
+  //
+  // = DESCRIPTION
+  //    This interface exports all the administration functionality of
+  //    the Implementation Repository.
 {
-  interface ServerObject
-    // = TITLE
-    //    Server Side IR Object
-    //
-    // = DESCRIPTION
-    //    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.
-  {
-    void ping ();
-    // Check the liveness of a server.
-
-    void shutdown ();
-    // Try to shutdown the server gracefully.
-  };
-
-  struct EnvironmentVariable
-  // One environment variable/value pair.
-  {
-    string name;
-    string value;
-  };
+  exception Already_Registered {};
+  // Object already bound in the Implementation Repository
 
-  struct Address
-  // Specifies the location of the server.
+  exception Cannot_Activate
   {
-    string host;
-    unsigned short port;
+    string reason_;
   };
 
-  typedef sequence<EnvironmentVariable> Environment;
-  // Complete Environment.
+  exception Not_Found {};
+  // Object not found in the Implementation Repository
 
-  struct StartupOptions
-  // Options used to start up the server.
+  struct INET_Addr
   {
-    string command_line;
-    // Startup command (program name and arguments).
-    
-    Environment environment;
-    // Environment Variables.
-    
-    string working_directory;
-    // Working directory.
+    string host_;
+    unsigned short port_;
   };
+  // The location of a server
 
-  struct ServerInformation
-  // All the information about one server.
+  struct Process_Options
   {
-    string logical_server;
-    // The logical server this server is part of.
-
-    string server;
-    // Server name.
-
-    StartupOptions startup;
-    // How to start up the server.
-
-    Address location;
-    // Where the server is located currently.
-  };
-
-  typedef sequence <ServerInformation> ServerInformationList;
-
-  interface ServerInformationIterator;
-  // Forward declaration.
-
-  interface Administration
-    // = TITLE
-    //    The Implementation Repository Administration Interface
-    //
-    // = DESCRIPTION
-    //    This interface exports all the administration functionality of
-    //    the Implementation Repository.
-  {
-    // = Exceptions
-
-    exception AlreadyRegistered {};
-    // Object already bound in the Implementation Repository
-
-    exception CannotActivate
-    {
-      string reason;
-    };
-    // The server could not be restarted.
-
-    exception NotFound {};
-    // Object not found in the Implementation Repository
-
-    void activate_server (in string server)
-      raises (NotFound,
-              CannotActivate);
-    // Activate server that is named <server>.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.  The <CannotActivate> exception
-    // is raised when <server> is found in the Repository but could not be
-    // activated.
-
-    void register_server (in string server,
-                          in StartupOptions options)
-      raises (AlreadyRegistered);
-    // Register the <options> to specify how the <server> should be
-    // restarted when a client asks for it.  
-    //
-    // The <AlreadyRegistered> exception is raised when <server> has
-    // already been registered with the Implementation Repository.
-
-    void reregister_server (in string server,
-                            in StartupOptions options);
-    // Update the <options> to specify how the <server> should be
-    // restarted when a client asks for it.  Will register the server
-    // if not already registered.
-
-    void remove_server (in string server)
-      raises (NotFound);
-    // Remove <server> from the Implementation Repository.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.
-
-    void shutdown_server (in string server)
-      raises (NotFound);
-    // Tries to shutdown the server, first gracefully, then ungracefully.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.
-
-    Address server_is_running (in string server,
-                               in Address addr,
-                               in ServerObject server_object)
-      raises (NotFound);
-    // Used to notify the Implementation Repository that <server> is alive 
-    // and well at <addr>.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.
-
-    void server_is_shutting_down (in string server)
-      raises (NotFound);
-    // Used to tell the Implementation Repository that <server> is shutting
-    // down.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.
-
-    void find (in string server, 
-               out ServerInformation info)
-      raises (NotFound);
-    // Returns the startup information for a given <server>.
-    //
-    // The <NotFound> exception is raised when <server> is not found
-    // in the Implementation Repository.
-
-    void list (in unsigned long how_many,
-               out ServerInformationList server_list,
-               out ServerInformationIterator server_iterator);
-    // 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.
+    string command_line_;
+    // Command line options
+    string environment_;
+    // Environment
+    string working_directory_;
+    // Working directory
+    unsigned long creation_flags_;
+    // Creation flags
   };
 
-  interface ServerInformationIterator
-  {
-    // = TITLE
-    // Interface for iterating over servers returned with
-    // Administration::list ().
-
-    boolean next_n (in unsigned long how_many,
-		    out ServerInformationList server_list);
-    // This operation returns at most the requested number of
-    // servers.
-
-    void destroy ();
-    // This operation destroys the iterator.
-  };
+  Object activate_object (in Object obj)
+    raises (Not_Found,
+            Cannot_Activate);
+  // Restart server that will contain this persistent object and return the
+  // new Object reference.
+  //
+  // The <Not_Found> exception is raised when <obj> is not found
+  // in the Implementation Repository.  The <Cannot_Activate> exception
+  // is raised when <obj> is found in the Repository but could not be
+  // activated.
+
+  INET_Addr activate_server (in string server)
+    raises (Not_Found,
+            Cannot_Activate);
+  // Restart server that is named <server> and return the host/port
+  //
+  // The <Not_Found> exception is raised when <server> is not found
+  // in the Implementation Repository.  The <Cannot_Activate> exception
+  // is raised when <server> is found in the Repository but could not be
+  // activated.
+
+
+  void register_server (in string server,
+                        in Process_Options options)
+    raises (Already_Registered);
+  // Register the <options> to specify how the <server> should be
+  // restarted when a client asks for it.  
+  //
+  // The <Already_Registered> exception is raised when <server> has
+  // already been registered with the Implementation Repository.
+
+  void reregister_server (in string server,
+                          in Process_Options options);
+  // Update the <options> to specify how the <server> should be
+  // restarted when a client asks for it.  Will register the server
+  // if not already registered.
+
+  void remove_server (in string server)
+    raises (Not_Found);
+  // Remove <server> from the Implementation Repository.
+  //
+  // The <Not_Found> exception is raised when <server> is not found
+  // in the Implementation Repository.
+
+  INET_Addr server_is_running (in string server,
+                               in INET_Addr addr,
+                               in Object ping)
+    raises (Not_Found);
+  // Used to notify the Implementation Repository that <server> is alive and
+  // well at <addr>.
+
+  void server_is_shutting_down (in string server)
+    raises (Not_Found);
+  // Used to tell the Implementation Repository that <server> is shutting
+  // down.
 };
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
index a61897aec58..907126cacaf 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "LoggerC.h"
-#include "Logger_i.h"
+#include "orbsvcs/LoggerC.h"
+#include "orbsvcs/Log/Logger_i.h"
 #include "ace/ACE.h"
 #include "ace/INET_Addr.h"
 #include "ace/Log_Record.h"
@@ -18,7 +18,7 @@ Logger_Factory_i::~Logger_Factory_i (void)
 
 Logger_ptr
 Logger_Factory_i::make_logger (const char *name,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -46,7 +46,7 @@ Logger_Factory_i::make_logger (const char *name,
   if (hash_map_.bind (name, result) == -1)
     {
       delete result;
-      ACE_THROW_RETURN (CORBA::UNKNOWN (),
+      TAO_THROW_RETURN (CORBA::UNKNOWN (),
                         Logger::_nil ());
     }
   else
@@ -61,7 +61,7 @@ Logger_Factory_i::make_logger (const char *name,
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
-  return result->_this (ACE_TRY_ENV);
+  return result->_this (TAO_IN_ENV);
 }
 
 Logger_i::Logger_i (const char *name)
@@ -111,27 +111,27 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 
 void
 Logger_i::log (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_, TAO_IN_ENV);
 }
 
 void
 Logger_i::log2 (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_, TAO_IN_ENV);
 }
 
 void
 Logger_i::logv2 (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity, TAO_IN_ENV);
 }
 
 void
@@ -185,6 +185,12 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
   // verbosity
 }
 
+Logger::Verbosity_Level
+Logger_i::verbosity (void) const
+{
+  return verbosity_level_;
+}
+
 void
 Logger_i::verbosity (Logger::Verbosity_Level level,
                      CORBA::Environment &)
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
index c23a0659134..816ef1f7120 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
@@ -20,7 +20,7 @@
 #ifndef TAO_ORBSVCS_LOGGER_I_H
 #define TAO_ORBSVCS_LOGGER_I_H
 
-#include "LoggerS.h"
+#include "orbsvcs/LoggerS.h"
 
 class Logger_i : public virtual POA_Logger
 {
@@ -34,36 +34,33 @@ public:
   // destructor
 
   virtual void log (const Logger::Log_Record &log_rec,
-                    CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+                    CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
                      Logger::Verbosity_Level verbosity,
-                     CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+                     CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
   virtual void log2 (const Logger::Log_Record &log_rec,
-                     CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+                     CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
   
   virtual void logv2 (const Logger::Log_Record &log_rec,
                       Logger::Verbosity_Level verbosity,
-                      CORBA::Environment & ACE_TRY_ENV=
-                    TAO_default_environment ())
+                      CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-   void verbosity (Logger::Verbosity_Level level, 
-                  CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ())
+  Logger::Verbosity_Level verbosity (void) const;
+  // Gets the verbosity level
+
+  void verbosity (Logger::Verbosity_Level level, CORBA::Environment &env)
     ACE_THROW_SPEC (());
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
@@ -86,7 +83,7 @@ private:
   // reset by the client to a new value at any point.
 };
 
-class Logger_Factory_i : public virtual POA_Logger_Factory
+class TAO_ORBSVCS_Export Logger_Factory_i : public virtual POA_Logger_Factory
 {
   // = TITLE
   //     Create a <Logger> of type <name>.
@@ -98,13 +95,12 @@ public:
   // Destructor.
 
   virtual Logger_ptr make_logger (const char *name,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+                                  CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
   // logger of name <name> is returned
-  
+
 private:
   ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> hash_map_;
   // Calls to <make_logger> will create a new instance of <Logger> and
diff --git a/TAO/orbsvcs/orbsvcs/Log/Makefile.am b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
new file mode 100644
index 00000000000..81a356344ff
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
@@ -0,0 +1,34 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Logging Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  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
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Logger.la
+
+libTAO_Logger_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Logger_la_SOURCES = \
+        Logger_i.cpp
+
+noinst_HEADERS = \
+        Logger_i.h
+
+## 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
+
diff --git a/TAO/examples/Logging/Logger.idl b/TAO/orbsvcs/orbsvcs/Logger.idl
index 7feaeafcfb6..7feaeafcfb6 100644
--- a/TAO/examples/Logging/Logger.idl
+++ b/TAO/orbsvcs/orbsvcs/Logger.idl
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index eba72d3ce4e..778647db381 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -24,12 +24,12 @@ endif
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
-        -I$(TAO_ROOT) -Ge 1 \
+        -I$(TAO_ROOT) \
         -Wb,export_macro=TAO_ORBSVCS_Export \
         -Wb,export_include=orbsvcs_export.h \
         $(TAO_LACKS_EVENT_CHANNEL_ANY)
 
-VPATH=.:Naming:Time:Concurrency:Property:Trader:Sched:Event:CosEvent:AV:
+VPATH=.:Naming:Time:Log:Concurrency:Property:Trader:Sched:Event:CosEvent:AV:
 
 LIBS    += -lTAO -lACE
 
@@ -48,6 +48,8 @@ ifndef TAO_ORBSVCS
   TAO_ORBSVCS = Naming \
                 ImplRepo \
                 Time \
+                Log \
+                Concurrency \
                 Property \
                 Trader \
                 LifeCycle \
@@ -56,11 +58,6 @@ ifndef TAO_ORBSVCS
                 CosEvent \
                 Event2 \
                 AV
-
-# This services is not compiled by default, it is rarely used and it
-# is not prepared to deal with exceptions
-#                Concurrency \
-
 endif # TAO_ORBSVCS
 
 ####
@@ -77,7 +74,7 @@ ifneq (,$(findstring AV,$(TAO_ORBSVCS)))
         AV/AVStreams_i \
         AV/Endpoint_Strategy \
         AV/Endpoint_Strategy_T\
-        AV/sfp
+	AV/sfp
 endif # AV
 
 ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
@@ -111,14 +108,14 @@ ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
         Event/EC_Timeout_Filter \
         Event/EC_Timeout_Generator \
         Event/EC_Reactive_Timeout_Generator \
-        Event/EC_Priority_Dispatching \
-        Event/EC_MT_Dispatching \
-        Event/EC_Dispatching_Task \
-        Event/EC_Sched_Filter \
-        Event/EC_Sched_Filter_Builder \
-        Event/EC_Scheduling_Strategy \
-        Event/EC_Null_Scheduling \
-        Event/EC_Priority_Scheduling
+	Event/EC_Priority_Dispatching \
+	Event/EC_MT_Dispatching \
+	Event/EC_Dispatching_Task \
+	Event/EC_Sched_Filter \
+	Event/EC_Sched_Filter_Builder \
+	Event/EC_Scheduling_Strategy \
+	Event/EC_Null_Scheduling \
+	Event/EC_Priority_Scheduling
 
   #### TAO's Event requires its Sched Service.
   ifeq (,$(findstring Sched,$(TAO_ORBSVCS)))
@@ -134,7 +131,7 @@ ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
         CosEvent/EventChannel_i \
         CosEvent/ProxyPushConsumer_i \
         CosEvent/ProxyPushSupplier_i \
-        CosEvent_Utilities
+	CosEvent_Utilities
 endif # CosEvent
 
 ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
@@ -169,8 +166,6 @@ ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
         Scheduler_Utilities \
         Sched/Config_Scheduler \
         Sched/DynSched \
-        Sched/Reconfig_Scheduler \
-        Sched/Reconfig_Sched_Utils \
         Sched/SchedEntry \
         Sched/Scheduler \
         Sched/Scheduler_Generic \
@@ -226,6 +221,12 @@ ifneq (,$(findstring Concurrency,$(TAO_ORBSVCS)))
         Concurrency/Concurrency_Utils
 endif # Concurrency
 
+ifneq (,$(findstring Log,$(TAO_ORBSVCS)))
+  IDL_SRCS += Logger
+  TAO_ORBSVCS_SRCS += \
+        Log/Logger_i
+endif # Log
+
 ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
   IDL_SRCS += TimeBase TimeService
   TAO_ORBSVCS_SRCS += \
@@ -244,8 +245,8 @@ ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
 endif # Time
 
 ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  IDL_SRCS += ImplRepo
-  TAO_ORBSVCS_SRCS += IR_Helper
+  IDL_SRCS += Ping ImplRepo
+  TAO_ORBSVCS_SRCS +=
 endif # ImplRepo
 
 ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
@@ -255,7 +256,7 @@ ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
         Naming/Naming_Context \
         Naming/Hash_Naming_Context \
         Naming/Persistent_Naming_Context \
-        Naming/Transient_Naming_Context \
+	Naming/Transient_Naming_Context \
         Naming/Persistent_Entries \
         Naming/Entries \
         Naming/Persistent_Context_Index \
@@ -301,6 +302,7 @@ $(foreach ext, $(IDL_EXT), LifeCycleService$(ext)): CosLifeCycle.idl
 $(foreach ext, $(IDL_EXT), CosLifeCycle$(ext)): CosNaming.idl
 $(foreach ext, $(IDL_EXT), AVStreams_Full$(ext)): AVStream.idl
 $(foreach ext, $(IDL_EXT), AVStreams$(ext)): CosPropertyService.idl
+$(foreach ext, $(IDL_EXT), ImplRepo$(ext)): Ping.idl
 #$(foreach ext, $(IDL_EXT), CosConcurrencyControl$(ext)): CosTransactions.idl
 
 .PRECIOUS: $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext))))
@@ -309,11 +311,11 @@ idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
 realclean: clean
 	-$(RM) $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
-	@sh $(ACE_ROOT)/bin/ace_components --orbsvcs --remove
+	@$(ACE_ROOT)/bin/ace_components --orbsvcs --remove
 
 .PHONY: ORBSVCS_COMPONENTS
 ORBSVCS_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --orbsvcs --set ' $(TAO_ORBSVCS) '
+	@$(ACE_ROOT)/bin/ace_components --orbsvcs --set " $(TAO_ORBSVCS) "
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -432,25 +434,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -498,9 +491,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -694,25 +691,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -760,9 +748,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -953,25 +945,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1019,9 +1002,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1211,25 +1198,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1277,9 +1255,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1471,25 +1453,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1537,9 +1510,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1749,19 +1726,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1807,9 +1775,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2012,19 +1984,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -2070,9 +2033,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2279,19 +2246,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -2337,9 +2295,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2542,19 +2504,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -2600,9 +2553,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2789,25 +2746,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2855,9 +2803,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3051,25 +3003,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3117,9 +3060,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3314,25 +3261,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3380,9 +3318,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3574,25 +3516,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3640,9 +3573,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3836,25 +3773,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3902,9 +3830,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4098,25 +4030,527 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
+ CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
+ CosPropertyServiceS.i
+.obj/CosConcurrencyControlS.o .obj/CosConcurrencyControlS.so .shobj/CosConcurrencyControlS.o .shobj/CosConcurrencyControlS.so: CosConcurrencyControlS.cpp \
+ CosConcurrencyControlS.h CosConcurrencyControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS_T.h \
+ CosConcurrencyControlS_T.i CosConcurrencyControlS_T.cpp \
+ CosConcurrencyControlS.i
+.obj/LoggerS.o .obj/LoggerS.so .shobj/LoggerS.o .shobj/LoggerS.so: LoggerS.cpp LoggerS.h LoggerC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4164,9 +4598,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4246,9 +4684,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
- CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
- CosPropertyServiceS.i
+ orbsvcs_export.h LoggerC.i LoggerS_T.h LoggerS_T.i LoggerS_T.cpp \
+ LoggerS.i
 .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -4374,19 +4811,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -4432,9 +4860,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4634,19 +5066,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -4692,9 +5115,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4770,7 +5197,7 @@ ORBSVCS_COMPONENTS:
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i TimeServiceC.h TimeServiceC.i \
  TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp TimeServiceS.i
-.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h ImplRepoC.h \
+.obj/PingS.o .obj/PingS.so .shobj/PingS.o .shobj/PingS.so: PingS.cpp PingS.h PingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -4879,25 +5306,269 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i
+.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h PingS.h PingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4945,9 +5616,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5027,8 +5702,9 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i \
- ImplRepoS_T.cpp ImplRepoS.i
+ orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i \
+ ImplRepoC.h ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \
+ ImplRepoS.i
 .obj/CosNamingS.o .obj/CosNamingS.so .shobj/CosNamingS.o .shobj/CosNamingS.so: CosNamingS.cpp CosNamingS.h CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5138,25 +5814,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5204,9 +5871,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5397,25 +6068,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5463,9 +6125,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5546,7 +6212,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  orbsvcs_export.h CosPropertyServiceC.h CosPropertyServiceC.i \
- AVStreamsC.i
+ AVStreamsC.i AVStreamsS.h CosPropertyServiceS.h \
+ CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i AVStreamsS_T.h \
+ AVStreamsS_T.i AVStreamsS_T.cpp AVStreamsS.i
 .obj/Null_MediaCtrlC.o .obj/Null_MediaCtrlC.so .shobj/Null_MediaCtrlC.o .shobj/Null_MediaCtrlC.so: Null_MediaCtrlC.cpp Null_MediaCtrlC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5656,25 +6325,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5722,9 +6382,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5804,7 +6468,9 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h Null_MediaCtrlC.i
+ orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS.h \
+ Null_MediaCtrlS_T.h Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp \
+ Null_MediaCtrlS.i
 .obj/sfpC.o .obj/sfpC.so .shobj/sfpC.o .shobj/sfpC.so: sfpC.cpp sfpC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5914,25 +6580,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5980,9 +6637,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6062,7 +6723,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h sfpC.i
+ orbsvcs_export.h sfpC.i sfpS.h sfpS_T.h sfpS_T.i sfpS_T.cpp sfpS.i
 .obj/CosEventCommC.o .obj/CosEventCommC.so .shobj/CosEventCommC.o .shobj/CosEventCommC.so: CosEventCommC.cpp CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -6172,25 +6833,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6238,9 +6890,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6320,7 +6976,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosEventCommC.i
+ orbsvcs_export.h CosEventCommC.i CosEventCommS.h CosEventCommS_T.h \
+ CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i
 .obj/CosEventChannelAdminC.o .obj/CosEventChannelAdminC.so .shobj/CosEventChannelAdminC.o .shobj/CosEventChannelAdminC.so: CosEventChannelAdminC.cpp \
  CosEventChannelAdminC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6431,25 +7088,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6497,9 +7145,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6580,7 +7232,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  orbsvcs_export.h CosEventCommC.h CosEventCommC.i \
- CosEventChannelAdminC.i
+ CosEventChannelAdminC.i CosEventChannelAdminS.h CosEventCommS.h \
+ CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \
+ CosEventCommS.i CosEventChannelAdminS_T.h CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp CosEventChannelAdminS.i
 .obj/RtecEventCommC.o .obj/RtecEventCommC.so .shobj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -6690,25 +7345,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6756,9 +7402,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6838,7 +7488,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h TimeBaseC.h TimeBaseC.i RtecEventCommC.i
+ orbsvcs_export.h TimeBaseC.h TimeBaseC.i RtecEventCommC.i \
+ RtecEventCommS.h TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i \
+ TimeBaseS_T.cpp TimeBaseS.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i
 .obj/RtecEventChannelAdminC.o .obj/RtecEventChannelAdminC.so .shobj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \
  RtecEventChannelAdminC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6949,25 +7602,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7015,9 +7659,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7099,7 +7747,13 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  orbsvcs_export.h RtecEventCommC.h TimeBaseC.h TimeBaseC.i \
  RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i
+ RtecEventChannelAdminC.i RtecEventChannelAdminS.h RtecEventCommS.h \
+ TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
+ RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
+ RtecEventCommS.i RtecSchedulerS.h RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i RtecSchedulerS_T.cpp RtecSchedulerS.i \
+ RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i
 .obj/RtecUDPAdminC.o .obj/RtecUDPAdminC.so .shobj/RtecUDPAdminC.o .shobj/RtecUDPAdminC.so: RtecUDPAdminC.cpp RtecUDPAdminC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7209,25 +7863,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7275,9 +7920,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7358,7 +8007,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  orbsvcs_export.h RtecEventCommC.h TimeBaseC.h TimeBaseC.i \
- RtecEventCommC.i RtecUDPAdminC.i
+ RtecEventCommC.i RtecUDPAdminC.i RtecUDPAdminS.h RtecEventCommS.h \
+ TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
+ RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
+ RtecEventCommS.i RtecUDPAdminS_T.h RtecUDPAdminS_T.i \
+ RtecUDPAdminS_T.cpp RtecUDPAdminS.i
 .obj/RtecSchedulerC.o .obj/RtecSchedulerC.so .shobj/RtecSchedulerC.o .shobj/RtecSchedulerC.so: RtecSchedulerC.cpp RtecSchedulerC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7468,25 +8121,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7534,9 +8178,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7616,7 +8264,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h TimeBaseC.h TimeBaseC.i RtecSchedulerC.i
+ orbsvcs_export.h TimeBaseC.h TimeBaseC.i RtecSchedulerC.i \
+ RtecSchedulerS.h TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i \
+ TimeBaseS_T.cpp TimeBaseS.i RtecSchedulerS_T.h RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp RtecSchedulerS.i
 .obj/CosLifeCycleC.o .obj/CosLifeCycleC.so .shobj/CosLifeCycleC.o .shobj/CosLifeCycleC.so: CosLifeCycleC.cpp CosLifeCycleC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7726,25 +8377,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7792,9 +8434,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7874,7 +8520,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosNamingC.h CosNamingC.i CosLifeCycleC.i
+ orbsvcs_export.h CosNamingC.h CosNamingC.i CosLifeCycleC.i \
+ CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
+ CosLifeCycleS_T.cpp CosLifeCycleS.i
 .obj/LifeCycleServiceC.o .obj/LifeCycleServiceC.so .shobj/LifeCycleServiceC.o .shobj/LifeCycleServiceC.so: LifeCycleServiceC.cpp LifeCycleServiceC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7984,25 +8633,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8050,9 +8690,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8133,7 +8777,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  orbsvcs_export.h CosLifeCycleC.h CosNamingC.h CosNamingC.i \
- CosLifeCycleC.i LifeCycleServiceC.i
+ CosLifeCycleC.i LifeCycleServiceC.i LifeCycleServiceS.h \
+ CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
+ CosLifeCycleS_T.cpp CosLifeCycleS.i LifeCycleServiceS_T.h \
+ LifeCycleServiceS_T.i LifeCycleServiceS_T.cpp LifeCycleServiceS.i
 .obj/CosTradingC.o .obj/CosTradingC.so .shobj/CosTradingC.o .shobj/CosTradingC.so: CosTradingC.cpp CosTradingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -8243,25 +8891,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8309,9 +8948,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8391,7 +9034,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosTradingC.i
+ orbsvcs_export.h CosTradingC.i CosTradingS.h CosTradingS_T.h \
+ CosTradingS_T.i CosTradingS_T.cpp CosTradingS.i
 .obj/CosTradingDynamicC.o .obj/CosTradingDynamicC.so .shobj/CosTradingDynamicC.o .shobj/CosTradingDynamicC.so: CosTradingDynamicC.cpp CosTradingDynamicC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -8501,25 +9145,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8567,9 +9202,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8649,7 +9288,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingDynamicC.i
+ orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingDynamicC.i \
+ CosTradingDynamicS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
+ CosTradingS_T.cpp CosTradingS.i CosTradingDynamicS_T.h \
+ CosTradingDynamicS_T.i CosTradingDynamicS_T.cpp CosTradingDynamicS.i
 .obj/CosTradingReposC.o .obj/CosTradingReposC.so .shobj/CosTradingReposC.o .shobj/CosTradingReposC.so: CosTradingReposC.cpp CosTradingReposC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -8759,25 +9401,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8825,9 +9458,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8907,7 +9544,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingReposC.i
+ orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingReposC.i \
+ CosTradingReposS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
+ CosTradingS_T.cpp CosTradingS.i CosTradingReposS_T.h \
+ CosTradingReposS_T.i CosTradingReposS_T.cpp CosTradingReposS.i
 .obj/CosPropertyServiceC.o .obj/CosPropertyServiceC.so .shobj/CosPropertyServiceC.o .shobj/CosPropertyServiceC.so: CosPropertyServiceC.cpp CosPropertyServiceC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -9017,25 +9657,272 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS.h \
+ CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i
+.obj/CosConcurrencyControlC.o .obj/CosConcurrencyControlC.so .shobj/CosConcurrencyControlC.o .shobj/CosConcurrencyControlC.so: CosConcurrencyControlC.cpp \
+ CosConcurrencyControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9083,9 +9970,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9165,8 +10056,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosPropertyServiceC.i
-.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
+ orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS.h \
+ CosConcurrencyControlS_T.h CosConcurrencyControlS_T.i \
+ CosConcurrencyControlS_T.cpp CosConcurrencyControlS.i
+.obj/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp LoggerC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -9275,25 +10168,270 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h LoggerC.i LoggerS.h LoggerS_T.h LoggerS_T.i \
+ LoggerS_T.cpp LoggerS.i
+.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9341,9 +10479,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9423,7 +10565,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h TimeBaseC.i
+ orbsvcs_export.h TimeBaseC.i TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i \
+ TimeBaseS_T.cpp TimeBaseS.i
 .obj/TimeServiceC.o .obj/TimeServiceC.so .shobj/TimeServiceC.o .shobj/TimeServiceC.so: TimeServiceC.cpp TimeServiceC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -9533,25 +10676,272 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ orbsvcs_export.h TimeBaseC.h TimeBaseC.i TimeServiceC.i \
+ TimeServiceS.h TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i \
+ TimeBaseS_T.cpp TimeBaseS.i TimeServiceS_T.h TimeServiceS_T.i \
+ TimeServiceS_T.cpp TimeServiceS.i
+.obj/PingC.o .obj/PingC.so .shobj/PingC.o .shobj/PingC.so: PingC.cpp PingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9599,9 +10989,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9681,7 +11075,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h TimeBaseC.h TimeBaseC.i TimeServiceC.i
+ orbsvcs_export.h PingC.i PingS.h PingS_T.h PingS_T.i PingS_T.cpp \
+ PingS.i
 .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -9791,25 +11186,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9857,9 +11243,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9939,7 +11329,9 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h ImplRepoC.i
+ orbsvcs_export.h PingC.h PingC.i ImplRepoC.i ImplRepoS.h PingS.h \
+ PingS_T.h PingS_T.i PingS_T.cpp PingS.i ImplRepoS_T.h ImplRepoS_T.i \
+ ImplRepoS_T.cpp ImplRepoS.i
 .obj/CosNamingC.o .obj/CosNamingC.so .shobj/CosNamingC.o .shobj/CosNamingC.so: CosNamingC.cpp CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -10049,25 +11441,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -10115,9 +11498,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -10197,7 +11584,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- orbsvcs_export.h CosNamingC.i
+ orbsvcs_export.h CosNamingC.i CosNamingS.h CosNamingS_T.h \
+ CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i
 .obj/AVStreams_i.o .obj/AVStreams_i.so .shobj/AVStreams_i.o .shobj/AVStreams_i.so: AV/AVStreams_i.cpp AV/AVStreams_i.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
@@ -10326,25 +11714,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -10392,9 +11771,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -10655,25 +12038,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -10721,9 +12095,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -10982,25 +12360,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -11048,9 +12417,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -11292,25 +12665,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -11358,9 +12722,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -11564,25 +12932,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -11630,9 +12989,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -11745,7 +13108,8 @@ ORBSVCS_COMPONENTS:
  Event/EC_Default_Factory.i Event/EC_Dispatching.h \
  Event/EC_Dispatching.i Event/EC_ConsumerAdmin.h \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -11887,19 +13251,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -11945,9 +13300,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -12046,15 +13405,15 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
  Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \
- Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp
+ Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i
 .obj/EC_SupplierAdmin.o .obj/EC_SupplierAdmin.so .shobj/EC_SupplierAdmin.o .shobj/EC_SupplierAdmin.so: Event/EC_SupplierAdmin.cpp \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
@@ -12184,19 +13543,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -12242,9 +13592,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -12477,19 +13831,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -12535,9 +13880,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -12770,19 +14119,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -12828,9 +14168,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -13046,25 +14390,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -13112,9 +14447,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -13310,25 +14649,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -13376,9 +14706,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -13578,25 +14912,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -13644,9 +14969,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -13760,7 +15089,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -13876,25 +15206,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -13942,9 +15263,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -14140,25 +15465,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -14206,9 +15522,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -14407,25 +15727,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -14473,9 +15784,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -14697,25 +16012,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -14763,9 +16069,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -14956,25 +16266,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -15022,9 +16323,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -15220,25 +16525,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -15286,9 +16582,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -15403,7 +16703,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -15418,8 +16719,7 @@ ORBSVCS_COMPONENTS:
  Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
  Event/EC_Null_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
  Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_ProxyPushSupplier_Set_T.cpp \
  Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
  Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
  Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
@@ -15535,25 +16835,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -15601,9 +16892,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -15799,25 +17094,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -15865,9 +17151,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -16063,25 +17353,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -16129,9 +17410,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -16328,25 +17613,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -16394,9 +17670,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -16603,25 +17883,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -16669,9 +17940,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -16788,7 +18063,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -16803,8 +18079,7 @@ ORBSVCS_COMPONENTS:
  Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
  Event/EC_Null_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
  Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_ProxyPushSupplier_Set_T.cpp \
  Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
  Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
  Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
@@ -16920,25 +18195,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -16986,9 +18252,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -17078,19 +18348,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  Event/EC_Dispatching.i Event/EC_Priority_Dispatching.i \
- Event/EC_MT_Dispatching.h Event/EC_Dispatching_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/EC_Dispatching_Task.i Event/EC_MT_Dispatching.i \
  Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
@@ -17118,7 +18375,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -17138,16 +18396,13 @@ ORBSVCS_COMPONENTS:
  Event/EC_Null_Scheduling.i Event/EC_Priority_Scheduling.h \
  Event/EC_Priority_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
  Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_ProxyPushSupplier_Set_T.cpp \
  Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
  Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
  Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
  Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \
  Event/EC_Event_Channel.h Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
+ $(ACE_ROOT)/ace/Arg_Shifter.h
 .obj/EC_ObserverStrategy.o .obj/EC_ObserverStrategy.so .shobj/EC_ObserverStrategy.o .shobj/EC_ObserverStrategy.so: Event/EC_ObserverStrategy.cpp \
  Event/EC_ObserverStrategy.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -17265,25 +18520,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -17328,9 +18574,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -17446,7 +18696,8 @@ ORBSVCS_COMPONENTS:
  Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
  Event/EC_ProxyConsumer.i Event/EC_ConsumerAdmin.h \
  Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h Event/EC_SupplierAdmin.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
@@ -17566,25 +18817,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -17632,9 +18874,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -17715,6 +18961,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_Defaults.h \
  Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
@@ -17747,8 +18994,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp
+ Event/EC_ProxySupplier.i
 .obj/EC_Per_Supplier_Filter.o .obj/EC_Per_Supplier_Filter.so .shobj/EC_Per_Supplier_Filter.o .shobj/EC_Per_Supplier_Filter.so: Event/EC_Per_Supplier_Filter.cpp \
  Event/EC_Per_Supplier_Filter.h Event/EC_SupplierFiltering.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
@@ -17860,25 +19106,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -17926,9 +19163,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -18042,6 +19283,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/EC_Event_Channel.i Event/EC_ProxyPushSupplier_Set.h \
  Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
+ Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
@@ -18163,25 +19405,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -18229,9 +19462,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -18463,25 +19700,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -18529,9 +19757,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -18736,25 +19968,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -18802,9 +20025,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -19003,25 +20230,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -19069,9 +20287,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -19201,282 +20423,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
-.obj/EC_MT_Dispatching.o .obj/EC_MT_Dispatching.so .shobj/EC_MT_Dispatching.o .shobj/EC_MT_Dispatching.so: Event/EC_MT_Dispatching.cpp \
- Event/EC_MT_Dispatching.h Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_Dispatching_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/EC_Dispatching_Task.i Event/EC_MT_Dispatching.i
 .obj/EC_Dispatching_Task.o .obj/EC_Dispatching_Task.so .shobj/EC_Dispatching_Task.o .shobj/EC_Dispatching_Task.so: Event/EC_Dispatching_Task.cpp \
  Event/EC_Dispatching_Task.h \
  $(ACE_ROOT)/ace/Task.h \
@@ -19620,25 +20566,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -19686,9 +20623,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -19889,25 +20830,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -19955,9 +20887,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -20157,25 +21093,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -20223,9 +21150,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -20458,25 +21389,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -20524,9 +21446,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -20725,25 +21651,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -20791,9 +21708,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -20992,25 +21913,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -21058,9 +21970,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -21285,25 +22201,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -21351,9 +22258,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -21570,25 +22481,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -21636,9 +22538,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -21875,25 +22781,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -21941,9 +22838,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -22183,25 +23084,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -22249,9 +23141,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -22491,25 +23387,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -22557,9 +23444,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -22785,25 +23676,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -22851,9 +23733,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -23104,25 +23990,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -23170,9 +24047,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -23393,25 +24274,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -23459,9 +24331,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -23733,25 +24609,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -23799,9 +24666,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -24079,25 +24950,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -24145,9 +25007,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -24341,25 +25207,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -24407,9 +25264,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -24641,25 +25502,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -24704,9 +25556,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -24974,25 +25830,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -25040,9 +25887,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -25316,25 +26167,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -25382,9 +26224,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -25641,25 +26487,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -25707,9 +26544,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -25988,19 +26829,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -26046,9 +26878,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -26299,19 +27135,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -26357,9 +27184,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -26599,19 +27430,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -26657,9 +27479,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -26883,25 +27709,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -26949,9 +27766,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -27203,25 +28024,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -27266,9 +28078,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -27477,25 +28293,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -27543,9 +28350,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -27757,25 +28568,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -27823,9 +28625,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -28021,25 +28827,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -28087,9 +28884,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -28309,25 +29110,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -28372,9 +29164,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -28464,9 +29260,8 @@ ORBSVCS_COMPONENTS:
  Sched/SchedEntry.i Sched/DynSched.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
-.obj/Reconfig_Scheduler.o .obj/Reconfig_Scheduler.so .shobj/Reconfig_Scheduler.o .shobj/Reconfig_Scheduler.so: Sched/Reconfig_Scheduler.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+.obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -28575,25 +29370,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -28641,9 +29427,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -28724,37 +29514,15 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Reconfig_Scheduler.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- Sched/Reconfig_Sched_Utils.h Sched/Reconfig_Sched_Utils.i \
- Sched/Reconfig_Scheduler.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Reconfig_Sched_Utils.o .obj/Reconfig_Sched_Utils.so .shobj/Reconfig_Sched_Utils.o .shobj/Reconfig_Sched_Utils.so: Sched/Reconfig_Sched_Utils.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Sched/SchedEntry.i
+.obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -28768,6 +29536,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -28862,25 +29634,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -28928,9 +29691,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -29013,31 +29780,13 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Reconfig_Scheduler.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ Sched/Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- Sched/Reconfig_Sched_Utils.h Sched/Reconfig_Sched_Utils.i \
- Sched/Reconfig_Scheduler.i
-.obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ Sched/Scheduler.i
+.obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -29051,13 +29800,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ Sched/Scheduler_Generic.h Sched/Scheduler.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -29072,6 +29817,12 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -29093,12 +29844,33 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -29120,11 +29892,227 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Sched/Scheduler.i Sched/Scheduler_Generic.i
+.obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \
+ Sched/Strategy_Scheduler.h Sched/DynSched.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -29136,6 +30124,37 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -29145,25 +30164,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -29201,9 +30211,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -29211,9 +30218,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -29300,9 +30311,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/SchedEntry.i
-.obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \
+ Sched/SchedEntry.i Sched/DynSched.i Sched/Strategy_Scheduler.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
+.obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Trader/Constraint_Interpreter.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -29316,9 +30328,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -29414,25 +30426,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -29480,9 +30483,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -29563,15 +30570,33 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- Sched/Scheduler.i
-.obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -29585,9 +30610,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Sched/Scheduler_Generic.h Sched/Scheduler.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -29602,12 +30631,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -29629,33 +30652,12 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -29677,6 +30679,22 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -29686,25 +30704,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -29742,6 +30751,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -29749,9 +30761,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -29832,16 +30848,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Scheduler.i Sched/Scheduler_Generic.i
-.obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \
- Sched/Strategy_Scheduler.h Sched/DynSched.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -29851,10 +30883,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -29869,10 +30909,20 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -29881,26 +30931,15 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -29914,16 +30953,16 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- Sched/SchedEntry.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -29935,16 +30974,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -29954,25 +30983,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -30010,6 +31030,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -30017,9 +31040,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -30100,16 +31127,38 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/SchedEntry.i Sched/DynSched.i Sched/Strategy_Scheduler.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Trader/Constraint_Interpreter.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.h Trader/Offer_Database.h Trader/Offer_Iterators.h \
+ Trader/Offer_Database.cpp Trader/Trader_T.cpp \
+ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
+.obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -30221,25 +31270,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -30287,9 +31327,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -30393,10 +31437,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Trader/Trader_Utils.h \
  $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -30410,6 +31451,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -30504,25 +31549,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -30570,9 +31606,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -30676,8 +31716,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Trader/Trader_Utils.h \
  $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \
- Trader/Constraint_Visitors.h Trader/Trader.h \
+.obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \
+ Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -30788,25 +31828,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -30854,9 +31885,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -30956,19 +31991,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.h Trader/Offer_Database.h Trader/Offer_Iterators.h \
- Trader/Offer_Database.cpp Trader/Trader_T.cpp \
- Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \
+ Trader/Offer_Iterators.h Trader/Trader_Utils.h \
+ Trader/Offer_Database.cpp
+.obj/Offer_Iterators.o .obj/Offer_Iterators.so .shobj/Offer_Iterators.o .shobj/Offer_Iterators.so: Trader/Offer_Iterators.cpp Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -30982,17 +32009,14 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -31007,33 +32031,60 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -31045,7 +32096,195 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
+.obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -31054,12 +32293,53 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -31071,6 +32351,27 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -31080,25 +32381,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -31146,9 +32438,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -31230,8 +32526,6 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
@@ -31250,9 +32544,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \
+ Trader/Offer_Database.h Trader/Offer_Database.cpp \
+ Trader/Offer_Iterators_T.cpp
+.obj/Service_Type_Repository.o .obj/Service_Type_Repository.so .shobj/Service_Type_Repository.o .shobj/Service_Type_Repository.so: Trader/Service_Type_Repository.cpp \
+ Trader/Locking.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -31266,10 +32562,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -31364,25 +32656,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -31430,9 +32713,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -31512,10 +32799,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ Trader/Service_Type_Repository.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
@@ -31533,11 +32821,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \
- Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
+.obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -31648,25 +32933,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -31714,9 +32990,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -31816,10 +33096,21 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Iterators.h Trader/Trader_Utils.h \
- Trader/Offer_Database.cpp
-.obj/Offer_Iterators.o .obj/Offer_Iterators.so .shobj/Offer_Iterators.o .shobj/Offer_Iterators.so: Trader/Offer_Iterators.cpp Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Trader.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Offer_Database.h \
+ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ Trader/Constraint_Visitors.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.h Trader/Trader_T.cpp Trader/Trader_Interfaces.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/Arg_Shifter.h
+.obj/Trader_Interfaces.o .obj/Trader_Interfaces.so .shobj/Trader_Interfaces.o .shobj/Trader_Interfaces.so: Trader/Trader_Interfaces.cpp \
+ Trader/Trader_Interfaces.h Trader/Trader_Utils.h Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -31930,25 +33221,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -31996,9 +33278,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -32097,10 +33383,19 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
  Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Trader.h \
+ Trader/Offer_Database.h Trader/Offer_Database.cpp \
+ Trader/Offer_Iterators_T.cpp Trader/Trader_T.h Trader/Trader_T.cpp \
+ Trader/Trader_Interfaces.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
+.obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -32211,25 +33506,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -32277,9 +33563,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -32379,10 +33669,20 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Database.h Trader/Offer_Database.cpp \
- Trader/Offer_Iterators_T.cpp
-.obj/Service_Type_Repository.o .obj/Service_Type_Repository.so .shobj/Service_Type_Repository.o .shobj/Service_Type_Repository.so: Trader/Service_Type_Repository.cpp \
- Trader/Service_Type_Repository.h Trader/Trader.h \
+ Trader/Offer_Database.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Offer_Database.cpp \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.cpp Trader/Trader_Interfaces.h \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
+.obj/Trader_Utils.o .obj/Trader_Utils.so .shobj/Trader_Utils.o .shobj/Trader_Utils.so: Trader/Trader_Utils.cpp Trader/Trader_Utils.h \
+ Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -32493,25 +33793,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -32559,9 +33850,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -32661,8 +33956,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+.obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -32676,14 +33971,17 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -32698,60 +33996,33 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -32763,6 +34034,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -32772,25 +34069,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -32838,9 +34126,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -32920,42 +34212,14 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Offer_Database.h \
- Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- Trader/Constraint_Visitors.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.h Trader/Trader_T.cpp Trader/Trader_Interfaces.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h
-.obj/Trader_Interfaces.o .obj/Trader_Interfaces.so .shobj/Trader_Interfaces.o .shobj/Trader_Interfaces.so: Trader/Trader_Interfaces.cpp \
- Trader/Trader_Interfaces.h Trader/Trader_Utils.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i
+.obj/CC_Lock.o .obj/CC_Lock.so .shobj/CC_Lock.o .shobj/CC_Lock.so: Concurrency/CC_Lock.cpp Concurrency/CC_Lock.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -32965,19 +34229,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -32991,20 +34245,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -33013,38 +34260,27 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -33056,6 +34292,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -33065,25 +34327,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -33131,9 +34384,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -33214,38 +34471,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Offer_Database.h Trader/Offer_Database.cpp \
- Trader/Offer_Iterators_T.cpp Trader/Trader_T.h Trader/Trader_T.cpp \
- Trader/Trader_Interfaces.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
+.obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -33255,19 +34484,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -33281,20 +34500,16 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -33303,38 +34518,27 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -33346,6 +34550,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -33355,25 +34585,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -33421,9 +34642,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -33504,40 +34729,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Database.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Offer_Database.cpp \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.cpp Trader/Trader_Interfaces.h \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/Trader_Utils.o .obj/Trader_Utils.so .shobj/Trader_Utils.o .shobj/Trader_Utils.so: Trader/Trader_Utils.cpp Trader/Trader_Utils.h \
- Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
+.obj/CC_LockSetFactory.o .obj/CC_LockSetFactory.so .shobj/CC_LockSetFactory.o .shobj/CC_LockSetFactory.so: Concurrency/CC_LockSetFactory.cpp \
+ Concurrency/CC_LockSetFactory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -33551,14 +34752,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -33573,39 +34773,59 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -33617,16 +34837,231 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \
+ Concurrency/CC_LockSet.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i
+.obj/Concurrency_Utils.o .obj/Concurrency_Utils.so .shobj/Concurrency_Utils.o .shobj/Concurrency_Utils.so: Concurrency/Concurrency_Utils.cpp \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -33638,6 +35073,32 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -33647,25 +35108,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -33713,9 +35165,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -33796,27 +35252,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
+.obj/Logger_i.o .obj/Logger_i.so .shobj/Logger_i.o .shobj/Logger_i.so: Log/Logger_i.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -33830,10 +35275,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -33928,25 +35369,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -33994,9 +35426,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -34076,11 +35512,18 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
 .obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -34192,25 +35635,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -34258,9 +35692,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -34471,19 +35909,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -34529,9 +35958,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -34730,25 +36163,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -34796,9 +36220,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -35044,19 +36472,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -35102,9 +36521,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -35312,13 +36735,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
@@ -35380,6 +36796,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -35592,19 +37010,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -35650,9 +37059,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -35760,13 +37173,8 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
-.obj/IR_Helper.o .obj/IR_Helper.so .shobj/IR_Helper.o .shobj/IR_Helper.so: IR_Helper.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
+.obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -35776,9 +37184,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
@@ -35829,30 +37241,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -35881,17 +37274,25 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -35938,9 +37339,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -36021,68 +37426,28 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK_IO.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/IIOP_Acceptor.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i
-.obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i
+.obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming/Naming_Context.cpp Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -36191,25 +37556,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -36257,9 +37613,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -36340,29 +37700,14 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i
-.obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming/Naming_Context.cpp Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
+.obj/Hash_Naming_Context.o .obj/Hash_Naming_Context.so .shobj/Hash_Naming_Context.o .shobj/Hash_Naming_Context.so: Naming/Hash_Naming_Context.cpp \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -36372,10 +37717,15 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ Naming/Hash_Naming_Context.h Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -36470,25 +37820,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -36536,9 +37877,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -36624,7 +37969,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
-.obj/Hash_Naming_Context.o .obj/Hash_Naming_Context.so .shobj/Hash_Naming_Context.o .shobj/Hash_Naming_Context.so: Naming/Hash_Naming_Context.cpp \
+.obj/Persistent_Naming_Context.o .obj/Persistent_Naming_Context.so .shobj/Persistent_Naming_Context.o .shobj/Persistent_Naming_Context.so: Naming/Persistent_Naming_Context.cpp \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -36641,7 +37986,8 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Naming/Hash_Naming_Context.h Naming/Naming_Context.h \
+ Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \
+ Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -36739,25 +38085,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -36805,9 +38142,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -36892,8 +38233,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
-.obj/Persistent_Naming_Context.o .obj/Persistent_Naming_Context.so .shobj/Persistent_Naming_Context.o .shobj/Persistent_Naming_Context.so: Naming/Persistent_Naming_Context.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ Naming/Persistent_Entries.h Naming/Shared_Hash_Map_T.h \
+ Naming/Shared_Hash_Map_T.cpp Naming/Persistent_Context_Index.h \
+ Naming/Bindings_Iterator_T.h Naming/Bindings_Iterator_T.cpp
+.obj/Transient_Naming_Context.o .obj/Transient_Naming_Context.so .shobj/Transient_Naming_Context.o .shobj/Transient_Naming_Context.so: Naming/Transient_Naming_Context.cpp \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -36910,7 +38254,7 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \
+ Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \
  Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -37009,25 +38353,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -37075,9 +38410,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -37163,15 +38502,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- Naming/Persistent_Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.i \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.cpp \
- Naming/Persistent_Context_Index.h Naming/Bindings_Iterator_T.h \
+ Naming/Entries.h Naming/Bindings_Iterator_T.h \
  Naming/Bindings_Iterator_T.cpp
-.obj/Transient_Naming_Context.o .obj/Transient_Naming_Context.so .shobj/Transient_Naming_Context.o .shobj/Transient_Naming_Context.so: Naming/Transient_Naming_Context.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/ACE.h \
+.obj/Persistent_Entries.o .obj/Persistent_Entries.so .shobj/Persistent_Entries.o .shobj/Persistent_Entries.so: Naming/Persistent_Entries.cpp \
+ Naming/Persistent_Entries.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -37181,16 +38516,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \
- Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -37285,25 +38614,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -37351,9 +38671,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -37433,17 +38757,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- Naming/Entries.h Naming/Bindings_Iterator_T.h \
- Naming/Bindings_Iterator_T.cpp
-.obj/Persistent_Entries.o .obj/Persistent_Entries.so .shobj/Persistent_Entries.o .shobj/Persistent_Entries.so: Naming/Persistent_Entries.cpp \
- Naming/Persistent_Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \
+ Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
+.obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -37524,8 +38842,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.i \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -37554,25 +38870,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -37620,9 +38927,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -37705,8 +39016,9 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
-.obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+.obj/Persistent_Context_Index.o .obj/Persistent_Context_Index.so .shobj/Persistent_Context_Index.o .shobj/Persistent_Context_Index.so: Naming/Persistent_Context_Index.cpp \
+ Naming/Persistent_Context_Index.h Naming/Persistent_Entries.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -37720,14 +39032,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -37742,58 +39053,33 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -37805,183 +39091,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
-.obj/Persistent_Context_Index.o .obj/Persistent_Context_Index.so .shobj/Persistent_Context_Index.o .shobj/Persistent_Context_Index.so: Naming/Persistent_Context_Index.cpp \
- Naming/Persistent_Context_Index.h Naming/Persistent_Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -37990,53 +39100,12 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -38048,27 +39117,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.i \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -38078,25 +39126,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -38144,9 +39183,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -38229,6 +39272,7 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp \
  Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \
  Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
@@ -38349,25 +39393,16 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -38415,9 +39450,13 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -38522,10 +39561,8 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \
  Naming/Entries.h Naming/Persistent_Context_Index.h \
- Naming/Persistent_Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.i \
- $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.cpp \
+ Naming/Persistent_Entries.h Naming/Shared_Hash_Map_T.h \
+ Naming/Shared_Hash_Map_T.cpp \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
deleted file mode 100644
index bb6ea8f77f9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# Makefile for building the TAO orbsvcs library
-#
-
-NAME = orbsvcs
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
-	-I..\.. -Ge 1 -Wb,export_macro=TAO_ORBSVCS_Export \
-	-Wb,export_include=orbsvcs_export.h
-
-OBJFILES = \
-	$(OBJDIR)\CosEventCommC.obj \
-	$(OBJDIR)\CosEventCommS.obj \
-	$(OBJDIR)\CosEventChannelAdminC.obj \
-	$(OBJDIR)\CosEventChannelAdminS.obj \
-	$(OBJDIR)\CosNamingC.obj \
-	$(OBJDIR)\CosNamingS.obj \
-	$(OBJDIR)\CosLifeCycleC.obj \
-	$(OBJDIR)\CosLifeCycleS.obj \
-	$(OBJDIR)\CosPropertyServiceC.obj \
-	$(OBJDIR)\CosPropertyServiceS.obj \
-	$(OBJDIR)\AVStreamsC.obj \
-	$(OBJDIR)\AVStreamsS.obj \
-	$(OBJDIR)\CosTradingC.obj \
-	$(OBJDIR)\CosTradingS.obj \
-	$(OBJDIR)\CosTradingDynamicC.obj \
-	$(OBJDIR)\CosTradingDynamicS.obj \
-	$(OBJDIR)\CosTradingReposC.obj \
-	$(OBJDIR)\CosTradingReposS.obj \
-	$(OBJDIR)\ImplRepoC.obj \
-	$(OBJDIR)\ImplRepoS.obj \
-	$(OBJDIR)\LifeCycleServiceC.obj \
-	$(OBJDIR)\LifeCycleServiceS.obj \
-	$(OBJDIR)\Null_MediaCtrlC.obj \
-	$(OBJDIR)\Null_MediaCtrlS.obj \
-	$(OBJDIR)\TimeBaseC.obj \
-	$(OBJDIR)\TimeBaseS.obj \
-	$(OBJDIR)\RtecEventCommC.obj \
-	$(OBJDIR)\RtecEventCommS.obj \
-	$(OBJDIR)\RtecSchedulerC.obj \
-	$(OBJDIR)\RtecSchedulerS.obj \
-	$(OBJDIR)\RtecEventChannelAdminC.obj \
-	$(OBJDIR)\RtecEventChannelAdminS.obj \
-	$(OBJDIR)\RtecUDPAdminC.obj \
-	$(OBJDIR)\RtecUDPAdminS.obj \
-	$(OBJDIR)\sfpC.obj \
-	$(OBJDIR)\sfpS.obj \
-	$(OBJDIR)\TimeServiceC.obj \
-	$(OBJDIR)\TimeServiceS.obj \
-	\
-	$(OBJDIR)\AVStreams_i.obj \
-	$(OBJDIR)\BCU.obj \
-	$(OBJDIR)\Config_Scheduler.obj \
-	$(OBJDIR)\Constraint_Interpreter.obj \
-	$(OBJDIR)\Constraint_l.obj \
-	$(OBJDIR)\Constraint_Nodes.obj \
-	$(OBJDIR)\Constraint_Visitors.obj \
-	$(OBJDIR)\Constraint_y.obj \
-	$(OBJDIR)\ConsumerAdmin_i.obj \
-	$(OBJDIR)\CosEvent_Utilities.obj \
-	$(OBJDIR)\CosPropertyService_i.obj \
-	$(OBJDIR)\Dispatching_Modules.obj \
-	$(OBJDIR)\DynSched.obj \
-	$(OBJDIR)\EC_Basic_Factory.obj \
-	$(OBJDIR)\EC_Basic_Filter_Builder.obj \
-	$(OBJDIR)\EC_Busy_Lock.obj \
-	$(OBJDIR)\EC_Conjunction_Filter.obj \
-	$(OBJDIR)\EC_ConsumerAdmin.obj \
-	$(OBJDIR)\EC_Default_Factory.obj \
-	$(OBJDIR)\EC_Disjunction_Filter.obj \
-	$(OBJDIR)\EC_Dispatching.obj \
-	$(OBJDIR)\EC_Dispatching_Task.obj \
-	$(OBJDIR)\EC_Event_Channel.obj \
-	$(OBJDIR)\EC_Factory.obj \
-	$(OBJDIR)\EC_Filter.obj \
-	$(OBJDIR)\EC_Filter_Builder.obj \
-	$(OBJDIR)\EC_Gateway.obj \
-	$(OBJDIR)\EC_Gateway_UDP.obj \
-	$(OBJDIR)\EC_MT_Dispatching.obj \
-	$(OBJDIR)\EC_Null_Factory.obj \
-	$(OBJDIR)\EC_Null_Scheduling.obj \
-	$(OBJDIR)\EC_ObserverStrategy.obj \
-	$(OBJDIR)\EC_Per_Supplier_Filter.obj \
-	$(OBJDIR)\EC_Priority_Dispatching.obj \
-	$(OBJDIR)\EC_Priority_Scheduling.obj \
-	$(OBJDIR)\EC_ProxyConsumer.obj \
-	$(OBJDIR)\EC_ProxyPushSupplier_Set.obj \
-	$(OBJDIR)\EC_ProxySupplier.obj \
-	$(OBJDIR)\EC_QOS_Info.obj \
-	$(OBJDIR)\EC_Reactive_Timeout_Generator.obj \
-	$(OBJDIR)\EC_Sched_Filter.obj \
-	$(OBJDIR)\EC_Sched_Filter_Builder.obj \
-	$(OBJDIR)\EC_Scheduling_Strategy.obj \
-	$(OBJDIR)\EC_Supplier_Filter_Builder.obj \
-	$(OBJDIR)\EC_SupplierAdmin.obj \
-	$(OBJDIR)\EC_SupplierFiltering.obj \
-	$(OBJDIR)\EC_Timeout_Filter.obj \
-	$(OBJDIR)\EC_Timeout_Generator.obj \
-	$(OBJDIR)\EC_Trivial_Supplier_Filter.obj \
-	$(OBJDIR)\EC_Type_Filter.obj \
-	$(OBJDIR)\EC_UDP_Admin.obj \
-	$(OBJDIR)\Endpoint_Strategy.obj \
-	$(OBJDIR)\Entries.obj \
-	$(OBJDIR)\Event_Channel.obj \
-	$(OBJDIR)\Event_Manip.obj \
-	$(OBJDIR)\Event_Utilities.obj \
-	$(OBJDIR)\EventChannel_i.obj \
-	$(OBJDIR)\Hash_Naming_Context.obj \
-	$(OBJDIR)\IOR_Multicast.obj \
-	$(OBJDIR)\IR_Helper.obj \
-	$(OBJDIR)\Local_ESTypes.obj \
-	$(OBJDIR)\Memory_Pools.obj \
-	$(OBJDIR)\Module_Factory.obj \
-	$(OBJDIR)\Naming_Context.obj \
-	$(OBJDIR)\Naming_Utils.obj \
-	$(OBJDIR)\Offer_Iterators.obj \
-	$(OBJDIR)\Persistent_Context_Index.obj \
-	$(OBJDIR)\Persistent_Entries.obj \
-	$(OBJDIR)\Persistent_Naming_Context.obj \
-	$(OBJDIR)\ProxyPushConsumer_i.obj \
-	$(OBJDIR)\ProxyPushSupplier_i.obj \
-	$(OBJDIR)\ReactorTask.obj \
-	$(OBJDIR)\Reconfig_Sched_Utils.obj \
-	$(OBJDIR)\Reconfig_Scheduler.obj \
-	$(OBJDIR)\RT_Task.obj \
-	$(OBJDIR)\Runtime_Scheduler.obj \
-	$(OBJDIR)\SchedEntry.obj \
-	$(OBJDIR)\Scheduler.obj \
-	$(OBJDIR)\Scheduler_Factory.obj \
-	$(OBJDIR)\Scheduler_Generic.obj \
-	$(OBJDIR)\Scheduler_Utilities.obj \
-	$(OBJDIR)\Service_Type_Repository.obj \
-	$(OBJDIR)\sfp.obj \
-	$(OBJDIR)\Strategy_Scheduler.obj \
-	$(OBJDIR)\SupplierAdmin_i.obj \
-	$(OBJDIR)\TAO_Time_Service_Clerk.obj \
-	$(OBJDIR)\TAO_Time_Service_Server.obj \
-	$(OBJDIR)\TAO_TIO.obj \
-	$(OBJDIR)\TAO_UTO.obj \
-	$(OBJDIR)\Time_Utilities.obj \
-	$(OBJDIR)\Timer_Helper.obj \
-	$(OBJDIR)\Timer_Module.obj \
-	$(OBJDIR)\Trader.obj \
-	$(OBJDIR)\Trader_Utils.obj \
-	$(OBJDIR)\Transient_Naming_Context.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_BUILD_CFLAGS) $(ORBSVCS_CFLAGS)
-
-CPPDIR = .;AV;Event;concurrency;Sched;Trader;Naming;CosEvent;Time;Property;Log
-
-IDLDIR = .
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\AVStreamsC.cpp $(IDLDIR)\AVStreamsS.cpp: $(IDLDIR)\AVStreams.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosEventCommC.cpp $(IDLDIR)\CosEventCommS.cpp: $(IDLDIR)\CosEventComm.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosEventChannelAdminC.cpp $(IDLDIR)\CosEventChannelAdminS.cpp: $(IDLDIR)\CosEventChannelAdmin.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosNamingC.cpp $(IDLDIR)\CosNamingS.cpp: $(IDLDIR)\CosNaming.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosLifeCycleC.cpp $(IDLDIR)\CosLifeCycleS.cpp: $(IDLDIR)\CosLifeCycle.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosPropertyServiceC.cpp $(IDLDIR)\CosPropertyServiceS.cpp: $(IDLDIR)\CosPropertyService.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosTradingC.cpp $(IDLDIR)\CosTradingS.cpp: $(IDLDIR)\CosTrading.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosTradingDynamicC.cpp $(IDLDIR)\CosTradingDynamicS.cpp: $(IDLDIR)\CosTradingDynamic.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\CosTradingReposC.cpp $(IDLDIR)\CosTradingReposS.cpp: $(IDLDIR)\CosTradingRepos.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\ImplRepoC.cpp $(IDLDIR)\ImplRepoS.cpp: $(IDLDIR)\ImplRepo.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\LifeCycleServiceC.cpp $(IDLDIR)\LifeCycleServiceS.cpp: $(IDLDIR)\LifeCycleService.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\Null_MediaCtrlC.cpp $(IDLDIR)\Null_MediaCtrlS.cpp: $(IDLDIR)\Null_MediaCtrl.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\RtecEventCommC.cpp $(IDLDIR)\RtecEventCommS.cpp: $(IDLDIR)\RtecEventComm.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\RtecSchedulerC.cpp $(IDLDIR)\RtecSchedulerS.cpp: $(IDLDIR)\RtecScheduler.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\RtecEventChannelAdminC.cpp $(IDLDIR)\RtecEventChannelAdminS.cpp: $(IDLDIR)\RtecEventChannelAdmin.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\RtecUDPAdminC.cpp $(IDLDIR)\RtecUDPAdminS.cpp: $(IDLDIR)\RtecUDPAdmin.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\sfpC.cpp $(IDLDIR)\sfpS.cpp: $(IDLDIR)\sfp.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\TimeBaseC.cpp $(IDLDIR)\TimeBaseS.cpp: $(IDLDIR)\TimeBase.idl
-	$(TAO_IDL) $**
-
-$(IDLDIR)\TimeServiceC.cpp $(IDLDIR)\TimeServiceS.cpp: $(IDLDIR)\TimeService.idl
-	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index be97306e0bc..52b5de70b38 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -10,12 +10,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context,
-                                                                     ITERATOR *hash_iter,
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (ITERATOR *hash_iter,
                                                                      PortableServer::POA_ptr poa,
                                                                      ACE_SYNCH_RECURSIVE_MUTEX &lock)
   : destroyed_ (0),
-    context_ (context),
     hash_iter_ (hash_iter),
     lock_ (lock),
     poa_ (PortableServer::POA::_duplicate (poa))
@@ -26,12 +24,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Na
 template <class ITERATOR, class TABLE_ENTRY>
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   delete hash_iter_;
-
-  // Since we are going away, decrement the reference count on the
-  // Naming Context we were iterating over.
-  context_->interface ()->_remove_ref (ACE_TRY_ENV);
 }
 
 // Return the Default POA of this Servant
@@ -55,6 +48,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  // Check to make sure this object didn't have <destroy> method
+  // invoked on it.
+  if (this->destroyed_)
+    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+
   b = binding;
 
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
@@ -62,27 +60,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
                       this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
-
-  // Check to make sure this object is still valid.
-  if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-
-  // If the context we are iterating over has been destroyed,
-  // self-destruct.
-  if (context_->destroyed ())
-    {
-      destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-    }
-
   // If there are no more bindings.
   if (hash_iter_->done ())
     return 0;
   else
     {
-      // Return a binding.
       TABLE_ENTRY *hash_entry;
       hash_iter_->next (hash_entry);
 
@@ -106,43 +88,31 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
                     CosNaming::BindingList (0),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-  // Obtain the lock.
+  // Obtain a lock.
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  // Check to make sure this object is still valid.
+  // Check to make sure this object didn't have <destroy> method
+  // invoked on it.
   if (this->destroyed_)
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 
-  // If the context we are iterating over has been destroyed,
-  // self-destruct.
-  if (context_->destroyed ())
-    {
-      destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-    }
-
-  // Check for illegal parameter values.
-  if (how_many == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-
   // If there are no more bindings...
   if (hash_iter_->done ())
       return 0;
   else
     {
-      // Initially assume that the iterator has the requested number of
+      // Initially assume that iterator has the requested number of
       // bindings.
       bl->length (how_many);
 
       TABLE_ENTRY *hash_entry;
 
       // Iterate and populate the BindingList.
+
       for (CORBA::ULong i = 0; i < how_many; i++)
         {
           hash_iter_->next (hash_entry);
@@ -152,8 +122,8 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
 
           if (hash_iter_->advance () == 0)
             {
-              // If no more bindings are left, reset length to the actual
-              // number of bindings populated, and get out of the loop.
+              // If no more bindings left, reset length to the actual
+              // number of bindings populated and get out of the loop.
               bl->length (i + 1);
               break;
             }
@@ -172,20 +142,22 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_T
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object is still valid.
+  // Check to make sure this object didn't have <destroy> method
+  // invoked on it.
   if (this->destroyed_)
     ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
 
-  // Mark the object invalid.
-  this->destroyed_ = 1;
+  PortableServer::POA_var poa =
+    this->_default_POA (ACE_TRY_ENV);
+  ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa_->servant_to_id (this,
-                         ACE_TRY_ENV);
+    poa->servant_to_id (this,
+                        ACE_TRY_ENV);
   ACE_CHECK;
 
-  poa_->deactivate_object (id.in (),
-                           ACE_TRY_ENV);
+  poa->deactivate_object (id.in (),
+                          ACE_TRY_ENV);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 177061c8e67..95bffc2582e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -16,7 +16,7 @@
 #ifndef TAO_BINDINGS_ITERATOR_T_H
 #define TAO_BINDINGS_ITERATOR_T_H
 
-#include "Hash_Naming_Context.h"
+#include "orbsvcs/CosNamingS.h"
 
 template <class ITERATOR, class TABLE_ENTRY>
 class TAO_Bindings_Iterator : public virtual PortableServer::RefCountServantBase,
@@ -24,99 +24,64 @@ class TAO_Bindings_Iterator : public virtual PortableServer::RefCountServantBase
 {
   // = TITLE
   //     This class implements the <BindingIterator> interface that is
-  //     part of the <CosNaming> idl module.   This class works with Hash_Map-based
-  //     implementations of CosNaming::NamingContext.
+  //     part of the <CosNaming> idl module based on the Hash_Map
+  //     implementation for CosNaming::NamingContext.
   //
   // = DESCRIPTION
-  //     This class is templatized by the types of the underlying
-  //     hash table iterator and hash table entry, so that it can be
-  //     used for both TAO_Transient_Naming_Context and
-  //     TAO_Persistent_Naming_Context (and any other classes with
-  //     underlying data structures supporting
-  //     ACE_Hash_Map_Manager/Iterator - like interfaces).
-  //
-  //     Instances of <TAO_Bindings_Iterator>s affect reference counts
-  //     of corresponding Naming Contexts. Reference count on a
-  //     Naming Context is incremented by one for a lifetime of each
-  //     instance of <TAO_Bindings_Iterator> created for that
-  //     context, i.e., a Naming Context cannot
-  //     be cleaned up (but, of course, it can be invalidated) before
-  //     all of its iterators have been cleaned up.  When <destroy>
-  //     method is invoked on a Naming Context, all of its iterators are
-  //     destroyed in a "lazy evaluation" fashion, i.e., whenever a next
-  //     operation is invoked on an iterator, and it can detect that
-  //     the corresponding Naming Context has been invalidated, the
-  //     iterator is destroyed.
-  //
+  //     <TAO_Hash_Binding_Iterator> constructor expects a pointer to a
+  //     dynamically allocated hash map iterator. Destructor
+  //     deallocates hash map iterator.
 public:
   // = Intialization and termination methods.
-  TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context,
-                         ITERATOR *hash_iter,
+  TAO_Bindings_Iterator (ITERATOR *hash_iter,
                          PortableServer::POA_ptr poa,
                          ACE_SYNCH_RECURSIVE_MUTEX &lock);
-  // Constructor expects a pointer to a
-  // dynamically allocated hash map iterator (destructor
-  // deallocates hash map iterator).
-
+  // Constructor.
 
   ~TAO_Bindings_Iterator (void);
   // Destructor.
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
   // Returns the Default POA of this Servant object
-
-  // = Idl methods.
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
   CORBA::Boolean next_one (CosNaming::Binding_out b,
                            CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // This operation passes back the next unseen binding.  True is
-  // returned if a binding is passed back, and false is returned otherwise.
+  // This operation returns the next binding.  If there are no more
+  // bindings false is returned.
 
   CORBA::Boolean next_n (CORBA::ULong how_many,
                          CosNaming::BindingList_out bl,
                          CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // This operation passes back at most <how_many> unseen bindings.
-  // True is returned if bindings were passed back, and false is
-  // returned if no bindings were passed back.
+  // This operation returns at most the requested number of bindings.
 
   void destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
+
   // This operation destroys the iterator.
 
   // = Helper method.
 
   static int populate_binding (TABLE_ENTRY *hash_entry,
                                CosNaming::Binding &b);
-  // Helper function used by TAO_*_Naming_Context and
+  // Helper function used by TAO_Hash_Naming_Context and
   // TAO_BindingIterator: populate a binding <b> with info contained
   // in <hash_entry>.  Return 1 if everything went smoothly, 0 if an
   // allocation failed.
 
 private:
   int destroyed_;
-  // Flag indicating whether this iterator is still valid.  (The
-  // iterator becomes invalid when <destroy> method has been invoked
-  // on it, or when <destroy> method has been invoked on the
-  // corresponding Naming Context.) This flag is necessary
-  // because immediate destruction of this servant might not be possible
-  // due to pending requests in the POA.
-
-  TAO_Hash_Naming_Context *context_;
-  // Pointer to the Naming Context we are iterating over.  We need
-  // this pointer to make sure the context is still valid before
-  // each iteration, and to decrement its reference count once we are <destroyed>.
 
   ITERATOR *hash_iter_;
   // A pointer to the hash map iterator.
 
   ACE_SYNCH_RECURSIVE_MUTEX &lock_;
-  // Lock passed on from Naming Context to serialize access to the
+  // Lock passed on from <TAO_NamingContext> to serialize access to the
   // internal data structure.
 
   PortableServer::POA_var poa_;
-  // Implement a different _default_POA().
+  // Implement a different _default_POA()
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 561e07b5273..b22550d89ee 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -32,16 +32,11 @@
 class TAO_ORBSVCS_Export TAO_IntId
 {
   // = TITLE
-  //     Helper class for TAO_Transient_Bindings_Map: unifies several
-  //     data items, so they can be stored together as a  <value>
-  //     for a <key> in a hash table holding the state of a Transient
-  //     Naming Context.
+  //     Stores information a context keeps for each bound name.
   //
   // = DESCRIPTION
-  //     This class holds CORBA Object pointer and a binding type, so
-  //     they can be stored together as a <value> for a <key> in a
-  //     hash table holding the state of a Transient Naming Context.
-  //
+  //     Each bound name is associated with an object reference and
+  //     the type of binding.
 public:
   // = Initialization and termination methods.
   TAO_IntId (void);
@@ -60,28 +55,22 @@ public:
   void operator= (const TAO_IntId & rhs);
   // Assignment operator (does copy memory).
 
-  // = Data members.
-
   CORBA::Object_ptr ref_;
-  // Object reference to be stored in a Transient Naming Context.
+  // CORBA object reference of the bound object.
 
   CosNaming::BindingType type_;
-  // Binding type for <ref_>.
+  // Indicator of whether the object is a NamingContext that should
+  // participate in name resolution when compound names are used.
 };
 
 class TAO_ORBSVCS_Export TAO_ExtId
 {
   // = TITLE
-  //     Helper class for TAO_Transient_Bindings_Map: unifies several
-  //     data items, so they can be stored together as a  <key>
-  //     for a <value> in a hash table holding the state of a Transient
-  //     Naming Context.
+  //    Stores the name to which an object is bound.
   //
   // = DESCRIPTION
-  //     This class holds id and kind strings, so
-  //     they can be stored together as a <key> for a <value> in a
-  //     hash table holding the state of a Transient Naming Context.
-  //
+  //    This class is used as the External ID for the
+  //    <ACE_Hash_Map_Manager>.
 public:
   // = Initialization and termination methods.
 
@@ -98,8 +87,6 @@ public:
   ~TAO_ExtId (void);
   // Destructor.
 
-  // = Assignment and comparison operators.
-
   void operator= (const TAO_ExtId & rhs);
   // Assignment operator (does copy memory).
 
@@ -110,23 +97,18 @@ public:
   // Inequality comparison operator.
 
   u_long hash (void) const;
-  // <hash> function is required in order for this class to be usable by
-  // ACE_Hash_Map_Manager.
-
-  // = Data members.
+  // This class has to have a hash for use with ACE_Hash_Map_Manager.
 
   ACE_CString kind_;
-  // <kind> portion of the name to be associated with some object
-  // reference in a Transient Naming Context.
+  // Any information user wants to store (not used by Naming Service).
 
   ACE_CString id_;
-  // <id> portion of the name to be associated with some object
-  // reference in a Transient Naming Context.
-
-  // = Accessors: return <id_> and <kind_> in a const char * format.
+  // Any information user wants to store (not used by Naming Service).
 
   const char * id (void);
   const char * kind (void);
+  // Accessors.
+
 };
 
 #endif /* TAO_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 24ca105d609..e140e87bdb4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -15,28 +15,17 @@
 #include "ace/Auto_Ptr.h"
 #include "Hash_Naming_Context.h"
 
-ACE_RCSID(Naming, Hash_Naming_Context, "$Id$")
-
-TAO_Bindings_Map::~TAO_Bindings_Map (void)
-{
-}
+ACE_RCSID(Naming, Hash_Naming_Context, "$Id:")
 
 TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (PortableServer::POA_ptr poa,
                                                   const char *poa_id)
   : context_ (0),
-    interface_ (0),
     destroyed_ (0),
     poa_ (PortableServer::POA::_duplicate (poa)),
     poa_id_ (poa_id)
 {
 }
 
-void
-TAO_Hash_Naming_Context::interface (TAO_Naming_Context *i)
-{
-  this->interface_ = i;
-}
-
 TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void)
 {
   delete context_;
@@ -85,6 +74,9 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
       ex.rest_of_name.length (rest_len);
       ex.rest_of_name[rest_len - 1] = name[name_len - 1];
 
+      if (ex.why == CosNaming::NamingContext::not_object)
+        ex.why = CosNaming::NamingContext::missing_node;
+
       ACE_RETHROW;
     }
   ACE_ENDTRY;
@@ -200,20 +192,12 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   else
     // If we received a simple name, we need to rebind it in this
     // context.
-    {
-      int result = this->context_->rebind (n[0].id,
-                                           n[0].kind,
-                                           obj,
-                                           CosNaming::nobject);
-      // Check for error conditions.
-      if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
-
-      else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_object,
-                    n));
-    }
+    if (this->context_->rebind (n[0].id,
+                               n[0].kind,
+                               obj,
+                               CosNaming::nobject)
+        == -1)
+      ACE_THROW (CORBA::INTERNAL ());
 }
 
 void
@@ -231,10 +215,6 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   if (this->destroyed_)
     ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
 
-  // Do not allow binding of nil context reference.
-  if (CORBA::is_nil (nc))
-    ACE_THROW (CORBA::BAD_PARAM ());
-
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
@@ -311,23 +291,14 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
       context->rebind_context (simple_name, nc, ACE_TRY_ENV);
       ACE_CHECK;
     }
+  // If we received a simple name, we need to rebind it in this
+  // context.
   else
-    // If we received a simple name, we need to rebind it in this
-    // context.
-    {
-      int result = this->context_->rebind (n[0].id,
-                                           n[0].kind,
-                                           nc,
-                                           CosNaming::ncontext);
-      // Check for error conditions.
-      if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
-
-      else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_context,
-                    n));
-    }
+    if (this->context_->rebind (n[0].id,
+                               n[0].kind,
+                               nc,
+                               CosNaming::ncontext) < 0)
+      ACE_THROW (CORBA::INTERNAL ());
 }
 
 CORBA::Object_ptr
@@ -364,7 +335,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
                             obj,
                             type) == -1)
     ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                      (CosNaming::NamingContext::missing_node,
+                      (CosNaming::NamingContext::not_object,
                        n),
                       CORBA::Object::_nil ());
 
@@ -466,7 +437,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
     if (this->context_->unbind (n[0].id,
                                 n[0].kind) == -1)
       ACE_THROW (CosNaming::NamingContext::NotFound
-                 (CosNaming::NamingContext::missing_node,
+                 (CosNaming::NamingContext::not_object,
                   n));
 }
 
@@ -539,8 +510,6 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
 
   else
     {
-      this->destroyed_ = 1;
-
       // Remove self from POA.  Because of reference counting, the POA
       // will automatically delete the servant when all pending requests
       // on this servant are complete.
@@ -565,15 +534,3 @@ TAO_Hash_Naming_Context::root (void)
   return (ACE_OS::strcmp (this->poa_id_.fast_rep (),
                           TAO_ROOT_NAMING_CONTEXT) == 0);
 }
-
-int
-TAO_Hash_Naming_Context::destroyed (void)
-{
-  return this->destroyed_;
-}
-
-TAO_Naming_Context *
-TAO_Hash_Naming_Context::interface (void)
-{
-  return this->interface_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index b37759e94cf..23602bc0459 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -37,9 +37,6 @@ class TAO_ORBSVCS_Export TAO_Bindings_Map
 
 public:
 
-  virtual ~TAO_Bindings_Map (void);
-  // Destructor.
-
   virtual size_t current_size (void) = 0;
   // Return current number of entries (name bindings) in the
   // underlying hash map.
@@ -98,26 +95,13 @@ public:
                            const char *poa_id);
   // Constructor.
 
-  void interface (TAO_Naming_Context *i);
-  // Set our <interface_> pointer.
-
   virtual ~TAO_Hash_Naming_Context (void);
   // Destructor.
 
-  // = Accessors.
-
-  TAO_Naming_Context *interface (void);
-  // Get the pointer to our <interface>.
+  // = CosNaming::NamingContext idl interface methods.
 
   int root (void);
-  // Returns true if this Naming Context is a root Naming Context for
-  // the server, and false otherwise.
-
-  int destroyed (void);
-  // Returns true if this context had <destroy> operation invoked on
-  // it, and false otherwise.
-
-  // = CosNaming::NamingContext idl interface methods.
+  //
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj,
@@ -200,19 +184,13 @@ protected:
   // bindings.  <context_> is initialized with a concrete data
   // structure by subclasses, which know which data structure to use.
 
-  TAO_Naming_Context *interface_;
-  // Pointer to the <interface> object for which we serve as a
-  // <concrete implementation>, i.e., the object that delegates to us
-  // all client CosNaming::NamingContext CORBA calls.
-  // We need this pointer for reference counting.
-
   ACE_SYNCH_RECURSIVE_MUTEX lock_;
   // Lock used to serialize access to the underlying data structure.
 
   int destroyed_;
-  // Flag indicating whether this Naming Context is no longer valid.
-  // This flag is necessary because immediate destruction
-  // might not be possible if there are pending requests on this servant
+  // Flag indicating whether this Naming Context has had <destroy> method
+  // invoked on it.  This is necessary because immediate destruction
+  // may not be possible if there are pending requests on this servant
   // in the POA.
 
   PortableServer::POA_var poa_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
index 335fb60c1ee..fc43c2eb9a3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
@@ -138,7 +138,3 @@ TAO_Naming_Context::list (CORBA::ULong how_many,
 {
   impl_->list (how_many, bl, bi, ACE_TRY_ENV);
 }
-
-TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
index 7aadc9fe6bf..a48ea9b3812 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
@@ -204,9 +204,6 @@ class TAO_ORBSVCS_Export TAO_Naming_Context_Impl
 
 public:
 
-  virtual ~TAO_Naming_Context_Impl (void);
-  // Destructor.
-
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index eba715964bf..3d8d2261c6f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -11,10 +11,10 @@
 ACE_RCSID(Naming, Naming_Utils, "$Id$")
 
 TAO_Naming_Server::TAO_Naming_Server (void)
-  : naming_context_ (),
+  : naming_context_impl_ (0),
+    naming_context_ (),
     ior_multicast_ (0),
-    naming_service_ior_ (),
-    context_index_ (0)
+    naming_service_ior_ ()
 {
 }
 
@@ -24,10 +24,10 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
                                       ACE_Time_Value *timeout,
                                       int resolve_for_existing_naming_service,
                                       LPCTSTR persistence_location)
-  : naming_context_ (),
+  : naming_context_impl_ (0),
+    naming_context_ (),
     ior_multicast_ (0),
-    naming_service_ior_ (),
-    context_index_ (0)
+    naming_service_ior_ ()
 {
   if (this->init (orb,
                   poa,
@@ -49,29 +49,48 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                          int resolve_for_existing_naming_service,
                          LPCTSTR persistence_location)
 {
-  if (resolve_for_existing_naming_service)
+  // Don't look for a Naming Service; become one.
+  if (!resolve_for_existing_naming_service)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      return this->init_new_naming (orb,
+                                    poa,
+                                    persistence_location,
+                                    context_size);
+    }
+  else
+    {
+      //
+      // Try to find an existing Naming Service.
+      //
+      CORBA::Object_var naming_obj =
+        orb->resolve_initial_references ("NameService",
+                                         timeout);
+
+      // No luck in finding an existing Naming Service.
+      if (CORBA::is_nil (naming_obj.in ()))
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "\nNameService not resolved, so we'll become a NameService\n"));
+
+          // Become a Naming Service.
+          return this->init_new_naming (orb,
+                                        poa,
+                                        persistence_location,
+                                        context_size);
+        }
+      else
         {
           //
-          // Try to find an existing Naming Service.
+          // Success in finding a Naming Service.
           //
-          CORBA::Object_var naming_obj =
-            orb->resolve_initial_references ("NameService",
-                                             timeout,
-                                             ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "\nNameService found!\n"));
 
-          if (!CORBA::is_nil (naming_obj.in ()))
+          ACE_DECLARE_NEW_CORBA_ENV;
+          ACE_TRY
             {
-              //
-              // Success in finding a Naming Service.
-              //
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "\nNameService found!\n"));
-
               this->naming_context_ =
                 CosNaming::NamingContext::_narrow (naming_obj.in (),
                                                    ACE_TRY_ENV);
@@ -80,28 +99,18 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
               this->naming_service_ior_ =
                 orb->object_to_string (naming_obj.in (),
                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
 
-              return 0;
+              ACE_TRY_CHECK;
             }
+          ACE_CATCHANY
+            {
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
+            }
+          ACE_ENDTRY;
+          ACE_CHECK_RETURN (-1);
         }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "\nWe'll become a NameService\n"));
-
-  // Become a Naming Service.
-  return this->init_new_naming (orb,
-                                poa,
-                                persistence_location,
-                                context_size);
+  return 0;
 }
 
 int
@@ -114,26 +123,24 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
   ACE_TRY
     {
       if (persistence_location != 0)
-        //
-        // Initialize Persistent Naming Service.
-        //
         {
-          // Allocate and initialize Persistent Context Index.
-          ACE_NEW_RETURN (this->context_index_,
+          // This needs to be cleaned up (currently a memory leak) when
+          // TAO_Naming_Server dies.
+          TAO_Persistent_Context_Index *context_index;
+          ACE_NEW_RETURN (context_index,
                           TAO_Persistent_Context_Index (orb, poa),
                           -1);
 
-          if (this->context_index_->open (persistence_location) == -1
-              || this->context_index_->init (context_size) == -1)
-            {
-              if (TAO_debug_level >0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "TAO_Naming_Server: context_index initialization failed\n"));
-              return -1;
-            }
+          if (context_index->open (persistence_location) == -1)
+            ACE_DEBUG ((LM_DEBUG,
+                        "context_index->open failed"));
+
+          if (context_index->init () == -1)
+            ACE_DEBUG ((LM_DEBUG,
+                        "context_index->init failed"));
 
-          // Set the root Naming Context reference and ior.
-          this->naming_service_ior_= this->context_index_->root_ior ();
+          // Set the ior and objref to the root naming context.
+          this->naming_service_ior_= context_index->root_ior ();
 
           CORBA::Object_var obj =
             orb->string_to_object (this->naming_service_ior_.in (),
@@ -144,52 +151,85 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
             CosNaming::NamingContext::_narrow (obj.in (),
                                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
+
+          // To make NS locatable through iioploc.  Right now not
+          // checking the return value.
+          orb->_tao_add_to_IOR_table ("NameService",
+                                      obj.in ());
         }
       else
         {
-          //
-          // Initialize Transient Naming Service.
-          //
+          TAO_Transient_Naming_Context *context_impl = 0;
+          ACE_NEW_RETURN (context_impl,
+                          TAO_Transient_Naming_Context (poa,
+                                                        "NameService",
+                                                        context_size),
+                          -1);
+
+          // Put <context_impl> into the auto pointer temporarily, in case
+          // next allocation fails.
+          ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context> temp (context_impl);
+
+          TAO_Naming_Context *context = 0;
+          ACE_NEW_RETURN (context,
+                          TAO_Naming_Context (context_impl),
+                          -1);
+
+          // Change what we hold in auto pointer.
+          temp.release ();
+          ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
+
+          // Register with the POA.
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId ("NameService");
+
+          poa->activate_object_with_id (id.in (),
+                                        context,
+                                        ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
           this->naming_context_ =
-            TAO_Transient_Naming_Context::make_new_context (poa,
-                                                            TAO_ROOT_NAMING_CONTEXT,
-                                                            context_size,
-                                                            ACE_TRY_ENV);
+            context->_this (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          // Set the root Naming Context ior.
+          // Give POA the ownership of this servant.
+          context->_remove_ref (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          // To make NS locatable through iioploc.  Right now not
+          // checking the return value.
+          orb->_tao_add_to_IOR_table ("NameService",
+                                      this->naming_context_.in ());
+
+          // Stringify the objref we'll be implementing, and print it
+          // to stdout.  Someone will take that string and give it to
+          // a client.
           this->naming_service_ior_=
             orb->object_to_string (this->naming_context_.in (),
                                    ACE_TRY_ENV);
           ACE_TRY_CHECK;
-        }
 
-      // Make the Naming Service locatable through iioploc.
-      if (orb->_tao_add_to_IOR_table ("NameService",
-                                      this->naming_context_.in ())
-          == -1)
-        {
-          if (TAO_debug_level >0)
+          if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Naming_Server: cannot add to ior table.\n"));
-          return -1;
+                        "NameService IOR is <%s>\n",
+                        this->naming_service_ior_.in ()));
+
+          // everything succeeded, so set the pointer, get rid of Auto_Ptr.
+          this->naming_context_impl_ = context;
+          temp2.release ();
         }
 #if defined (ACE_HAS_IP_MULTICAST)
-      //
-      // Install ior multicast handler.
-      //
       // Get reactor instance from TAO.
       ACE_Reactor *reactor =
         TAO_ORB_Core_instance ()->reactor ();
 
       // First, see if the user has given us a multicast port number
-      // on the command-line;
+      // for the name service on the command-line;
       u_short port =
         TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
 
       if (port == 0)
         {
-          // Check environment var. for multicast port.
           const char *port_number =
             ACE_OS::getenv ("NameServicePort");
 
@@ -197,13 +237,10 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
             port = ACE_OS::atoi (port_number);
         }
 
-      // Port wasn't specified on the command-line or in environment -
-      // use the default.
       if (port == 0)
         port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
 
-      // Instantiate a handler which will handle client requests for
-      // the root Naming Context ior, received on the multicast port.
+      // Instantiate a server which will receive requests for an ior
       ACE_NEW_RETURN (this->ior_multicast_,
                       TAO_IOR_Multicast (this->naming_service_ior_.in (),
                                          port,
@@ -217,19 +254,20 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Naming_Server: cannot register Event handler\n"));
+                        "cannot register Event handler\n"));
           return -1;
         }
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Naming_Server: The multicast server setup is done.\n"));
-
+      else
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "The multicast server setup is done.\n"));
+        }
 #endif /* ACE_HAS_IP_MULTICAST */
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Naming Service");
       return -1;
     }
   ACE_ENDTRY;
@@ -238,12 +276,22 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
   return 0;
 }
 
+// Returns the "NameService" NamingContext implementation object.
+
+TAO_Naming_Context &
+TAO_Naming_Server::get_naming_context (void)
+{
+  return *this->naming_context_impl_;
+}
+
 CORBA::String
 TAO_Naming_Server::naming_service_ior (void)
 {
   return CORBA::string_dup (this->naming_service_ior_.in ());
 }
 
+// Returns a pointer to the NamingContext.
+
 CosNaming::NamingContext_ptr
 TAO_Naming_Server::operator-> (void) const
 {
@@ -259,16 +307,19 @@ TAO_Naming_Server::~TAO_Naming_Server (void)
          ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL);
       delete this->ior_multicast_;
     }
-
-  delete context_index_;
+  delete this->naming_context_impl_;
 }
 
+// Returns a pointer to the NamingContext.
+
 CosNaming::NamingContext_ptr
 TAO_Naming_Client::operator -> (void) const
 {
   return this->naming_context_.ptr ();
 }
 
+// Returns a pointer to the NamingContext.
+
 CosNaming::NamingContext_ptr
 TAO_Naming_Client::get_context (void) const
 {
@@ -283,8 +334,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
   ACE_TRY
     {
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", timeout, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService", timeout);
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index 83f4c85eed7..699c883ab97 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -10,7 +10,8 @@
 //    Naming_Utils.h
 //
 // = DESCRIPTION
-//      Implement wrappers useful to Naming Service clients and servers.
+//      This class implements wrapper classes for clients and servers
+//      of the Naming Service.
 //
 // = AUTHORS
 //    Nagarajan Surendran (naga@cs.wustl.edu), Matt Braun
@@ -26,9 +27,6 @@
 #include "orbsvcs/IOR_Multicast.h"
 #include "Naming_Context.h"
 
-// Forward decl;
-class TAO_Persistent_Context_Index;
-
 class TAO_ORBSVCS_Export TAO_Naming_Server
 {
   // = TITLE
@@ -37,28 +35,13 @@ class TAO_ORBSVCS_Export TAO_Naming_Server
   //
   // = DESCRIPTION
   //
-  //    This class either finds an existing Naming Service (if the
-  //    <resolve_for_existing_naming_service> flag is set) or creates
-  //    one (if <resolve_for_existing_naming_service> flag isn't set or
-  //    Naming Service was not found).  This class also defines the
-  //    operator-> so that  <NamingContext> functions like <bind>,
-  //    <unbind> .. can be called directly on a <TAO_Naming_Server>
-  //    object, and be forwareded to the root Naming Context.
-  //    This class is intended to simplify
+  //    This class either finds an existing Naming Service or creates
+  //    one.  It also defines the operator-> so that <NamingContext>
+  //    functions like <bind>, <unbind> .. can be called on a
+  //    <NameServer> object.  This class is intended to simplify
   //    programs that want to play the role of a Naming Service
-  //    server.  To simplify programs that want to play the role of
+  //    servers.  To simplify programs that want to play the role of
   //    Naming Service clients, use <TAO_Naming_Client>.
-  //
-  //    If a Naming Service is created locally, a TAO_IOR_Multicast
-  //    event handler is created and installed on the ORB's reactor.
-  //    This event handler allows other clients on the network to
-  //    discover and use this Naming Service.
-  //    Event handler listens on a multicast port for messages from
-  //    clients looking for a Naming Service, and sends back the ior
-  //    of the root Naming Context.  For more information on how this
-  //    bootstraping through a multicast process works, check out
-  //    orbsvcs/orbsvcs/TAO_IOR_Multicast.*, implementation of
-  //    <resolve_initial_references>, and orbsvcs/Naming/README.
 public:
   TAO_Naming_Server (void);
   // Default constructor.
@@ -69,15 +52,9 @@ public:
                      ACE_Time_Value *timeout = 0,
                      int resolve_for_existing_naming_service = 1,
                      LPCTSTR persistence_location = 0);
-  // Constructor.  Attempts to find an existing Naming Service if
-  // <resolve_for_existing_naming_service> is set to true.  If it is
-  // false, or no Naming Service was found during a <timeout> period,
-  // create the Naming Service in this process.  If creating the
-  // Naming Service locally, make the root context of size
-  // <context_size>, register it under the <poa>, and make the Naming
-  // Service persistent if <persistence_location> is not 0.
-  // (<persistence_location> specifies name of the file to use for
-  // persistent storage).
+  // Either find an existing Naming Service or creates one.  Takes the
+  // POA under which to register the Naming Service implementation
+  // object.
 
   int init (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa,
@@ -85,88 +62,77 @@ public:
             ACE_Time_Value *timeout = 0,
             int resolve_for_existing_naming_service = 1,
             LPCTSTR persistence_location = 0);
-  // Initializer.  Attempts to find an existing Naming Service if
-  // <resolve_for_existing_naming_service> is set to true.  If it is
-  // false, or no Naming Service was found during a <timeout> period,
-  // create the Naming Service in this process.  If creating the
-  // Naming Service locally, make the root context of size
-  // <context_size>, register it under the <poa>, and make the Naming
-  // Service persistent if <persistence_location> is not 0.
-  // (<persistence_location> specifies name of the file to use for
-  // persistent storage).
+  // Either find an existing Naming Service or creates one.  Takes the
+  // POA under which to register the Naming Service implementation
+  // object.
 
   ~TAO_Naming_Server (void);
   // Destructor.
 
+  TAO_Naming_Context &get_naming_context (void);
+  // Returns the "NameService" NamingContext implementation object
+  // reference.
+
   CORBA::String naming_service_ior (void);
   // Returns the IOR of the naming service.
 
   CosNaming::NamingContext_ptr operator-> (void) const;
-  // Returns a <NamingContext_ptr> for the root Naming Context.
+  // Returns a <NamingContext_ptr>.
 
 protected:
   int init_new_naming (CORBA::ORB_ptr orb,
                        PortableServer::POA_ptr root_poa,
                        LPCTSTR persistence_location,
                        size_t context_size);
-  // Helper method: create Naming Service locally.
-  // Make the root context of size
-  // <context_size>, register it under the <root_poa>, and make the Naming
-  // Service persistent if <persistence_location> is not 0.
-  // (<persistence_location> specifies name of the file to use for
-  // persistent storage).
+  // Initialize a new name server under the given ORB and POA.
+
+  TAO_Naming_Context *naming_context_impl_;
+  // Naming context implementation for "NameService".
 
   CosNaming::NamingContext_var naming_context_;
-  // Root NamingContext_ptr.
+  // NamingContext ptr.
 
   TAO_IOR_Multicast *ior_multicast_;
   // The ior_multicast event handler.
 
   CORBA::String_var naming_service_ior_;
-  // The IOR string of the root naming context.
-
-  TAO_Persistent_Context_Index *context_index_;
-  // Pointer to the object used to create/initialize
-  // the Naming Service when local persistent Naming Service is
-  // desired.
+  // The IOR string of the naming service.
 };
 
 class TAO_ORBSVCS_Export TAO_Naming_Client
 {
   // = TITLE
-  //    This class is intended to simplify programs that want to play
-  //    the role of Naming Service clients.
+  //    Defines a wrapper class that simplifies initialization and
+  //    access to a <NamingContext>.
   //
   // = DESCRIPTION
-  //    Wrapper class that locates the root Naming Context.  It also
+  //    This class takes an ORB reference and contacts the
+  //    NamingService naming context object under that.  It also
   //    defines the operator-> so that <NamingContext> functions like
-  //    <resolve>, etc. can be directly called on a
-  //    <TAO_Naming_Client> object, and will be forwarded to the root
-  //    Naming Context.
+  //    <resolve>, etc. can be called on a <NameServer> object.  This
+  //    class is intended to simplify programs that want to play the
+  //    role of a Naming Service clients.
 public:
   // = Initialization and termination methods.
-
   TAO_Naming_Client (void);
   // Default constructor.
 
   int init (CORBA::ORB_ptr orb,
             ACE_Time_Value *timeout = 0);
-  // Look for a Naming Service for a period of <timeout> using
-  // <resolve_initial_references>.  Return 0 if Naming Service is
-  // successfully located, and -1 on failure.
+  // Initialize the name server.
 
   ~TAO_Naming_Client (void);
   // Destructor.
 
   CosNaming::NamingContext_ptr operator-> (void) const;
-  // Returns a pointer to the root Naming Context.
+  // Returns a <NamingContext_ptr>.
 
   CosNaming::NamingContext_ptr get_context (void) const;
-  // Returns a pointer to the root Naming Context.
+  // Returns the NamingContext
 
 protected:
   CosNaming::NamingContext_var naming_context_;
-  // Reference to the root Naming Context.
+  // NamingContext ptr.
 };
 
 #endif /* TAO_NAMING_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 97f8ecad34c..d7053a540dc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -28,7 +28,6 @@ TAO_Persistent_Context_Index::bind (const char *poa_id,
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  // Allocate memory for items to be stored in the table.
   size_t poa_id_len = ACE_OS::strlen (poa_id) + 1;
   size_t counter_len = sizeof (ACE_UINT32);
   char *ptr = (char *) this->allocator_->malloc (poa_id_len + counter_len);
@@ -37,7 +36,6 @@ TAO_Persistent_Context_Index::bind (const char *poa_id,
     return -1;
   else
     {
-      // Populate memory with data.
       counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr);
       *counter = 0;
       char * poa_id_ptr = ptr + counter_len;
@@ -121,12 +119,8 @@ TAO_Persistent_Context_Index::open (LPCTSTR file_name,
 }
 
 int
-TAO_Persistent_Context_Index::init (size_t context_size)
+TAO_Persistent_Context_Index::init (void)
 {
-  // Note: in case of an early exit from this (or helper) function due
-  // to an error condition, we rely on POA to clean up all of the servants
-  // already registered with it.
-
   // Return value of this function (necessary to keep compilers quiet).
   int status = 0;
 
@@ -134,19 +128,63 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
+      // Store the stub we will return from the method here.
+      CosNaming::NamingContext_var result;
+
+      // Put together a servant for the new Naming Context.
+
+      TAO_Persistent_Naming_Context *context_impl = 0;
+      ACE_NEW_RETURN (context_impl,
+                      TAO_Persistent_Naming_Context (poa_.in (),
+                                                     "NameService",
+                                                     this),
+                      -1);
+
+      // Put <context_impl> into the auto pointer temporarily, in case next
+      // allocation fails.
+      ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context> temp (context_impl);
+
+      if (context_impl->init (ACE_DEFAULT_MAP_SIZE) == -1)
+          return -1;
+
+      // register with the index @@need to roll back in case this fails.
+      this->bind ("NameService",
+                  context_impl->counter_,
+                  context_impl->persistent_context_->map ());
+
+      TAO_Naming_Context *context = 0;
+      ACE_NEW_RETURN (context,
+                      TAO_Naming_Context (context_impl),
+                      -1);
+
+      // Change what we hold in auto pointer.
+      temp.release ();
+      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
+
+      // Register with the POA.
       ACE_DECLARE_NEW_CORBA_ENV;
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("NameService");
 
-      CosNaming::NamingContext_var result =
-        TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
-                                                         TAO_ROOT_NAMING_CONTEXT,
-                                                         context_size,
-                                                         this,
-                                                         ACE_TRY_ENV);
+      this->poa_->activate_object_with_id (id.in (),
+                                           context,
+                                           ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+
+      result = context->_this (ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
 
       this->root_ior_=
         orb_->object_to_string (result.in (), ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
+
+      // Give POA the ownership of this servant.
+      context->_remove_ref (ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+
+      // Everything went successfully.
+      status = 0;
+      temp2.release ();
     }
 
   else
@@ -159,16 +197,16 @@ TAO_Persistent_Context_Index::init (size_t context_size)
 int
 TAO_Persistent_Context_Index::recreate_all (void)
 {
-  CONTEXT_INDEX::ITERATOR *index_iter = 0;
+  INDEX::ITERATOR *index_iter = 0;
 
   ACE_NEW_RETURN (index_iter,
-                  (CONTEXT_INDEX::ITERATOR) (*index_),
+                  (INDEX::ITERATOR) (*index_),
                   -1);
 
-  ACE_Auto_Basic_Ptr<CONTEXT_INDEX::ITERATOR> it (index_iter);
+  ACE_Auto_Basic_Ptr<INDEX::ITERATOR> it (index_iter);
 
   // Because of broken old g++!!!
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId,
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
     TAO_Persistent_Index_IntId>  IND_DEF;
 
   IND_DEF::ENTRY *entry = 0;
@@ -176,7 +214,6 @@ TAO_Persistent_Context_Index::recreate_all (void)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
 
-  // For each entry in <index_>, create a Naming Context servant.
   do
     {
       index_iter->next (entry);
@@ -202,13 +239,9 @@ TAO_Persistent_Context_Index::recreate_all (void)
                       TAO_Naming_Context (context_impl),
                       -1);
 
-      // Let <implementation> know about it's <interface>.
-      context_impl->interface (context);
-
-      // Release auto pointer and start using reference counting to
-      // control our servant.
+      // Change what we hold in auto pointer.
       temp.release ();
-      PortableServer::ServantBase_var s = context;
+      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
 
       // Register with the POA.
       ACE_DECLARE_NEW_CORBA_ENV;
@@ -223,13 +256,25 @@ TAO_Persistent_Context_Index::recreate_all (void)
       CosNaming::NamingContext_var result = context->_this (ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
 
-      // If this is the root Naming Context, take a note of it.
+      // Give POA the ownership of this servant.
+      context->_remove_ref (ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+
       if (context_impl->root ())
         {
           this->root_ior_=
             orb_->object_to_string (result.in (), ACE_TRY_ENV);
           ACE_CHECK_RETURN (-1);
         }
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Recreating Naming Context with poa_id %s and counter %d\n",
+                    entry->ext_id_.poa_id_,
+                    (*(context_impl->counter_))));
+
+      temp2.release ();
+
     } while (index_iter->advance ());
 
   return 0;
@@ -238,7 +283,6 @@ TAO_Persistent_Context_Index::recreate_all (void)
 int
 TAO_Persistent_Context_Index::create_index (void)
 {
-  // Make sure that the file name is of the legal length.
   if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN)
     {
       errno = ENAMETOOLONG;
@@ -256,7 +300,7 @@ TAO_Persistent_Context_Index::create_index (void)
 #endif /* CHORUS */
 
   // Create the allocator with the appropriate options.  The name used
-  // for  the lock is the same as one used for the file.
+  // for  the lock is the same one as used for the file.
   ACE_NEW_RETURN (this->allocator_,
                   ALLOCATOR (this->index_file_,
                              this->index_file_,
@@ -264,7 +308,7 @@ TAO_Persistent_Context_Index::create_index (void)
                   -1);
 
 #if !defined (ACE_LACKS_ACCESS)
-  // Now check if the backing store has been created successfully.
+  // Now check if the backing store has been created successfully
   if (ACE_OS::access (this->index_file_, F_OK) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "create_index\n"),
@@ -273,39 +317,25 @@ TAO_Persistent_Context_Index::create_index (void)
 
   void *context_index = 0;
 
-  // This is the easy case since if we find hash table in the
-  // memory-mapped file we know it's already initialized.
+  // This is the easy case since if we find the Context Index Map
+  // we know it's already initialized.
   if (this->allocator_->find (TAO_NAMING_CONTEXT_INDEX, context_index) == 0)
-    this->index_ = (CONTEXT_INDEX *) context_index;
+    this->index_ = (INDEX *) context_index;
 
-  // Create a new <index_> (because we've just created a new
-  // memory-mapped file).
   else
     {
-      size_t index_size = sizeof (CONTEXT_INDEX);
+      size_t index_size = sizeof (INDEX);
       context_index = this->allocator_->malloc (index_size);
 
-      if (context_index == 0
-          || create_index_helper (context_index) == -1
-          || this->allocator_->bind (TAO_NAMING_CONTEXT_INDEX,
-                                     context_index) == -1)
-        {
-          // Attempt to clean up.
-          ACE_ERROR ((LM_ERROR,
-                      "create_index\n"));
-          this->allocator_->remove ();
-          return -1;
-        }
+      // Initialize the map into its memory location (e.g., shared memory).
+      ACE_NEW_RETURN (this->index_,
+                      (context_index) INDEX (this->allocator_),
+                      -1);
+
+      if (this->allocator_->bind (TAO_NAMING_CONTEXT_INDEX, context_index) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "create_index\n"), -1);
     }
-  return 0;
-}
 
-int
-TAO_Persistent_Context_Index::create_index_helper (void *buffer)
-{
-  ACE_NEW_RETURN (this->index_,
-                  (buffer) CONTEXT_INDEX (this->allocator_),
-                  -1);
   return 0;
 }
 
@@ -313,7 +343,7 @@ TAO_Persistent_Context_Index::create_index_helper (void *buffer)
 template class ACE_Auto_Basic_Ptr<TAO_Naming_Context>;
 template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>;
 template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
-template class ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>;
+template class ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>;
 template class ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>;
@@ -324,12 +354,12 @@ template class ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_
 template class ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
-template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>;
+template class ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Naming_Context>
 #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>
+#pragma instantiate ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>
@@ -339,6 +369,6 @@ template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Ind
 #pragma instantiate ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index 2b60b3ede0f..7ad5d9746d6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -22,129 +22,87 @@
 class TAO_ORBSVCS_Export TAO_Persistent_Context_Index
 {
   // = TITLE
-  //     This class facilitates implementation of Persistent
-  //     Naming Service.  It keeps track, centrally, of several pieces of
-  //     info for each Persistent Naming Context, allowing to perform the
-  //     initialization necessary for each Naming Context to
-  //     restore the state of the Naming Service from persistent storage
-  //     on server start-up.
+  //
   //
   // = DESCRIPTION
-  //     This class creates a memory-mapped file, allocates a hash
-  //     table from that file, and uses the hash table to store POA id,
-  //     and table and counter pointers for each Persistent Naming
-  //     Context.  There are methods for adding and deleting entries
-  //     from this hash table as new Persistent Naming Contexts are
-  //     created and old ones are destroyed.  This hash table
-  //     facilitates Persistent Naming Context servant initialization
-  //     upon Naming Server start-up.
+  //
 public:
-  // = Some typedefs for convenience.
-
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId,
-    TAO_Persistent_Index_IntId> CONTEXT_INDEX;
-  // Hash map in which we will store info about each Persistent Naming Context.
 
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId,
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+    TAO_Persistent_Index_IntId> INDEX;
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
     TAO_Persistent_IntId> CONTEXT;
-  // Hash map used by Persistent Naming Context to keep its state.
-
-  typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
-  > ALLOCATOR;
-  // Allocator we will be using to make the Naming Service persistent.
 
   // = Initialization and termination methods.
-
   TAO_Persistent_Context_Index (CORBA::ORB_ptr orb,
                                 PortableServer::POA_ptr poa);
-  // Constructor.
+  // "Do-nothing" constructor.
 
   int open (LPCTSTR file_name,
             void * base_address = ACE_DEFAULT_BASE_ADDR);
-  // Create ACE_Allocator, open/create memory-mapped file with the
-  // specified file name/base address.  Find or allocate <index_>.
-  // Return 0 on success or -1 on failure.
-
-  int init (size_t context_size);
-  // If <index_> contains no entries (i.e., was just created), create
-  // a root Persistent Naming Context servant with table of size
-  // <context_size>, and make an entry for it
-  // in the <index_>.  If <index_> contains entries, create a
-  // Persistent Naming Context servant for each entry.  Return 0 on
-  // success and -1 on failure.
+  //
 
-  ~TAO_Persistent_Context_Index (void);
-  // Destructor.  The memory mapped file that was opened/created is
-  // not deleted, since we want it to keep the state of the Naming
-  // Service until the next run.
+  int init (void);
+  // go through the index of contexts and create a servant of each,
+  // and register it with POA.  If no contexts are present, create one.
 
-  // = Methods for adding/removing entries.
+  ~TAO_Persistent_Context_Index (void);
+  // destructor, do some cleanup :TBD: last dtor should "compress"
+  // file
 
   int bind (const char *poa_id,
-            ACE_UINT32 *&counter,
-            CONTEXT *hash_map);
-  // Create an entry for a Persistent Naming Context in <index_>,
-  // i.e., a context with <poa_id>, <counter> and <hash_map> has just
-  // been created, and is registering with us.
-
-  int unbind (const char *poa_id);
-  // Remove an entry for the Persistent Naming Context with <poa_id>
-  // from <index_> (i.e., this context has just been destroyed).
+                    ACE_UINT32 *&counter,
+                    CONTEXT *hash_map);
+  // Create an entry - new context is created.
 
-  // = Accessors.
+  int unbind (const char * poa_id);
+  // Unbind an entry - a context is destroyed.
 
   ACE_Allocator *allocator (void);
-  // Return allocator.
+  // accessor.
 
   CORBA::ORB_ptr orb (void);
-  // Return orb pointer.
+  //
+
+  char * root_ior (void);
+  //
 
-  char *root_ior (void);
-  // Return ior of the root Naming Context (returns a copy - must be
-  // deallocated by the user).
+  //@@ ACE_Null_Mutex might be sufficient here.
+  typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
+  > ALLOCATOR;
 
 private:
 
   int recreate_all (void);
-  // Helper for the <init> method.  Iterates over <index_>, and
-  // creates a servant for each entry.
+  //
 
   int create_index (void);
-  // Helper for the <open> method.
-
-  int create_index_helper (void *buffer);
-  // Helper for <create_index> method: places hash table into an
-  // allocated space.
+  // Allocate the appropriate type of map manager that stores the
+  // key/value binding.
 
   ACE_SYNCH_MUTEX lock_;
   // Lock to prevent multiple threads from modifying entries in the
-  // <index_> simultanneously.
+  // hash map simultanneously.
 
   ALLOCATOR *allocator_;
-  // Allocator that deals out memory from a memory-mapped file.  We
-  // use it here, and in TAO_Persistent_Naming_Context, whenever we
-  // deal with data that should be kept in persistent store.
+  // Pointer to the allocator
 
-  CONTEXT_INDEX *index_;
-  // Hash map where we keep entries for all Persistent Naming
-  // Contexts.
+  INDEX *index_;
+  // Pointer to the allocated map manager.
 
   LPCTSTR index_file_;
-  // Name of the memory-mapped file used by <allocator_>.
+  // Name of the file used for storage.
 
   void *base_address_;
-  // Base address for the memory-mapped file.
 
   CORBA::ORB_var orb_;
-  // ORB.  We use it for several object_to_string conversions, and
-  // keep it around for Persistent Naming Contexts' use.
+  //
 
   PortableServer::POA_var poa_;
-  // POA under which to register Persistent Naming Context servants
-  // during start-up.
+  //
 
   CORBA::String_var root_ior_;
-  // The ior of the root Naming Context.
+  //
 };
 
 #endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
index e84401349f6..1b704d4f896 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -50,6 +50,12 @@ TAO_Persistent_IntId::operator= (const TAO_Persistent_IntId &rhs)
   ref_ = rhs.ref_;
 }
 
+CosNaming::BindingType
+TAO_Persistent_IntId::type (void)
+{
+  return type_;
+}
+
 TAO_Persistent_ExtId::TAO_Persistent_ExtId (void)
   : id_ (0),
     kind_ (0)
@@ -127,7 +133,7 @@ TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void)
 }
 
 TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
-                                                        ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId,
+                                                        ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
                                                         TAO_Persistent_IntId> * hash_map)
   : counter_ (counter),
     hash_map_ (hash_map)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 69cf5d1a450..59a86851fa4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -17,29 +17,18 @@
 #ifndef TAO_PERSISTENT_ENTRIES_H
 #define TAO_PERSISTENT_ENTRIES_H
 
-#include "ace/Hash_Map_With_Allocator_T.h"
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "Shared_Hash_Map_T.h"
 
 class TAO_ORBSVCS_Export TAO_Persistent_IntId
 {
   // = TITLE
-  //     Helper class for TAO_Persistent_Bindings_Map: unifies several
-  //     data items, so they can be stored together as a  <value>
-  //     for a <key> in a hash table holding the state of a Persistent
-  //     Naming Context.
+  //     Stores information a context keeps for each bound name.
   //
   // = DESCRIPTION
-  //     This class holds a strigified IOR and a binding type, so
-  //     they can be stored together as a <value> for a <key> in a
-  //     hash table holding the state of a Persistent Naming Context.
-  //
-  //     Memory for the ior isn't allocated/deallocated, this class just
-  //     copies a pointer.
+  //     Each bound name is associated with an object reference and
+  //     the type of binding.
 public:
   // = Initialization and termination methods.
   TAO_Persistent_IntId (void);
@@ -56,32 +45,28 @@ public:
   // Destructor.
 
   void operator= (const TAO_Persistent_IntId & rhs);
-  // Assignment operator.
+  // Assignment operator (does copy memory).
 
-  // = Data members.
+  CosNaming::BindingType type (void);
+  //
 
-  const char *ref_;
-  // Stringified IOR to be stored in a Persistent Naming Context.
+  const char * ref_;
+  // This should be allocated from shared/mmap memory.
 
   CosNaming::BindingType type_;
-  // Binding type for <ref_>.
+  // Indicator of whether the object is a NamingContext that should
+  // participate in name resolution when compound names are used.
 };
 
 class TAO_ORBSVCS_Export TAO_Persistent_ExtId
 {
   // = TITLE
-  //     Helper class for TAO_Persistent_Bindings_Map: unifies several
-  //     data items, so they can be stored together as a  <key>
-  //     for a <value> in a hash table holding the state of a Persistent
-  //     Naming Context.
+  //    Stores the name to which an object is bound.
   //
   // = DESCRIPTION
-  //     This class holds id and kind strings, so
-  //     they can be stored together as a <key> for a <value> in a
-  //     hash table holding the state of a Persistent Naming Context.
-  //
-  //     Memory for id and kind isn't allocated/deallocated, this
-  //     class just copies pointers.
+  //    This class is used as the External ID for the
+  //    <ACE_Hash_Map_Manager>.  We do not allocate memory for <id>
+  //    and <kind>, we do not deallocate it.
 public:
   // = Initialization and termination methods.
 
@@ -98,8 +83,6 @@ public:
   ~TAO_Persistent_ExtId (void);
   // Destructor.
 
-  // = Assignment and comparison methods.
-
   void operator= (const TAO_Persistent_ExtId & rhs);
   // Assignment operator (does copy memory).
 
@@ -110,21 +93,13 @@ public:
   // Inequality comparison operator.
 
   u_long hash (void) const;
-  // <hash> function is required in order for this class to be usable by
-  // ACE_Hash_Map_Manager.
-
-  // = Data members.
+  // This class has to have a hash for use with ACE_Hash_Map_Manager.
 
   const char * id_;
-  // <kind> portion of the name to be associated with some object
-  // reference in a Persistent Naming Context.
-
   const char * kind_;
-  // <id> portion of the name to be associated with some object
-  // reference in a Persistent Naming Context.
+  // These point into shared/mmaped memory.
 
   // Accessors.
-
   const char * id (void);
   const char * kind (void);
 };
@@ -132,24 +107,18 @@ public:
 class TAO_ORBSVCS_Export TAO_Persistent_Index_IntId
 {
   // = TITLE
-  //     Helper class for TAO_Persistent_Context_Index: unifies several
-  //     data items, so they can be stored together as a  <value>
-  //     for a <key> in a hash table holding the state of a Persistent
-  //     Context Index.  (Persistent Context Index is like directory
-  //     that stores info about every active Naming Context).
+  //     Stores information about a context.
   //
   // = DESCRIPTION
-  //     This class holds a counter and a hash map pointers, so
-  //     they can be stored together as a <value> for a <key> in a
-  //     hash table holding the state of a Persistent Context Index.
-  //
+  //     Each context
+  //     the type of binding.
 public:
   // = Initialization and termination methods.
   TAO_Persistent_Index_IntId (void);
   // Constructor.
 
   TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
-                              ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId,
+                              ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
                               TAO_Persistent_IntId> * hash_map);
   // Constructor.
 
@@ -162,30 +131,23 @@ public:
   void operator= (const TAO_Persistent_Index_IntId & rhs);
   // Assignment operator (does copy memory).
 
-  // = Data members.
-
   ACE_UINT32 *counter_;
-  // Pointer to a Persistent Naming Context's counter.
+  //
 
-  ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId,
+  ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
     TAO_Persistent_IntId> * hash_map_;
-  // Pointer to a Persistent Naming Context's hash map.
+  // The pointer to the context's bindings hash map.
 };
 
 class TAO_ORBSVCS_Export TAO_Persistent_Index_ExtId
 {
   // = TITLE
-  //    Helper class for TAO_Persistent_Context_Index: holds
-  //    Persistent Naming Context POA id, so it can be stored as a <key>
-  //    for a <value> in a hash table holding state of a Persistent
-  //    Context Index.  (Persistent Context Index is like directory
-  //    that stores info about every active Naming Context).
+  //    Stores the poa_id of a context.
   //
   // = DESCRIPTION
-  //    We need this wrapper class around the actual data because we must
-  //    provide <hash> function for it to work with
-  //    ACE_Hash_Map_Manager.
-  //
+  //    This class is used as the External ID for the
+  //    <ACE_Hash_Map_Manager>.  We do not allocate memory for
+  //    <poa_id>, we do not deallocate it.
 public:
   // = Initialization and termination methods.
 
@@ -201,8 +163,6 @@ public:
   ~TAO_Persistent_Index_ExtId (void);
   // Destructor.
 
-  // = Assignment and comparison methods.
-
   void operator= (const TAO_Persistent_Index_ExtId & rhs);
   // Assignment operator (does copy memory).
 
@@ -213,14 +173,11 @@ public:
   // Inequality comparison operator.
 
   u_long hash (void) const;
-  // <hash> function is required in order for this class to be usable by
-  // ACE_Hash_Map_Manager.
-
-  // = Data member.
+  // This class has to have a hash for use with ACE_Hash_Map_Manager.
 
   const char * poa_id_;
-  // POA id to be associated with the rest of the info for some
-  // Persistent Naming Context in the Persistent Context Index.
+  // These point into shared/mmaped memory.
+
 };
 
 #endif /* TAO_PERSISTENT_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 6542dc39e89..1b9277dc1c6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -73,7 +73,7 @@ TAO_Persistent_Bindings_Map::find (const char *id,
       ACE_DECLARE_NEW_CORBA_ENV;
       obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
-      type = entry.type_;
+      type = entry.type ();
 
       return 0;
     }
@@ -93,20 +93,19 @@ TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void)
 void
 TAO_Persistent_Bindings_Map::destroy (void)
 {
-  this->map_->ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::~ACE_Hash_Map_With_Allocator ();
-  this->allocator_->free (map_);
+  allocator_->free (map_);
 }
 
 TAO_Persistent_Bindings_Map::HASH_MAP *
 TAO_Persistent_Bindings_Map::map (void)
 {
-  return this->map_;
+  return map_;
 }
 
 size_t
 TAO_Persistent_Bindings_Map::total_size (void)
 {
-  return this->map_->total_size ();
+  return map_->total_size ();
 }
 
 size_t
@@ -125,25 +124,13 @@ TAO_Persistent_Bindings_Map::open (size_t hash_table_size,
   void *hash_map = 0;
   size_t map_size = sizeof (HASH_MAP);
   hash_map = this->allocator_->malloc (map_size);
-
-  // If allocation failed ...
-  if (hash_map == 0)
-    return -1;
+  //@@ check if hash_map == 0 ??
 
   // Initialize allocated hash map through placement new.
-  if (open_helper (hash_table_size, hash_map) == -1)
-    this->allocator_->free (hash_map);
-
-  return 0;
-}
-
-int
-TAO_Persistent_Bindings_Map::open_helper (size_t hash_table_size,
-                                          void *buffer)
-{
   ACE_NEW_RETURN (this->map_,
-                  (buffer) HASH_MAP (hash_table_size, this->allocator_),
+                  (hash_map) HASH_MAP (hash_table_size, this->allocator_),
                   -1);
+
   return 0;
 }
 
@@ -162,7 +149,7 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
                                           CosNaming::BindingType type,
                                           int rebind)
 {
-  // Obtain a stringified ior of <obj> (i.e., the representation we can store).
+  // Obtain a stringified ior ob <obj> (i.e., the representation we can store).
   ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::String_var ref = orb_->object_to_string (obj, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
@@ -211,40 +198,29 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
             }
         }
       else
-        // Rebind.
         {
+          // Do a rebind.  If there's already any entry, this will return the existing
+          // <new_name> and <new_internal> and overwrite the existing name binding.
           TAO_Persistent_ExtId old_name;
           TAO_Persistent_IntId old_entry;
 
-          // Check that the types of old and new entries match.
-          if (this->map_->find (new_name,
-                                old_entry,
-                                this->allocator_) == 0
-              && type != old_entry.type_)
-            result = -2;
-
-          // If types match, perform rebind.
-          else
-            result = this->map_->rebind (new_name, new_entry,
-                                         old_name, old_entry,
-                                         this->allocator_);
+          result = this->map_->rebind (new_name, new_entry,
+                                       old_name, old_entry,
+                                       this->allocator_);
           if (result == 1)
             {
-              // Free up the old binding's memory, if it was replaced.
-              // Note, this assumes that the "ref" pointer comes
-              // first, and that the id, kind, and ref are contiguously
-              // allocated (see beginning of this method for details).
+              // Free up the memory we allocated in shared_bind().  Note that this
+              // assumes that the "ref" pointer comes first and that the id,
+              // kind, and ref are contiguously allocated (see above for details)
               this->allocator_->free ((void *) old_entry.ref_);
             }
         }
 
-      // Check for failures, and clean up dynamically allocated memory
-      // if necessary.
-      if (result < 0)
+      if (result == -1)
+        // Free our dynamically allocated memory.
         this->allocator_->free ((void *) ptr);
-
       else
-        // If bind() or rebind() succeeded, they will automatically sync
+        // If bind() or rebind() succeed, they will automatically sync
         // up the map manager entry.  However, we must sync up our
         // name/value memory.
         this->allocator_->sync (ptr, total_len);
@@ -298,43 +274,50 @@ TAO_Persistent_Naming_Context::init (size_t hash_table_size)
 
 TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void)
 {
-  // Perform appropriate cleanup based on the destruction level specified.
-
-  if (this->destroyed_ > 1)
+  // This should only get called if we are destroyed, i.e., we don't
+  // want persistent state.
+  if (this->destroyed_)
     {
       // Remove ourselves from context index.
       index_->unbind (poa_id_.c_str ());
       // Remove the underlying data structure from persistent storage.
       persistent_context_->destroy ();
     }
-  else if (this->destroyed_ == 1)
-    // Remove the underlying data structure from persistent storage.
-    persistent_context_->destroy ();
-}
-
-void
-TAO_Persistent_Naming_Context::set_cleanup_level (int level)
-{
-  this->destroyed_ = level;
 }
 
+//@@This method may need adjustments to deal with errors correctly.
 CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
-                                                 const char *poa_id,
-                                                 size_t context_size,
-                                                 TAO_Persistent_Context_Index * ind,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 {
-  // Store the stub we will return here.
+  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+                      ace_mon,
+                      this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  // Check to make sure this object didn't have <destroy> method
+  // invoked on it.
+  if (this->destroyed_)
+    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                      CosNaming::NamingContext::_nil ());
+
+  // Store the stub we will return from the method here.
   CosNaming::NamingContext_var result;
 
+  // Generate a POA id for the new context.
+  char poa_id[BUFSIZ];
+  ACE_OS::sprintf (poa_id,
+                   "%s_%ld",
+                   this->poa_id_.c_str (),
+                   (*this->counter_)++);
+
   // Put together a servant for the new Naming Context.
 
   TAO_Persistent_Naming_Context *context_impl = 0;
   ACE_NEW_THROW_EX (context_impl,
-                    TAO_Persistent_Naming_Context (poa,
+                    TAO_Persistent_Naming_Context (poa_.in (),
                                                    poa_id,
-                                                   ind),
+                                                   index_),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
@@ -342,20 +325,15 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
   // allocation fails.
   ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context> temp (context_impl);
 
-  if (context_impl->init (context_size) == -1)
+  if (context_impl->init (persistent_context_->total_size ()) == -1)
     ACE_THROW_RETURN (CORBA::NO_MEMORY (), result._retn ());
 
-  // Insure appropriate cleanup in case of exception conditions ahead.
-  context_impl->set_cleanup_level (1);
-
   // Register with the index of Naming Contexts.
-  if (ind->bind (context_impl->poa_id_.c_str (),
-                 context_impl->counter_,
-                 context_impl->persistent_context_->map ()) == -1)
+  if (index_->bind (context_impl->poa_id_.c_str (),
+                    context_impl->counter_,
+                    context_impl->persistent_context_->map ()) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (), result._retn ());
-
-  // Insure appropriate cleanup in case of exception conditions ahead.
-  context_impl->set_cleanup_level (2);
+  //@@ At this point destroy_ flag should be enabled to avoid mem. leaks?
 
   TAO_Naming_Context *context = 0;
   ACE_NEW_THROW_EX (context,
@@ -363,62 +341,28 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
-  // Let <implementation> know about it's <interface>.
-  context_impl->interface (context);
-
-  // Release auto pointer, and start using reference counting to
-  // control our servant.
+  // Change what we hold in auto pointer.
   temp.release ();
-  PortableServer::ServantBase_var s = context;
+  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
 
   // Register the new context with the POA.
   PortableServer::ObjectId_var id =
     PortableServer::string_to_ObjectId (poa_id);
 
-  poa->activate_object_with_id (id.in (),
-                                context,
-                                ACE_TRY_ENV);
+  this->poa_->activate_object_with_id (id.in (),
+                                       context,
+                                       ACE_TRY_ENV);
   ACE_CHECK_RETURN (result._retn ());
 
   result = context->_this (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
-  // Everything went smoothly, without errors - we don't need any cleanup.
-  context_impl->set_cleanup_level (0);
-
-  return result._retn ();
-}
-
-CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
-
-  // Generate a POA id for the new context.
-  char poa_id[BUFSIZ];
-  ACE_OS::sprintf (poa_id,
-                   "%s_%ld",
-                   this->poa_id_.c_str (),
-                   (*this->counter_)++);
-
-  CosNaming::NamingContext_var result =
-    make_new_context (this->poa_.in (),
-                      poa_id,
-                      this->persistent_context_->total_size (),
-                      this->index_,
-                      ACE_TRY_ENV);
+  // Give POA the ownership of this servant.
+  context->_remove_ref (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
+  // Everything went without errors: release auto pointer and return.
+  temp2.release ();
   return result._retn ();
 }
 
@@ -462,8 +406,8 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
   // Silliness below is required because of broken old g++!!!  E.g.,
   // without it, we could have just said HASH_MAP::ITERATOR everywhere we use ITER_DEF.
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::ITERATOR ITER_DEF;
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::ENTRY ENTRY_DEF;
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>::ITERATOR ITER_DEF;
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>::ENTRY ENTRY_DEF;
 
   // Typedef to the type of BindingIterator servant for ease of use.
   typedef TAO_Bindings_Iterator<ITER_DEF, ENTRY_DEF> ITER_SERVANT;
@@ -504,18 +448,13 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
     {
       // Create a BindingIterator for return.
       ACE_NEW_THROW_EX (bind_iter,
-                        ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
+                        ITER_SERVANT (hash_iter, this->poa_.in (), this->lock_),
                         CORBA::NO_MEMORY ());
 
-      // Release <hash_iter> from auto pointer, and start using the
-      // reference counting to control our servant.
+      // Release <hash_iter> from auto pointer and put <bind_iter> into
+      // one.
       temp.release ();
-      PortableServer::ServantBase_var iter = bind_iter;
-
-      // Increment reference count on this Naming Context, so it doesn't get
-      // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK;
+      ACE_Auto_Basic_Ptr<ITER_SERVANT> temp2 (bind_iter);
 
       // Register with the POA.
       char poa_id[BUFSIZ];
@@ -533,11 +472,20 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
       bi = bind_iter->_this (ACE_TRY_ENV);
       ACE_CHECK;
+
+      // Give POA the ownership of this servant.
+      bind_iter->_remove_ref (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      // Everything went without error, release the auto pointer.
+      temp2.release ();
     }
 }
 
+//@@ Need instantiation for TAO_Bindings_Iterator.
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>;
+template class ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>;
 template class ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId>;
@@ -552,10 +500,9 @@ template class ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context>;
 template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex > >;
 template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> >;
 template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> > >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>
+#pragma instantiate ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId>
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 1f1338d4ec9..31bc78138d1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -26,13 +26,13 @@ class TAO_ORBSVCS_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map
   //     name to object  bindings in a Naming Context.
   //
   // = DESCRIPTION
-  //     Wrapper on top of ACE_Hash_Map_With_Allocator (which is a wrapper
+  //     Wrapper on top of ACE_Shared_Hash_Map (which is a wrapper
   //     around ACE_Hash_Map_Manager).  Uses ACE_Allocator (allocating
   //     from persistent storage) to make bindings persistent and
   //     supports TAO_Bindings_Map interface.  Used by TAO_Persistent_Naming_Context.
 public:
 
-  typedef ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId> HASH_MAP;
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId> HASH_MAP;
   // Underlying data structure - typedef for ease of use.
 
   // = Initialization and termination methods.
@@ -86,9 +86,8 @@ public:
                       CORBA::Object_ptr obj,
                       CosNaming::BindingType type);
   // Overwrite a binding containing <id> and <kind> (or create a new
-  // one if one doesn't exist) with the specified parameters.  Return
-  // 0 or 1 on success.  Return -1 or -2 on failure. (-2 is returned
-  // if the new and old bindings differ in type).
+  // one if one doesn't exist) with the specified parameters.  Returns
+  // -1 on failure.
 
   virtual int unbind (const char * id,
                       const char * kind);
@@ -107,13 +106,6 @@ public:
 
 protected:
 
-  int open_helper (size_t hash_table_size,
-                   void *buffer);
-  // Helper to the <open> method.  By isolating placement new into a
-  // separate method, we can deal with memory allocation failures more
-  // efficiently.  If there is a problem in HASH_MAP constructor, we
-  // can clean up preallocated space.
-
   int shared_bind (const char *id,
                    const char *kind,
                    CORBA::Object_ptr obj,
@@ -173,18 +165,6 @@ public:
   virtual ~TAO_Persistent_Naming_Context (void);
   // Destructor.
 
-  // = Utility methods.
-  static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
-                                                        const char *poa_id,
-                                                        size_t context_size,
-                                                        TAO_Persistent_Context_Index *ind,
-                                                        CORBA::Environment &ACE_TRY_ENV);
-  // This utility method factors out the code needed to create a new
-  // Persistent Naming Context servant and activate it under the
-  // specified POA with the specified id.  This function is static so
-  // that the code can be used, both from inside the class (e.g., <new_context>),
-  // and from outside (e.g., Naming_Utils.cpp).
-
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
   virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
@@ -201,33 +181,20 @@ public:
   // are returned with a BindingIterator.  In the naming context does
   // not contain any additional bindings <bi> returned as null.
 
-protected:
-
-  void set_cleanup_level (int level);
-  // Set <destroyed_> flag (inherited from TAO_Hash_Naming_Context) to
-  // <level>.  Legal values for <destroyed_> are 0, 1, and 2.  The
-  // values specify the extent of cleanup that should take place in the
-  // context's destructor:
-  // '0' - no cleanup (e.g., if the context goes out of scope, but
-  // it's state is to remain in persistent storage);
-  // '1' - free up the underlying data structure in persistent storage
-  // (e.g., if the initialization of this context was only partially completed
-  // due to some failures, and we need to roll back);
-  // '2' - free up the underlying data structure, and deregister this
-  // naming context from its <index_> (e.g., if the context had
-  // <destroy> method invoked and needs to be completely removed from existence).
 
   ACE_UINT32 *counter_;
   // Counter used for generation of POA ids for children Naming
   // Contexts.
 
-  TAO_Persistent_Bindings_Map *persistent_context_;
+  TAO_Persistent_Bindings_Map * persistent_context_;
   // A pointer to the underlying data structure used to store name
   // bindings. While our superclass (TAO_Hash_Naming_Context) also
   // maintains a pointer to the data structure, keeping this pointer
   // around saves us from the need to downcast when invoking
   // non-virtual methods.
 
+protected:
+
   TAO_Persistent_Context_Index *index_;
   // A pointer to the index object of this naming service: it keeps
   // track of all the naming contexts created.  Every time we make a
diff --git a/TAO/orbsvcs/orbsvcs/Naming/README b/TAO/orbsvcs/orbsvcs/Naming/README
index ced27c7503f..9cccf13e622 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/README
+++ b/TAO/orbsvcs/orbsvcs/Naming/README
@@ -1,68 +1,86 @@
-// $Id$
+// $Id:
 
 CONTENT
-=======
-This directory contains files implementing CosNaming idl interfaces
-(from CORBA COSS), as well as a few utilities.  Server code, service
-executable, and documentation for using the service are located in
-$TAO_ROOT/orbsvcs/Naming_Service.
 
+This directory contains files implementing CosNaming idl interface
+from CORBA COSS, as well as a few utilities.
 
-UTILITIES
-=========
-Naming_Utils.{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
-using these classes.
 
+ARCHITECTURE
 
-IMPLEMENTATION
-==============
-The architecture for TAO's implementation of CosNaming::NamingContext
-interface follows the Bridge pattern.
+The architecture of the Naming Service (i.e., CosNaming)
+implementation follows the Bridge pattern.
+Below is the list of player classes:
 
- * TAO_Naming_Context (in Naming_Context.h) inherits from
-   POA skeleton, and plays the role of 'Abstraction' (aka 'Interface')
-   in the Bridge architecture - it forwards all client
-   requests to a 'ConcreteImplementor' through an 'Implementor' pointer.
+ * TAO_Naming_Context (in Naming_Context.h) - this class inherits from
+   POA skeleton, and plays the role of 'Abstraction' (aka 'Interface') -
+   it forwards all client requests to a 'ConcreteImplementor' through an
+   'Implementor' pointer.
 
- * TAO_Naming_Context_Impl (in Naming_Context.h) is an abstract base class for all
+ * TAO_Naming_Context_Impl (in Naming_Context.h) - this is an abstract base class for all
    concrete implementations of NamingContext functionality (i.e., 'Implementor').
 
- * Currently, TAO Naming Service has two 'ConcreteImplementors':
-   TAO_Transient_Naming_Context (in Transient_Naming_Context.h), and
-   TAO_Persistent_Naming_Context (in Persistent_Naming_Context.h),
-   providing non-persistent and persistent, hash-table-based implementations of the
-   NamingContext functionality, correspondingly.  Both
-   'ConcreteImplementors' inherit from TAO_Hash_Naming_Context (in
-   Hash_Naming_Context.h), which, in turn, inherits from
-   TAO_Naming_Context_Impl.  TAO_Hash_Naming_Context factors out code
-   common to both 'ConcreteImplementors'. (Here we have a form of the
-   Template Method pattern).
-
-*  Other major classes:
-   - TAO_Persistent_Context_Index - facilitates implementation of the
-     Persistent version of the Naming Service.
-   - TAO_BindingsIterator - implements CosNaming::BindingIterator
-     interface.  Can be used with either of the NamingContext 'ConcreteImplementors'.
-
-*  Persistent implementation of the Naming Service uses ACE_Allocators
-   and memory-mapped files.
-
-The Bridge implementation class structure makes it easy to:
-
-1) Create and plug-in different CosNaming::NamingContext implementations by
+ * TAO_Hash_Naming_Context (in Hash_Naming_Context.h) - this
+   class inherits from TAO_Naming_Context_Impl.  It is a
+   'ConcreteImplementor' which uses ACE_Hash_Map_Manager to implement
+   NamingContext functionality.
+
+ * A set of classes implementing a persistent version of the Naming
+   Context functionality.  These are the classes in
+   Shared_Hash_Map_T.{h, cpp}, and Persistent* files.
+
+The class structure described above makes it easy to:
+
+1) Create and plug different Naming Service implementations by
    subclassing TAO_Naming_Context_Impl.
 
-2) Dynamically load an appropriate NamingContext implementation at
-   run-time, based on the config file entry, by making TAO_Naming_Context_Impl
-   inherit from ACE_Service_Object...
+2) Dynamically load an appropriate Naming Service implementation at
+   run-time based on the config file entry by making TAO_Naming_Context_Impl
+   inherit from ACE_Service_Object, etc.
+
+
+PERSISTENCE
+
+The first version of Persistent Naming implementation is here!
+It is based on the memory-mapped files.  Directions on how to use the
+Persistent version of the Naming Service can be found in
+TAO/orbsvcs/Naming_Service/README (by using a command-line option).
+
+The current set of classes implementing persistent version of the
+Naming Service will be restructured for one of the upcoming releases
+(to factor out commonality, get rid of unnecessary generality, etc.),
+at which time more documentation will be available in this README file
+and in the source code.
+
 
 
 TO-DO
-=====
-Extend CosNaming::NamingContext interface and its implementation to
-support binding of more than one object per name and name
-resolution according to policies (e.g., random or round robin), to provide
-Load Balancing functionality.
+
+- Check <destroy> test on NT.
+- Add example for persistent Naming Service
+- Make binding iterators observers of their corresponding Naming
+  Context, so they die once the Naming Context dies (use either
+  ref. counted locks or delayed death)
+
+- migrate ACE_Shared_Map to ACE and use in ACE Naming Service.
+
+
+- Factor out initialization of a NamingContext into a static function
+  on an appropriate class.
+
+- Factor out Naming_Util initialization code into a factory
+
+- Check for proper destruction of contexts
+
+- code review/comments of Entries, Persistent_Entries,
+  Persistent_Context_Index, Naming_Utils, Bindings_Iterator
+
+- Update README file
+
+- update Naming Service slides.
+
+- do code review of Simple_Naming.
+
+- add Load Balancing functionality.
+
+- make sure we can pass hash_table_size to Persistent Naming Context.
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp
new file mode 100644
index 00000000000..a94b17a1e0a
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp
@@ -0,0 +1,70 @@
+// $Id$
+
+#ifndef ACE_SHARED_HASH_MAP_T_CPP
+#define ACE_SHARED_HASH_MAP_T_CPP
+
+#include "Shared_Hash_Map_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+template <class EXT_ID, class INT_ID>
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::ACE_Shared_Hash_Map (ACE_Allocator *alloc)
+  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (alloc)
+{
+}
+
+template <class EXT_ID, class INT_ID>
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::ACE_Shared_Hash_Map (size_t size,
+                                                          ACE_Allocator *alloc)
+  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (size, alloc)
+{
+}
+
+template <class EXT_ID, class INT_ID> int
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::close (ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+  return this->close_i ();
+}
+
+template <class EXT_ID, class INT_ID> int
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::bind (const EXT_ID &ext_id,
+                                           const INT_ID &int_id,
+                                           ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+  return this->bind_i (ext_id, int_id);
+}
+
+template <class EXT_ID, class INT_ID> int
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::unbind (const EXT_ID &ext_id,
+                                             INT_ID &int_id,
+                                             ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+  return this->unbind_i (ext_id, int_id);
+}
+
+template <class EXT_ID, class INT_ID> int
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::rebind (const EXT_ID &ext_id,
+                                             const INT_ID &int_id,
+                                             EXT_ID &old_ext_id,
+                                             INT_ID &old_int_id,
+                                             ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+  return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id);
+}
+
+template <class EXT_ID, class INT_ID> int
+ACE_Shared_Hash_Map<EXT_ID, INT_ID>::find (const EXT_ID &ext_id,
+                                           INT_ID &int_id,
+                                           ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+  return this->find_i (ext_id, int_id);
+}
+
+#endif /* ACE_SHARED_HASH_MAP_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h
new file mode 100644
index 00000000000..f7617026f2e
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h
@@ -0,0 +1,77 @@
+/* -*- C++ -*- */
+// $Id$
+// ============================================================================
+//
+// = LIBRARY
+//    cos
+//
+// = FILENAME
+//   Shared_Hash_Map_T.h
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef ACE_SHARED_HASH_MAP_T_H
+#define ACE_SHARED_HASH_MAP_T_H
+
+#include "ace/Hash_Map_Manager.h"
+
+template <class EXT_ID, class INT_ID>
+class ACE_Shared_Hash_Map : public ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex>
+{
+  // = TITLE
+  //     This class serves as a Proxy that ensures our process always
+  //     has the appropriate allocator in place for every operation
+  //     that accesses or updates the Map Manager.
+  //
+  // = DESCRIPTION
+  //     We need this class because otherwise the ALLOCATOR
+  //     pointer will be stored in the Map_Manager that resides within
+  //     shared memory.  Naturally, this will cause horrible problems
+  //     since only the first process to set that pointer will be
+  //     guaranteed the address of the ALLOCATOR is meaningful!
+public:
+  ACE_Shared_Hash_Map (ACE_Allocator *alloc);
+  // Constructor.
+
+  ACE_Shared_Hash_Map (size_t size,
+                       ACE_Allocator *alloc);
+  // Constructor.
+
+  // = The following methods are Proxies to the underlying methods
+  // provided by <ACE_Hash_Map_Manager>.  When they are called, they
+  // acquire the lock, set the allocator to the one specific to this
+  // process, and then call down to perform the intended operation.
+  int bind (const EXT_ID &,
+            const INT_ID &,
+            ACE_Allocator *alloc);
+
+  int unbind (const EXT_ID &,
+              INT_ID &,
+              ACE_Allocator *alloc);
+
+  int rebind (const EXT_ID &,
+              const INT_ID &,
+              EXT_ID &,
+              INT_ID &,
+              ACE_Allocator *alloc);
+
+  int find (const EXT_ID &,
+            INT_ID &,
+            ACE_Allocator *alloc);
+
+  int close (ACE_Allocator *alloc);
+};
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Shared_Hash_Map_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Shared_Hash_Map_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+
+#endif /* ACE_SHARED_HASH_MAP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 7d68701e129..149f9c971d3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -93,14 +93,13 @@ TAO_Transient_Bindings_Map::total_size (void)
 
 int
 TAO_Transient_Bindings_Map::shared_bind (const char * id,
-                                         const char * kind,
-                                         CORBA::Object_ptr obj,
-                                         CosNaming::BindingType type,
-                                         int rebind)
+                               const char * kind,
+                               CORBA::Object_ptr obj,
+                               CosNaming::BindingType type,
+                               int rebind)
 {
   TAO_ExtId new_name (id, kind);
   TAO_IntId new_entry (obj, type);
-  TAO_IntId old_entry;
 
   if (rebind == 0)
     // Do a normal bind.
@@ -108,16 +107,7 @@ TAO_Transient_Bindings_Map::shared_bind (const char * id,
 
   else
     // Rebind.
-    {
-      // Check that types of old and new entries match.
-      if (this->map_.find (new_name,
-                           old_entry) == 0
-          && type != old_entry.type_)
-        return -2;
-
-      else
-        return this->map_.rebind (new_name, new_entry);
-    }
+    return this->map_.rebind (new_name, new_entry);
 }
 
 TAO_Transient_Naming_Context::TAO_Transient_Naming_Context (PortableServer::POA_ptr poa,
@@ -139,21 +129,37 @@ TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
-                                                const char *poa_id,
-                                                size_t context_size,
-                                                CORBA::Environment &ACE_TRY_ENV)
+TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 {
-  // Store the stub we will return here.
+  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+                      ace_mon,
+                      this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  // Check to make sure this object didn't have <destroy> method
+  // invoked on it.
+  if (this->destroyed_)
+    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+                      CosNaming::NamingContext::_nil ());
+
+  // Store the stub we will return from the method here.
   CosNaming::NamingContext_var result;
 
+  // Generate a POA id for the new context.
+  char poa_id[BUFSIZ];
+  ACE_OS::sprintf (poa_id,
+                   "%s_%ld",
+                   this->poa_id_.c_str (),
+                   this->counter_++);
+
   // Put together a servant for the new Naming Context.
 
   TAO_Transient_Naming_Context *context_impl = 0;
   ACE_NEW_THROW_EX (context_impl,
-                    TAO_Transient_Naming_Context (poa,
+                    TAO_Transient_Naming_Context (poa_.in (),
                                                   poa_id,
-                                                  context_size),
+                                                  transient_context_->total_size ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
@@ -167,59 +173,28 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
-  // Let <implementation> know about it's <interface>.
-  context_impl->interface (context);
-
-  // Release auto pointer, and start using reference counting to
-  // control our servant.
+  // Change what we hold in auto pointer.
   temp.release ();
-  PortableServer::ServantBase_var s = context;
+  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
 
   // Register the new context with the POA.
   PortableServer::ObjectId_var id =
     PortableServer::string_to_ObjectId (poa_id);
 
-  poa->activate_object_with_id (id.in (),
-                                context,
-                                ACE_TRY_ENV);
+  this->poa_->activate_object_with_id (id.in (),
+                                       context,
+                                       ACE_TRY_ENV);
   ACE_CHECK_RETURN (result._retn ());
 
   result = context->_this (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
-  return result._retn ();
-}
-
-CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      CosNaming::NamingContext::_nil ());
-
-  // Generate a POA id for the new context.
-  char poa_id[BUFSIZ];
-  ACE_OS::sprintf (poa_id,
-                   "%s_%ld",
-                   this->poa_id_.c_str (),
-                   this->counter_++);
-
-  // Create a new context.
-  CosNaming::NamingContext_var result =
-    make_new_context (this->poa_.in (),
-                      poa_id,
-                      this->transient_context_->total_size (),
-                      ACE_TRY_ENV);
+  // Give POA the ownership of this servant.
+  context->_remove_ref (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
+  // Everything went without errors: release auto pointer and return.
+  temp2.release ();
   return result._retn ();
 }
 
@@ -305,18 +280,13 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
     {
       // Create a BindingIterator for return.
       ACE_NEW_THROW_EX (bind_iter,
-                        ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
+                        ITER_SERVANT (hash_iter, this->poa_.in (), this->lock_),
                         CORBA::NO_MEMORY ());
 
-      // Release <hash_iter> from auto pointer, and start using
-      // reference counting to control our servant.
+      // Release <hash_iter> from auto pointer and put <bind_iter> into
+      // one.
       temp.release ();
-      PortableServer::ServantBase_var iter = bind_iter;
-
-      // Increment reference count on this Naming Context, so it doesn't get
-      // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK;
+      ACE_Auto_Basic_Ptr<ITER_SERVANT> temp2 (bind_iter);
 
       // Register with the POA.
       char poa_id[BUFSIZ];
@@ -334,6 +304,13 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
 
       bi = bind_iter->_this (ACE_TRY_ENV);
       ACE_CHECK;
+
+      // Give POA the ownership of this servant.
+      bind_iter->_remove_ref (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      // Everything went without error, release the auto pointer.
+      temp2.release ();
     }
 }
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index b561ef6aa70..7ed16d5c5f2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -73,9 +73,8 @@ public:
                       CORBA::Object_ptr obj,
                       CosNaming::BindingType type);
   // Overwrite a binding containing <id> and <kind> (or create a new
-  // one if one doesn't exist) with the specified parameters.  Return
-  // 0 or 1 on success.  Return -1 or -2 on failure. (-2 is returned
-  // if the new and old bindings differ in type).
+  // one if one doesn't exist) with the specified parameters.  Returns
+  // -1 on failure.
 
   virtual int unbind (const char * id,
                       const char * kind);
@@ -135,17 +134,6 @@ public:
   virtual ~TAO_Transient_Naming_Context (void);
   // Destructor.
 
-  // = Utility methods.
-  static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
-                                                        const char *poa_id,
-                                                        size_t context_size,
-                                                        CORBA::Environment &ACE_TRY_ENV);
-  // This utility method factors out the code needed to create a new
-  // Transient Naming Context servant and activate it under the
-  // specified POA with the specified id.  This function is static so
-  // that the code can be used, both from inside the class (e.g., <new_context>),
-  // and from outside (e.g., Naming_Utils.cpp).
-
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
   virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Ping.idl b/TAO/orbsvcs/orbsvcs/Ping.idl
new file mode 100644
index 00000000000..50be83c601a
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Ping.idl
@@ -0,0 +1,16 @@
+// $Id$
+
+#ifndef TAO_PING_IDL
+#define TAO_PING_IDL
+
+interface Ping_Object
+{
+  void ping ();
+  // Used for checking for liveness of a server.  When the server
+  // receives this, it should send back a response indicating it is
+  // sill alive.  Depending on the policy specified, a timeout can be
+  // reached where the Implementation Repository will restart the
+  // server.
+};
+
+#endif /*TAO_PING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 1f8d2831d20..0c58e66beee 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -521,12 +521,12 @@ TAO_PropertySet::define_property (const char *property_name,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO_PropertySet::Define Property failed\n"));
-          ACE_THROW (CORBA::UNKNOWN ());
+          TAO_THROW (CORBA::UNKNOWN ());
         }
       break;
     default:
       // Error. ret is -1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      TAO_THROW (CORBA::UNKNOWN ());
     }
 
   return;
@@ -845,6 +845,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 
   for (size_t i = 0; i < n; i++)
     {
+      ACE_TRY_ENV.clear ();
       any_ptr = get_property_value (property_names [i],
                                     ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
@@ -1004,9 +1005,11 @@ TAO_PropertySet::delete_property (const char *property_name,
   // Unbind this property.
   if (this->hash_table_.unbind (entry_ptr) != 0)
     {
-      ACE_THROW (CORBA::UNKNOWN ());
+      ACE_ERROR ((LM_ERROR,
+                  "Unbind failed\n"));
+      TAO_THROW (CORBA::UNKNOWN ());
     }
-  
+
   return;
 }
 
@@ -1389,12 +1392,13 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
          }
       ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
         {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::unsupported_mode;
-          multi_ex.exceptions[len].failing_property_name =
-            property_defs[i].property_name;
+          ACE_TRY_ENV.print_exception ("UnsupportedMode");
+            size_t len = multi_ex.exceptions.length ();
+            multi_ex.exceptions.length (len + 1);
+            multi_ex.exceptions[len].reason =
+              CosPropertyService::unsupported_mode;
+            multi_ex.exceptions[len].failing_property_name =
+              property_defs[i].property_name;
         }
       ACE_CATCH (CORBA::SystemException, sysex)
         {
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index 287e7356135..e2a818253d6 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -124,7 +124,7 @@ module RtecScheduler
     Dependency_Set dependencies;
 
     // The OS thread priority for processing the
-    // events generated from this RT_Info.=
+    // events generated from this RT_Info.
     OS_Priority priority;
 
     // For ordering RT_Info's with equal priority.
@@ -139,7 +139,7 @@ module RtecScheduler
     // Token reserved for the scheduler's internal use:
     // information placed here from outside the scheduler
     // implementation is prone to be overwritten.
-    unsigned long long volatile_token;
+    unsigned long volatile_token;
   };
 
   enum Dispatching_Type_t
@@ -202,18 +202,6 @@ module RtecScheduler
 
   typedef sequence<Scheduling_Anomaly> Scheduling_Anomaly_Set;
 
-  exception CYCLIC_DEPENDENCIES {};
-  // There are cycles in the registered dependencies.
-
-  exception UNRESOLVED_LOCAL_DEPENDENCIES {};
-  // There are unresolved local dependencies: one
-  // or more nodes that are not declared as having
-  // unresolved remote dependencies has no threads,
-  // period, or dependencies on another node.
-
-  exception THREAD_SPECIFICATION {};
-  // A node that specifies threads does not specify a period.
-
   exception DUPLICATE_NAME {};
   // The application is trying to register the same task again.
 
@@ -227,7 +215,7 @@ module RtecScheduler
   exception UTILIZATION_BOUND_EXCEEDED {};
   exception INSUFFICIENT_THREAD_PRIORITY_LEVELS {};
   exception TASK_COUNT_MISMATCH {};
-  // Problems while computing scheduling.
+  // Problems while computing off-line scheduling.
 
   exception UNKNOWN_PRIORITY_LEVEL {};
   // Problems obtaining run-time dispatch queue info.
@@ -235,9 +223,6 @@ module RtecScheduler
   exception SYNCHRONIZATION_FAILURE {};
   // Problems acquiring a synchronization resource.
 
-  exception INTERNAL {};
-  // Problems with the internal scheduler data structures.
-
   typedef sequence<RT_Info> RT_Info_Set;
 
   // TODO: Find a reasonable name for this interface, maybe we should
@@ -264,19 +249,17 @@ module RtecScheduler
     //   Once the scheduling data is computed it can be retrieved
     //   remotely to generate the code for the run-time version.
   {
-    handle_t create (in string entry_point)
-      raises (DUPLICATE_NAME, INTERNAL, SYNCHRONIZATION_FAILURE);
+    handle_t create (in string entry_point) raises (DUPLICATE_NAME);
     // Creates a new RT_Info entry for the function identifier
     // "entry_point", it can be any string, but the fully qualified
     // name function name is suggested.
     // Returns a handle to the RT_Info.
 
-    handle_t lookup (in string entry_point)
-      raises (UNKNOWN_TASK, SYNCHRONIZATION_FAILURE);
+    handle_t lookup (in string entry_point);
     // Lookups a handle for entry_point.
+    // TODO: Should we add INVALID_HANDLE or raise an exception?
 
-    RT_Info get (in handle_t handle)
-      raises (UNKNOWN_TASK, SYNCHRONIZATION_FAILURE);
+    RT_Info get (in handle_t handle) raises (UNKNOWN_TASK);
     // Retrieve information about an RT_Info.
 
     void set (in handle_t handle,
@@ -289,7 +272,7 @@ module RtecScheduler
               in Quantum_t quantum,
               in long threads,
               in Info_Type_t info_type)
-      raises (UNKNOWN_TASK, INTERNAL, SYNCHRONIZATION_FAILURE);
+      raises (UNKNOWN_TASK);
     // Set the attributes of an RT_Info.
     // Notice that some values may not be modified (like priority).
     // Criticality and Info_Type are only used with the Dynamic Scheduler.
@@ -298,7 +281,7 @@ module RtecScheduler
                          in handle_t dependency,
                          in long number_of_calls,
                          in Dependency_Type_t dependency_type)
-      raises (SYNCHRONIZATION_FAILURE, UNKNOWN_TASK);
+      raises (UNKNOWN_TASK);
     // Adds <dependency> to <handle>.
     // Dependency_Type_t is only used with the Dynamic Scheduler.
 
@@ -306,12 +289,12 @@ module RtecScheduler
                    out OS_Priority o_priority,
                    out Preemption_Subpriority_t p_subpriority,
                    out Preemption_Priority_t p_priority)
-      raises (UNKNOWN_TASK, SYNCHRONIZATION_FAILURE, NOT_SCHEDULED);
+      raises (UNKNOWN_TASK, NOT_SCHEDULED);
     void entry_point_priority (in string entry_point,
                                out OS_Priority o_priority,
                                out Preemption_Subpriority_t p_subpriority,
                                out Preemption_Priority_t p_priority)
-      raises (UNKNOWN_TASK, SYNCHRONIZATION_FAILURE, NOT_SCHEDULED);
+      raises (UNKNOWN_TASK, NOT_SCHEDULED);
     // Obtain the run time priorities.
     // TODO: Do we need the two interfaces or is it simply confusing?
     // If we should to keep only the <handle> version: Are the extra
@@ -325,11 +308,8 @@ module RtecScheduler
                              out Config_Info_Set configs,
                              out Scheduling_Anomaly_Set anomalies)
       raises (UTILIZATION_BOUND_EXCEEDED,
-              SYNCHRONIZATION_FAILURE,
               INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-              TASK_COUNT_MISMATCH,
-              INTERNAL,
-              DUPLICATE_NAME);
+              TASK_COUNT_MISMATCH);
     // Computes the scheduling priorities, returns the RT_Info's with
     // their priorities properly filled.
     // This info can be cached by a Run_Time_Scheduler service or
@@ -358,9 +338,7 @@ module RtecScheduler
     void dispatch_configuration (in Preemption_Priority_t p_priority,
                                  out OS_Priority o_priority,
                                  out Dispatching_Type_t d_type)
-      raises (NOT_SCHEDULED,
-              SYNCHRONIZATION_FAILURE,
-              UNKNOWN_PRIORITY_LEVEL);
+      raises (UNKNOWN_PRIORITY_LEVEL, NOT_SCHEDULED);
     // Returns the thread priority and dispatching type assigned
     // to the dispatching priority level that was passed in.  This
     // information is used to configure the queues through wich
@@ -375,7 +353,7 @@ module RtecScheduler
 
 
     Preemption_Priority_t last_scheduled_priority ()
-      raises (SYNCHRONIZATION_FAILURE, NOT_SCHEDULED);
+      raises (NOT_SCHEDULED);
     // Returns the last priority number assigned to an operation in the schedule.
     // The number returned is one less than the total number of scheduled priorities.
     // All scheduled priorities range from 0 to the number returned, inclusive.
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 999ace13443..6c0c748ee4f 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -48,10 +48,10 @@ ACE_Runtime_Scheduler::create (const char *entry_point,
 
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return create (entry_point, ACE_TRY_ENV);
+  return create (entry_point, TAO_IN_ENV);
 }
 
 
@@ -110,7 +110,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
                                  RtecScheduler::Quantum_t quantum,
                                  CORBA::Long threads,
                                  RtecScheduler::Info_Type_t info_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &TAO_IN_ENV)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -120,7 +120,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
     {
       ACE_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n",
                   handle));
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK());
+      TAO_THROW (RtecScheduler::UNKNOWN_TASK());
       // NOTREACHED
     }
   if (rt_info_[handle - 1].worst_case_execution_time != time
@@ -147,13 +147,13 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
                                  RtecScheduler::Preemption_Priority_t& p_priority,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &TAO_IN_ENV)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    TAO_THROW (RtecScheduler::UNKNOWN_TASK ());
     // NOTREACHED
 
   o_priority = rt_info_[handle - 1].priority;
@@ -170,22 +170,20 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
                                              RtecScheduler::Preemption_Priority_t& p_priority,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             CORBA::Environment &TAO_IN_ENV)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  RtecScheduler::handle_t handle = lookup (entry_point, ACE_TRY_ENV);
-  ACE_CHECK;
-
+  RtecScheduler::handle_t handle = lookup (entry_point, TAO_IN_ENV);
   if (handle < -1)
-    // The exception was thrown or is in ACE_TRY_ENV already.
+    // The exception was thrown or is in TAO_IN_ENV already.
     return;
   this->priority (handle,
                   priority,
                   subpriority,
                   p_priority,
-                  ACE_TRY_ENV);
+                  TAO_IN_ENV);
 }
 
 
@@ -197,12 +195,12 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
                                        RtecScheduler::Dependency_Type_t /* dependency_type */,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    TAO_THROW (RtecScheduler::UNKNOWN_TASK ());
     // NOTREACHED
 
 #if 0
@@ -251,7 +249,7 @@ void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
                                                RtecScheduler::Dispatching_Type_t & d_type,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               CORBA::Environment &TAO_IN_ENV)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -260,13 +258,13 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
   if (config_count_ <= 0
       || config_info_ [p_priority].preemption_priority != p_priority)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      TAO_THROW (RtecScheduler::NOT_SCHEDULED ());
       ACE_NOTREACHED (return);
     }
   // throw an exception if an invalid priority was passed
   else if (p_priority < 0 || p_priority >= config_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+      TAO_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
       ACE_NOTREACHED (return);
     }
   else
@@ -284,13 +282,13 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 // to the number returned, inclusive.
 
 RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
+ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
   if (config_count_ <= 0)
-    ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED(),
+    TAO_THROW_RETURN (RtecScheduler::NOT_SCHEDULED(),
                       (RtecScheduler::Preemption_Priority_t) -1);
   else
     return (RtecScheduler::Preemption_Priority_t) (config_count_ - 1);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index b752f2193b4..533b6272b1f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -148,6 +148,10 @@ private:
 
   typedef ACE_RMS_Scheduler_Strategy Scheduler_Strategy;
 
+#elif defined (TAO_USES_RMS_DYN_SCHEDULING)
+
+  typedef ACE_RMS_Dyn_Scheduler_Strategy Scheduler_Strategy;
+
 #elif defined (TAO_USES_CRITICALITY_SCHEDULING)
 
   typedef ACE_Criticality_Scheduler_Strategy Scheduler_Strategy;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index fd4b3f584a8..09f187cf7dc 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -329,7 +329,7 @@ ACE_DynScheduler::get_rt_info (Object_Name name,
     {
       rtinfo = new RT_Info;
       rtinfo->info_type = RtecScheduler::OPERATION;
-      rtinfo->entry_point = CORBA::string_dup(name);
+      rtinfo->entry_point = name;
       // Bind the rtinfo to the name.
       if (info_collection_.bind (lookup, rtinfo) != 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
index 97213c6f2ab..1adfc0f5e39 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
@@ -23,8 +23,6 @@ libTAO_Sched_la_LDADD = \
 libTAO_Sched_la_SOURCES = \
         Config_Scheduler.cpp \
         DynSched.cpp \
-        Reconfig_Scheduler.cpp \
-        Reconfig_Sched_Utils.cpp \
         SchedEntry.cpp \
         Scheduler.cpp \
         Scheduler_Generic.cpp \
@@ -33,8 +31,6 @@ libTAO_Sched_la_SOURCES = \
 noinst_HEADERS = \
         Config_Scheduler.h \
         DynSched.h \
-        Reconfig_Scheduler.h \
-        Reconfig_Sched_Utils.h \
         SchedEntry.h \
         Scheduler.h \
         Scheduler_Generic.h \
@@ -45,3 +41,4 @@ noinst_HEADERS = \
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
 	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
deleted file mode 100644
index 9d37c52e122..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHED_UTILS_C
-#define TAO_RECONFIG_SCHED_UTILS_C
-
-#include "Reconfig_Sched_Utils_T.h"
-#include "Reconfig_Sched_Utils.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "orbsvcs/Time_Utilities.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# 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$")
-
-
-////////////////////////////////////////
-// class TAO_Reconfig_Scheduler_Entry //
-////////////////////////////////////////
-
-// Constructor.
-
-TAO_Reconfig_Scheduler_Entry::
-TAO_Reconfig_Scheduler_Entry (RtecScheduler::RT_Info &rt_info)
-  : actual_rt_info_ (&rt_info),
-    fwd_dfs_status_ (NOT_VISITED),
-    rev_dfs_status_ (NOT_VISITED),
-    fwd_discovered_ (-1),
-    rev_discovered_ (-1),
-    fwd_finished_ (-1),
-    rev_finished_ (-1),
-    is_thread_delineator_ (0),
-    has_unresolved_remote_dependencies_ (0),
-    has_unresolved_local_dependencies_ (0),
-    effective_exec_multiplier_ (0),
-    effective_period_ (0)
-{
-  // Store the RT_Info fields.  
-  this->orig_rt_info_data (*actual_rt_info_);
-}
-
-
-// Accessor for original RT_Info data.
-
-RtecScheduler::RT_Info &
-TAO_Reconfig_Scheduler_Entry::orig_rt_info_data ()
-{
-  return orig_rt_info_data_;
-}
-
-
-// Mutator for stored original RT_Info data.
-
-void
-TAO_Reconfig_Scheduler_Entry::orig_rt_info_data (RtecScheduler::RT_Info &data)
-{
-  // Only store the information that can be updated by the public interface at run-time.
-  this->orig_rt_info_data_.worst_case_execution_time = data.worst_case_execution_time;
-  this->orig_rt_info_data_.typical_execution_time = data.typical_execution_time;
-  this->orig_rt_info_data_.cached_execution_time = data.cached_execution_time;
-  this->orig_rt_info_data_.period = data.period;
-  this->orig_rt_info_data_.criticality = data.criticality;
-  this->orig_rt_info_data_.importance = data.importance;
-  this->orig_rt_info_data_.quantum = data.quantum;
-  this->orig_rt_info_data_.threads = data.threads;
-  this->orig_rt_info_data_.info_type = data.info_type;
-}
-
-// Accessor for actual RT_Info pointer.
-
-RtecScheduler::RT_Info *
-TAO_Reconfig_Scheduler_Entry::
-actual_rt_info ()
-{
-  return this->actual_rt_info_;
-}
-
-
-// Mutator for actual RT_Info pointer.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-actual_rt_info (RtecScheduler::RT_Info *rt_info)
-{
-  this->actual_rt_info_ = rt_info;
-}
-
-
-// Accessor for when the node was discovered in forward DFS traversal.
-
-long
-TAO_Reconfig_Scheduler_Entry::
-fwd_discovered () const
-{
-  return this->fwd_discovered_;
-}
-
-
-// Mutator for when the node was discovered in forward DFS traversal.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-fwd_discovered (long l)
-{
-  this->fwd_discovered_ = l;
-}
-
-
-// Accessor for when the node was discovered in reverse DFS traversal.
-
-long
-TAO_Reconfig_Scheduler_Entry::
-rev_discovered () const
-{
-  return this->rev_discovered_;
-}
-
-
-// Mutator for when the node was discovered in reverse DFS traversal.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-rev_discovered (long l)
-{
-  this->rev_discovered_ = l;
-}
-
-
-// Accessor for when the node was finished in forward DFS traversal.
-
-long
-TAO_Reconfig_Scheduler_Entry::
-fwd_finished () const
-{
-  return this->fwd_finished_;
-}
-
-
-// Mutator for when the node was finished in forward DFS traversal.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-fwd_finished (long l)
-{
-  this->fwd_finished_ = l;
-}
-
-
-// Accessor for when the node was finished in reverse DFS traversal.
-
-long
-TAO_Reconfig_Scheduler_Entry::
-rev_finished () const
-{
-  return this->rev_finished_;
-}
-
-
-// Mutator for when the node was finished in reverse DFS traversal.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-rev_finished (long l)
-{
-  this->rev_finished_ = l;
-}
-
-
-// Accessor for forward DFS traversal status of the node.
-
-TAO_Reconfig_Scheduler_Entry::DFS_Status
-TAO_Reconfig_Scheduler_Entry::
-fwd_dfs_status () const
-{
-  return this->fwd_dfs_status_;
-}
-
-
-// Mutator for forward DFS traversal status of the node.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds)
-{
-  this->fwd_dfs_status_ = ds;
-}
-
-
-
-// Accessor for DFS traversal status of the node.
-
-TAO_Reconfig_Scheduler_Entry::DFS_Status
-TAO_Reconfig_Scheduler_Entry::
-rev_dfs_status () const
-{
-  return this->rev_dfs_status_;
-}
-
-
-// Mutator for DFS traversal status of the node.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-rev_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds)
-{
-  this->rev_dfs_status_ = ds;
-}
-
-
-// Accessor for flag indicating whether node is a thread
-// delineator.
-
-int
-TAO_Reconfig_Scheduler_Entry::
-is_thread_delineator () const
-{
-  return this->is_thread_delineator_;
-}
-
-
-// Mutator for flag indicating whether node is a thread
-// delineator.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-is_thread_delineator (int i)
-{
-  this->is_thread_delineator_ = i;
-}
-
-
-// Accessor for flag indicating whether node has unresolved remote
-// dependencies.
-
-int
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_remote_dependencies () const
-{
-  return this->has_unresolved_remote_dependencies_;
-}
-
-
-// Mutator for flag indicating whether node has unresolved remote
-// dependencies.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_remote_dependencies (int i)
-{
-  this->has_unresolved_remote_dependencies_ = i;
-}
-
-
-// Accessor for flag indicating whether node has unresolved local
-// dependencies.
-
-int
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_local_dependencies () const
-{
-  return this->has_unresolved_local_dependencies_;
-}
-
-
-// Mutator for flag indicating whether node has unresolved local
-// dependencies.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-has_unresolved_local_dependencies (int i)
-{
-  this->has_unresolved_local_dependencies_ = i;
-}
-
-
-// Accessor for effective period of corresponding RT_Info.
-
-RtecScheduler::Period_t
-TAO_Reconfig_Scheduler_Entry::
-effective_period ()
-{
-  return this->effective_period_;
-}
-
-
-// Mutator for effective period of corresponding RT_Info.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-effective_period (RtecScheduler::Period_t p)
-{
-  this->effective_period_ = p;
-}
-
-
-// Accessor for effective execution time of corresponding RT_Info.
-
-CORBA::Long
-TAO_Reconfig_Scheduler_Entry::
-effective_exec_multiplier ()
-{
-  return this->effective_exec_multiplier_;
-}
-
-
-// Mutator for effective execution time of corresponding RT_Info.
-
-void
-TAO_Reconfig_Scheduler_Entry::
-effective_exec_multiplier (CORBA::Long l)
-{
-  this->effective_exec_multiplier_ = l;
-}
-
-
-///////////////////////////
-// TAO_RSE_Reset_Visitor //
-///////////////////////////
-
-// Constructor.
-
-TAO_RSE_Reset_Visitor::TAO_RSE_Reset_Visitor ()
-{
-}
-
-
-// Resets the fields in the entry to pre-DFS traversal states.
-// Returns 0 on success and -1 on error.
-
-int
-TAO_RSE_Reset_Visitor::visit (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Note that this value differs from what is set in the
-  // constructor for the entry.  This is because the reset
-  // visitor is applied prior to a DFS traversal, in which callers
-  // *unset* the thread delineator status of any of their called
-  // operations that do not specify a period or threads.
-  rse.is_thread_delineator (1);
-
-  rse.fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::NOT_VISITED);
-  rse.rev_dfs_status (TAO_Reconfig_Scheduler_Entry::NOT_VISITED);
-  rse.fwd_discovered (-1);
-  rse.rev_discovered (-1);
-  rse.fwd_finished (-1);
-  rse.rev_finished (-1);
-  rse.has_unresolved_remote_dependencies (0);
-  rse.has_unresolved_local_dependencies (0);
-
-  // These settings are used for a conservative but
-  // efficient approach to estimating utilization:
-  // for an exact algorithm using frame merging,
-  // other initial settings might be needed.
-  rse.effective_exec_multiplier (0);
-  rse.effective_period (0);
-
-  return 0;
-}
-
-
-
-
-
-///////////////////////////////////////////
-// class TAO_MUF_Reconfig_Sched_Strategy //
-///////////////////////////////////////////
-
-// Ordering function used to qsort an array of TAO_Reconfig_Scheduler_Entry
-// pointers into a total <priority, subpriority> ordering.  Returns -1 if the
-// first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const void *t)
-{
-  // 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));
-  TAO_Reconfig_Scheduler_Entry **second =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
-
-  // Check the converted pointers.
-  if (first == 0 || *first == 0)
-    {
-      return (second == 0 || *second == 0) ? 0 : 1;
-    }
-  else if (second == 0 || *second == 0)
-    {
-      return -1;
-    }
-
-  int result =
-    TAO_MUF_Reconfig_Sched_Strategy::priority_diff (*((*first)->actual_rt_info ()),
-                                                    *((*second)->actual_rt_info ()));
-
-  // Check whether they were distinguished by priority.
-  if (result == 0)
-    {
-      return TAO_MUF_Reconfig_Sched_Strategy::compare_subpriority (**first,
-                                                                   **second);
-    }
-  else
-    {
-      return result;
-    }
-}
-
-
-// Compares two entries by priority alone.  Returns -1 if the
-// first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::compare_priority (TAO_Reconfig_Scheduler_Entry &s,
-                                                   TAO_Reconfig_Scheduler_Entry &t)
-{
-  // Simply call the corresponding comparison based on the underlying rt_infos.
-  return TAO_MUF_Reconfig_Sched_Strategy::priority_diff (*s.actual_rt_info (),
-                                                         *t.actual_rt_info ());
-}
-
-
-// Compares two entries by subpriority alone.  Returns -1 if the
-// first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::compare_subpriority (TAO_Reconfig_Scheduler_Entry &s,
-                                                      TAO_Reconfig_Scheduler_Entry &t)
-{
-  // In MUF, priority is per criticality level: compare criticalities.
-  if (s.actual_rt_info ()->importance > t.actual_rt_info ()->importance)
-    {
-      return -1;
-    }
-  else if (s.actual_rt_info ()->importance < t.actual_rt_info ()->importance)
-    {
-      return 1;
-    }
-  // Same importance, so look at dfs finish time as a tiebreaker.
-  else if (s.fwd_finished () > t.fwd_finished ())
-    {
-      return -1;
-    }
-  else if (s.fwd_finished () < t.fwd_finished ())
-    {
-      return 1;
-    }
-
-  // They're the same if we got here.
-  return 0;
-}
-
-
-// Compares two RT_Infos by priority alone.  Returns -1 if the
-// first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::priority_diff (RtecScheduler::RT_Info &s,
-                                                RtecScheduler::RT_Info &t)
-{
-  // In MUF, priority is per criticality level: compare criticalities.
-  if (s.criticality > t.criticality)
-    {
-      return -1;
-    }
-  else if (s.criticality < t.criticality)
-    {
-      return 1;
-    }
-
-  // They're the same if we got here.
-  return 0;
-}
-
-
-// Determines whether or not an entry is critical, based on operation characteristics.
-// returns 1 if critical, 0 if not
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::is_critical (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Look at the underlying RT_Info's criticality field.
-  return (rse.actual_rt_info ()->criticality == RtecScheduler::HIGH_CRITICALITY ||
-          rse.actual_rt_info ()->criticality == RtecScheduler::VERY_HIGH_CRITICALITY)
-         ? 1 : 0;
-}
-
-// Fills in a static dispatch configuration for a priority level, based
-// on the operation characteristics of a representative scheduling entry.
-
-int
-TAO_MUF_Reconfig_Sched_Strategy::assign_config (RtecScheduler::Config_Info &info,
-                                                TAO_Reconfig_Scheduler_Entry &rse)
-{
-    // Global and thread priority of dispatching queue are simply
-    // those assigned the representative operation it will dispatch.
-    info.preemption_priority = rse.actual_rt_info ()->preemption_priority;
-    info.thread_priority = rse.actual_rt_info ()->priority;
-
-    // Dispatching queues are all laxity-based in this strategy.
-    info.dispatching_type = RtecScheduler::LAXITY_DISPATCHING;
-
-  return 0;
-}
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHED_UTILS_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
deleted file mode 100644
index de8ef81c5bb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_Utils.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHED_UTILS_H
-#define TAO_RECONFIG_SCHED_UTILS_H
-
-#include "ace/inc_user_config.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_ORBSVCS_Export TAO_Reconfig_Scheduler_Entry
-  // = TITLE
-  //   An implementation class used to store interim scheduling results
-  //   such as DFS finishing order, etc.
-  //
-  // = DESCRIPTION
-  //   This class improves the performance of the Reconfig Scheduler
-  //   by saving information from one computation for use in other
-  //   computations, and simplifies the implementation logic.
-{
-public:
-
-  // Info for DFS traversal, topological sort of call graph.
-  enum DFS_Status {NOT_VISITED, VISITED, FINISHED};
-
-  TAO_Reconfig_Scheduler_Entry (RtecScheduler::RT_Info &rt_info);
-  // Constructor.
-
-  RtecScheduler::RT_Info & orig_rt_info_data (void);
-  // Accessor for stored original RT_Info data.
-
-  void orig_rt_info_data (RtecScheduler::RT_Info &data);
-  // Mutator for stored original RT_Info data.
-
-  RtecScheduler::RT_Info * actual_rt_info ();
-  // Accessor for actual RT_Info.
-
-  void actual_rt_info (RtecScheduler::RT_Info *);
-  // Mutator for actual RT_Info.
-
-  long fwd_discovered () const;
-  // Accessor for when the node was discovered in forward DFS traversal.
-
-  void fwd_discovered (long l);
-  // Mutator for when the node was discovered in forward DFS traversal.
-
-  long rev_discovered () const;
-  // Accessor for when the node was discovered in reverse DFS traversal.
-
-  void rev_discovered (long l);
-  // Mutator for when the node was discovered in reverse DFS traversal.
-
-  long fwd_finished () const;
-  // Accessor for when the node was finished in forward DFS traversal.
-
-  void fwd_finished (long l);
-  // Mutator for when the node was finished in forward DFS traversal.
-
-  long rev_finished () const;
-  // Accessor for when the node was finished in reverse DFS traversal.
-
-  void rev_finished (long l);
-  // Mutator for when the node was finished in reverse DFS traversal.
-
-  DFS_Status fwd_dfs_status () const;
-  // Accessor for forward DFS traversal status of the node.
-
-  DFS_Status rev_dfs_status () const;
-  // Accessor for reverse DFS traversal status of the node.
-
-  void fwd_dfs_status (DFS_Status ds);
-  // Mutator for forward DFS traversal status of the node.
-
-  void rev_dfs_status (DFS_Status ds);
-  // Mutator for reverse DFS traversal status of the node.
-
-  int is_thread_delineator () const;
-  // Accessor for flag indicating whether node is a thread
-  // delineator.
-
-  void is_thread_delineator (int i);
-  // Mutator for flag indicating whether node is a thread
-  // delineator.
-
-  int has_unresolved_remote_dependencies () const;
-  // Accessor for flag indicating whether node has unresolved remote
-  // dependencies.
-
-  void has_unresolved_remote_dependencies (int i);
-  // Mutator for flag indicating whether node has unresolved remote
-  // dependencies.
-
-  int has_unresolved_local_dependencies () const;
-  // Accessor for flag indicating whether node has unresolved local
-  // dependencies.
-
-  void has_unresolved_local_dependencies (int i);
-  // Mutator for flag indicating whether node has unresolved local
-  // dependencies.
-
-  RtecScheduler::Period_t effective_period ();
-  // Accessor for effective period of corresponding RT_Info.
-
-  void effective_period (RtecScheduler::Period_t p);
-  // Mutator for effective period of corresponding RT_Info.
-
-  CORBA::Long effective_exec_multiplier ();
-  // Accessor for effective execution time multiplier of corresponding
-  // RT_Info.
-
-  void effective_exec_multiplier (CORBA::Long l);
-  // Mutator for effective execution time multiplier of corresponding
-  // RT_Info.
-
-private:
-
-  RtecScheduler::RT_Info orig_rt_info_data_;
-  // Stores the values of operation characteristics as they were specified
-  // in the most recent call to the Reconfig_Scheduler's set () method.
-  // That way, the scheduler propagation pass can overwrite RT_Info fields
-  // without losing the original values.  This is useful when
-
-  RtecScheduler::RT_Info *actual_rt_info_;
-  // Points to the actual RT_Info to which the schedling entry corresponds.
-
-  DFS_Status fwd_dfs_status_;
-  // Forward depth-first-search status of the entry.
-
-  DFS_Status rev_dfs_status_;
-  // Reverse depth-first-search status of the entry.
-
-  long fwd_discovered_;
-  // Forward depth-first-search discovery order of the entry.
-
-  long rev_discovered_;
-  // Reverse depth-first-search discovery order of the entry.
-
-  long fwd_finished_;
-  // Forward depth-first-search completion order of the entry.
-
-  long rev_finished_;
-  // Reverse depth-first-search completion order of the entry.
-
-  int is_thread_delineator_;
-  // Flag identifying threads in the call graph.
-
-  int has_unresolved_remote_dependencies_;
-  // Flag indicating whether or not there are unresolved remote
-  // dependencies in the entry's dependency call chain.
-
-  int has_unresolved_local_dependencies_;
-  // Flag indicating whether or not there are unresolved local
-  // dependencies in the entry's dependency call chain.
-
-  CORBA::Long effective_exec_multiplier_;
-  // Effective execution time multiplier for corresponding RT_Info.
-
-  RtecScheduler::Period_t effective_period_;
-  // Effective period of corresponding RT_Info.
-
-};
-
-
-class TAO_ORBSVCS_Export TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   An abstract base class for scheduler entry visitors.
-  //
-  // = DESCRIPTION
-  //   This class simplifies the reconfig scheduler implementation
-  //   by giving a common interface for distinct visitors over the
-  //   scheduling entries.
-{
-public:
-
-  virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0;
-  // Visit a Reconfig Scheduler Entry.
-
-};
-
-
-class TAO_ORBSVCS_Export TAO_RSE_Reset_Visitor :
-  public TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   A scheduler entry visitor that resets nodes.
-  //
-  // = DESCRIPTION
-  //   This class resets each node it visits to an initial state
-  //   prior to the first DFS traversal for topological sorting.
-{
-public:
-
-  TAO_RSE_Reset_Visitor ();
-  // Constructor.
-
-  virtual int visit (TAO_Reconfig_Scheduler_Entry &rse);
-  // Resets the fields in the entry to pre-DFS traversal states.
-  // Returns 0 on success and -1 on error.
-};
-
-
-
-
-class TAO_ORBSVCS_Export TAO_MUF_Reconfig_Sched_Strategy
-  // = TITLE
-  //   A scheduling strategy that implements the Maximum
-  //   Urgency First scheduling algorithm.
-  //
-  // = DESCRIPTION
-  //   The strategy assigns static thread and global priority according
-  //   to operation criticality, assigns static subpriority according to
-  //   importance and then topological order, and assigns a dispatching
-  //   configuration with a minimum laxity dispatching queue for each
-  //   distinct criticality level.
-{
-public:
-
-  static int total_priority_comp (const void *, const void *);
-  // Ordering function used to qsort an array of
-  // TAO_Reconfig_Scheduler_Entry pointers into a total <priority,
-  // subpriority> ordering.  Returns -1 if the first one is higher, 0
-  // if they're the same, and 1 if the second one is higher.
-
-  static int compare_priority (TAO_Reconfig_Scheduler_Entry &,
-                               TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-
-  static int compare_subpriority (TAO_Reconfig_Scheduler_Entry &,
-                                  TAO_Reconfig_Scheduler_Entry &);
-  // Compares two entries by subpriority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-  static int priority_diff (RtecScheduler::RT_Info &s,
-                            RtecScheduler::RT_Info &t);
-  // Compares two RT_Infos by priority alone.  Returns -1 if the
-  // first one is higher, 0 if they're the same, and 1 if the second one is higher.
-
-  static int is_critical (TAO_Reconfig_Scheduler_Entry &rse);
-  // Determines whether or not an entry is critical, based on operation characteristics.
-  // returns 1 if critical, 0 if not
-
-  static int assign_config (RtecScheduler::Config_Info &,
-                            TAO_Reconfig_Scheduler_Entry &);
-  // Fills in a static dispatch configuration for a priority level, based
-  // 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"
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHED_UTILS_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
deleted file mode 100644
index 7f6932fe82e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ /dev/null
@@ -1,882 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils_T.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHED_UTILS_T_C
-#define TAO_RECONFIG_SCHED_UTILS_T_C
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "Reconfig_Sched_Utils_T.h"
-#include "ace/Sched_Params.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# 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$")
-
-////////////////////////////////
-// TAO_RSE_Dependency_Visitor //
-////////////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-TAO_RSE_Dependency_Visitor
-    (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
-  : dependency_map_ (dependency_map),
-    rt_info_map_ (rt_info_map)
-{
-}
-
-
-// Visit a Reconfig Scheduler Entry.  This method calls protected hook
-// methods that can be overridden by derived classes, according to the
-// Template Method design pattern.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-visit (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  int result = 0;
-
-  // Call unconditional action method, which performs any necessary
-  // modifications that are applied to each node unconditionally.
-  if (this->unconditional_action (rse) < 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO_RSE_Dependency_Visitor::"
-                         "visit: error from unconditional action.\n"), -1);
-    }
-
-  // Call precondition hook method, and only proceed if the
-  // precondition returns 0 for success.
-
-  result = this->precondition (rse);
-  if (result < 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO_RSE_Dependency_Visitor::"
-                         "visit: error from precondition evaluation.\n"), -1);
-    }
-
-  if (result == 0)
-    {
-      // Call prefix action method, which performs any necessary
-      // modifications on the node prior to visiting its successors.
-      if (this->prefix_action (rse) < 0)
-	{
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO_RSE_Dependency_Visitor::"
-                             "visit: error from prefix action.\n"), -1);
-	}
-
-      // Get the dependency set for the current entry.
-      RtecScheduler::Dependency_Set *dependency_set = 0;
-      if (dependency_map_.find (rse.actual_rt_info ()->handle,
-                                dependency_set) == 0)
-	{
-          // Iterate over the set of dependencies for the current entry.
-          TAO_Reconfig_Scheduler_Entry * next_rse = 0;
-          RtecScheduler::RT_Info *next_rt_info;
-          for (u_int i = 0; i < dependency_set->length (); ++i)
-            {
-              // Take the handle from the dependency and use it
-              // to obtain an RT_Info pointer from the map.
-              if (rt_info_map_.find ((*dependency_set) [i].rt_info,
-                                     next_rt_info) != 0)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info not found.\n"), -1);
-                }
-
-              // Extract a pointer to the scheduling entry from the RT_Info.
-
-              if (next_rt_info == 0)
-	        {
-                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info in map was null.\n"),
-                                    -1);
-                }
-
-              // Reference the associated scheduling entry: the double cast is
-              // needed to ensure that the size of the pointer and the size of the
-              // stored magic cookie are the same (see the definition of
-              // ptr_arith_t in ACE to grok how this works portably).
-              next_rse = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry *,
-                                               ACE_static_cast (ptr_arith_t,
-                                                                next_rt_info->
-                                                                  volatile_token));
-              if (next_rse == 0)
-	        {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "Entry pointer in RT_Info was null.\n"),
-                                    -1);
-                }
-
-              // Call pre-recursion action method, which performs any necessary
-              // modifications to a successor (or the entry) prior to recursing
-              // on the successor.
-              result = this->pre_recurse_action (rse, *next_rse,
-                                                 (*dependency_set) [i]);
-              if (result < 0)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "TAO_RSE_Dependency_Visitor::visit: "
-                                     "error from pre-recursion action.\n"),
-                                    -1);
-                }
-
-              // If the pre-recursion action returned 0, visit the successor.
-              if (result == 0)
-                {
-                  this->visit (*next_rse);
-                }
-            }
-
-	}
-
-      // Call postfix action method, which performs any necessary
-      // modifications on the node after visiting all its successors.
-      if (this->postfix_action (rse) < 0)
-	{
-          ACE_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::"
-                             "visit: error from postfix action.\n"), -1);
-	}
-    }
-
-  return 0;
-}
-
-
-// Performs an unconditional action when the entry is first reached.
-// Returns 0 for success, and -1 if an error occurred.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unconditional_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
-  return 0;
-}
-
-
-// Tests whether or not any conditional actions should be taken for
-// the entry.  Returns 0 if the actions should be applied, 1 if the
-// entry should be left alone, and -1 if an error occurred.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-precondition (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
-  return 0;
-}
-
-
-// Performs an action on the entry prior to visiting any of
-// its successors.  Returns 0 on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
-  return 0;
-}
-
-
-// Performs an action on a successor entry prior to visiting
-// it.  Returns 0 on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (successor);
-  ACE_UNUSED_ARG (di);
-  return 0;
-}
-
-
-// Performs an action on the entry after visiting all of
-// its successors.  Returns 0 on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Default behavior: just return success.
-  ACE_UNUSED_ARG (rse);
-  return 0;
-}
-
-
-
-/////////////////////////
-// TAO_RSE_DFS_Visitor //
-/////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-TAO_RSE_DFS_Visitor
-  (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
-  : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-      (dependency_map, rt_info_map),
-    DFS_time_ (0)
-{
-}
-
-
-// Makes sure the entry has not previously been visited in forward DFS.
-// Returns 0 if the actions should be applied, 1 if the entry
-// should be left alone, and -1 if an error occurred.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-precondition (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  return (rse.fwd_dfs_status () ==
-          TAO_Reconfig_Scheduler_Entry::NOT_VISITED)
-          ? 0 : 1;
-}
-
-
-// Marks entry as forward visited and sets its forward DFS start
-// time, prior to visiting any of its successors.  Returns 0 on
-// success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  rse.fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::VISITED);
-  rse.fwd_discovered (this->DFS_time_++);
-  return 0;
-}
-
-
-// Marks whether or not successor is a thread delineator prior to
-// visiting it.  Returns 0 on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
-{
-  ACE_UNUSED_ARG (entry);
-  ACE_UNUSED_ARG (di);
-
-  // Operations we reached via a dependency and that do not
-  // specify a period are not thread delineators.
-  if (successor.actual_rt_info ()->period == 0 &&
-      successor.actual_rt_info ()->threads == 0)
-    {
-      successor.is_thread_delineator (0);
-    }
-
-  return 0;
-}
-
-
-// Marks entry as forward finished and sets its forward DFS finish
-// time, after all of its successors have been visited.  Returns 0
-// on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  rse.fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::FINISHED);
-  rse.fwd_finished (this->DFS_time_++);
-  return 0;
-}
-
-
-/////////////////////////
-// TAO_RSE_SCC_Visitor //
-/////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-TAO_RSE_SCC_Visitor
-  (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
-  : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-      (dependency_map, rt_info_map),
-    DFS_time_ (0),
-    number_of_cycles_ (0),
-    in_a_cycle_ (0)
-{
-}
-
-
-// Accessor for number of cycles detected in traversal.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-number_of_cycles (void)
-{
-  return this->number_of_cycles_;
-}
-
-
-// Accessor for whether or not the recursion is within a previously
-// detected cycle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-in_a_cycle (void)
-{
-  return this->in_a_cycle_;
-}
-
-
-// Mutator for whether or not the recursion is within a previously
-// detected cycle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-in_a_cycle (int i)
-{
-  this->in_a_cycle_ = i;
-}
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unconditional_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  if (rse.is_thread_delineator () &&
-      rse.effective_period () == 0)
-    {
-      rse.effective_period (rse.actual_rt_info ()->period);
-      long threads = rse.actual_rt_info ()->threads;
-      rse.effective_exec_multiplier (threads > 0 ? threads : 1);
-    }
-
-  return 0;
-}
-
-// Makes sure the entry has not previously been visited in the
-// reverse DFS (call graph transpose) direction.  Returns 0 if
-// the actions should be applied, 1 if the entry should be left
-// alone, and -1 if an error occurred.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-precondition (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  return (rse.rev_dfs_status () ==
-          TAO_Reconfig_Scheduler_Entry::NOT_VISITED)
-         ? 0 : 1;
-}
-
-
-// Marks reverse status as visited and sets reverse start time for
-// entry, prior to visiting any of its successors.  Returns 0 on
-// success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  rse.rev_dfs_status (TAO_Reconfig_Scheduler_Entry::VISITED);
-  rse.rev_discovered (this->DFS_time_++);
-  return 0;
-}
-
-
-// Checks reverse status of each successor.  For any that have not
-// been previously visited, it complains about the entry and
-// successor being part of a cycle, stores the fact that a cycle was
-// detected, and maintains a count of the total number of cycles
-// (strongly connected components).  Returns 0 on success and -1 on
-// an error (finding a cycle is not considered an error, at least as
-// far as this method is concerned).
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
-{
-  ACE_UNUSED_ARG (di);
-
-  if  (successor.rev_dfs_status () ==
-       TAO_Reconfig_Scheduler_Entry::NOT_VISITED)
-    {
-      if (this->in_a_cycle () == 0)
-	{
-          this->in_a_cycle (1);
-          ++this->number_of_cycles_;
-	}
-
-      ACE_DEBUG ((LM_ERROR,
-                  "RT_Infos \"%s\" and \"%s\" are part of dependency cycle %d.\n",
-                  entry.actual_rt_info ()->entry_point.in (),
-                  successor.actual_rt_info ()->entry_point.in (),
-                  this->number_of_cycles_));
-    }
-
-  return 0;
-}
-
-
-// Sets the entry's reverse finish time and marks it as finished in
-// the reverse DFS traversal, after visiting all of its successors.
-// Returns 0 on success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  rse.rev_dfs_status (TAO_Reconfig_Scheduler_Entry::FINISHED);
-  rse.rev_finished (this->DFS_time_++);
-  return 0;
-}
-
-
-/////////////////////////////////
-// TAO_RSE_Propagation_Visitor //
-/////////////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-TAO_RSE_Propagation_Visitor
-  (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
-  : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> (dependency_map, rt_info_map),
-    unresolved_locals_ (0),
-    unresolved_remotes_ (0),
-    thread_specification_errors_ (0)
-{
-}
-
-
-// Accessor for number of nodes with unresolved local dependencies.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_locals (void)
-{
-  return this->unresolved_locals_;
-}
-
-
-// Mutator for number of nodes with unresolved local dependencies.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_locals (int i)
-{
-  this->unresolved_locals_ = i;
-}
-
-
-// Accessor for number of nodes with unresolved remote dependencies.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_remotes (void)
-{
-  return this->unresolved_remotes_;
-}
-
-
-// Mutator for number of nodes with unresolved remote dependencies.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-unresolved_remotes (int i)
-{
-  this->unresolved_remotes_ = i;
-}
-
-// Accessor for number of nodes with thread specification errors.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-thread_specification_errors (void)
-{
-  return this->thread_specification_errors_;
-}
-
-
-// Mutator for number of nodes with thread specification errors.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-thread_specification_errors (int i)
-{
-  this->thread_specification_errors_ = i;
-}
-
-
-// Tests the entry for possibly having unresolved remote or local
-// dependencies prior to visiting any of its successors, and also
-// checks for thread specification errors.  Returns 0 on success and
-// -1 on error (having unresolved dependencies or thread specification
-// problems is not considered an error, at least for this method).
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-prefix_action (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  // Complain about anything that is still marked as a thread
-  // delineator but does not have a period: if it has threads, it is a
-  // specification error.  Otherwise, if it's not a remote dependant
-  // (per RT_Info's info_type field) it has unresolved *local*
-  // dependencies.
-
-  if (rse.is_thread_delineator ())
-    {
-      if (rse.actual_rt_info ()->period == 0)
-        {
-          if (rse.actual_rt_info ()->threads == 0)
-          {
-            if (rse.actual_rt_info ()->info_type ==
-                RtecScheduler::REMOTE_DEPENDANT)
-              {
-                ++this->unresolved_remotes_;
-
-                ACE_DEBUG ((LM_ERROR,
-                            "RT_Info \"%s\" has unresolved "
-                            "remote dependencies.\n",
-                            rse.actual_rt_info ()->entry_point.in ()));
-              }
-            else
-              {
-                ++this->unresolved_locals_;
-
-                ACE_DEBUG ((LM_ERROR,
-                            "RT_Info \"%s\" has unresolved "
-                            "local dependencies.\n",
-                            rse.actual_rt_info ()->entry_point.in ()));
-              }
-          }
-        else
-          {
-            // Specification error: any RT_Info that specifies threads
-            // must also specify a period.
-            ++this->thread_specification_errors_;
-            ACE_DEBUG ((LM_ERROR,
-                        "RT_Info \"%s\" specifies %ld "
-                        "threads, but no period.\n",
-                        rse.actual_rt_info ()->entry_point.in (),
-                        rse.actual_rt_info ()->threads));
-          }
-        }
-    }
-
-  return 0;
-}
-
-
-// Propagates effective period and execution time multiplier from
-// entry to successor prior to visiting successor.  Returns 0 on
-// success and -1 on error.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                    TAO_Reconfig_Scheduler_Entry &successor,
-                    const RtecScheduler::Dependency_Info &di)
-{
-  ACE_UNUSED_ARG (di);
-
-  // This method makes a conservative estimate in cases where periods
-  // differ, taking the minimum frame size and dividing down the
-  // execution multiplier of the longer frame (and rounding the result
-  // upward as needed).  A more exact computation could be achieved
-  // by merging sets of arrivals and frame offsets, but that
-  // would in turn cost more in run-time computation time.
-  // NOTE: this approach *only* works for harmonic periods.  For
-  // non-harmonic periods, the set merge approach is necessary.
-
-  if (successor.effective_period () == 0)
-    {
-      // If this is the first dependency by which the successor has
-      // been reached, and the successor is not itself a thread
-      // delineator, then simply adopt the effective period and
-      // execution time multiplier of the shorter period.
-      successor.effective_period (entry.effective_period ());
-      successor.effective_exec_multiplier (entry.effective_exec_multiplier ());
-    }
-  else
-    {
-      // Otherwise, take the smaller of the two periods, and divide down
-      // the execution multipliers accordingly.
-
-      long new_exec_multiplier = 0;
-      long old_exec_multiplier = 0;
-
-      if (successor.effective_period () < entry.effective_period ())
-        {
-          // Store the previous execution multiplier.
-          old_exec_multiplier = successor.effective_exec_multiplier ();
-
-          // Divide down the new execution multiplier.
-          new_exec_multiplier =
-            ACE_static_cast (long,
-                             (old_exec_multiplier *
-                              successor.effective_period ()) /
-                             entry.effective_period ());
-
-          // Adjust for round-off error.
-          if (old_exec_multiplier >
-              ACE_static_cast (long,
-                               (new_exec_multiplier *
-                                entry.effective_period ()) /
-                               successor.effective_period ()))
-            {
-              ++new_exec_multiplier;
-            }
-
-          // Set the successor's effective period and execution multiplier.
-          successor.effective_period (entry.effective_period ());
-          successor.effective_exec_multiplier (entry.effective_exec_multiplier () +
-                                               new_exec_multiplier);
-        }
-      else
-        {
-          // Store the previous execution multiplier.
-          old_exec_multiplier = entry.effective_exec_multiplier ();
-
-          // Divide down the new execution multiplier.
-          new_exec_multiplier =
-            ACE_static_cast (long,
-                             old_exec_multiplier *
-                             entry.effective_period () /
-                             successor.effective_period ());
-
-          // Adjust for round-off error.
-          if (old_exec_multiplier >
-              ACE_static_cast (long,
-                               new_exec_multiplier *
-                               successor.effective_period () /
-                               entry.effective_period ()))
-            {
-              ++new_exec_multiplier;
-            }
-
-          // Just set the successor's execution multiplier (the period is unchanged).
-          successor.effective_exec_multiplier (successor.effective_exec_multiplier () +
-                                               new_exec_multiplier);
-        }
-    }
-
-  // Do not recurse on the successor node, just continue to the next successor.
-  return 1;
-}
-
-
-////////////////////////////////////
-// class TAO_RSE_Priority_Visitor //
-////////////////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY>
-TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::
-TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles,
-                          TAO_Reconfig_Scheduler_Entry ** entry_ptr_array)
-  : previous_entry_ (0),
-    first_subpriority_entry_ (0),
-    priority_ (0),
-    subpriority_ (0),
-    os_priority_ (ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
-                                                  ACE_SCOPE_PROCESS)),
-    handles_ (handles),
-    entry_ptr_array_ (entry_ptr_array)
-{
-}
-
-
-// Visit a Reconfig Scheduler Entry.  This method
-// assigns a priority and subpriority value to each
-// entry.  Priorities are assigned in increasing value
-// order, with lower numbers corresponding to higher
-// priorities.
-
-template <class RECONFIG_SCHED_STRATEGY> int
-TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  int result = 0;
-
-  if (previous_entry_ == 0)
-    {
-      // Indicate a new priority level was assigned.
-      result = 1;
-
-      // If we're on the first node, store the start of the array
-      // as the start of the priority level.
-      first_subpriority_entry_ = this->entry_ptr_array_;
-      rse.actual_rt_info ()->preemption_subpriority = subpriority_;
-    }
-  else
-    {
-      if (RECONFIG_SCHED_STRATEGY::compare_priority (*previous_entry_, rse) == 0)
-	{
-          // Subpriority is increased at each new node.
-          ++subpriority_;
-
-          // Store negative value of subpriority level: will be
-          // adjusted by adding back in the total number of
-          // subpriorities in the priority level, so the
-          // subpriorities are assigned in decreasing order.
-          rse.actual_rt_info ()->preemption_subpriority = - subpriority_;
-	}
-      else
-	{
-          // Indicate a new priority level was assigned.
-          result = 1;
-
-          // Iterate back through and adjust the subpriority levels.
-          for (int i = 0; i <= subpriority_; ++i, ++first_subpriority_entry_)
-	    {
-              (*first_subpriority_entry_)->
-                actual_rt_info ()->
-                  preemption_subpriority += subpriority_;
-	    }
-
-          subpriority_ = 0;
-          rse.actual_rt_info ()->preemption_subpriority = subpriority_;
-
-          ++priority_;
-          os_priority_ = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    os_priority_,
-                                                    ACE_SCOPE_PROCESS);
-	}
-    }
-
-  // Assign the entry's priority and subpriority values
-  rse.actual_rt_info ()->priority = os_priority_;
-  rse.actual_rt_info ()->preemption_priority = priority_;
-
-  // Remember the current entry for the next visit.
-  previous_entry_ = &rse;
-
-  return result;
-}
-
-
-// Finishes scheduler entry priority assignment by iterating over the
-// remaining entries in the last subpriority level, and adjusting
-// their subpriorities.
-template <class RECONFIG_SCHED_STRATEGY> int
-TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>::finish ()
-{
-  // Iterate back through and adjust the subpriority levels.
-  for (int i = 0; i <= subpriority_; ++i, ++first_subpriority_entry_)
-    {
-      (*first_subpriority_entry_)->
-        actual_rt_info ()->
-          preemption_subpriority += subpriority_;
-    }
-
-  // Indicate no new proirity level was identified.
-  return 0;
-}
-
-///////////////////////////////////////
-// class TAO_RSE_Utilization_Visitor //
-///////////////////////////////////////
-
-// Constructor.
-
-template <class RECONFIG_SCHED_STRATEGY>
-TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY>::TAO_RSE_Utilization_Visitor ()
-  : critical_utilization_ (0.0),
-    noncritical_utilization_ (0.0)
-{
-}
-
-// Visit a Reconfig Scheduler Entry.  This method
-// determines the utilization by the entry, and
-// adds it to the critical or non-critical utilization,
-// depending on whether or not the strategy says the
-// operation is critical.
-
-template <class RECONFIG_SCHED_STRATEGY> int
-TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_Reconfig_Scheduler_Entry &rse)
-{
-  CORBA::Double entry_period = rse.effective_period ();
-  CORBA::Double entry_time = ACE_static_cast (
-    CORBA::Double,
-    ACE_UINT64_DBLCAST_ADAPTER (rse.actual_rt_info ()->
-                                worst_case_execution_time));
-  CORBA::Double entry_mult = rse.effective_exec_multiplier ();
-
-  if (RECONFIG_SCHED_STRATEGY::is_critical (rse))
-    {
-      this->critical_utilization_ =
-        (entry_mult * entry_time) / entry_period;
-    }
-  else
-    {
-      this->noncritical_utilization_ =
-        (entry_mult * entry_time) / entry_period;
-    }
-
-  return 0;
-}
-
-
-// Accessor for utilization by critical operations.
-
-template <class RECONFIG_SCHED_STRATEGY> CORBA::Double
-TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY>::critical_utilization ()
-{
-  return this->critical_utilization_;
-}
-
-
-// Accessor for utilization by noncritical operations.
-
-template <class RECONFIG_SCHED_STRATEGY> CORBA::Double
-TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY>::noncritical_utilization ()
-{
-  return this->noncritical_utilization_;
-}
-
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
deleted file mode 100644
index 3a9120922fb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_Utils_T.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHED_UTILS_T_H
-#define TAO_RECONFIG_SCHED_UTILS_T_H
-
-#include "ace/inc_user_config.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "Reconfig_Sched_Utils.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//////////////////////////////////////////
-// Reconfig Sched Entry Visitor classes //
-//////////////////////////////////////////
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_RSE_Dependency_Visitor :
-  public TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   A base class for scheduler entry visitors that use a
-  //   dependency map to traverse a dependency graph over entries.
-  //
-  // = DESCRIPTION
-  //   This class hold the maps and a constructor that
-  //   derived classes may call to pass them in. 
-{
-public:
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  RtecScheduler::Dependency_Set*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> DEPENDENCY_SET_MAP;
-  // Type of map used for O(1) lookup of RT_Info
-  // dependency sets by caller or called handle.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  RtecScheduler::RT_Info*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> RT_INFO_MAP;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  TAO_RSE_Dependency_Visitor
-    (DEPENDENCY_SET_MAP & dependency_map,
-     RT_INFO_MAP & rt_info_map);
-  // Constructor.
-
-  virtual int visit (TAO_Reconfig_Scheduler_Entry &);
-  // Visit a Reconfig Scheduler Entry.  This method calls
-  // protected hook methods that can be overridden by
-  // derived classes, according to the Template Method
-  // design pattern.
-
-protected:
-
-  virtual int unconditional_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an unconditional action when the entry is first reached.
-  // Returns 0 for success, and -1 if an error occurred.
-
-  virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Tests whether or not any conditional actions should be taken for
-  // the entry.  Returns 0 if the actions should be applied, 1 if the
-  // entry should be left alone, and -1 if an error occurred.
-
-  virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an action on the entry prior to visiting any of
-  // its successors.  Returns 0 on success and -1 on error.
-
-  virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                                  TAO_Reconfig_Scheduler_Entry &successor,
-                                  const RtecScheduler::Dependency_Info &di);
-  // Performs an action on a successor entry prior to visiting
-  // it.  Returns 0 if the successor should be visited recursively,
-  // 1 if the successor should not be visited, and -1 on error.
-
-  virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Performs an action on the entry after visiting all of
-  // its successors.  Returns 0 on success and -1 on error.
-
-  DEPENDENCY_SET_MAP & dependency_map_;
-  // Map of dependencies between RT_Info handles.
-
-  RT_INFO_MAP & rt_info_map_;
-  // Map of handles into RT_Infos.
-
-};
-
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_RSE_DFS_Visitor :
-  public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-  // = TITLE
-  //   A scheduler entry visitor that marks nodes with DFS start
-  //   and finish times.
-  //
-  // = DESCRIPTION
-  //   This class does DFS traversal marking of each node it visits,
-  //   as appropriate according to DFS state markers.
-{
-public:
-
-  TAO_RSE_DFS_Visitor
-    (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
-
-protected:
-  virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Makes sure the entry has not previously been visited in forward DFS.
-  // Returns 0 if the actions should be applied, 1 if the entry
-  // should be left alone, and -1 if an error occurred.
-
-  virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks entry as forward visited and sets its forward DFS start
-  // time, prior to visiting any of its successors.  Returns 0 on
-  // success and -1 on error.
-
-  virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                                  TAO_Reconfig_Scheduler_Entry &successor,
-                                  const RtecScheduler::Dependency_Info &di);
-  // Marks whether or not successor is a thread delineator prior to
-  // visiting it.  Returns 0 on success and -1 on error.
-
-  virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks entry as forward finished and sets its forward DFS finish
-  // time, after all of its successors have been visited.  Returns 0
-  // on success and -1 on error.
-
-private:
-  int DFS_time_;
-  // Keeps track of DFS start and finish times.
-
-};
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_RSE_SCC_Visitor :
-  public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-  // = TITLE
-  //   A scheduler entry visitor that checks for cycles in the graph.
-  //
-  // = DESCRIPTION
-  //   This class, when applied to nodes in the transpose of the DFS graph as
-  //   ordered for the strongly connected components algorithm, will
-  //   flag cycles in the graph.
-{
-public:
-
-  TAO_RSE_SCC_Visitor
-    (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
-
-  int number_of_cycles (void);
-  // Accessor for number of cycles detected in traversal.
-
-  int in_a_cycle (void);
-  // Accessor for whether or not the recursion is within a previously
-  // detected cycle.
-
-  void in_a_cycle (int);
-  // Mutator for whether or not the recursion is within a previously
-  // detected cycle.
-
-protected:
-  virtual int unconditional_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // If the entry is a thread delineator, sets its effective period and
-  // execution multiplier from the values in its corresponding RT_Info.
-  // Returns 0 for success, and -1 if an error occurred.
-
-  virtual int precondition (TAO_Reconfig_Scheduler_Entry &rse);
-  // Makes sure the entry has not previously been visited in the
-  // reverse DFS (call graph transpose) direction.  Returns 0 if
-  // the actions should be applied, 1 if the entry should be left
-  // alone, and -1 if an error occurred.
-
-  virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Marks reverse status as visited and sets reverse start time for
-  // entry, prior to visiting any of its successors.  Returns 0 on
-  // success and -1 on error.
-
-  virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                                  TAO_Reconfig_Scheduler_Entry &successor,
-                                  const RtecScheduler::Dependency_Info &di);
-  // Checks reverse status of each successor.  For any that have not
-  // been previously visited, it complains about the entry and
-  // successor being part of a cycle, stores the fact that a cycle was
-  // detected, and maintains a count of the total number of cycles
-  // (strongly connected components).  Returns 0 on success and -1 on
-  // an error (finding a cycle is not considered an error, at least as
-  // far as this method is concerned).
-
-  virtual int postfix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Sets the entry's reverse finish time and marks it as finished in
-  // the reverse DFS traversal, after visiting all of its successors.
-  // Returns 0 on success and -1 on error.
-
-private:
-  int DFS_time_;
-  // Keeps track of DFS start and finish times.
-
-  int number_of_cycles_;
-  // Keeps track of DFS start and finish times.
-
-  int in_a_cycle_;
-  // Indicates whether or not the recursion is
-  // currently within a previously discovered cycle.
-};
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_RSE_Propagation_Visitor :
-  public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-  // = TITLE
-  //   A scheduler entry visitor that propagates effective periods and
-  //   execution time multipliers between nodes in a topologically
-  //   ordered graph.
-  //
-  // = DESCRIPTION
-  //   This class computes the effective period of each node, according to
-  //   its dependencies, and the period and threads it specifies.
-{
-public:
-
-  TAO_RSE_Propagation_Visitor
-    (TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
-  // Constructor.
-
-  int unresolved_locals (void);
-  // Accessor for number of nodes with unresolved local dependencies.
-
-  void unresolved_locals (int);
-  // Mutator for numberof nodes with unresolved local dependencies.
-
-  int unresolved_remotes (void);
-  // Accessor for number of nodes with unresolved remote dependencies.
-
-  void unresolved_remotes (int);
-  // Mutator for number of nodes with unresolved remote dependencies.
-
-  int thread_specification_errors (void);
-  // Accessor for number of nodes with thread specification errors.
-
-  void thread_specification_errors (int);
-  // Mutator for number of nodes with thread specification errors.
-
-protected:
-  virtual int prefix_action (TAO_Reconfig_Scheduler_Entry &rse);
-  // Tests the entry for possibly having unresolved remote or local
-  // dependencies prior to visiting any of its successors.  Returns 0
-  // on success and -1 on error (having unresolved remote or local
-  // dependencies is not considered an error, at least for this
-  // method).
-
-  virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
-                                  TAO_Reconfig_Scheduler_Entry &successor,
-                                  const RtecScheduler::Dependency_Info &di);
-  // Propagates effective period and execution time multiplier from
-  // entry to successor prior to visiting successor.  Returns 1 on
-  // success (to prevent recursion on the successor), and -1 on error.
-
-private:
-
-  int unresolved_locals_;
-  // Number of nodes with unresolved local dependencies.
-
-  int unresolved_remotes_;
-  // Number of nodes with unresolved remote dependencies.
-
-  int thread_specification_errors_;
-  // Number of nodes with thread specification errors.
-};
-
-template <class RECONFIG_SCHED_STRATEGY>
-class TAO_RSE_Priority_Visitor :
-  public TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   A scheduler entry visitor that assigns static priority and
-  //   subpriority values to entries in an array already sorted in
-  //   static <priority, subpriority> order.
-  //
-  // = DESCRIPTION
-  //   The visitor uses the parameterized strategy type to determine
-  //   priority and subpriority boundaries.
-{
-public:
-
-  TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles,
-                            TAO_Reconfig_Scheduler_Entry ** entry_ptr_array);
-  // Constructor.
-
-    virtual int visit (TAO_Reconfig_Scheduler_Entry &);
-  // Visit a Reconfig Scheduler Entry.  This method
-  // assigns a priority and subpriority value to each
-  // entry.  Priorities are assigned in increasing value
-  // order, with lower numbers corresponding to higher
-  // priorities.  Returns -1 on error, 1 if a new priority
-  // was assigned, or 0 otherwise. 
-
-  int finish ();
-  // Finishes scheduler entry priority assignment by iterating over the
-  // remaining entries in the last subpriority level, and adjusting
-  // their subpriorities.
-
-private:
-
-  TAO_Reconfig_Scheduler_Entry *previous_entry_;
-  // Pointer to previous entry most recently seen in the iteration.
-
-  TAO_Reconfig_Scheduler_Entry **first_subpriority_entry_;
-  // Pointer to first subpriority entry in the priority level.
-
-  RtecScheduler::Preemption_Priority_t priority_;
-  // Current priority value.
-
-  RtecScheduler::Preemption_Subpriority_t subpriority_;
-  // Current subpriority value.
-
-  RtecScheduler::OS_Priority os_priority_;
-  // Current OS (thread) priority value.
-
-  RtecScheduler::handle_t handles_;
-  // Number of handles in the entry pointer array.
-
-  TAO_Reconfig_Scheduler_Entry ** entry_ptr_array_;
-  // An array of pointers to entries we will be visiting.
-};
-
-template <class RECONFIG_SCHED_STRATEGY>
-class TAO_RSE_Utilization_Visitor :
-  public TAO_Reconfig_Sched_Entry_Visitor
-  // = TITLE
-  //   A scheduler entry visitor that accumulates utilization separately
-  //   for the critical operations and the non-critical operations.
-  //
-  // = DESCRIPTION
-  //   The visitor uses the parameterized strategy type to determine
-  //   whether or not a given operation is critical.
-{
-public:
-
-  TAO_RSE_Utilization_Visitor ();
-  // Constructor.
-
-    virtual int visit (TAO_Reconfig_Scheduler_Entry &);
-  // Visit a Reconfig Scheduler Entry.  This method
-  // determines the utilization by the entry, and
-  // adds it to the critical or non-critical utilization,
-  // depending on whether or not the strategy says the
-  // operation is critical.
-
-  CORBA::Double critical_utilization ();
-  // Accessor for utilization by critical operations.
-
-  CORBA::Double noncritical_utilization ();
-  // Accessor for utilization by noncritical operations.
-
-private:
-
-  CORBA::Double critical_utilization_;
-  // Utilization by critical operations.
-
-  CORBA::Double noncritical_utilization_;
-  // Utilization by noncritical operations.
-};
-
-
-
-#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 */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Sched_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHED_UTILS_T_H */
-
-
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 8fda563dd82..bb8aa39cca4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
@@ -1,42 +1,745 @@
-// ============================================================================
-//
 // $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHEDULER_C
-#define TAO_RECONFIG_SCHEDULER_C
-
-#include "Reconfig_Scheduler_T.h"
-#include "Reconfig_Scheduler.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
+
+#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Reconfig_Scheduler.h"
+
+#if defined (__ACE_INLINE__)
+#include "orbsvcs/Reconfig_Scheduler.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$")
+ACE_RCSID(orbsvcs, Reconfig_Scheduler, "$Id$")
+
+// Default constructor.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+ACE_Reconfig_Scheduler::ACE_Reconfig_Scheduler ()
+  : next_handle_ (0),
+    stability_flags_ (SCHED_NONE_STABLE),
+    dependency_count_ (0),
+    last_scheduled_priority_ (0)
+{
+}
+
+// Constructor. Initialize the scheduler from the POD_Config_Info, POD_RT_Info, 
+// and POD_Dependency arrays, plus stability flag.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+ACE_Reconfig_Scheduler::
+ACE_Reconfig_Scheduler (int config_count,
+                        ACE_Scheduler_Factory::POD_Config_Info config_infos[],
+                        int rt_info_count,
+                        ACE_Scheduler_Factory::POD_RT_Info rt_infos[],
+                        int dependency_count,
+                        ACE_Scheduler_Factory::POD_Dependency_Info dependency_infos[],
+                        u_long stability_flags)
+  : next_handle_ (0),
+    stability_flags_ (SCHED_ALL_STABLE),
+    dependency_count_ (0),
+    last_scheduled_priority_ (0)
+{
+  // Declare a CORBA::Environment variable in the current scope.
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  // The init method can throw an exception, which must be caught
+  // *inside* the constructor to be portable between compilers that
+  // differ in whether they support native C++ exceptions.
+  ACE_TRY
+    {
+      this->init (config_count, config_infos,
+                  rt_info_count, rt_infos,
+                  dependency_count, dependency_infos,
+                  stability_flags);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::SystemException, corba_sysex)
+    {
+       ACE_ERROR ((LM_ERROR, "ACE_Reconfig_Scheduler::ACE_Reconfig_Scheduler "
+                             "system exception: cannot initialize scheduler.\n"));
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+}
+
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
+ACE_Reconfig_Scheduler::init (int config_count,
+                              ACE_Scheduler_Factory::POD_Config_Info config_info[],
+                              int rt_info_count,
+                              ACE_Scheduler_Factory::POD_RT_Info rt_info[],
+                              int dependency_count,
+                              ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
+                              int stability_flags,
+                              CORBA::Environment &ACE_TRY_ENV)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::DUPLICATE_NAME,
+                     RtecScheduler::UNKNOWN_TASK,
+                     RtecScheduler::SYNCHRONIZATION_FAILURE))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK_RETURN (-1);
+
+  int result = 0;
+
+  // Clear out the previous entries, if any.
+  this->close (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // (Re)initialize using the new settings.
+
+  // Add the passed config infos to the scheduler
+  for (int config_info_count = 0; config_info_count < config_count; ++config_info_count)
+    {
+      RtecScheduler::Config_Info* new_config_info;
+      ACE_NEW_THROW_EX (new_config_info,
+                        RtecScheduler::Config_Info,
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (ST_VIRTUAL_MEMORY_EXHAUSTED);
+
+      result = config_info_map_.bind (config_info [config_info_count].preemption_priority,
+                                      new_config_info);
+      switch (result)
+        {
+          case -1:
+            // Something bad but unknown occurred while trying to bind in map.
+            delete new_config_info;
+            ACE_THROW_RETURN (CORBA::UNKNOWN (), -1);
+
+          case 1:
+            // Tried to bind an operation that was already in the map.
+            delete new_config_info;
+            ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), -1);
+
+          default:
+            break;
+        }
+
+      new_config_info->preemption_priority = 
+        config_info [config_info_count].preemption_priority;
+      new_config_info->thread_priority =
+        config_info [config_info_count].thread_priority;
+      new_config_info->dispatching_type = 
+        config_info [config_info_count].dispatching_type;
+
+      if (new_config_info->preemption_priority >
+          last_scheduled_priority_)
+        {
+          last_scheduled_priority_ = 
+            new_config_info->preemption_priority;
+        }
+    }
+
+  // Add RT_Infos to scheduler
+  RtecScheduler::RT_Info* new_rt_info;
+  for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos)
+    {
+      new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
+                              rt_info [num_rt_infos].handle,
+                              ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+      
+      // Fill in the portions to which the user has access.
+      set_i (new_rt_info,
+             RtecScheduler::Criticality_t (rt_info [num_rt_infos].criticality),
+             rt_info [num_rt_infos].worst_case_execution_time,
+             rt_info [num_rt_infos].typical_execution_time,
+             rt_info [num_rt_infos].cached_execution_time,
+             rt_info [num_rt_infos].period,
+             RtecScheduler::Importance_t (rt_info [num_rt_infos].importance),
+             rt_info [num_rt_infos].quantum,
+             rt_info [num_rt_infos].threads,
+             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type));
+
+      // Fill in the scheduler managed portions.
+      new_rt_info->priority = 
+        rt_info [num_rt_infos].priority;
+      new_rt_info->preemption_subpriority = 
+        rt_info [num_rt_infos].preemption_subpriority;
+      new_rt_info->preemption_priority = 
+        rt_info [num_rt_infos].preemption_priority;
+      new_rt_info->volatile_token = 0;
+
+    // Add dependencies between RT_Infos to scheduler.
+    for (dependency_count_ = 0; dependency_count_ < dependency_count; ++dependency_count_)
+      {
+        add_dependency_i (dependency_info [dependency_count_].info_that_depends,
+                          dependency_info [dependency_count_].info_depended_on,
+                          dependency_info [dependency_count_].dependency_type,
+                          dependency_info [dependency_count_].number_of_calls,
+                          ACE_TRY_ENV);
+        ACE_CHECK_RETURN (-1);
+      }
+
+    // Set stability flags after the operations are loaded, as the passed flags
+    // should be respected as being the stability state of the passed schedule.
+    stability_flags_ = stability_flags;
+
+  return result;
+}
+
+// Closes the scheduler, releasing all current resources.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
+ACE_Reconfig_Scheduler::close (void)
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Unbind and delete each RT_Info in the map.
+  RtecScheduler::RT_Info *rt_info;
+  RtecScheduler::handle_t handle;
+  while (rt_info_map_.current_size () > 0)
+    {
+      handle = (*rt_info_map_.begin ()).ext_id_;
+      if (rt_info_map_.unbind (handle, rt_info) == 0)
+        {
+          if (rt_info_tree_.unbind (rt_info->entry_point) == 0)
+            {
+              delete rt_info;
+            }
+          else
+            {
+              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+            }
+         }
+      else
+        {
+          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+        }
+    }
+
+  // Delete each Config_Info in the map.
+  RtecScheduler::Preemption_Priority_t config_priority;
+  RtecScheduler::Config_Info *config_info;
+  while (rt_info_map_.current_size () > 0)
+    {
+      config_priority = (*config_info_map_.begin ()).ext_id_;
+      if (config_info_map_.unbind (config_priority, config_info) == 0)
+        {
+          delete config_info;
+        }
+      else
+        {
+          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+        }
+    }
+
+  // Finally, start over with the lowest handle number.
+  next_handle = 0;    
+}
+
+// Create an RT_Info.  If it does not exist, a new RT_Info is
+// created and inserted into the schedule, and the handle of the new
+// RT_Info is returned.  If the RT_Info already exists, an exception
+// is thrown.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::handle_t
+ACE_Reconfig_Scheduler::create (const char *entry_point,
+                               CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::DUPLICATE_NAME))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK_RETURN (0);
+
+  RtecScheduler::handle_t handle = next_handle_;
+  create_i (entry_point, handle, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (handle);
+
+  return handle;
+}
+
+// Lookup a handle for an RT_Info, and return its handle, or an error
+// value if it's not present.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::handle_t
+ACE_Reconfig_Scheduler::lookup (const char * entry_point,
+                               CORBA::Environment &ACE_TRY_ENV)
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK_RETURN (0);
+
+  RtecScheduler::handle_t handle;
+  handle = this->lookup_i (entry_point, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (handle);
+
+  return handle;
+}
+
+
+// Return a pointer to the RT_Info corresponding to the passed handle.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::RT_Info *
+ACE_Reconfig_Scheduler::get (RtecScheduler::handle_t handle,
+                             CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK_RETURN (0);
+
+  // Find the RT_Info in the hash map.
+  RtecScheduler::RT_Info *rt_info = 0;
+  if (rt_info_map_.find (handle, rt_info) != 0)
+    {
+      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0)
+    }
+
+  // Allocate a new RT_Info
+  RtecScheduler::RT_Info* new_info;
+  ACE_NEW_THROW_EX (new info,
+                    RtecScheduler::RT_Info,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  *new_info = *rt_info;
+
+  return new_info;
+}
+
+
+// Set characteristics of the RT_Info corresponding to the passed handle.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::set (RtecScheduler::handle_t handle,
+                             RtecScheduler::Criticality_t criticality,
+                             RtecScheduler::Time time,
+                             RtecScheduler::Time typical_time,
+                             RtecScheduler::Time cached_time,
+                             RtecScheduler::Period_t period,
+                             RtecScheduler::Importance_t importance,
+                             RtecScheduler::Quantum_t quantum,
+                             CORBA::Long threads,
+                             RtecScheduler::Info_Type_t info_type,
+                             CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Look up the RT_Info by its handle, throw an exception if it's not there.
+  RtecScheduler::RT_Info *rt_info = 0;
+  if (rt_info_map_.find (handle, rt_info) != 0)
+    {
+      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0)
+    }
+
+  // CDG - TBD - set stability flags - check existing values against new ones
+
+  // Call the internal set method.
+  this->set_i (rt_info, criticality, time, typical_time,
+               cached_time, period, importance, quantum,
+               threads, info_type);
+}
+
+
+// Returns the priority and subpriority values assigned to an RT_Info,
+// based on its handle.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::priority (RtecScheduler::handle_t handle,
+                                 RtecScheduler::OS_Priority& o_priority,
+                                 RtecScheduler::Preemption_Subpriority_t& subpriority,
+                                 RtecScheduler::Preemption_Priority_t& p_priority,
+                                 CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK,
+                      RtecScheduler::NOT_SCHEDULED))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Check stability flags.
+  if (stability_flags & SCHED_PRIORITY_NOT_STABLE)
+    {
+      ACE_THROW (RtecScheduler::NOT_SCHEDULED ())
+    }
+  
+  RtecScheduler::RT_Info *rt_info = 0;
+  if (rt_info_tree_.find (entry_point, rt_info) != 0)
+    {
+      ACE_THROW (RtecScheduler::UNKNOWN_TASK ())
+    }
+
+  o_priority = rt_info->priority;
+  subpriority = rt_info->static_subpriority;
+  p_priority = rt_info->preemption_priority;
+}
+
+
+// Returns the priority and subpriority values assigned to an RT_Info,
+// based on its entry point name.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::entry_point_priority (const char * entry_point,
+                                             RtecScheduler::OS_Priority& priority,
+                                             RtecScheduler::Preemption_Subpriority_t& subpriority,
+                                             RtecScheduler::Preemption_Priority_t& p_priority,
+                                             CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK,
+                      RtecScheduler::NOT_SCHEDULED))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  RtecScheduler::handle_t handle = 
+    this->lookup_i (entry_point, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->priority_i (handle,
+                  priority,
+                  subpriority,
+                  p_priority,
+                  ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+
+// This method registers a dependency between two RT_Infos.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
+                                       RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
+                                       CORBA::Long number_of_calls,
+                                       RtecScheduler::Dependency_Type_t dependency_type,
+                                       CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Delegate to the internal method.
+  add_dependency_i (handle, dependency, number_of_calls, 
+                    dependency_type, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // Set stability flags and increment the dependency count.
+  ++dependency_count_;
+  stability_flags |= SCHED_UTILIZATION_NOT_STABLE |
+                     SCHED_PRIORITY_NOT_STABLE |
+                     SCHED_CONFIG_NOT_STABLE;
+}
+
+CDG - TBD - check TAO_THROW_SPECs
+
+// If information has been added or changed since the last stable
+// schedule was computed, this method causes scheduling information
+// to be computed for all registered RT_Infos.  If the schedule is
+// already stable, this is a no-op
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
+                                           CORBA::Long /* maximum_priority */,
+                                           RtecScheduler::RT_Info_Set_out /* infos */,
+                                           RtecScheduler::Config_Info_Set_out /* configs */,
+                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */,
+                                           CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
+                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
+                      RtecScheduler::TASK_COUNT_MISMATCH))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // CDG - TBD - check stability flags (before)
+
+  // CDG - TBD - add comparable behavior to the dynsched implementation, but be *very* efficient
+
+  // CDG - TBD - set last_scheduled_priority_, etc.
+
+  // CDG - TBD - set stability flags (afterward)
+
+  return;
+}
+
+
+// Provides the thread priority and queue type for the given priority
+// level.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
+                                               RtecScheduler::OS_Priority& t_priority,
+                                               RtecScheduler::Dispatching_Type_t & d_type,
+                                               CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::NOT_SCHEDULED,
+                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Check stability flags
+  if (stability_flags_ & SCHED_CONFIG_NOT_STABLE)
+    {
+      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+    }
+
+  RtecScheduler::Config_Info *config_info;
+  if (config_info_map_.find (p_priority, config_info) != 0)
+    {
+      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+    }
+ 
+  t_priority = config_info->thread_priority;
+  d_type = config_info_->dispatching_type;
+}
+
+
+// Returns the last priority number assigned to an operation in the
+// schedule.  The number returned is one less than the total number
+// of scheduled priorities.  All scheduled priorities range from 0
+// to the number returned, inclusive.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::Preemption_Priority_t
+ACE_Reconfig_Scheduler::last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    RtecScheduler::NOT_SCHEDULED))
+{
+  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_, 
+                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
+  ACE_CHECK;
+
+  // Check schedule stability flags.
+  if (stability_flags_ & (SCHED_PRIORITY_NOT_STABLE | SCHED_CONFIG_NOT_STABLE))
+    {
+      ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED (),
+                        (RtecScheduler::Preemption_Priority_t) -1);
+    }
+
+  return last_scheduled_priority_;
+}
+
+// Internal method to create an RT_Info.  If it does not exist, a new RT_Info is
+// created and inserted into the schedule, and the handle of the new
+// RT_Info is returned.  If the RT_Info already exists, an exception
+// is thrown.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::RT_Info *
+ACE_Reconfig_Scheduler::create_i (const char *entry_point,
+                                  RtecScheduler::handle_t handle,
+                                  CORBA::Environment &ACE_TRY_ENV)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::DUPLICATE_NAME));
+{
+  RtecScheduler::RT_Info* new_rt_info;
+  int result = 0;
+
+  // Create a new RT_Info.
+  ACE_NEW_THROW_EX (new_rt_info,
+                    RtecScheduler::RT_Info,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  // Bind the new RT_Info to its handle, in the map.
+  result = rt_info_map_.bind (handle, new_rt_info);
+  switch (result)
+    {
+      case -1:
+        // Something bad but unknown occurred while trying to bind in map.
+        delete new_rt_info;
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+
+      case 1:
+        // Tried to bind an operation that was already in the map.
+        delete new_rt_info;
+        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), 0);
+
+      default:
+        break;
+    }
+
+  // Bind the new RT_Info to its entry point, in the tree.
+  result = rt_info_tree_.bind (entry_point, new_rt_info);
+  switch (result)
+    {
+      case -1:
+        // Something bad but unknown occurred while trying to bind in tree.
+        rt_info_map_.unbind (handle);
+        delete new_rt_info;
+        ACE_THROW_RETURN (CORBA::UNKNOWN (), -1);
+
+      case 1:
+        // Tried to bind an operation that was already in the tree.
+        rt_info_map_.unbind (handle);
+        delete new_rt_info;
+        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), -1);
+
+      default:
+        break;
+        }
+    }
+
+  // With everything safely registered in the map and tree,
+  // store the passed information, null out the other fields,
+  // and update the next handle.
+  new_rt_info->entry_point = entry_point;
+  new_rt_info->handle = handle;
+
+// CDG - TBD - give these reasonable default values
+  rt_info->criticality = ;
+  rt_info->worst_case_execution_time = ;
+  rt_info->typical_execution_time = ;
+  rt_info->cached_execution_time = ;
+  rt_info->period = ;
+  rt_info->importance = ;
+  rt_info->quantum = ;
+  rt_info->threads = 0;
+  rt_info->info_type = ;
+  rt_info->priority = 0;
+  rt_info->preemption_subpriority = 0;
+  rt_info->preemption_priority = 0;
+  rt_info->volatile_token = 0;
+
+  if (handle >= ACE_Reconfig_Scheduler::next_handle_)
+    {
+      ACE_Reconfig_Scheduler::next_handle_ = handle + 1;
+    }
+
+  return new_rt_info;
+}
+
+
+// Internal method to set characteristics of the passed RT_Info.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::set_i (RtecScheduler::RT_Info *rt_info,
+                               RtecScheduler::Criticality_t criticality,
+                               RtecScheduler::Time time,
+                               RtecScheduler::Time typical_time,
+                               RtecScheduler::Time cached_time,
+                               RtecScheduler::Period_t period,
+                               RtecScheduler::Importance_t importance,
+                               RtecScheduler::Quantum_t quantum,
+                               CORBA::Long threads,
+                               RtecScheduler::Info_Type_t info_type)
+{
+  rt_info->handle = handle;
+  rt_info->criticality = criticality;
+  rt_info->worst_case_execution_time = time;
+  rt_info->typical_execution_time = typical_time;
+  rt_info->cached_execution_time = cached_time;
+  rt_info->period = period;
+  rt_info->importance = importance;
+  rt_info->quantum = quantum;
+  rt_info->threads = threads;
+  rt_info->info_type = info_type;
+}
+
+
+// Internal method to lookup a handle for an RT_Info, and return its
+// handle, or an error value if it's not present.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+RtecScheduler::handle_t
+ACE_Reconfig_Scheduler::lookup_i (const char * entry_point,
+                                  CORBA::Environment &ACE_TRY_ENV)
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK))
+{
+  RtecScheduler::RT_Info *rt_info = 0;
+  if (rt_info_tree_.find (entry_point, rt_info) != 0)
+    {
+      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0)
+    }
+
+  return rt_info->handle;
+}
+
+// Internal method that returns the priority and subpriority values
+// assigned to an RT_Info, based on its handle.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::priority_i (RtecScheduler::handle_t handle,
+                                    RtecScheduler::OS_Priority& o_priority,
+                                    RtecScheduler::Preemption_Subpriority_t& subpriority,
+                                    RtecScheduler::Preemption_Priority_t& p_priority,
+                                    CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK,
+                      RtecScheduler::NOT_SCHEDULED))
+{
+  // Check stability flags.
+  if (stability_flags & SCHED_PRIORITY_NOT_STABLE)
+    {
+      ACE_THROW (RtecScheduler::NOT_SCHEDULED ())
+    }
+  
+  RtecScheduler::RT_Info *rt_info = 0;
+  if (rt_info_tree_.find (entry_point, rt_info) != 0)
+    {
+      ACE_THROW (RtecScheduler::UNKNOWN_TASK ())
+    }
+
+  o_priority = rt_info->priority;
+  subpriority = rt_info->static_subpriority;
+  p_priority = rt_info->preemption_priority;
+}
+
+
+// This method registers a dependency between two RT_Infos.
+
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+void
+ACE_Reconfig_Scheduler::add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
+                                          RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
+                                          CORBA::Long number_of_calls,
+                                          RtecScheduler::Dependency_Type_t dependency_type,
+                                          CORBA::Environment &ACE_TRY_ENV)
+     TAO_THROW_SPEC ((CORBA::SystemException,
+                      RtecScheduler::UNKNOWN_TASK))
+{
+  // Look up the RT_Info in the map
+  RtecScheduler::RT_Info *rt_info = 0;
+
+  if (rt_info_map_.find (handle, rt_info) != 0)
+    {
+      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    }
+
+  // Insert unconditionally: there can be multiple copies
+  // of the same dependency, if the user so chooses.
+  RtecScheduler::Dependency_Set& deps = rt_info->dependencies;
+  int prev_length =  deps.length ();
+  deps.length (prev_length + 1);
+  deps [prev_length].rt_info = dependency;
+  deps [prev_length].number_of_calls = number_of_calls;
+  deps [prev_length].dependency_type = dependency_type;
+}
+
+
+
+
+
+
+
+
 
-#endif /* __GNUC__ */
 
-#endif /* TAO_RECONFIG_SCHEDULER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 0cd740578d2..18dd7be02c6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -14,33 +14,292 @@
 //
 // ============================================================================
 
-#ifndef TAO_RECONFIG_SCHEDULER_H
-#define TAO_RECONFIG_SCHEDULER_H
+#ifndef ACE_RECONFIG_SCHEDULER_H
+#define ACE_RECONFIG_SCHEDULER_H
 
-#include "ace/inc_user_config.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/RB_Tree.h"
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecSchedulerS.h"
-#include "Reconfig_Sched_Utils.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
+class TAO_ORBSVCS_Export ACE_Reconfig_Scheduler : 
+  public POA_RtecScheduler::Scheduler
+{
+  // = TITLE
+  //   A servant for RtecScheduler::Scheduler that can be initialized 
+  //   and run solely with precomputed scheduling information, but is also
+  //   designed to perform efficient recomputation of scheduling info
+  //   in the face of run-time changes to RT_Infos in the schedule.
+  //
+  // = DESCRIPTION
+  //   This class implements the TAO scheduling service.  It has
+  //   the ability to accept and use precomputed scheduling information
+  //   with deterministic performance once the schedule is fully configured.
+  //   It also provides efficient and flexible lookup and computation
+  //   during schedule configuration, so that it can be used during
+  //   both schedule configuration and run-time phases of operation.
+  //
+public:
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
+  enum Stability_Flags 
+  {
+    // This should always be zero.
+    SCHED_ALL_STABLE = 0x00UL,
+
+    // Individual stability flags, each of
+    // which should have a distinct bit value.
+
+    // Utilization may need to be recomputed.
+    SCHED_UTILIZATION_NOT_STABLE = 0x01UL,
+
+    // Priorities may need to be recomputed.
+    SCHED_PRIORITY_NOT_STABLE = 0x02UL,
+
+    // Dispatching configuration may need to be recomputed.
+    SCHED_CONFIG_NOT_STABLE = 0x04UL,
+
+    // This should be the disjunction of
+    // all the individual stability flags.
+    SCHED_NONE_STABLE = 
+      SCHED_UTILIZATION_NOT_STABLE |
+      SCHED_PRIORITY_NOT_STABLE |
+      SCHED_CONFIG_NOT_STABLE
+  };
+  // Flags indicating stability conditions of schedule.
+
+  ACE_Reconfig_Scheduler ();
+  // Default constructor.
+
+  ACE_Reconfig_Scheduler (int config_count,
+                          ACE_Scheduler_Factory::POD_Config_Info config_info[],
+                          int entry_count,
+                          ACE_Scheduler_Factory::POD_RT_Info rt_info[],
+                          int dependency_count,
+                          ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
+                          u_long stability_flags = SCHED_NONE_STABLE);
+  // Constructor. Initialize the scheduler from POD_Config_Info, POD_RT_Info, 
+  // and POD_Dependency arrays, plus schedule stability flags.
+
+  int init (int config_count,
+            ACE_Scheduler_Factory::POD_Config_Info config_info[],
+            int entry_count,
+            ACE_Scheduler_Factory::POD_RT_Info rt_info[],
+            int dependency_count,
+            ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
+            u_long stability_flags,
+            CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME,
+                     RtecScheduler::UNKNOWN_TASK));
+  // Initializes the scheduler with the passed information.
+
+  void close (CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+  // Closes the scheduler, releasing all current resources.
+
+  virtual RtecScheduler::handle_t create (const char * entry_point,
+                                          CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::DUPLICATE_NAME));
+  // Create an RT_Info.  If it does not exist, a new RT_Info is
+  // created and inserted into the schedule, and the handle of the new
+  // RT_Info is returned.  If the RT_Info already exists, an exception
+  // is thrown.
+
+  virtual RtecScheduler::handle_t lookup (const char * entry_point,
+                                          CORBA::Environment &_env)
+    TAO_THROW_SPEC((CORBA::SystemException));
+  // Lookup a handle for an RT_Info, and return its handle, or an error
+  // value if it's not present.
+
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
+                                       CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK));
+  // Return a pointer to the RT_Info corresponding to the passed handle.
+
+  virtual void set (RtecScheduler::handle_t handle,
+                    RtecScheduler::Criticality_t criticality,
+                    RtecScheduler::Time time,
+                    RtecScheduler::Time typical_time,
+                    RtecScheduler::Time cached_time,
+                    RtecScheduler::Period_t period,
+                    RtecScheduler::Importance_t importance,
+                    RtecScheduler::Quantum_t quantum,
+                    CORBA::Long threads,
+                    RtecScheduler::Info_Type_t info_type,
+                    CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK));
+  // Set characteristics of the RT_Info corresponding to the passed handle.
+
+  virtual void priority (RtecScheduler::handle_t handle,
+                         RtecScheduler::OS_Priority& o_priority,
+                         RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                         RtecScheduler::Preemption_Priority_t& p_priority,
+                         CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK,
+                     RtecScheduler::NOT_SCHEDULED));
+  // Returns the priority and subpriority values assigned to an RT_Info,
+  // based on its handle.
+
+  virtual void entry_point_priority (const char * entry_point,
+                                     RtecScheduler::OS_Priority& o_priority,
+                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                                     RtecScheduler::Preemption_Priority_t& p_priority,
+                                     CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK,
+                     RtecScheduler::NOT_SCHEDULED));
+  // Returns the priority and subpriority values assigned to an RT_Info,
+  // based on its entry point name.
+
+  virtual void add_dependency (RtecScheduler::handle_t handle,
+                               RtecScheduler::handle_t dependency,
+                               CORBA::Long number_of_calls,
+                               RtecScheduler::Dependency_Type_t dependency_type,
+                               CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK));
+  // This method registers a dependency between two RT_Infos.
+
+  virtual void compute_scheduling (CORBA::Long minimum_priority,
+                                   CORBA::Long maximum_priority,
+                                   RtecScheduler::RT_Info_Set_out infos,
+                                   RtecScheduler::Config_Info_Set_out configs,
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
+                                   CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
+                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
+                     RtecScheduler::TASK_COUNT_MISMATCH));
+  // If information has been added or changed since the last stable
+  // schedule was computed, this method causes scheduling information
+  // to be computed for all registered RT_Infos.  If the schedule is
+  // already stable, this is a no-op
 
-// Include the templates here.
-#include "Reconfig_Scheduler_T.h"
+  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
+                                       RtecScheduler::OS_Priority& o_priority,
+                                       RtecScheduler::Dispatching_Type_t & d_type,
+                                       CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    RtecScheduler::NOT_SCHEDULED,
+                    RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
+  // Provides the thread priority and queue type for the given priority level.
 
-#endif /* __GNUC__ */
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                    RtecScheduler::NOT_SCHEDULED));
+  // Returns the last priority number assigned to an operation in the
+  // schedule.  The number returned is one less than the total number
+  // of scheduled priorities.  All scheduled priorities range from 0
+  // to the number returned, inclusive.
+
+protected:
+
+  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t, 
+                                  RtecScheduler::RT_Info*, 
+                                  ACE_Hash<RtecScheduler::handle_t>, 
+                                  ACE_Equal_To<RtecScheduler::handle_t>, 
+                                  ACE_LOCK> RT_INFO_MAP;
+  // Type of map used for O(1) lookup of RT_Infos by their handles.
+
+  typedef ACE_RB_Tree<char *,
+                      RtecScheduler::RT_Info*,
+                      ACE_Less_Than<char *>, 
+                      ACE_LOCK> RT_INFO_TREE;
+  // Type of tree used for O(log n) lookup of RT_Infos by their names.
+
+  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Preemption_Priority_t,
+                                  RtecScheduler::Config_Info*,
+                                  ACE_Hash<RtecScheduler::Preemption_Priority_t>,
+                                  ACE_Equal_To<RtecScheduler::Preemption_Priority_t>,
+                                  ACE_LOCK> CONFIG_INFO_MAP;
+  // Type of map used for O(1) lookup of Config_Infos by their priorities.
+
+  virtual RtecScheduler::RT_Info * create_i (const char * entry_point,
+                                             RtecScheduler::handle_t handle,
+                                             CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::DUPLICATE_NAME));
+  // Internal method to create an RT_Info.  If it does not exist, 
+  // a new RT_Info is created and inserted into the schedule, 
+  // and the handle of the new RT_Info is returned.
+  // If the RT_Info already exists, an exception is thrown.
+
+  virtual void set_i (RtecScheduler::RT_Info *rt_info,
+                      RtecScheduler::Criticality_t criticality,
+                      RtecScheduler::Time time,
+                      RtecScheduler::Time typical_time,
+                      RtecScheduler::Time cached_time,
+                      RtecScheduler::Period_t period,
+                      RtecScheduler::Importance_t importance,
+                      RtecScheduler::Quantum_t quantum,
+                      CORBA::Long threads,
+                      RtecScheduler::Info_Type_t info_type)
+  // Internal method to set characteristics of the passed RT_Info.
+
+  virtual RtecScheduler::handle_t lookup_i (const char * entry_point,
+                                            CORBA::Environment &_env)
+    TAO_THROW_SPEC((CORBA::SystemException));
+  // Internal method to look up a handle for an RT_Info, and return 
+  // its handle, or an exception if it's not present.
+
+  virtual void priority_i (RtecScheduler::handle_t handle,
+                           RtecScheduler::OS_Priority& o_priority,
+                           RtecScheduler::Preemption_Subpriority_t& p_subpriority,
+                           RtecScheduler::Preemption_Priority_t& p_priority,
+                           CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK,
+                     RtecScheduler::NOT_SCHEDULED));
+  // Internal method to return the priority and subpriority
+  // values assigned to an RT_Info, based on its handle.
+
+  virtual void add_dependency_i (RtecScheduler::handle_t handle,
+                                 RtecScheduler::handle_t dependency,
+                                 CORBA::Long number_of_calls,
+                                 RtecScheduler::Dependency_Type_t dependency_type,
+                                 CORBA::Environment &_env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecScheduler::UNKNOWN_TASK));
+  // Internal method that registers a dependency between two RT_Infos.
+  // Assumes it is being called with all locks held, and does *not*
+  // set any schedule stability flags.
+
+  RECONFIG_SCHED_STRATEGY sched_strategy_;
+  // Scheduling strategy for the reconfig scheduler.
+
+  CONFIG_INFO_MAP config_info_map_;
+  // Map for O(1) lookup of Config_Infos by priority level.
+
+  RT_INFO_MAP rt_info_map_;
+  // Map for O(1) lookup of RT_Infos by handle.
+
+  RT_INFO_TREE rt_info_tree_;
+  // Map for O(1) lookup of RT_Infos by handle.
+
+  RtecScheduler::handle_t next_handle_;
+  // Next RT_Info descriptor handle to allocate.
+
+  u_long stability_flags_;
+  // Flags indicating whether a stable schedule has been computed
+  // since the last addition or modification of information, and which
+  // parts of the schedule are unstable.
+
+  int dependency_count_;
+  // The number of dependencies in the dependency lists of all RT_Infos.
+  // This is used when traversing the dependency graph.
+
+  RtecScheduler::Preemption_Priority_t last_scheduled_priority_;
+  // Stores the last priority for which an operation can be scheduled
+
+  ACE_LOCK mutex_;
+  // Mutual exclusion lock for the scheduler itself.  This is needed to
+  // synchronize updates and accesses to scheduling information.
+};
+
+#if defined (__ACE_INLINE__)
+#include "orbsvcs/Reconfig_Scheduler.i"
+#endif /* __ACE_INLINE__ */
 
-#endif /* TAO_RECONFIG_SCHEDULER_H */
+#endif /* ACE_RECONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
index c093d552760..a21ea7f9897 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
@@ -3,14 +3,3 @@
 // $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
deleted file mode 100644
index 3f44e3f8163..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ /dev/null
@@ -1,1453 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.cpp
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHEDULER_T_C
-#define TAO_RECONFIG_SCHEDULER_T_C
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "Reconfig_Scheduler_T.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Sched, Reconfig_Scheduler_T, "$Id$")
-
-//////////////////////////////////////////////
-// Helper function type definition for sort //
-//////////////////////////////////////////////
-
-// This is awkward, but it makes MSVC++ happy.
-extern "C"
-{
-typedef int (*COMP_FUNC) (const void*, const void*);
-}
-
-
-// Default constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::TAO_Reconfig_Scheduler ()
-  : config_info_count_ (0),
-    rt_info_count_ (0),
-    next_handle_ (1),
-    entry_ptr_array_ (0),
-    entry_ptr_array_size_ (0),
-    stability_flags_ (SCHED_NONE_STABLE),
-    dependency_count_ (0),
-    last_scheduled_priority_ (0)
-{
-}
-
-// Constructor. Initialize the scheduler from the POD_Config_Info, POD_RT_Info,
-// and POD_Dependency arrays, plus stability flag.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-TAO_Reconfig_Scheduler (int config_count,
-                        ACE_Scheduler_Factory::POD_Config_Info config_infos[],
-                        int rt_info_count,
-                        ACE_Scheduler_Factory::POD_RT_Info rt_infos[],
-                        int dependency_count,
-                        ACE_Scheduler_Factory::POD_Dependency_Info dependency_infos[],
-                        u_long stability_flags)
-  : config_info_count_ (0),
-    rt_info_count_ (0),
-    next_handle_ (1),
-    stability_flags_ (SCHED_ALL_STABLE),
-    dependency_count_ (0),
-    last_scheduled_priority_ (0)
-{
-  // The init method can throw an exception, which must be caught
-  // *inside* the constructor to be portable between compilers that
-  // differ in whether they support native C++ exceptions.
-  ACE_TRY_NEW_ENV
-    {
-      this->init (config_count, config_infos,
-                  rt_info_count, rt_infos,
-                  dependency_count, dependency_infos,
-                  stability_flags, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, corba_sysex)
-    {
-       ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, "
-                             "ACE_LOCK>::TAO_Reconfig_Scheduler "
-                             "system exception: cannot init scheduler.\n"));
-    }
-  ACE_ENDTRY;
-}
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-init (int config_count,
-      ACE_Scheduler_Factory::POD_Config_Info config_info[],
-      int rt_info_count,
-      ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-      int dependency_count,
-      ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-      u_long stability_flags,
-      CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (-1);
-
-  int result = 0;
-
-  // Clear out the previous entries, if any.
-  this->close (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // (Re)initialize using the new settings.
-
-  // Add the passed config infos to the scheduler
-  auto_ptr<RtecScheduler::Config_Info> new_config_info_ptr;
-  for (this->config_info_count_ = 0;
-       this->config_info_count_ < config_count;
-       ++this->config_info_count_)
-    {
-      RtecScheduler::Config_Info* new_config_info;
-      ACE_NEW_THROW_EX (new_config_info,
-                        RtecScheduler::Config_Info,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
-
-      // Make sure the new config info is cleaned up if we exit abruptly.
-      new_config_info_ptr.reset (new_config_info);
-
-      result = config_info_map_.bind (config_info [config_info_count].preemption_priority,
-                                      new_config_info);
-      switch (result)
-        {
-          case -1:
-            // Something bad but unknown occurred while trying to bind in map.
-            ACE_THROW_RETURN (RtecScheduler::INTERNAL (), -1);
-
-          case 1:
-            // Tried to bind an operation that was already in the map.
-            ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), -1);
-
-          default:
-            break;
-        }
-
-      new_config_info->preemption_priority =
-        config_info [config_info_count].preemption_priority;
-      new_config_info->thread_priority =
-        config_info [config_info_count].thread_priority;
-      new_config_info->dispatching_type =
-        config_info [config_info_count].dispatching_type;
-
-      if (new_config_info->preemption_priority >
-          last_scheduled_priority_)
-        {
-          this->last_scheduled_priority_ =
-            new_config_info->preemption_priority;
-        }
-
-      // Release the auto_ptr so it does not clean
-      // up the sucessfully bound config info.
-      new_config_info_ptr.release ();
-    }
-
-  // Add RT_Infos to scheduler
-  RtecScheduler::RT_Info* new_rt_info;
-  for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos)
-    {
-      new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
-                              rt_info [num_rt_infos].handle,
-                              ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      // Fill in the portions to which the user has access.
-      set_i (new_rt_info,
-             RtecScheduler::Criticality_t (rt_info [num_rt_infos].criticality),
-             rt_info [num_rt_infos].worst_case_execution_time,
-             rt_info [num_rt_infos].typical_execution_time,
-             rt_info [num_rt_infos].cached_execution_time,
-             rt_info [num_rt_infos].period,
-             RtecScheduler::Importance_t (rt_info [num_rt_infos].importance),
-             rt_info [num_rt_infos].quantum,
-             rt_info [num_rt_infos].threads,
-             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type));
-
-      // Fill in the scheduler managed portions.
-      new_rt_info->priority =
-        rt_info [num_rt_infos].priority;
-      new_rt_info->preemption_subpriority =
-        rt_info [num_rt_infos].static_subpriority;
-      new_rt_info->preemption_priority =
-        rt_info [num_rt_infos].preemption_priority;
-      new_rt_info->volatile_token = 0;
-
-      // Add dependencies between RT_Infos to scheduler.
-      for (this->dependency_count_ = 0;
-           this->dependency_count_ < dependency_count;
-           ++this->dependency_count_)
-        {
-          add_dependency_i (dependency_info [dependency_count_].info_that_depends,
-                            dependency_info [dependency_count_].info_depended_on,
-                            dependency_info [dependency_count_].number_of_calls,
-                            dependency_info [dependency_count_].dependency_type,
-                            ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
-        }
-
-    }
-
-    // Set stability flags after the operations are loaded, as the passed flags
-    // should be respected as being the stability state of the passed schedule.
-    this->stability_flags_ = stability_flags;
-
-  return result;
-}
-
-// Closes the scheduler, releasing all current resources.
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // Unbind and delete each RT_Info in the map.
-  RtecScheduler::RT_Info *rt_info;
-  RtecScheduler::handle_t handle;
-  while (rt_info_map_.current_size () > 0)
-    {
-      handle = (*rt_info_map_.begin ()).ext_id_;
-      if (rt_info_map_.unbind (handle, rt_info) == 0)
-        {
-          if (rt_info_tree_.unbind (rt_info->entry_point) == 0)
-            {
-              delete rt_info;
-            }
-          else
-            {
-              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-            }
-         }
-      else
-        {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-        }
-    }
-
-  // Delete each Config_Info in the map.
-  RtecScheduler::Preemption_Priority_t config_priority;
-  RtecScheduler::Config_Info *config_info;
-  while (config_info_map_.current_size () > 0)
-    {
-      config_priority = (*config_info_map_.begin ()).ext_id_;
-      if (config_info_map_.unbind (config_priority, config_info) == 0)
-        {
-          delete config_info;
-        }
-      else
-        {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-        }
-    }
-
-  // Zero out the scheduling entry pointer array but do not deallocate it.
-  if (entry_ptr_array_size_ > 0)
-    {
-      ACE_OS::memset (entry_ptr_array_, 0,
-                      sizeof (TAO_Reconfig_Scheduler_Entry *) *
-                        entry_ptr_array_size_);
-    }
-
-
-  // Finally, reset the entry counts and start over with the lowest
-  // handle number.
-  this->config_info_count_ = 0;
-  this->rt_info_count_ = 0;
-  this->next_handle_ = 1;
-}
-
-// Create an RT_Info.  If it does not exist, a new RT_Info is
-// created and inserted into the schedule, and the handle of the new
-// RT_Info is returned.  If the RT_Info already exists, an exception
-// is thrown.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::handle_t
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create (const char *entry_point,
-        CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
-
-  RtecScheduler::handle_t handle = next_handle_;
-  create_i (entry_point, handle, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (handle);
-
-  // Set affected stability flags.
-  this->stability_flags_ |=
-    SCHED_UTILIZATION_NOT_STABLE |
-    SCHED_PRIORITY_NOT_STABLE;
-
-  return handle;
-}
-
-// Lookup a handle for an RT_Info, and return its handle, or an error
-// value if it's not present.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::handle_t
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup (const char * entry_point,
-        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
-
-  RtecScheduler::handle_t handle;
-  handle = this->lookup_i (entry_point, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (handle);
-
-  return handle;
-}
-
-
-// Return a pointer to the RT_Info corresponding to the passed handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::RT_Info *
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get (RtecScheduler::handle_t handle,
-     CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
-
-  // Find the RT_Info in the hash map.
-  RtecScheduler::RT_Info *rt_info = 0;
-  if (rt_info_map_.find (handle, rt_info) != 0)
-    {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0);
-    }
-
-  // Allocate a new RT_Info
-  RtecScheduler::RT_Info* new_info;
-  ACE_NEW_THROW_EX (new_info,
-                    RtecScheduler::RT_Info,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  *new_info = *rt_info;
-
-  return new_info;
-}
-
-
-// Set characteristics of the RT_Info corresponding to the passed handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set (RtecScheduler::handle_t handle,
-     RtecScheduler::Criticality_t criticality,
-     RtecScheduler::Time time,
-     RtecScheduler::Time typical_time,
-     RtecScheduler::Time cached_time,
-     RtecScheduler::Period_t period,
-     RtecScheduler::Importance_t importance,
-     RtecScheduler::Quantum_t quantum,
-     CORBA::Long threads,
-     RtecScheduler::Info_Type_t info_type,
-     CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // Look up the RT_Info by its handle, throw an exception if it's not there.
-  RtecScheduler::RT_Info *rt_info_ptr = 0;
-  if (rt_info_map_.find (handle, rt_info_ptr) != 0)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-    }
-
-  // Call the internal set method.
-  this->set_i (rt_info_ptr, criticality, time, typical_time,
-               cached_time, period, importance, quantum,
-               threads, info_type);
-
-  // Update stability flags, based on changes to operation characteristics.
-
-  // Reference the associated scheduling entry: the double cast is
-  // needed to ensure that the size of the pointer and the size of the
-  // stored magic cookie are the same (see the definition of
-  // ptr_arith_t in ACE to grok how this works portably).
-  TAO_Reconfig_Scheduler_Entry *sched_entry_ptr =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry *,
-                          ACE_static_cast (ptr_arith_t,
-                                           rt_info_ptr->volatile_token));
-  if (0 == sched_entry_ptr)
-    {
-      ACE_THROW (RtecScheduler::INTERNAL ());
-    }
-
-  // Test the utilization difference between the old and new values.
-  if ((sched_entry_ptr->orig_rt_info_data ().period != rt_info_ptr->period
-       && sched_entry_ptr->orig_rt_info_data ().worst_case_execution_time
-          != rt_info_ptr->worst_case_execution_time))
-    {
-      CORBA::Double orig_time = ACE_static_cast (
-        CORBA::Double,
-        ACE_UINT64_DBLCAST_ADAPTER (sched_entry_ptr->
-                                      orig_rt_info_data ().
-                                        worst_case_execution_time));
-
-      CORBA::Double orig_period =
-        sched_entry_ptr->orig_rt_info_data ().period;
-
-      CORBA::Double new_time = ACE_static_cast (
-        CORBA::Double,
-        ACE_UINT64_DBLCAST_ADAPTER (rt_info_ptr->
-                                      worst_case_execution_time));
-
-      CORBA::Double new_period = rt_info_ptr->period;
-
-      if ((orig_time / orig_period) - (new_time / new_period) > DBL_EPSILON
-          || (orig_time / orig_period) - (new_time / new_period) < DBL_EPSILON)
-        {
-          this->stability_flags_ |= SCHED_UTILIZATION_NOT_STABLE;
-        }
-    }
-
-  // Test the priority difference between the old and new info.
-  if (RECONFIG_SCHED_STRATEGY::priority_diff (sched_entry_ptr->
-                                                orig_rt_info_data (),
-                                              *rt_info_ptr) != 0)
-    {
-      this->stability_flags_ |= SCHED_PRIORITY_NOT_STABLE;
-    }
-
-  // If the period changed, look up the handle in the calling
-  // dependency map and see if there is anything there: if so,
-  // the propagation is unstable.
-  if (sched_entry_ptr->orig_rt_info_data ().period
-      != rt_info_ptr->period)
-    {
-      // Get the dependency set for the current entry.
-      RtecScheduler::Dependency_Set *dependency_set = 0;
-      int result = calling_dependency_set_map_.find (rt_info_ptr->handle,
-                                                     dependency_set);
-      if (result == 0 && dependency_set->length () > 0)
-        {
-          this->stability_flags_ |= SCHED_PROPAGATION_NOT_STABLE;
-        }
-    }
-
-  // Update the stored operation characteristics values in the scheduling entry
-  sched_entry_ptr->orig_rt_info_data (*rt_info_ptr);
-}
-
-
-// Returns the priority and subpriority values assigned to an RT_Info,
-// based on its handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-priority (RtecScheduler::handle_t handle,
-          RtecScheduler::OS_Priority& o_priority,
-          RtecScheduler::Preemption_Subpriority_t& subpriority,
-          RtecScheduler::Preemption_Priority_t& p_priority,
-          CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // Check stability flags.
-  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-    {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
-    }
-
-  RtecScheduler::RT_Info *rt_info = 0;
-  if (rt_info_map_.find (handle, rt_info) != 0)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-    }
-
-  o_priority = rt_info->priority;
-  subpriority = rt_info->preemption_subpriority;
-  p_priority = rt_info->preemption_priority;
-}
-
-
-// Returns the priority and subpriority values assigned to an RT_Info,
-// based on its entry point name.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-entry_point_priority (const char * entry_point,
-                      RtecScheduler::OS_Priority& priority,
-                      RtecScheduler::Preemption_Subpriority_t& subpriority,
-                      RtecScheduler::Preemption_Priority_t& p_priority,
-                      CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  RtecScheduler::handle_t handle =
-    this->lookup_i (entry_point, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->priority_i (handle,
-                  priority,
-                  subpriority,
-                  p_priority,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-
-// This method registers a dependency between two RT_Infos.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
-                RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
-                CORBA::Long number_of_calls,
-                RtecScheduler::Dependency_Type_t dependency_type,
-                CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // Delegate to the internal method.
-  add_dependency_i (handle, dependency, number_of_calls,
-                    dependency_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Since the call graph topology has changed, set *all*
-  // stability flags before incrementing the dependency count.
-  this->stability_flags_ |= SCHED_UTILIZATION_NOT_STABLE;
-  ++dependency_count_;
-}
-
-
-// If information has been added or changed since the last stable
-// schedule was computed, this method causes scheduling information
-// to be computed for all registered RT_Infos.  If the schedule is
-// already stable, this is a no-op
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_scheduling (CORBA::Long minimum_priority,
-                    CORBA::Long maximum_priority,
-                    RtecScheduler::RT_Info_Set_out infos,
-                    RtecScheduler::Config_Info_Set_out configs,
-                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                    CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::DUPLICATE_NAME))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // If everything is already up to date, we're done.
-  if (SCHED_ALL_STABLE == stability_flags_)
-    {
-      return;
-    }
-
-  // @@ TO DO - use try/catch blocks to catch exceptions and add anomalies
-  //            to scheduling anomaly set, and then perhaps rethrow)
-
-  if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE)
-    {
-      // Traverse dependency graph, assigning a topological ordering and identifying threads.
-      dfs_traverse_i (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Sort an array of RT_info handles in topological order, check
-      // for loops using the strongly connected components algorithm.
-      detect_cycles_i (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Propagate effective execution time and period, set total frame size.
-      propagate_characteristics_i (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-    {
-      // Sort operations by urgency (done by strategy), then
-      // assign priorities and subpriorities in one pass.
-      // Sets last scheduled priority.
-      assign_priorities_i (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)
-    {
-      // Compute utilization, set last feasible priority.
-      compute_utilization_i (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // @@ TODO: record any scheduling anomalies in a set within the scheduler,
-  //          storing the maximum severity level recorded so far.
-  if (anomalies.ptr () == 0)
-    {
-      anomalies =
-        new RtecScheduler::Scheduling_Anomaly_Set (0);
-    }
-
-  // return the set of scheduled RT_Infos
-  if (infos.ptr () == 0)
-    {
-      infos = new RtecScheduler::RT_Info_Set (this->rt_info_count_);
-    }
-  infos->length (this->rt_info_count_);
-  RtecScheduler::RT_Info* rt_info = 0;
-  for (RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
-       info_iter.done () == 0;
-       ++info_iter)
-    {
-      rt_info = (*info_iter).int_id_;
-      infos[ACE_static_cast (CORBA::ULong, rt_info->handle - 1)] = *rt_info;
-    }
-
-  // return the set of scheduled Config_Infos
-  if (configs.ptr () == 0)
-    {
-      configs =
-        new RtecScheduler::Config_Info_Set(this->config_info_count_);
-    }
-  configs->length (this->config_info_count_);
-  RtecScheduler::Config_Info* config_info = 0;
-  for (CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
-       config_iter.done () == 0;
-       ++config_iter)
-    {
-      config_info = (*config_iter).int_id_;
-      configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "Schedule prepared.\n"));
-  ACE_DEBUG ((LM_DEBUG, "Dumping to stdout.\n"));
-  ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), *(configs.ptr()),
-                                            *(anomalies.ptr()), 0);
-  ACE_DEBUG ((LM_DEBUG, "Dump done.\n"));
-
-  // Set stability flags last.
-  this->stability_flags_ = SCHED_ALL_STABLE;
-  return;
-}
-
-
-// Provides the thread priority and queue type for the given priority
-// level.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
-                        RtecScheduler::OS_Priority& t_priority,
-                        RtecScheduler::Dispatching_Type_t & d_type,
-                        CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::NOT_SCHEDULED,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE,
-                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
-
-  // Check stability flags
-  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-    {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
-    }
-
-  RtecScheduler::Config_Info *config_info;
-  if (config_info_map_.find (p_priority, config_info) != 0)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
-    }
-
-  t_priority = config_info->thread_priority;
-  d_type = config_info->dispatching_type;
-}
-
-
-// Returns the last priority number assigned to an operation in the
-// schedule.  The number returned is one less than the total number
-// of scheduled priorities.  All scheduled priorities range from 0
-// to the number returned, inclusive.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::Preemption_Priority_t
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED))
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
-                      RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
-
-  // Check schedule stability flags.
-  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-    {
-      ACE_THROW_RETURN (RtecScheduler::NOT_SCHEDULED (),
-                        (RtecScheduler::Preemption_Priority_t) -1);
-    }
-
-  return last_scheduled_priority_;
-}
-
-// Internal method to create an RT_Info.  If it does not exist, a new RT_Info is
-// created and inserted into the schedule, and the handle of the new
-// RT_Info is returned.  If the RT_Info already exists, an exception
-// is thrown.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::RT_Info *
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create_i (const char *entry_point,
-          RtecScheduler::handle_t handle,
-          CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL))
-{
-  RtecScheduler::RT_Info* new_rt_info = 0;
-  TAO_Reconfig_Scheduler_Entry* new_sched_entry = 0;
-  int result = 0;
-
-  // Create a new scheduling entry for the RT_Info.
-  ACE_NEW_THROW_EX (new_rt_info,
-                    RtecScheduler::RT_Info,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // Make sure the new scheduling entry is cleaned up if we exit abruptly.
-  auto_ptr<RtecScheduler::RT_Info> new_rt_info_ptr (new_rt_info);
-
-  // Set some reasonable default values, and store the passed ones.
-  TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (*new_rt_info);
-  new_rt_info->entry_point = CORBA::string_dup(entry_point);
-  new_rt_info->handle = handle;
-
-  // Bind the new RT_Info to its handle, in the RT_Info map.
-  result = rt_info_map_.bind (handle, new_rt_info);
-  switch (result)
-    {
-      case -1:
-        // Something bad but unknown occurred while trying to bind in map.
-        ACE_THROW_RETURN (RtecScheduler::INTERNAL (), 0);
-
-      case 1:
-        // Tried to bind an operation that was already in the map.
-        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), 0);
-
-      default:
-        break;
-    }
-
-  // Bind the new RT_Info to *its* entry point, in the tree.
-  result = rt_info_tree_.bind (new_rt_info->entry_point, new_rt_info);
-  switch (result)
-    {
-      case -1:
-        // Something bad but unknown occurred while trying to bind in tree.
-        rt_info_map_.unbind (handle);
-        ACE_THROW_RETURN (RtecScheduler::INTERNAL (), 0);
-
-      case 1:
-        // Tried to bind an operation that was already in the tree.
-        rt_info_map_.unbind (handle);
-        ACE_THROW_RETURN (RtecScheduler::DUPLICATE_NAME (), 0);
-
-      default:
-        break;
-    }
-
-  // Create a new scheduling entry for the RT_Info.
-  ACE_NEW_THROW_EX (new_sched_entry,
-                    TAO_Reconfig_Scheduler_Entry (*new_rt_info),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // Make sure the new scheduling entry is cleaned up if we exit abruptly.
-  auto_ptr<TAO_Reconfig_Scheduler_Entry> new_sched_entry_ptr (new_sched_entry);
-
-  // Make sure there is room in the scheduling entry pointer array:
-  // expand the array eagerly, to minimize memory allocation overhead
-
-  if (this->entry_ptr_array_size_ <= handle)
-    {
-      if (entry_ptr_array_size_ > 0)
-        {
-          // Store previous array size.
-          long new_size = entry_ptr_array_size_;
-
-          // Double the size of the array until sufficient.
-          do
-            {
-              new_size *= 2;
-            }
-          while (new_size <= handle);
-
-          // Allocate the new array of the proper size, zero it out.
-
-          TAO_Reconfig_Scheduler_Entry ** new_array;
-          ACE_NEW_THROW_EX (new_array,
-                    TAO_Reconfig_Scheduler_Entry * [new_size],
-                    CORBA::NO_MEMORY ());
-
-          ACE_OS::memset (new_array, 0,
-                          sizeof (TAO_Reconfig_Scheduler_Entry *) *
-                            new_size);
-
-          // Copy in the previous array.
-          ACE_OS::memcpy (new_array, entry_ptr_array_,
-                          sizeof (TAO_Reconfig_Scheduler_Entry *) *
-                            entry_ptr_array_size_);
-
-          // Free the old array and swap to point to the new one.
-          delete [] entry_ptr_array_;
-          entry_ptr_array_ = new_array;
-          entry_ptr_array_size_ = new_size;
-        }
-      else
-        {
-          // For the first allocation, just start with sufficient space
-          // for the handle that was given.
-          ACE_NEW_THROW_EX (entry_ptr_array_,
-                    TAO_Reconfig_Scheduler_Entry * [handle + 1],
-                    CORBA::NO_MEMORY ());
-          entry_ptr_array_size_ = handle + 1;
-        }
-    }
-
-  // Atore in the scheduling entry pointer array.
-  entry_ptr_array_ [handle - 1] = new_sched_entry;
-
-  // Store a pointer to the scheduling entry in the scheduling entry
-  // pointer array and in the RT_Info: the double cast is needed to
-  // ensure that the size of the pointer and the size of the stored
-  // magic cookie are the same (see the definition of ptr_arith_t in
-  // ACE to grok how this works portably).
-  new_rt_info->volatile_token =
-    ACE_static_cast (CORBA::ULongLong,
-                     ACE_reinterpret_cast (ptr_arith_t,
-                                           new_sched_entry));
-
-  // Release the auto pointers, so their destruction does not
-  // remove the new rt_info that is now in the map and tree,
-  // or the scheduling entry attached to the rt_info.
-  new_rt_info_ptr.release ();
-  new_sched_entry_ptr.release ();
-
-  // With everything safely registered in the map and tree, just
-  // update the next handle and info counter and return the new info.
-  if (handle >= this->next_handle_)
-    {
-      this->next_handle_ = handle + 1;
-    }
-  if (handle > this->rt_info_count_)
-    {
-      this->rt_info_count_ = handle;
-    }
-
-  return new_rt_info;
-}
-
-
-// Internal method to set characteristics of the passed RT_Info.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_i (RtecScheduler::RT_Info *rt_info,
-       RtecScheduler::Criticality_t criticality,
-       RtecScheduler::Time time,
-       RtecScheduler::Time typical_time,
-       RtecScheduler::Time cached_time,
-       RtecScheduler::Period_t period,
-       RtecScheduler::Importance_t importance,
-       RtecScheduler::Quantum_t quantum,
-       CORBA::Long threads,
-       RtecScheduler::Info_Type_t info_type)
-{
-  rt_info->criticality = criticality;
-  rt_info->worst_case_execution_time = time;
-  rt_info->typical_execution_time = typical_time;
-  rt_info->cached_execution_time = cached_time;
-  rt_info->period = period;
-  rt_info->importance = importance;
-  rt_info->quantum = quantum;
-  rt_info->threads = threads;
-  rt_info->info_type = info_type;
-}
-
-
-// Internal method to lookup a handle for an RT_Info, and return its
-// handle, or an error value if it's not present.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::handle_t
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup_i (const char * entry_point,
-          CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info *rt_info = 0;
-  if (rt_info_tree_.find (entry_point, rt_info) != 0)
-    {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (), 0);
-    }
-
-  return rt_info->handle;
-}
-
-// Internal method that returns the priority and subpriority values
-// assigned to an RT_Info, based on its handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-priority_i (RtecScheduler::handle_t handle,
-            RtecScheduler::OS_Priority& o_priority,
-            RtecScheduler::Preemption_Subpriority_t& subpriority,
-            RtecScheduler::Preemption_Priority_t& p_priority,
-            CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  // Check stability flags.
-  if (this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
-    {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
-    }
-
-  RtecScheduler::RT_Info *rt_info = 0;
-  if (rt_info_map_.find (handle, rt_info) != 0)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-    }
-
-  o_priority = rt_info->priority;
-  subpriority = rt_info->preemption_subpriority;
-  p_priority = rt_info->preemption_priority;
-}
-
-
-// This method registers a dependency between two RT_Infos.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
-                  RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
-                  CORBA::Long number_of_calls,
-                  RtecScheduler::Dependency_Type_t dependency_type,
-                  CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  // All dependencies are mapped by both the calling and called
-  // operation handles, so that a topological sort can be performed
-  // once over both one-way and two-way dependencies.  The dependency
-  // specification is in absolute terms, however, so that the calling
-  // and called handles are reversed for one-way and two way
-  // dependencies.
-
- switch (dependency_type)
-  {
-    // In a two-way call, the calling operation depends on the
-    // called operation.
-    case RtecScheduler::TWO_WAY_CALL:
-
-      // Add the calling dependency map entry
-      map_dependency_i (handle,                        // calling handle
-                        dependency,                    // called handle
-                        calling_dependency_set_map_,   // calling map
-                        number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Add the called dependency map entry
-      map_dependency_i (dependency,                    // called handle
-                        handle,                        // calling handle
-                        called_dependency_set_map_,    // called map
-                        number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      break;
-
-    // In a one-way call, the called operation depends on the
-    // calling operation.
-    case RtecScheduler::ONE_WAY_CALL:
-
-      // Add the calling dependency map entry
-      map_dependency_i (dependency,                    // calling handle
-                        handle,                        // called handle
-                        calling_dependency_set_map_,   // calling map
-                        number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Add the called dependency map entry
-      map_dependency_i (handle,                        // called handle
-                        dependency,                    // calling handle
-                        called_dependency_set_map_,    // called map
-                        number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      break;
-
-    default:
-
-      // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
-  }
-
-}
-
-// This method installs a dependency in a dependency set map.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-map_dependency_i (RtecScheduler::handle_t key,
-                  RtecScheduler::handle_t handle,
-                  TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &map,
-                  CORBA::Long number_of_calls,
-                  RtecScheduler::Dependency_Type_t dependency_type,
-                  CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::Dependency_Set *dependency_set;
-
-  // Look up the dependency set in the passed map
-  if (map.find (key, dependency_set) != 0)
-    {
-      // Create a new one
-      ACE_NEW_THROW_EX (dependency_set,
-                        RtecScheduler::Dependency_Set,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      if (map.bind (key, dependency_set) != 0)
-        {
-          delete dependency_set;
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-        }
-    }
-
-  // Insert unconditionally: there can be multiple copies
-  // of the same dependency, if the user so chooses.
-  int prev_length =  dependency_set->length ();
-  dependency_set->length (prev_length + 1);
-  (*dependency_set) [prev_length].rt_info = handle;
-  (*dependency_set) [prev_length].number_of_calls = number_of_calls;
-  (*dependency_set) [prev_length].dependency_type = dependency_type;
-}
-
-
-// Traverses dependency graph, assigning a topological ordering.
-// Resets scheduling entries, do DFS traversal, constructs DFS map.
-// Fills in: dfs_status_, discovered_, finished_, is_thread_delineator_,
-// has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
-{
-  int i;  // index into array of scheduling entry pointers
-
-  // Reset registered RT_Infos.
-  TAO_RSE_Reset_Visitor reset_visitor;
-  for (i = 0; i < this->rt_info_count_; ++i)
-    {
-      if (reset_visitor.visit (* (entry_ptr_array_ [i])) < 0)
-        {
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-    }
-
-  // Traverse registered RT_Infos, assigning DFS start, finish order.
-  TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-    dfs_visitor (this->calling_dependency_set_map_,
-                 this->rt_info_map_);
-  for (i = 0; i < this->rt_info_count_; ++i)
-    {
-      if (dfs_visitor.visit (* (entry_ptr_array_ [i])) < 0)
-        {
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-    }
-}
-
-
-// Helper function to compare the DFS finish times of
-// two task entries, so qsort orders these in topological
-// order, with the higher times *first*
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-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);
-
-  const TAO_Reconfig_Scheduler_Entry *second_entry =
-    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
-                            second);
-
-  // sort blank entries to the end
-  if (! first_entry)
-  {
-    return (second_entry) ? 1 : 0;
-  }
-  else if (! second_entry)
-  {
-    return -1;
-  }
-
-  // Sort entries with higher forward DFS finishing times before those
-  // with lower forward DFS finishing times.
-  if (first_entry->fwd_finished () >
-      second_entry->fwd_finished ())
-  {
-    return -1;
-  }
-  else if (first_entry->fwd_finished () <
-           second_entry->fwd_finished ())
-  {
-    return 1;
-  }
-
-  return 0;
-}
-
-// Sorts an array of RT_info handles in topological order, then
-// checks for loops, marks unresolved remote dependencies.
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::CYCLIC_DEPENDENCIES))
-{
-  // Sort the pointers to entries in order of descending forward
-  // finish times, which produces a topological ordering, with
-  // callers ahead of called nodes.
-  ::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_),
-           this->rt_info_count_,
-           sizeof (TAO_Reconfig_Scheduler_Entry *),
-           ACE_reinterpret_cast (COMP_FUNC,
-                                 TAO_Reconfig_Scheduler::comp_entry_finish_times));
-
-  // Traverse entries in reverse topological order,
-  // looking for strongly connected components (cycles).
-  TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-    scc_visitor (this->called_dependency_set_map_,
-                   this->rt_info_map_);
-  for (int i = 0; i < this->rt_info_count_; ++i)
-    {
-      // Each new top level entry marks a potential new cycle.
-      scc_visitor.in_a_cycle (0);
-
-      if (scc_visitor.visit (* (entry_ptr_array_ [i])) < 0)
-        {
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-    }
-
-  // Check whether any cycles were detected.
-  if (scc_visitor.number_of_cycles () > 0)
-    {
-      ACE_THROW (RtecScheduler::CYCLIC_DEPENDENCIES ());
-    }
-}
-
-// Propagates effective execution time and period, sets total frame size.
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
-                      RtecScheduler::THREAD_SPECIFICATION))
-{
-  // Traverse entries in topological (DFS finish) order,
-  // propagating period and effective execution time from
-  // calling node to called node at each step.
-  TAO_RSE_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
-    prop_visitor (this->calling_dependency_set_map_,
-                  this->rt_info_map_);
-  for (int i = 0; i < this->rt_info_count_; ++i)
-    {
-      if (prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
-        {
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-    }
-
-  // Check whether any unresolved local dependencies were detected.
-  if (prop_visitor.unresolved_locals () > 0)
-    {
-      ACE_THROW (RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES ());
-    }
-
-  // Check whether any thread specification errors were detected.
-  if (prop_visitor.thread_specification_errors () > 0)
-    {
-      ACE_THROW (RtecScheduler::THREAD_SPECIFICATION ());
-    }
-}
-
-// Sort operations by urgency (done by strategy), then
-// assign priorities and subpriorities in one pass.
-// Sets last scheduled priority.
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::DUPLICATE_NAME))
-{
-  // Sort the pointers to entries in descending order
-  // of static priority and static subpriority, according
-  // to our given scheduling strategy.
-  ::qsort (ACE_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));
-
-  // Empty out the previously stored configuration infos, if any.
-  RtecScheduler::Preemption_Priority_t config_priority;
-  RtecScheduler::Config_Info *config_info_temp;
-  while (config_info_map_.current_size () > 0)
-    {
-      config_priority = (*config_info_map_.begin ()).ext_id_;
-      if (config_info_map_.unbind (config_priority, config_info_temp) == 0)
-        {
-          delete config_info_temp;
-        }
-      else
-        {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-        }
-    }
-
-  // Traverse using a priority assignment visitor, which uses a
-  // strategy to decide when a new priority or subpriority is reached.
-  TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY>
-    prio_visitor (this->rt_info_count_, this->entry_ptr_array_);
-  auto_ptr<RtecScheduler::Config_Info> new_config_info_ptr;
-  for (int i = 0; i <= this->rt_info_count_; ++i)
-    {
-      int result;
-
-      if (i < this->rt_info_count_)
-        {
-          // Visit the next entry in the array.
-          result = prio_visitor.visit (* (this->entry_ptr_array_ [i]));
-        }
-      else
-        {
-          // Finish up after all enties in the array have been visited.
-          result = prio_visitor.finish ();
-        }
-
-      if (result < 0)
-        {
-          // Something bad happened with the internal data structures.
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-      else if (result == 1)
-        {
-          RtecScheduler::Config_Info* new_config_info;
-          ACE_NEW_THROW_EX (new_config_info,
-                            RtecScheduler::Config_Info,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-
-          // Make sure the new config info is cleaned up if we exit abruptly.
-          new_config_info_ptr.reset (new_config_info);
-
-          // Have the strategy fill in the new config info for that
-          // priority level, using the representative scheduling entry.
-          if  (RECONFIG_SCHED_STRATEGY::assign_config (*new_config_info,
-                                                       *(entry_ptr_array_ [i])) < 0)
-            {
-              ACE_THROW (RtecScheduler::INTERNAL ());
-            }
-
-          if (new_config_info->preemption_priority >
-              last_scheduled_priority_)
-            {
-              this->last_scheduled_priority_ =
-                new_config_info->preemption_priority;
-            }
-
-          result = config_info_map_.bind (new_config_info->preemption_priority,
-                                          new_config_info);
-          switch (result)
-            {
-              case -1:
-                // Something bad but unknown occurred while trying to bind in map.
-                ACE_THROW (RtecScheduler::INTERNAL ());
-
-              case 1:
-                // Tried to bind an operation that was already in the map.
-                ACE_THROW (RtecScheduler::DUPLICATE_NAME ());
-
-              default:
-                ++this->config_info_count_;
-                break;
-            }
-
-          // Release the auto_ptr so it does not clean
-          // up the sucessfully bound config info.
-          new_config_info_ptr.release ();
-        }
-    }
-}
-
-// Compute utilization, set last feasible priority.
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL))
-{
-  TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY> util_visitor;
-  for (int i = 0; i < this->rt_info_count_; ++i)
-    {
-      if (util_visitor.visit (* (entry_ptr_array_ [i])) < 0)
-        {
-          ACE_THROW (RtecScheduler::INTERNAL ());
-        }
-    }
-
-  // Store the values accumulated by the visitor.
-  this->noncritical_utilization_ =
-    util_visitor.noncritical_utilization ();
-  this->critical_utilization_ =
-    util_visitor.critical_utilization ();
-}
-
-
-// Static helper method to give an RT_Info some reasonable default values.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecScheduler::RT_Info &rt_info)
-     ACE_THROW_SPEC (())
-{
-  // Set some reasonable default values.
-  rt_info.criticality = RtecScheduler::VERY_LOW_CRITICALITY;
-  rt_info.worst_case_execution_time = 0;
-  rt_info.typical_execution_time = 0;
-  rt_info.cached_execution_time = 0;
-  rt_info.period = 0;
-  rt_info.importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  rt_info.quantum = 0;
-  rt_info.threads = 0;
-  rt_info.info_type = RtecScheduler::OPERATION;
-  rt_info.priority = 0;
-  rt_info.preemption_subpriority = 0;
-  rt_info.preemption_priority = 0;
-  rt_info.volatile_token = 0;
-}
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHEDULER_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
deleted file mode 100644
index 5b2e378cf0a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_RECONFIG_SCHEDULER_T_H
-#define TAO_RECONFIG_SCHEDULER_T_H
-
-#include "ace/inc_user_config.h"
-
-// The templatized method parameters needed by this file are
-// hopelessly broken on pre-2.8 versions of g++
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
-#include "Reconfig_Scheduler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_Reconfig_Scheduler :
-  public POA_RtecScheduler::Scheduler
-  // = TITLE
-  //   A servant for RtecScheduler::Scheduler that can be initialized
-  //   and run solely with precomputed scheduling information, but is also
-  //   designed to perform efficient recomputation of scheduling info
-  //   in the face of run-time changes to RT_Infos in the schedule.
-  //
-  // = DESCRIPTION
-  //   This class implements the TAO scheduling service.  It has
-  //   the ability to accept and use precomputed scheduling information
-  //   with deterministic performance once the schedule is fully configured.
-  //   It also provides efficient and flexible lookup and computation
-  //   during schedule configuration, so that it can be used during
-  //   both schedule configuration and run-time phases of operation.
-  //
-{
-public:
-
-  TAO_Reconfig_Scheduler ();
-  // Default constructor.
-
-  TAO_Reconfig_Scheduler (int config_count,
-                          ACE_Scheduler_Factory::POD_Config_Info config_info[],
-                          int entry_count,
-                          ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-                          int dependency_count,
-                          ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-                          u_long stability_flags);
-  // Constructor. Initialize the scheduler from POD_Config_Info, POD_RT_Info,
-  // and POD_Dependency arrays, plus schedule stability flags.
-
-  int init (int config_count,
-            ACE_Scheduler_Factory::POD_Config_Info config_info[],
-            int rt_info_count,
-            ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-            int dependency_count,
-            ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            u_long stability_flags,
-            CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INTERNAL));
-  // Initializes the scheduler with the passed information.
-
-  void close (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Closes the scheduler, releasing all current resources.
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Create an RT_Info.  If it does not exist, a new RT_Info is
-  // created and inserted into the schedule, and the handle of the new
-  // RT_Info is returned.  If the RT_Info already exists, an exception
-  // is thrown.
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UNKNOWN_TASK,
-                    RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Lookup a handle for an RT_Info, and return its handle, or an error
-  // value if it's not present.
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Return a pointer to the RT_Info corresponding to the passed handle.
-
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality_t criticality,
-                    RtecScheduler::Time time,
-                    RtecScheduler::Time typical_time,
-                    RtecScheduler::Time cached_time,
-                    RtecScheduler::Period_t period,
-                    RtecScheduler::Importance_t importance,
-                    RtecScheduler::Quantum_t quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type,
-                    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE));
-  // Set characteristics of the RT_Info corresponding to the passed handle.
-
-  virtual void priority (RtecScheduler::handle_t handle,
-                         RtecScheduler::OS_Priority& o_priority,
-                         RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority,
-                         CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its handle.
-
-  virtual void entry_point_priority (const char * entry_point,
-                                     RtecScheduler::OS_Priority& o_priority,
-                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its entry point name.
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-                               RtecScheduler::handle_t dependency,
-                               CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type,
-                               CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method registers a dependency between two RT_Infos.
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-                                   CORBA::Long maximum_priority,
-                                   RtecScheduler::RT_Info_Set_out infos,
-                                   RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                   CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // If information has been added or changed since the last stable
-  // schedule was computed, this method causes scheduling information
-  // to be computed for all registered RT_Infos.  If the schedule is
-  // already stable, this is a no-op.
-
-  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
-                                       RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type,
-                                       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::NOT_SCHEDULED,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
-  // Provides the thread priority and queue type for the given priority level.
-
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::SYNCHRONIZATION_FAILURE,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the last priority number assigned to an operation in the
-  // schedule.  The number returned is one less than the total number
-  // of scheduled priorities.  All scheduled priorities range from 0
-  // to the number returned, inclusive.
-
-protected:
-
-  // @@ TO DO: use a memento to save and restore scheduler state without
-  //           breaking encapsulation, particularly of these flags.
-
-  enum Stability_Flags
-  {
-    // This should always be zero.
-    SCHED_ALL_STABLE = 0x00UL,
-
-    // Individual stability flags, each of
-    // which should have a distinct bit value.
-
-    // Utilization may need to be recomputed.
-    SCHED_UTILIZATION_NOT_STABLE = 0x01UL,
-
-    // Priorities may need to be recomputed.
-    SCHED_PRIORITY_NOT_STABLE = 0x02UL,
-
-    // Characteristics may need to be repropagated.
-    SCHED_PROPAGATION_NOT_STABLE = 0x04UL,
-
-    // This should be the disjunction of
-    // all the individual stability flags.
-    SCHED_NONE_STABLE =
-      SCHED_UTILIZATION_NOT_STABLE |
-      SCHED_PRIORITY_NOT_STABLE |
-      SCHED_PROPAGATION_NOT_STABLE
-  };
-  // Flags indicating stability conditions of schedule.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-	                              RtecScheduler::RT_Info*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> RT_INFO_MAP;
-  // Type of map used for O(1) lookup of RT_Infos by their handles.
-
-  typedef ACE_RB_Tree<const char *,
-                      RtecScheduler::RT_Info*,
-                      ACE_Less_Than<const char *>,
-                      ACE_LOCK> RT_INFO_TREE;
-  // Type of tree used for O(log n) lookup of RT_Infos by their names.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::Preemption_Priority_t,
-                                  RtecScheduler::Config_Info*,
-                                  ACE_Hash<RtecScheduler::Preemption_Priority_t>,
-                                  ACE_Equal_To<RtecScheduler::Preemption_Priority_t>,
-                                  ACE_LOCK> CONFIG_INFO_MAP;
-  // Type of map used for O(1) lookup of Config_Infos by their priorities.
-
-  typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-                                  RtecScheduler::Dependency_Set*,
-                                  ACE_Hash<RtecScheduler::handle_t>,
-                                  ACE_Equal_To<RtecScheduler::handle_t>,
-                                  ACE_LOCK> DEPENDENCY_SET_MAP;
-  // Type of map used for O(1) lookup of RT_Info
-  // dependency sets by caller or called handle.
-
-  virtual RtecScheduler::RT_Info * create_i (const char * entry_point,
-                                             RtecScheduler::handle_t handle,
-                                             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME,
-                     RtecScheduler::INTERNAL));
-  // Internal method to create an RT_Info.  If it does not exist,
-  // a new RT_Info is created and inserted into the schedule,
-  // and the handle of the new RT_Info is returned.
-  // If the RT_Info already exists, an exception is thrown.
-
-  virtual void set_i (RtecScheduler::RT_Info *rt_info,
-                      RtecScheduler::Criticality_t criticality,
-                      RtecScheduler::Time time,
-                      RtecScheduler::Time typical_time,
-                      RtecScheduler::Time cached_time,
-                      RtecScheduler::Period_t period,
-                      RtecScheduler::Importance_t importance,
-                      RtecScheduler::Quantum_t quantum,
-                      CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type);
-  // Internal method to set characteristics of the passed RT_Info.
-
-  virtual RtecScheduler::handle_t lookup_i (const char * entry_point,
-                                            CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UNKNOWN_TASK));
-  // Internal method to look up a handle for an RT_Info, and return
-  // its handle, or an exception if it's not present.
-
-  virtual void priority_i (RtecScheduler::handle_t handle,
-                           RtecScheduler::OS_Priority& o_priority,
-                           RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                           RtecScheduler::Preemption_Priority_t& p_priority,
-                           CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Internal method to return the priority and subpriority
-  // values assigned to an RT_Info, based on its handle.
-
-  virtual void add_dependency_i (RtecScheduler::handle_t handle,
-                                 RtecScheduler::handle_t dependency,
-                                 CORBA::Long number_of_calls,
-                                 RtecScheduler::Dependency_Type_t dependency_type,
-                                 CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Internal method that registers a dependency between two RT_Infos.
-  // Assumes it is being called with all locks held, and does *not*
-  // set any schedule stability flags.
-
-  virtual void map_dependency_i (RtecScheduler::handle_t key,
-                                 RtecScheduler::handle_t handle,
-                                 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &map,
-                                 CORBA::Long number_of_calls,
-                                 RtecScheduler::Dependency_Type_t dependency_type,
-                                 CORBA::Environment &env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK));
-  // This method installs a dependency in a dependency set map.
-
-
-  virtual void dfs_traverse_i (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Traverses dependency graph, assigning a topological ordering.
-  // Resets DFS map entries, do DFS traversal, constructs DFS map.
-
-  static int comp_entry_finish_times (const void *first, const void *second);
-  // Helper function to compare the DFS finish times of
-  // two task entries, so qsort orders these in topological
-  // order, with the higher times *first*.
-
-  virtual void detect_cycles_i (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::CYCLIC_DEPENDENCIES));
-  // Sorts an array of RT_info handles in topological order, then
-  // checks for loops, marks unresolved remote dependencies.
-
-  virtual void propagate_characteristics_i (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::INTERNAL,
-                      RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
-                      RtecScheduler::THREAD_SPECIFICATION));
-  // Propagates effective execution time and period, sets total frame size.
-
-  virtual void assign_priorities_i (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Sort operations by urgency (done by strategy), then
-  // assign priorities and subpriorities in one pass.
-  // Sets last scheduled priority.
-
-  virtual void compute_utilization_i (CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::INTERNAL));
-  // Compute utilization, set last feasible priority.
-
-  static void init_rt_info (RtecScheduler::RT_Info &rt_info)
-    ACE_THROW_SPEC (());
-  // Helper method to give an RT_Info some reasonable default values
-
-
-  RECONFIG_SCHED_STRATEGY sched_strategy_;
-  // Scheduling strategy for the reconfig scheduler.
-
-  CONFIG_INFO_MAP config_info_map_;
-  // Map for O(1) lookup of Config_Infos by priority level.
-
-  long config_info_count_;
-  // The number of config infos, which is also the number of priority
-  // levels.
-
-  RT_INFO_MAP rt_info_map_;
-  // Map for O(1) lookup of RT_Infos by handle.
-
-  long rt_info_count_;
-  // The number of registered RT_Infos.
-
-  RT_INFO_TREE rt_info_tree_;
-  // Map for O(1) lookup of RT_Infos by handle.
-
-  DEPENDENCY_SET_MAP calling_dependency_set_map_;
-  // Map for O(1) lookup of RT_Info dependency
-  // set by the caller operation's handle.
-
-  DEPENDENCY_SET_MAP called_dependency_set_map_;
-  // Map for O(1) lookup of RT_Info dependency
-  // set by the called operation's handle.
-
-  RtecScheduler::handle_t next_handle_;
-  // Next RT_Info descriptor handle to allocate.  The first handle is
-  // always 1.
-
-  TAO_Reconfig_Scheduler_Entry ** entry_ptr_array_;
-  // Array of pointers to scheduling entries.  This
-  // array is maintained by the methods that create
-  // scheduling entries, and sorted in topological
-  // order and then priority order at various points
-  // during schedule computation.
-
-  long entry_ptr_array_size_;
-  // Size of the array of scheduling entry pointers.
-
-  u_long stability_flags_;
-  // Flags indicating whether a stable schedule has been computed
-  // since the last addition or modification of information, and which
-  // parts of the schedule are unstable.
-
-  int dependency_count_;
-  // The number of dependencies in the dependency lists of all RT_Infos.
-  // This is used when traversing the dependency graph.
-
-  RtecScheduler::Preemption_Priority_t last_scheduled_priority_;
-  // Stores the last priority for which an operation can be scheduled
-
-  CORBA::Double noncritical_utilization_;
-  // Utilization by noncritical tasks.
-
-  CORBA::Double critical_utilization_;
-  // Utilization by critical tasks.
-
-  ACE_LOCK mutex_;
-  // Mutual exclusion lock for the scheduler itself.  This is needed to
-  // synchronize updates and accesses to scheduling information.
-};
-
-#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 */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Scheduler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* __GNUC__ */
-
-#endif /* TAO_RECONFIG_SCHEDULER_T_H */
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.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 8499a44ddd6..8d082e333e0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -1,5 +1,5 @@
 // $Id$
-
+//
 // ============================================================================
 //
 // = LIBRARY
@@ -24,7 +24,11 @@
 
 ACE_RCSID(Sched, SchedEntry, "$Id$")
 
-Task_Entry::Task_Entry (void)
+//////////////////////
+// Class Task_Entry //
+//////////////////////
+
+Task_Entry::Task_Entry ()
   : rt_info_ (0),
     effective_period_(0),
     dfs_status_ (NOT_VISITED),
@@ -38,56 +42,56 @@ Task_Entry::Task_Entry (void)
 {
 }
 
-Task_Entry::~Task_Entry (void)
+Task_Entry::~Task_Entry ()
 {
-  // Zero out the task entry ACT in the corresponding rt_info
+  // zero out the task entry ACT in the corresponding rt_info
   rt_info_->volatile_token = 0;
 
+  // iterate through the "calls" set of Task Entry Links and free each one
   ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter(calls_);
   Task_Entry_Link **link = 0;
-
-  // Iterate through the "calls" set of Task Entry Links and free each one
-
-  for (iter.first ();
-       ! iter.done ();
-       iter.advance (), link = 0)
+  for (iter.first (); ! iter.done (); iter.advance (), link = 0)
+  {
+    if ((iter.next (link) != 0) && (link) && (*link))
     {
-      if (iter.next (link) != 0 && link != 0 && *link != 0)
-        {
-          // remove the link object pointer from the calling entry's
-          // "callers" set and destroy the link object
-          (*link)->called ().callers_.remove (*link);
-          delete (*link);
-        }
+      // remove the link object pointer from the calling
+      // entry's "callers" set and destroy the link object
+      (*link)->called ().callers_.remove (*link);
+      delete (*link);
     }
+  }
 }
 
-// Merge dispatches according to info type and type of call, update
-// relevant scheduling characteristics for this entry.
+// Merge dispatches according to info type and type of call,
+// update relevant scheduling characteristics for this entry.
 
 Task_Entry::Propagation_Status
-Task_Entry::merge_dispatches (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                              ACE_CString &unresolved_locals,
-                              ACE_CString &unresolved_remotes)
+Task_Entry::merge_dispatches (
+  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
+  ACE_CString & unresolved_locals,
+  ACE_CString & unresolved_remotes)
 {
   Task_Entry::Propagation_Status result = SUCCEEDED;
   switch (info_type ())
-    {
+  {
     case RtecScheduler::DISJUNCTION:
 
-      // Prohibit two-way dispatches of a disjunction group, and
-      // disjunctively merge its one-way dispatches.  NOTE: one
-      // interpretation of disjunction for two-way calls is that the
-      // caller calls one OR the other, but this is problematic: how
-      // do we map the dispatches for this ?
+      // Prohibit two-way dispatches of a disjunction group,
+      // and disjunctively merge its one-way dispatches.
+      // NOTE: one interpretation of disjunction for two-way calls
+      //       is that the caller calls one OR the other, but this
+      //       is problematic: how do we map the dispatches for this ?
       if (prohibit_dispatches (RtecScheduler::TWO_WAY_CALL) < 0)
-        result = TWO_WAY_DISJUNCTION;
-
+        {
+          result = TWO_WAY_DISJUNCTION;
+        }
       if (disjunctive_merge (RtecScheduler::ONE_WAY_CALL,
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
-        result = INTERNAL_ERROR;
+        {
+          result = INTERNAL_ERROR;
+        }
       break;
 
     case RtecScheduler::CONJUNCTION:
@@ -101,572 +105,591 @@ Task_Entry::merge_dispatches (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_ent
       //       conjunctions of two-ways, but not disjunctions does not
       //       buy us anything, anyway).
       if (prohibit_dispatches (RtecScheduler::TWO_WAY_CALL) < 0)
-        result = TWO_WAY_CONJUNCTION;
+        {
+          result = TWO_WAY_CONJUNCTION;
+        }
       if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL,
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
-        result = INTERNAL_ERROR;
+        {
+          result = INTERNAL_ERROR;
+        }
       break;
 
     case RtecScheduler::OPERATION:
     case RtecScheduler::REMOTE_DEPENDANT:
 
-      // Disjunctively merge the operation's two-way dispatches, and
-      // conjunctively merge its one-way dispatches.
+      // Disjunctively merge the operation's two-way dispatches,
+      // and conjunctively merge its one-way dispatches.
       if (disjunctive_merge (RtecScheduler::TWO_WAY_CALL,
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
-        result = INTERNAL_ERROR;
+        {
+          result = INTERNAL_ERROR;
+        }
       if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL,
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
-        result = INTERNAL_ERROR;
+        {
+          result = INTERNAL_ERROR;
+        }
       break;
 
     default:
 
-      // There should not be any other kind of RT_Info, or if there
-      // is, the above switch logic is in need of repair.
+      // There should not be any other kind of RT_Info, or if
+      // there is, the above switch logic is in need of repair.
       result = UNRECOGNIZED_INFO_TYPE;
       break;
-    }
+  }
 
   return result;
 }
 
-// Prohibit calls of the given type: currently used to enforce the
-// notion that two-way calls to disjunctive or conjunctive RT_Infos do
-// not have any defined meaning, and thus should be considered
-// dependency specification errors: if these constraints are removed
-// in the future, this method should be removed as well Returns 0 if
-// all is well, or -1 if an error has occurred.
-
+// Prohibit calls of the given type: currently used to enforce
+// the notion that two-way calls to disjunctive or conjunctive
+// RT_Infos do not have any defined meaning, and thus should be
+// considered dependency specification errors: if these constraints
+// are removed in the future, this method should be removed as well
+// Returns 0 if all is well, or -1 if an error has occurred.
 int
 Task_Entry::prohibit_dispatches (Dependency_Type dt)
 {
-  // Iterate over the set of dependencies, ensuring none of them has
-  // the given dependency type.
-  for (ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
-       ! iter.done ();
-      iter.advance ())
+  // Iterate over the set of dependencies, ensuring
+  // none of them has the given dependency type.
+  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
+  while (! iter.done ())
+  {
+    Task_Entry_Link **link;
+    if ((iter.next (link) == 0) || (! link) || (! (*link)) ||
+        ((*link)->dependency_type () == dt))
     {
-      Task_Entry_Link **link;
-
-      if (iter.next (link) == 0 
-          || link == 0 
-          || *link == 0
-          || (*link)->dependency_type () == dt)
-        return -1;
+      return -1;
     }
 
+    iter.advance ();
+  }
+
   return 0;
 }
 
-// Perform disjunctive merge of arrival times of oneway calls: all
-// arrival times of all dependencies are duplicated by the multiplier
-// and repetition over the new frame size.
+
+// Perform disjunctive merge of arrival times of oneway calls:
+// all arrival times of all dependencies are duplicated by the
+// multiplier and repetition over the new frame size.
 
 int
-Task_Entry::disjunctive_merge (Dependency_Type dt,
-                               ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                               ACE_CString &unresolved_locals,
-                               ACE_CString &unresolved_remotes)
+Task_Entry::disjunctive_merge (
+  Dependency_Type dt,
+  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
+  ACE_CString & unresolved_locals,
+  ACE_CString & unresolved_remotes)
 {
-  char string_buffer[BUFSIZ];
+  char string_buffer [BUFSIZ];
 
-  // Iterate over the set of dependencies, merging dispatches of the
-  // callers over the enclosing frame size.
-  for (ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
-       ! iter.done ();
-       iter.advance ())
+  // Iterate over the set of dependencies, merging dispatches
+  // of the callers over the enclosing frame size.
+  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
+  while (! iter.done ())
+  {
+    Task_Entry_Link **link;
+    if ((iter.next (link) == 0) || (! link) || (! (*link)))
     {
-      Task_Entry_Link **link;
+      return -1;
+    }
 
-      if (iter.next (link) == 0 
-          || link == 0 
-          || *link == 0)
-        return -1;
+    // the link matches the dependency type given
+    if ((*link)->dependency_type () == dt)
+    {
+      // Check for and warn about unresolved remote
+      // dependencies in the ONE_WAY call graph.
+      if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
+          (*link)->caller ().has_unresolved_remote_dependencies () &&
+          ! this->has_unresolved_remote_dependencies ())
+        {
+          // Propagate the unresolved remote dependency
+          // flag, and issue a debug scheduler warning.
+          this->has_unresolved_remote_dependencies (1);
+          ACE_DEBUG (
+             (LM_DEBUG,
+              "Warning: an operation identified by "
+              "\"%s\" has unresolved remote dependencies.\n",
+              (const char*) this->rt_info ()->entry_point));
+
+          // Record entry point in list of unresolved remote dependencies
+          ACE_OS::sprintf (string_buffer, "// %s\n",
+                           (const char*) this->rt_info ()->entry_point);
+          unresolved_remotes +=
+            ACE_CString (string_buffer);
+
+        }
 
-      // The link matches the dependency type given
-      if ((*link)->dependency_type () == dt)
+      // Check for and warn about unresolved local
+      // dependencies in the ONE_WAY call graph.
+      if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
+          (*link)->caller ().has_unresolved_local_dependencies () &&
+          ! this->has_unresolved_local_dependencies ())
         {
-          // Check for and warn about unresolved remote dependencies
-          // in the ONE_WAY call graph.
-          if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL 
-              && (*link)->caller ().has_unresolved_remote_dependencies () 
-              && ! this->has_unresolved_remote_dependencies ())
-            {
-              // Propagate the unresolved remote dependency flag, and
-              // issue a debug scheduler warning.
-              this->has_unresolved_remote_dependencies (1);
-              ACE_DEBUG ((LM_DEBUG,
-                          "Warning: an operation identified by "
-                          "\"%s\" has unresolved remote dependencies.\n",
-                          (const char*) this->rt_info ()->entry_point));
-
-              // Record entry point in list of unresolved remote
-              // dependencies
-              ACE_OS::sprintf (string_buffer,
-                               "// %s\n",
-                               (const char*) this->rt_info ()->entry_point);
-              unresolved_remotes +=
-                ACE_CString (string_buffer);
-
-            }
-
-          // Check for and warn about unresolved local dependencies in
-          // the ONE_WAY call graph.
-          if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL 
-              && (*link)->caller ().has_unresolved_local_dependencies () 
-              && ! this->has_unresolved_local_dependencies ())
-            {
-              // Propagate the unresolved local dependency flag, and
-              // issue a debug scheduler warning.
-              this->has_unresolved_local_dependencies (1);
-              ACE_DEBUG ((LM_DEBUG,
-                          "Warning: an operation identified by "
-                          "\"%s\" has unresolved local dependencies.\n",
-                          (const char*) this->rt_info ()->entry_point));
-
-              // Record entry point in list of unresolved local
-              // dependencies
-              ACE_OS::sprintf (string_buffer,
-                               "// %s\n",
-                               (const char*) this->rt_info ()->entry_point);
-              unresolved_locals +=
-                ACE_CString (string_buffer);
-            }
-
-          // Merge the caller's dispatches into the current set.
-          if (merge_frames (dispatch_entries,
-                            *this,
-                            dispatches_,
-                            (*link)->caller ().dispatches_, effective_period_,
-                            (*link)->caller ().effective_period_,
-                            (*link)->number_of_calls ()) < 0)
-            return -1;
+          // Propagate the unresolved local dependency
+          // flag, and issue a debug scheduler warning.
+          this->has_unresolved_local_dependencies (1);
+          ACE_DEBUG (
+             (LM_DEBUG,
+              "Warning: an operation identified by "
+              "\"%s\" has unresolved local dependencies.\n",
+              (const char*) this->rt_info ()->entry_point));
+
+          // Record entry point in list of unresolved local dependencies
+          ACE_OS::sprintf (string_buffer, "// %s\n",
+                           (const char*) this->rt_info ()->entry_point);
+          unresolved_locals +=
+            ACE_CString (string_buffer);
         }
+
+      // Merge the caller's dispatches into the current set.
+      if (merge_frames (dispatch_entries, *this, dispatches_,
+                       (*link)->caller ().dispatches_, effective_period_,
+                       (*link)->caller ().effective_period_,
+                       (*link)->number_of_calls ()) < 0)
+      {
+        return -1;
+      }
     }
 
+    iter.advance ();
+  }
+
   return 0;
 }
 
-// Perform conjunctive merge of arrival times of calls: all arrival
-// times of all dependencies are duplicated by the multiplier and
-// repetition over the new frame size and then iteratively merged by
-// choosing the maximal arrival time at the current position in each
-// queue (iteration is in lockstep over all queues, and ends when any
-// queue ends).
+// Perform conjunctive merge of arrival times of calls:
+// all arrival times of all dependencies are duplicated by the
+// multiplier and repetition over the new frame size and then
+// iteratively merged by choosing the maximal arrival time at
+// the current position in each queue (iteration is in lockstep
+// over all queues, and ends when any queue ends).
 
 int
-Task_Entry::conjunctive_merge (Dependency_Type dt,
-                               ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                               ACE_CString &unresolved_locals,
-                               ACE_CString &unresolved_remotes)
+Task_Entry::conjunctive_merge (
+  Dependency_Type dt,
+  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
+  ACE_CString & unresolved_locals,
+  ACE_CString & unresolved_remotes)
 {
   int result = 0;
   char string_buffer [BUFSIZ];
 
-  // Iterate over the dependencies, and determine the total frame
-  // size.
-
+  // Iterate over the dependencies, and determine the total frame size.
   u_long frame_size = 1;
-
   ACE_Unbounded_Set_Iterator <Task_Entry_Link *> dep_iter (callers_);
-
-  for (dep_iter.first ();
-       dep_iter.done () == 0;
-       dep_iter.advance ())
+  for (dep_iter.first (); dep_iter.done () == 0; dep_iter.advance ())
+  {
+    Task_Entry_Link **link;
+    if ((dep_iter.next (link) == 0) || (! link) || (! (*link)))
     {
-      Task_Entry_Link **link;
+      return -1;
+    }
 
-      if (dep_iter.next (link) == 0
-          || link == 0
-          || *link == 0)
-        return -1;
+    // The link matches the dependency type given.
+    if ((*link)->dependency_type () == dt)
+    {
+      // Check for and warn about unresolved remote
+      // dependencies in the ONE_WAY call graph.
+      if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
+          (*link)->caller ().has_unresolved_remote_dependencies () &&
+          ! this->has_unresolved_remote_dependencies ())
+        {
+          // Propagate the unresolved remote dependency
+          // flag, and issue a debug scheduler warning.
+          this->has_unresolved_remote_dependencies (1);
+          ACE_DEBUG (
+             (LM_DEBUG,
+              "Warning: an operation identified by "
+              "\"%s\" has unresolved remote dependencies.\n",
+              (const char*) this->rt_info ()->entry_point));
+
+          // Record entry point in list of unresolved remote dependencies
+          ACE_OS::sprintf (string_buffer, "// %s\n",
+                           (const char*) this->rt_info ()->entry_point);
+          unresolved_remotes +=
+            ACE_CString (string_buffer);
+        }
 
-      // The link matches the dependency type given.
-      if ((*link)->dependency_type () == dt)
+      // Check for and warn about unresolved local
+      // dependencies in the ONE_WAY call graph.
+      if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
+          (*link)->caller ().has_unresolved_local_dependencies () &&
+          ! this->has_unresolved_local_dependencies ())
         {
-          // Check for and warn about unresolved remote dependencies
-          // in the ONE_WAY call graph.
-          if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL 
-              && (*link)->caller ().has_unresolved_remote_dependencies () 
-              && ! this->has_unresolved_remote_dependencies ())
-            {
-              // Propagate the unresolved remote dependency flag, and
-              // issue a debug scheduler warning.
-              this->has_unresolved_remote_dependencies (1);
-              ACE_DEBUG ((LM_DEBUG,
-                          "Warning: an operation identified by "
-                          "\"%s\" has unresolved remote dependencies.\n",
-                          (const char*) this->rt_info ()->entry_point));
-
-              // Record entry point in list of unresolved remote
-              // dependencies
-              ACE_OS::sprintf (string_buffer,
-                               "// %s\n",
-                               (const char*) this->rt_info ()->entry_point);
-              unresolved_remotes +=
-                ACE_CString (string_buffer);
-            }
-
-          // Check for and warn about unresolved local dependencies in
-          // the ONE_WAY call graph.
-          if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL 
-              && (*link)->caller ().has_unresolved_local_dependencies () 
-              && ! this->has_unresolved_local_dependencies ())
-            {
-              // Propagate the unresolved local dependency flag, and
-              // issue a debug scheduler warning.
-              this->has_unresolved_local_dependencies (1);
-              ACE_DEBUG ((LM_DEBUG,
-                          "Warning: an operation identified by "
-                          "\"%s\" has unresolved local dependencies.\n",
-                          (const char*) this->rt_info ()->entry_point));
-
-              // Record entry point in list of unresolved local dependencies
-              ACE_OS::sprintf (string_buffer,
-                               "// %s\n",
-                               (const char*) this->rt_info ()->entry_point);
-              unresolved_locals +=
-                ACE_CString (string_buffer);
-            }
-
-          frame_size = ACE::minimum_frame_size (frame_size,
-                                                (*link)->caller ().effective_period_);
+          // Propagate the unresolved local dependency
+          // flag, and issue a debug scheduler warning.
+          this->has_unresolved_local_dependencies (1);
+          ACE_DEBUG (
+             (LM_DEBUG,
+              "Warning: an operation identified by "
+              "\"%s\" has unresolved local dependencies.\n",
+              (const char*) this->rt_info ()->entry_point));
+
+          // Record entry point in list of unresolved local dependencies
+          ACE_OS::sprintf (string_buffer, "// %s\n",
+                           (const char*) this->rt_info ()->entry_point);
+          unresolved_locals +=
+            ACE_CString (string_buffer);
         }
+
+      frame_size = ACE::minimum_frame_size (frame_size, (*link)->caller ().effective_period_);
     }
+  }
 
-  // Reframe dispatches in the set to the new frame size (expands the
-  // set's effective period to be the new enclosing frame).
-  if (reframe (dispatch_entries,
-               *this, dispatches_,
-               effective_period_,
-               frame_size) < 0)
+  // Reframe dispatches in the set to the new frame size
+  // (expands the set's effective period to be the new enclosing frame).
+  if (reframe (dispatch_entries, *this, dispatches_,
+               effective_period_, frame_size) < 0)
+  {
     return -1;
+  }
 
-  // A container and iterator for virtual dispatch sets over which the
-  // conjunction will operate
+  // A container and iterator for virtual dispatch sets
+  // over which the conjunction will operate
   ACE_Ordered_MultiSet <Dispatch_Proxy_Iterator *> conj_set;
   ACE_Ordered_MultiSet_Iterator <Dispatch_Proxy_Iterator *> conj_set_iter (conj_set);
 
-  // Iterate over the dependencies, and for each of the given call
-  // type, create a Dispatch_Proxy_Iterator for the caller's dispatch
-  // set, using the caller's period, the total frame size, and the
-  // number of calls: if any of the sets is empty, just return 0;
-  for (dep_iter.first ();
-       dep_iter.done () == 0;
-       dep_iter.advance ())
+  // Iterate over the dependencies, and for each of the given call type,
+  // create a Dispatch_Proxy_Iterator for the caller's dispatch set, using
+  // the caller's period, the total frame size, and the number of calls:
+  // if any of the sets is empty, just return 0;
+  for (dep_iter.first (); dep_iter.done () == 0; dep_iter.advance ())
+  {
+    Task_Entry_Link **link;
+    if ((dep_iter.next (link) == 0) || (! link) || (! (*link)))
     {
-      Task_Entry_Link **link;
-      if (dep_iter.next (link) == 0
-          || link == 0 
-          || *link == 0)
-        return -1;
+      return -1;
+    }
 
-      // The link matches the dependency type given.
-      if ((*link)->dependency_type () == dt)
-        {
-          Dispatch_Proxy_Iterator *proxy_ptr;
-          ACE_NEW_RETURN (proxy_ptr,
-                          Dispatch_Proxy_Iterator ((*link)->caller ().dispatches_,
-                                                   (*link)->caller ().effective_period_,
-                                                   frame_size,
-                                                   (*link)->number_of_calls ()),
-                          -1);
-
-          // If there are no entries in the virtual set, we're done.
-          if (proxy_ptr->done ())
-            return 0;
-          else if (conj_set.insert (proxy_ptr, conj_set_iter) < 0)
-            return -1;
-        }
+    // The link matches the dependency type given.
+    if ((*link)->dependency_type () == dt)
+    {
+      Dispatch_Proxy_Iterator *proxy_ptr;
+      ACE_NEW_RETURN (proxy_ptr,
+                      Dispatch_Proxy_Iterator (
+                        (*link)->caller ().dispatches_,
+                        (*link)->caller ().effective_period_,
+                        frame_size, (*link)->number_of_calls ()),
+                      -1);
+
+      // If there are no entries in the virtual set, we're done.
+      if (proxy_ptr->done ())
+      {
+        return 0;
+      }
+      if (conj_set.insert (proxy_ptr, conj_set_iter) < 0)
+      {
+        return -1;
+      }
     }
+  }
 
   // loop, adding conjunctive dispatches, until one of the conjunctive
   // dispatch sources runs out of entries over the total frame
   conj_set_iter.first ();
   int more_dispatches = (conj_set_iter.done ()) ? 0 : 1;
   while (more_dispatches)
-    {
-      Time arrival = 0;
-      Time deadline = 0;
-      Preemption_Priority priority = 0;
-      OS_Priority OS_priority = 0;
-
-      for (conj_set_iter.first ();
-           conj_set_iter.done () == 0;
-           conj_set_iter.advance ())
-        {
-          // initialize to earliest arrival and deadline, and highest priority
-          arrival = 0;
-          deadline = 0;
-          priority = 0;
-          OS_priority = 0;
-
-          // Policy: conjunctively dispatched operations get the
-          // latest deadline of any of the dispatches in the
-          // conjunction at the time they were dispatched - when and
-          // if it is useful to change any of the merge policies, this
-          // should be one of the decisions factored out into the
-          // conjunctive merge strategy class.
-
-          // Policy: conjunctively dispatched operations get the
-          // lowest priority of any of the dispatches in the
-          // conjunction at the time they were dispatched - when and
-          // if it is useful to change any of the merge policies, this
-          // should be one of the decisions factored out into the
-          // conjunctive merge strategy class.
-
-          // Obtain a pointer to the current dispatch proxy iterator.
-          Dispatch_Proxy_Iterator **proxy_iter;
-          if (conj_set_iter.next (proxy_iter) == 0
-              || proxy_iter == 0 
-              || *proxy_iter == 0)
-            return -1;
-
-          // Use latest arrival, latest deadline, lowest priority (0 is highest).
-          if (arrival <= (*proxy_iter)->arrival ())
-            arrival = (*proxy_iter)->arrival ();
-          if (deadline <= (*proxy_iter)->deadline ())
-            deadline = (*proxy_iter)->deadline ();
-          if (priority <= (*proxy_iter)->priority ())
-            {
-              priority = (*proxy_iter)->priority ();
-              OS_priority = (*proxy_iter)->OS_priority ();
-            }
-
-          (*proxy_iter)->advance ();
-
-          if ((*proxy_iter)->done ())
-            more_dispatches = 0;
-        }
-
-      Dispatch_Entry *entry_ptr;
-      ACE_NEW_RETURN (entry_ptr,
-                      Dispatch_Entry (arrival,
-                                      deadline,
-                                      priority,
-                                      OS_priority,
-                                      *this),
-                      -1);
+  {
+    Time arrival = 0;
+    Time deadline = 0;
+    Preemption_Priority priority = 0;
+    OS_Priority OS_priority = 0;
+
+    for (conj_set_iter.first ();
+         conj_set_iter.done () == 0;
+         conj_set_iter.advance ())
+         {
+      // initialize to earliest arrival and deadline, and highest priority
+      arrival = 0;
+      deadline = 0;
+      priority = 0;
+      OS_priority = 0;
+
+      // Policy: conjunctively dispatched operations get the latest deadline of any
+      //         of the dispatches in the conjunction at the time they were dispatched
+      //          - when and if it is useful to change any of the merge policies, this
+      //         should be one of the decisions factored out into the conjunctive merge
+      //         strategy class.
+
+      // Policy: conjunctively dispatched operations get the lowest priority of any
+      //         of the dispatches in the conjunction at the time they were dispatched
+      //          - when and if it is useful to change any of the merge policies, this
+      //         should be one of the decisions factored out into the conjunctive merge
+      //         strategy class.
+
+      // Obtain a pointer to the current dispatch proxy iterator.
+      Dispatch_Proxy_Iterator **proxy_iter;
+      if ((conj_set_iter.next (proxy_iter) == 0) || (! proxy_iter) || (! (*proxy_iter)))
+      {
+        return -1;
+      }
+
+      // Use latest arrival, latest deadline, lowest priority (0 is highest).
+      if (arrival <= (*proxy_iter)->arrival ())
+      {
+        arrival = (*proxy_iter)->arrival ();
+      }
+      if (deadline <= (*proxy_iter)->deadline ())
+      {
+        deadline = (*proxy_iter)->deadline ();
+      }
+      if (priority <= (*proxy_iter)->priority ())
+      {
+        priority = (*proxy_iter)->priority ();
+        OS_priority = (*proxy_iter)->OS_priority ();
+      }
+
+      (*proxy_iter)->advance ();
+      if ((*proxy_iter)->done ())
+      {
+        more_dispatches = 0;
+      }
+    }
 
-      // If even one new dispatch was inserted, result is "something
-      // happened".
-      result = 1;
+    Dispatch_Entry *entry_ptr;
+    ACE_NEW_RETURN (entry_ptr,
+                    Dispatch_Entry (arrival, deadline, priority, OS_priority, *this),
+                    -1);
 
-      // Add the new dispatch entry to the set of all dispatches, and
-      // a link to it to the dispatch links for this task entry.
-      if (dispatch_entries.insert (entry_ptr) < 0)
-        return -1;
+    // If even one new dispatch was inserted, result is "something happened".
+    result = 1;
 
-      // Use iterator for efficient insertion into the dispatch set.
-      ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> insert_iter (dispatches_);
-      if (dispatches_.insert (Dispatch_Entry_Link (*entry_ptr),
-                              insert_iter) < 0)
-        return -1;
+    // Add the new dispatch entry to the set of all dispatches, and
+    // a link to it to the dispatch links for this task entry.
+    if (dispatch_entries.insert (entry_ptr) < 0)
+    {
+      return -1;
+    }
 
-      // TBD - Clients are not assigned priority, but rather obtain it
-      // from their call dependencies.  We could complain here if
-      // there is a priority specified that doesn't match (or is lower
-      // QoS?)
+    // Use iterator for efficient insertion into the dispatch set.
+    ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> insert_iter (dispatches_);
+    if (dispatches_.insert (Dispatch_Entry_Link (*entry_ptr), insert_iter) < 0)
+    {
+      return -1;
     }
 
+    // TBD - Clients are not assigned priority, but rather obtain it from
+    // their call dependencies.  We could complain here if there is a
+    // priority specified that doesn't match (or is lower QoS?)
+  }
+
   return result;
 }
 
-// This static method is used to reframe an existing dispatch set to
-// the given new period multiplier, creating new instances of each
-// existing dispatch (with adjusted arrival and deadline) in each
-// successive sub-frame.  Returns 1 if the set was reframed to a new
-// period, 0 if the set was not changed (the new period was not a
-// multiple of the old one), or -1 if an error occurred.
+// This static method is used to reframe an existing dispatch set
+// to the given new period multiplier, creating new instances of
+// each existing dispatch (with adjusted arrival and deadline)
+// in each successive sub-frame.  Returns 1 if the set was reframed
+// to a new period, 0 if the set was not changed (the new period
+// was not a multiple of the old one), or -1 if an error occurred.
 
 int
-Task_Entry::reframe (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                     Task_Entry &owner,
-                     ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
-                     u_long &set_period, u_long new_period)
+Task_Entry::reframe (
+  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
+  Task_Entry &owner,
+  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
+  u_long &set_period, u_long new_period)
 {
   int result = 0;
 
   // if the set period is zero, treat it as uninitialized,
   // and simply value the set period with the new period
   if (set_period)
+  {
+    // make sure the new period is greater than the current
+    // set period, and that they are harmonically related
+    if (new_period <= set_period)
     {
-      // make sure the new period is greater than the current
-      // set period, and that they are harmonically related
-      if (new_period <= set_period)
-        // return an error if they're not harmonically related,
-        // do nothing if set's frame is a multiple of the new frame
-        return (set_period % new_period) ? -1 : 0;
-      else if (new_period % set_period)
-        return -1;
-
-      // make a shallow copy of the set in a new ordered multiset
-      // using the Dispatch_Entry_Link smart pointers
-      ACE_Ordered_MultiSet <Dispatch_Entry_Link> new_set;
-      ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> new_iter (new_set);
-      ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> set_iter (set);
+      // return an error if they're not harmonically related,
+      // do nothing if set's frame is a multiple of the new frame
+      return (set_period % new_period) ? -1 : 0;
+    }
+    else if (new_period % set_period)
+    {
+      return -1;
+    }
 
-      for (set_iter.first (); set_iter.done () == 0; set_iter.advance ())
-        {
-          Dispatch_Entry_Link *link;
+    // make a shallow copy of the set in a new ordered
+    // multiset using the Dispatch_Entry_Link smart pointers
+    ACE_Ordered_MultiSet <Dispatch_Entry_Link> new_set;
+    ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> new_iter (new_set);
+    ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> set_iter (set);
 
-          if (set_iter.next (link) == 0)
-            return -1;
-          else if (new_set.insert (*link, new_iter) < 0)
-            return -1;
-        }
+    for (set_iter.first (); set_iter.done () == 0; set_iter.advance ())
+    {
+      Dispatch_Entry_Link *link;
+      if (set_iter.next (link) == 0)
+      {
+        return -1;
+      }
 
-      // Do a deep copy merge back into the set using the new period
-      // and starting after the 0th sub-frame: this puts all
-      // dispatches after the 0th sub-frame of the new period into the
-      // set, and leaves existing dispatches in the 0th sub-frame of
-      // the new period in the set as well.
-      result = merge_frames (dispatch_entries,
-                             owner,
-                             set,
-                             new_set,
-                             new_period,
-                             set_period,
-                             1,
-                             1);
+      if (new_set.insert (*link, new_iter) < 0)
+      {
+        return -1;
+      }
     }
 
+    // Do a deep copy merge back into the set using the new period and starting
+    // after the 0th sub-frame: this puts all dispatches after the 0th
+    // sub-frame of the new period into the set, and leaves existing dispatches
+    // in the 0th sub-frame of the new period in the set as well.
+    result = merge_frames (dispatch_entries, owner, set,
+                           new_set, new_period, set_period, 1, 1);
+
+  }
+
   // update the set's period to be the new frame
   set_period = new_period;
 
   return result;
 }
 
+
 // This static method is used to merge an existing dispatch set,
 // multiplied by the given multipliers for the period and number of
-// instances in each period of each existing dispatch, into the given
-// "into" set, without affecting the "from set".
+// instances in each period of each existing dispatch, into the
+// given "into" set, without affecting the "from set".
 
 int
-Task_Entry::merge_frames (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                          Task_Entry &owner,
-                          ACE_Ordered_MultiSet <Dispatch_Entry_Link> &dest,
-                          ACE_Ordered_MultiSet <Dispatch_Entry_Link> &src,
-                          u_long &dest_period,
-                          u_long src_period,
-                          u_long number_of_calls,
-                          u_long starting_dest_sub_frame)
+Task_Entry::merge_frames (
+  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
+  Task_Entry &owner,
+  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &dest,
+  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &src,
+  u_long &dest_period,
+  u_long src_period,
+  u_long number_of_calls,
+  u_long starting_dest_sub_frame)
 {
   int status = 0;
 
   // reframe dispatches in the destination set to the new frame size
   // (expands the destination set's period to be the new enclosing frame)
-  if (reframe (dispatch_entries,
-               owner,
-               dest,
-               dest_period,
-               ACE::minimum_frame_size (dest_period,
-                                        src_period)) < 0)
-      return -1;
+  if (reframe (dispatch_entries, owner, dest, dest_period,
+               ACE::minimum_frame_size (dest_period, src_period)) < 0)
+  {
+    return -1;
+  }
 
   // use iterator for efficient insertion into the destination set
   ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> dest_iter (dest);
 
-  // do virtual iteration over the source set in the new frame, adding
-  // adjusted dispatch entries to the destination
-  Dispatch_Proxy_Iterator src_iter (src,
-                                    src_period,
-                                    dest_period,
+  // do virtual iteration over the source set in the new frame,
+  // adding adjusted dispatch entries to the destination
+  Dispatch_Proxy_Iterator src_iter (src, src_period, dest_period,
                                     number_of_calls,
                                     starting_dest_sub_frame);
 
-  for (src_iter.first (starting_dest_sub_frame);
-       src_iter.done () == 0;
-       src_iter.advance ())
+  for (src_iter.first (starting_dest_sub_frame); src_iter.done () == 0; src_iter.advance ())
+  {
+
+    // Policy: disjunctively dispatched operations get their deadline and
+    //         priority from the original dispatch - when and if it is useful
+    //         to change any of the merge policies, this should be one of the
+    //         decisions factored out into the disjunctive merge strategy
+    //         class.
+
+    Dispatch_Entry *entry_ptr;
+    ACE_NEW_RETURN (entry_ptr,
+                    Dispatch_Entry (src_iter.arrival (),
+                                    src_iter.deadline (),
+                                    src_iter.priority (),
+                                    src_iter.OS_priority (),
+                                    owner),
+                    -1);
+
+    // if even one new dispatch was inserted, status is "something happened".
+    status = 1;
+
+    // add the new dispatch entry to the set of all dispatches, and
+    //  a link to it to the dispatch links for this task entry
+    if (dispatch_entries.insert (entry_ptr) < 0)
     {
-      // Policy: disjunctively dispatched operations get their
-      // deadline and priority from the original dispatch - when and
-      // if it is useful to change any of the merge policies, this
-      // should be one of the decisions factored out into the
-      // disjunctive merge strategy class.
-
-      Dispatch_Entry *entry_ptr;
-      ACE_NEW_RETURN (entry_ptr,
-                      Dispatch_Entry (src_iter.arrival (),
-                                      src_iter.deadline (),
-                                      src_iter.priority (),
-                                      src_iter.OS_priority (),
-                                      owner),
-                      -1);
-
-      // if even one new dispatch was inserted, status is "something happened".
-      status = 1;
-
-      // add the new dispatch entry to the set of all dispatches, and
-      // a link to it to the dispatch links for this task entry
-      if (dispatch_entries.insert (entry_ptr) < 0)
-        return -1;
-
-      else if (dest.insert (Dispatch_Entry_Link (*entry_ptr), dest_iter) < 0)
-        return -1;
+      return -1;
+    }
 
-      // TBD - Clients are not assigned priority, but rather obtain it
-      // from their call dependencies.  We could complain here if
-      // there is a priority specified that doesn't match (or is lower
-      // QoS?)
+    if (dest.insert (Dispatch_Entry_Link (*entry_ptr), dest_iter) < 0)
+    {
+      return -1;
     }
 
+    // TBD - Clients are not assigned priority, but rather obtain it from
+    // their call dependencies.  We could complain here if there is a
+    // priority specified that doesn't match (or is lower QoS?)
+  }
+
   return status;
 }
 
-Task_Entry_Link::Task_Entry_Link (Task_Entry &caller,
-                                  Task_Entry &called,
-                                  CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type)
-  : number_of_calls_ (number_of_calls),
-    caller_ (caller),
-    called_ (called),
-    dependency_type_ (dependency_type)
+
+///////////////////////////
+// Class Task_Entry_Link //
+///////////////////////////
+
+
+Task_Entry_Link::Task_Entry_Link (
+  Task_Entry &caller,
+  Task_Entry &called,
+  CORBA::Long number_of_calls,
+  RtecScheduler::Dependency_Type_t dependency_type)
+  : number_of_calls_ (number_of_calls)
+  , caller_ (caller)
+  , called_ (called)
+  , dependency_type_ (dependency_type)
 {
 }
 
+
+//////////////////////////
+// Class Dispatch_Entry //
+//////////////////////////
+
 Dispatch_Entry::Dispatch_Id Dispatch_Entry::next_id_ = 0;
 
-Dispatch_Entry::Dispatch_Entry (Time arrival,
-                                Time deadline,
-                                Preemption_Priority priority,
-                                OS_Priority os_priority,
-                                Task_Entry &task_entry,
-                                Dispatch_Entry *original_dispatch)
-  : priority_ (priority),
-    OS_priority_ (os_priority),
-    dynamic_subpriority_ (0),
-    static_subpriority_ (0),
-    arrival_ (arrival),
-    deadline_ (deadline),
-    task_entry_ (task_entry),
-    original_dispatch_ (original_dispatch)
+Dispatch_Entry::Dispatch_Entry (
+      Time arrival,
+      Time deadline,
+      Preemption_Priority priority,
+      OS_Priority os_priority,
+      Task_Entry &task_entry,
+      Dispatch_Entry *original_dispatch)
+
+  : priority_ (priority)
+  , OS_priority_ (os_priority)
+  , dynamic_subpriority_ (0)
+  , static_subpriority_ (0)
+  , arrival_ (arrival)
+  , deadline_ (deadline)
+  , task_entry_ (task_entry)
+  , original_dispatch_ (original_dispatch)
 {
   // obtain, increment the next id
   dispatch_id_ = next_id_++;
 }
 
 Dispatch_Entry::Dispatch_Entry (const Dispatch_Entry &d)
-  : priority_ (d.priority_),
-    OS_priority_ (d.OS_priority_),
-    dynamic_subpriority_ (d.dynamic_subpriority_),
-    static_subpriority_ (d.static_subpriority_),
-    arrival_ (d.arrival_),
-    deadline_ (d.deadline_),
-    task_entry_ (d.task_entry_),
-    original_dispatch_ (d.original_dispatch_)
+  : priority_ (d.priority_)
+  , OS_priority_ (d.OS_priority_)
+  , dynamic_subpriority_ (d.dynamic_subpriority_)
+  , static_subpriority_ (d.static_subpriority_)
+  , arrival_ (d.arrival_)
+  , deadline_ (d.deadline_)
+  , task_entry_ (d.task_entry_)
+  , original_dispatch_ (d.original_dispatch_)
 {
   // obtain, increment the next id
   dispatch_id_ = next_id_++;
 }
 
+
 int
 Dispatch_Entry::operator < (const Dispatch_Entry &d) const
 {
@@ -674,47 +697,56 @@ Dispatch_Entry::operator < (const Dispatch_Entry &d) const
 
   // lowest arrival time first
   if (this->arrival_ != d.arrival_)
-    return this->arrival_ < d.arrival_ ? 1 : 0;
+  {
+    return (this->arrival_ < d.arrival_) ? 1 : 0;
+  }
 
   // highest priority second
   if (this->priority_ != d.priority_)
-    return this->priority_ > d.priority_ ? 1 : 0;
-
-  // lowest laxity (highest dynamic sub-priority) third Just use low
-  // 32 bits of worst_case_execution_time.  This will have to change
-  // when TimeBase.idl is finalized.
-  // 
-  // NOTE: Leave the -= code intact as it's a workaround of a BCB4
-  // internal compiler error.
-  Time this_laxity = deadline_;
-  this_laxity -= task_entry ().rt_info ()->worst_case_execution_time;
-
-  Time that_laxity = d.deadline_;
-  that_laxity -= d.task_entry ().rt_info ()->worst_case_execution_time;
-
+  {
+    return (this->priority_ > d.priority_) ? 1 : 0;
+  }
+
+  // lowest laxity (highest dynamic sub-priority) third
+  // Just use low 32 bits of worst_case_execution_time.  This will
+  // have to change when TimeBase.idl is finalized.
+  Time this_laxity = deadline_ -
+                     task_entry ().rt_info ()->worst_case_execution_time;
+  Time that_laxity = d.deadline_ -
+                     d.task_entry ().rt_info ()->worst_case_execution_time;
   if (this_laxity != that_laxity)
+  {
     return (this_laxity < that_laxity) ? 1 : 0;
+  }
 
   // finally, by higher importance
   return (task_entry ().rt_info ()->importance >
           d.task_entry ().rt_info ()->importance) ? 1 : 0;
 }
 
-// ctor
+
+///////////////////////////////
+// Class Dispatch_Entry_Link //
+///////////////////////////////
+
 
 Dispatch_Entry_Link::Dispatch_Entry_Link (Dispatch_Entry &d)
   : dispatch_entry_ (d)
 {
 }
+  // ctor
 
-// copy ctor
-
-Dispatch_Entry_Link::Dispatch_Entry_Link (const Dispatch_Entry_Link &d)
+Dispatch_Entry_Link::Dispatch_Entry_Link (
+  const Dispatch_Entry_Link &d)
   : dispatch_entry_ (d.dispatch_entry_)
 {
 }
+  // copy ctor
 
-// ctor
+
+///////////////////////////////////
+// Class Dispatch_Proxy_Iterator //
+///////////////////////////////////
 
 Dispatch_Proxy_Iterator::Dispatch_Proxy_Iterator
   (ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
@@ -722,29 +754,26 @@ Dispatch_Proxy_Iterator::Dispatch_Proxy_Iterator
    u_long virtual_frame_size,
    u_long number_of_calls,
    u_long starting_sub_frame)
-  : number_of_calls_ (number_of_calls),
-    current_call_ (0),
-    actual_frame_size_ (actual_frame_size),
-    virtual_frame_size_ (virtual_frame_size),
-    current_frame_offset_ (actual_frame_size * starting_sub_frame),
-    iter_ (set)
+  : number_of_calls_ (number_of_calls)
+  , current_call_ (0)
+  , actual_frame_size_ (actual_frame_size)
+  , virtual_frame_size_ (virtual_frame_size)
+  , current_frame_offset_ (actual_frame_size * starting_sub_frame)
+  , iter_ (set)
 {
   first (starting_sub_frame);
 }
-
-// positions the iterator at the first entry of the passed sub-frame,
-// returns 1 if it could position the iterator correctly, 0 if not,
-// and -1 if an error occurred.
+      // ctor
 
 int
 Dispatch_Proxy_Iterator::first (u_int sub_frame)
 {
   if (actual_frame_size_ * (sub_frame) >= virtual_frame_size_)
-    {
-      // can not position the virtual iterator
-      // in the given range: do nothing
-      return 0;
-    }
+  {
+    // can not position the virtual iterator
+    // in the given range: do nothing
+    return 0;
+  }
 
   // restart the call counter
   current_call_ = 0;
@@ -755,13 +784,12 @@ Dispatch_Proxy_Iterator::first (u_int sub_frame)
   // restart the iterator
   return iter_.first ();
 }
-
-// positions the iterator at the last entry of the total frame,
-// returns 1 if it could position the iterator correctly, 0 if not,
-// and -1 if an error occurred.
+  // positions the iterator at the first entry of the passed
+  // sub-frame, returns 1 if it could position the iterator
+  // correctly, 0 if not, and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::last (void)
+Dispatch_Proxy_Iterator::last ()
 {
   // use the last call
   current_call_ = number_of_calls_ - 1;
@@ -772,159 +800,172 @@ Dispatch_Proxy_Iterator::last (void)
   // position the iterator at the last dispatch
   return iter_.first ();
 }
-
-// positions the iterator at the next entry of the total frame,
-// returns 1 if it could position the iterator correctly, 0 if not,
-// and -1 if an error occurred.
+  // positions the iterator at the last entry of the total
+  // frame, returns 1 if it could position the iterator
+  // correctly, 0 if not, and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::advance (void)
+Dispatch_Proxy_Iterator::advance ()
 {
   int result = 1;
 
   if (iter_.done ())
+  {
     result = 0; // cannot retreat if we're out of bounds
+  }
   else if (current_call_ < number_of_calls_ - 1)
+  {
     // if we're still in the same set of calls, increment the call counter
     ++current_call_;
+  }
   else
-    {
-      // roll over the call counter
-      current_call_ = 0;
+  {
+    // roll over the call counter
+    current_call_ = 0;
 
-      // advance the iterator in the current sub-frame
-      if (! iter_.advance ())
-        {
-          // if we're not already in the last sub_frame
-          if (current_frame_offset_ + actual_frame_size_ < virtual_frame_size_)
-            {
-              // increment the sub-frame offset
-              current_frame_offset_ += actual_frame_size_;
-
-              // restart the iterator at the front of the sub-frame
-              result = iter_.first ();
-            }
-          else
-            result = 0; // cannot advance if we're already at the end
-        }
+    // advance the iterator in the current sub-frame
+    if (! iter_.advance ())
+    {
+      // if we're not already in the last sub_frame
+      if (current_frame_offset_ + actual_frame_size_ < virtual_frame_size_)
+      {
+        // increment the sub-frame offset
+        current_frame_offset_ += actual_frame_size_;
+
+        // restart the iterator at the front of the sub-frame
+        result = iter_.first ();
+      }
+      else
+      {
+        result = 0; // cannot advance if we're already at the end
+      }
     }
+  }
 
   return result;
 }
-
-// positions the iterator at the previous entry of the total frame,
-// returns 1 if it could position the iterator correctly, 0 if not,
-// and -1 if an error occurred.
+  // positions the iterator at the next entry of the total
+  // frame, returns 1 if it could position the iterator
+  // correctly, 0 if not, and -1 if an error occurred.
 
 int
-Dispatch_Proxy_Iterator::retreat (void)
+Dispatch_Proxy_Iterator::retreat ()
 {
   int result = 1;
 
   if (iter_.done ())
+  {
     result = 0; // cannot retreat if we're out of bounds
+  }
   else if (current_call_ > 0)
+  {
     // if we're still in the same set of calls, decrement the call counter
     --current_call_;
+  }
   else
-    {
-      // roll over the call counter
-      current_call_ = number_of_calls_ - 1;
+  {
+    // roll over the call counter
+    current_call_ = number_of_calls_ - 1;
 
-      // back up the iterator in the current sub-frame
-      if (!iter_.retreat ())
-        {
-          // if we're not already in the 0th sub_frame
-          if (current_frame_offset_ > 0)
-            {
-              // decrement the sub-frame offset
-              current_frame_offset_ -= actual_frame_size_;
-
-              // restart the iterator at the tail of the sub-frame
-              result = iter_.last ();
-            }
-          else
-            result = 0; // cannot retreat if we're already at the start
-        }
+    // back up the iterator in the current sub-frame
+    if (!iter_.retreat ())
+    {
+      // if we're not already in the 0th sub_frame
+      if (current_frame_offset_ > 0)
+      {
+        // decrement the sub-frame offset
+        current_frame_offset_ -= actual_frame_size_;
+
+        // restart the iterator at the tail of the sub-frame
+        result = iter_.last ();
+      }
+      else
+      {
+        result = 0; // cannot retreat if we're already at the start
+      }
     }
+  }
 
   return result;
 }
-
-// returns the adjusted arrival time of the virtual entry
+  // positions the iterator at the previous entry of the total
+  // frame, returns 1 if it could position the iterator
+  // correctly, 0 if not, and -1 if an error occurred.
 
 RtecScheduler::Time
-Dispatch_Proxy_Iterator::arrival (void) const
+Dispatch_Proxy_Iterator::arrival () const
 {
   Dispatch_Entry_Link *link;
-  if (iter_.done () 
-      || iter_.next(link) == 0
-      || link == 0)
+  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
+  {
     return 0;
+  }
 
-  // Just use low 32 bits of arrival.  This will have to change when
-  // TimeBase.idl is finalized.
+  // Just use low 32 bits of arrival.  This will
+  // have to change when TimeBase.idl is finalized.
   return link->dispatch_entry ().arrival () + current_frame_offset_;
 }
-
-// returns the adjusted deadline time of the virtual entry
+  // returns the adjusted arrival time of the virtual entry
 
 RtecScheduler::Time
-Dispatch_Proxy_Iterator::deadline (void) const
+Dispatch_Proxy_Iterator::deadline () const
 {
   Dispatch_Entry_Link *link;
-  if (iter_.done ()
-      || iter_.next(link) == 0
-      || link == 0)
+  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
+  {
     return 0;
+  }
 
-  // Just use low 32 bits of deadline.  This will have to change when
-  // TimeBase.idl is finalized.
+  // Just use low 32 bits of deadline.  This will
+  // have to change when TimeBase.idl is finalized.
   return link->dispatch_entry ().deadline () + current_frame_offset_;
 }
-
-// returns the scheduler priority of the virtual entry
+  // returns the adjusted deadline time of the virtual entry
 
 Dispatch_Proxy_Iterator::Preemption_Priority
-Dispatch_Proxy_Iterator::priority (void) const
+Dispatch_Proxy_Iterator::priority () const
 {
   Dispatch_Entry_Link *link;
-
-  if (iter_.done () 
-      || iter_.next(link) == 0
-      || link == 0)
+  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
+  {
     return 0;
+  }
 
   return link->dispatch_entry ().priority ();
 }
-
-// returns the OS priority of the virtual entry
+  // returns the scheduler priority of the virtual entry
 
 Dispatch_Proxy_Iterator::OS_Priority
-Dispatch_Proxy_Iterator::OS_priority (void) const
+Dispatch_Proxy_Iterator::OS_priority () const
 {
   Dispatch_Entry_Link *link;
-  if (iter_.done ()
-      || iter_.next(link) == 0
-      || link == 0)
+  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
+  {
     return 0;
+  }
 
   return link->dispatch_entry ().OS_priority ();
 }
+  // returns the OS priority of the virtual entry
+
+
+//////////////////////////
+// Class TimeLine_Entry //
+//////////////////////////
 
-// time slice constructor
 
+    // time slice constructor
 TimeLine_Entry::TimeLine_Entry (Dispatch_Entry &dispatch_entry,
                                 Time start, Time stop,
                                 Time arrival, Time deadline,
                                 TimeLine_Entry *next,
                                 TimeLine_Entry *prev)
-  : dispatch_entry_ (dispatch_entry),
-    start_ (start),
-    stop_ (stop),
-    arrival_ (arrival),
-    deadline_ (deadline),
-    next_ (next),
-    prev_ (prev)
+  : dispatch_entry_ (dispatch_entry)
+  , start_ (start)
+  , stop_ (stop)
+  , arrival_ (arrival)
+  , deadline_ (deadline)
+  , next_ (next)
+  , prev_ (prev)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 93fd023e2bf..bda4bed16e9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -1258,6 +1258,211 @@ ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
 }
 
 
+
+/////////////////////////////////////////////////////////////////////////////
+// class ACE_RMS_Dyn_Scheduler_Strategy static data member initializations //
+/////////////////////////////////////////////////////////////////////////////
+
+ACE_RMS_Dyn_Scheduler_Strategy * ACE_RMS_Dyn_Scheduler_Strategy::instance_ = 0;
+
+///////////////////////////////////////////////////////////
+// class ACE_RMS_Dyn_Scheduler_Strategy member functions //
+///////////////////////////////////////////////////////////
+
+// = Returns an instance of the strategy.
+
+ACE_RMS_Dyn_Scheduler_Strategy *
+ACE_RMS_Dyn_Scheduler_Strategy::instance ()
+{
+  if (0 == ACE_RMS_Dyn_Scheduler_Strategy::instance_)
+  {
+    ACE_NEW_RETURN (ACE_RMS_Dyn_Scheduler_Strategy::instance_,
+                    ACE_RMS_Dyn_Scheduler_Strategy, 0);
+  }
+
+  return ACE_RMS_Dyn_Scheduler_Strategy::instance_;
+}
+
+// = Compares two dispatch entries: returns -1
+//   if the first Dispatch_Entry is greater in the order, 0 if they're
+//   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
+
+int
+ACE_RMS_Dyn_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
+                                               const Dispatch_Entry &second_entry)
+{
+  if ((first_entry.task_entry ().rt_info ()->criticality >=
+       RtecScheduler::HIGH_CRITICALITY)                    &&
+      (second_entry.task_entry ().rt_info ()->criticality >=
+       RtecScheduler::HIGH_CRITICALITY))
+  {
+    // If they're both in the high criticality bracket,
+    // order by dispatch period as in RMS scheduling.
+    if ((first_entry.deadline () - first_entry.arrival ())    <
+        (second_entry.deadline () - second_entry.arrival ()))
+    {
+      return -1;
+    }
+    else if ((first_entry.deadline () - first_entry.arrival ())    >
+             (second_entry.deadline () - second_entry.arrival ()))
+    {
+      return 1;
+    }
+
+    return 0;  // Same priority level.
+  }
+  else if ((first_entry.task_entry ().rt_info ()->criticality <
+            RtecScheduler::HIGH_CRITICALITY)                   &&
+           (second_entry.task_entry ().rt_info ()->criticality <
+            RtecScheduler::HIGH_CRITICALITY))
+  {
+    // If they're both in the low criticality bracket, they have the same priority.
+    return 0;
+  }
+
+  // Otherwise, they're in different criticality brackets: 
+  // order by criticality (descending).
+  return (first_entry.task_entry ().rt_info ()->criticality   >
+          second_entry.task_entry ().rt_info ()->criticality)
+         ? -1 : 1;
+}
+
+
+// = Sorts the dispatch entry pointer array in descending priority order.
+
+void
+ACE_RMS_Dyn_Scheduler_Strategy::sort (
+  Dispatch_Entry **dispatch_entries_, u_int size)
+{
+  ::qsort ((void *) dispatch_entries_,
+           size,
+           sizeof (Dispatch_Entry *),
+           (COMP_FUNC) ACE_RMS_Dyn_Scheduler_Strategy::sort_function);
+}
+
+
+// = Default constructor.
+
+ACE_RMS_Dyn_Scheduler_Strategy::ACE_RMS_Dyn_Scheduler_Strategy (
+  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
+  :ACE_Scheduler_Strategy (minimum_critical_priority)
+{
+}
+
+// = Virtual destructor.
+
+ACE_RMS_Dyn_Scheduler_Strategy::~ACE_RMS_Dyn_Scheduler_Strategy ()
+{
+}
+
+// = Returns a dynamic subpriority value for the given entry and the
+//   current time relative to its arrival.
+
+long
+ACE_RMS_Dyn_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
+                                                     RtecScheduler::Time current_time)
+{
+  if (entry.task_entry ().rt_info ()->criticality <
+      RtecScheduler::HIGH_CRITICALITY)
+  {
+    long laxity =
+      ACE_U64_TO_U32 (entry.deadline () - current_time -
+        entry.task_entry ().rt_info ()->worst_case_execution_time);
+
+     return (laxity > 0) ? LONG_MAX - laxity : laxity;
+  }
+
+  return 0;
+}
+
+// = Compares two dispatch entries within the very high and high
+//   criticality sets by minimum period (RMS) or of two dispatch entries
+//   within the medium, low, and very low criticality sets by minimum
+//   laxity: returns -1 if the first Dispatch_Entry is greater in the order,
+//   0 if they're equivalent, or 1 if the second Dispatch_Entry is greater
+//   in the order.
+
+int
+ACE_RMS_Dyn_Scheduler_Strategy::dynamic_subpriority_comp
+  (const Dispatch_Entry &first_entry,
+   const Dispatch_Entry &second_entry)
+{
+  // If either is in the high criticality bracket, we do not
+  // distinguish between them on the basis of dynamic subpriority.
+  if ((first_entry.task_entry ().rt_info ()->criticality >=
+       RtecScheduler::HIGH_CRITICALITY)                    ||
+      (second_entry.task_entry ().rt_info ()->criticality >=
+       RtecScheduler::HIGH_CRITICALITY))
+  {
+    // For HIGH_CRITICALITY and VERY_HIGH_CRITICALITY, all
+    // entries have the same dynamic subpriority as in RMS.
+    return 0;
+  }
+  else
+  {
+    // For VERY_LOW_CRITICALITY, LOW_CRITICALITY and MEDIUM_CRITICALITY,
+    // order second by laxity (ascending).
+    u_long laxity1 =
+      ACE_U64_TO_U32 (first_entry.deadline () - first_entry.arrival () -
+        first_entry.task_entry ().rt_info ()->worst_case_execution_time);
+
+    u_long laxity2 =
+      ACE_U64_TO_U32 (second_entry.deadline () - first_entry.arrival () -
+        second_entry.task_entry ().rt_info ()->worst_case_execution_time);
+
+    if (laxity1 < laxity2)
+    {
+      return -1;
+    }
+    else if (laxity1 > laxity2)
+    {
+      return 1;
+    }
+    else
+    {
+      return 0;
+    }
+  }
+}
+
+
+// = Comparison function to pass to qsort.
+
+int
+ACE_RMS_Dyn_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
+{
+  return ACE_RMS_Dyn_Scheduler_Strategy::instance ()->
+           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
+                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+}
+
+
+// = Returns 0 for minimum critical priority number.
+
+ACE_DynScheduler::Preemption_Priority
+ACE_RMS_Dyn_Scheduler_Strategy::minimum_critical_priority ()
+{
+  return minimum_critical_priority_;
+}
+
+
+// = Provides the dispatching queue type for the given dispatch entry.
+
+ACE_DynScheduler::Dispatching_Type
+ACE_RMS_Dyn_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
+{
+  if (entry.task_entry ().rt_info ()->criticality >= RtecScheduler::HIGH_CRITICALITY)
+  {
+    return RtecScheduler::STATIC_DISPATCHING;
+  }
+  else
+  {
+    return RtecScheduler::LAXITY_DISPATCHING;
+  }
+}
+
+
+
 //////////////////////////////////////////////
 // class ACE_Criticality_Scheduler_Strategy //
 //   static data member initializations     //
@@ -1403,6 +1608,7 @@ template class ACE_Strategy_Scheduler_Factory<ACE_MUF_Scheduler_Strategy>;
 template class ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>;
 template class ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>;
 template class ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>;
+template class ACE_Strategy_Scheduler_Factory<ACE_RMS_Dyn_Scheduler_Strategy>;
 template class ACE_Strategy_Scheduler_Factory<ACE_Criticality_Scheduler_Strategy>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Node<Dispatch_Entry *>
@@ -1412,6 +1618,7 @@ template class ACE_Strategy_Scheduler_Factory<ACE_Criticality_Scheduler_Strategy
 #pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>
 #pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>
 #pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>
+#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_RMS_Dyn_Scheduler_Strategy>
 #pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_Criticality_Scheduler_Strategy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index d13d8c9e51e..9f8d5aa497e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -426,6 +426,77 @@ private:
 };
 
 
+class TAO_ORBSVCS_Export ACE_RMS_Dyn_Scheduler_Strategy : public ACE_Scheduler_Strategy
+  // = TITLE
+  //    ACE_RMS_Dyn_Scheduler_Strategy
+  //
+  // = DESCRIPTION
+  //    Defines "schedule" method using Rate Monotonic priority assignment for
+  //    the critical set, single priority for the dynamic (non-critical) set.
+{
+public:
+
+  ACE_RMS_Dyn_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
+    // = Constructor.
+
+  virtual ~ACE_RMS_Dyn_Scheduler_Strategy ();
+    // = Virtual destructor.
+
+  static ACE_RMS_Dyn_Scheduler_Strategy *instance ();
+    // = Returns an instance of the strategy.
+
+  virtual int priority_comp (const Dispatch_Entry &first_entry,
+                             const Dispatch_Entry &second_entry);
+    // = Compares two dispatch entries by maximum criticality: returns -1
+    //   if the first Dispatch_Entry is greater in the order, 0 if they're
+    //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
+
+  virtual void sort (Dispatch_Entry **dispatch_entries,
+                     u_int count);
+    // = Sort the dispatch entry pointer array in descending priority order.
+
+  virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
+    // = Determine the minimum critical priority number.
+
+  virtual ACE_DynScheduler::Dispatching_Type
+    dispatch_type (const Dispatch_Entry &entry);
+    // = Provide the dispatching queue type for the given dispatch entry.
+
+protected:
+
+  virtual long dynamic_subpriority (Dispatch_Entry &entry,
+                                    RtecScheduler::Time current_time);
+    // = Returns a dynamic subpriority value at the current time for the
+    //   given timeline entry: if the operation is in the
+    //   critical set, the dynamic subpriority value is always 0; if the
+    //   operation is non-critical and has non-negative laxity, then the
+    //   dynamic subpriority value is positive, and a lower laxity gives a
+    //   higher dynamic subpriority if the operation is non-critical and has
+    //   negative laxity, the value is the (negative) laxity value.
+
+
+  virtual int dynamic_subpriority_comp
+    (const Dispatch_Entry &first_entry,
+     const Dispatch_Entry &second_entry);
+    // = Compares two dispatch entries within the very high and high
+    //   criticality sets by minimum period (RMS) or of two dispatch entries
+    //   within the medium, low, and very low criticality sets by minimum
+    //   laxity: returns -1 if the first Dispatch_Entry is greater in the 
+    //   order, 0 if they're equivalent, or 1 if the second Dispatch_Entry is 
+    //   greater in the order.
+
+private:
+
+  static int sort_function (void *arg1, void *arg2);
+    // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
+
+  static ACE_RMS_Dyn_Scheduler_Strategy *instance_;
+    // = Instance of the strategy.
+
+};
+
+
+
 class TAO_ORBSVCS_Export ACE_Criticality_Scheduler_Strategy : public ACE_Scheduler_Strategy
   // = TITLE
   //    ACE_Criticality_Scheduler_Strategy
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index e0fb7c9008b..9cca2581485 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -86,22 +86,20 @@ static_server (void)
                        ACE_Null_Mutex>::instance ()) == 0)
         return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      server_ = ace_scheduler_factory_data->scheduler_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      server_ = ace_scheduler_factory_data->scheduler_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "ACE_Scheduler_Factory - configured static server\n"));
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_Scheduler_Factory::config_runtime - "
-                           "cannot allocate server\n");
-    }
-  ACE_ENDTRY;
+  TAO_CATCHANY
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "ACE_Scheduler_Factory::config_runtime - "
+                       "cannot allocate server\n"),
+                      0);
+  TAO_ENDTRY;
 
   return server_;
 }
@@ -122,30 +120,30 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
     // config runs.
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
         naming->resolve (schedule_name,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       server_ =
         RtecScheduler::Scheduler::_narrow(objref.in (),
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       server_ = 0;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ACE_Scheduler_Factory::use_config - "
-                           " exception while resolving server\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "ACE_Scheduler_Factory::use_config - "
+                         " exception while resolving server\n"),
+                        -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   status_ = ACE_Scheduler_Factory::CONFIG;
   return 0;
@@ -255,7 +253,7 @@ int ACE_Scheduler_Factory::dump_schedule
 
   // Indicate anomalies encountered during scheduling.
 
-  ACE_OS::fprintf(file, (anomalies.length () > 0
+  ACE_OS::fprintf(file, (anomalies.length () > 0 
                          ? start_anomalies_found
                          : start_anomalies_none));
 
@@ -263,7 +261,7 @@ int ACE_Scheduler_Factory::dump_schedule
     {
       const RtecScheduler::Scheduling_Anomaly& anomaly = anomalies[i];
       switch (anomaly.severity)
-        {
+        { 
           case RtecScheduler::ANOMALY_FATAL:
             ACE_OS::fprintf(file, "FATAL: ");
             break;
@@ -301,7 +299,7 @@ int ACE_Scheduler_Factory::dump_schedule
 
       // Put quotes around the entry point name, exactly as it is stored.
       ACE_OS::sprintf (entry_point,
-                       "\"%s\"",
+                       "\"%s\"", 
                        (const char *) info.entry_point);
 
       // @@ TODO Eventually the TimeT structure will be a 64-bit
@@ -403,7 +401,7 @@ ACE_Scheduler_Factory::set_preemption_priority
   // Probably don't need this, because it should be safe to assume
   // that static_server () was called before this function.  But just
   // in case . . .
-  if (!ace_scheduler_factory_data
+  if (!ace_scheduler_factory_data 
       && (ace_scheduler_factory_data =
           ACE_Singleton<ACE_Scheduler_Factory_Data,
           ACE_Null_Mutex>::instance ()) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 75f03baa49d..7ab3143518f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -56,11 +56,12 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  env.exception (new CORBA::NO_IMPLEMENT ());
+  return 0;
 }
 
 // This creates a new UTO based on the given parameters.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 81d560396ac..5b94a8eebc3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -61,11 +61,12 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  env.exception (new CORBA::NO_IMPLEMENT ());
+  return 0;
 }
 
 // This creates a new UTO based on the given parameters.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 140c6be36f7..75de50ad531 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -1,14 +1,25 @@
+// ========================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Constraint_Interpreter.cpp
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
 
 #include "ace/OS.h"
 #include "Constraint_Interpreter.h"
 
 ACE_RCSID(Trader, Constraint_Interpreter, "$Id$")
 
-TAO_Interpreter::TAO_Interpreter (void)
-  : root_ (0) 
-{
-}
+  // *************************************************************
+  // TAO_Interpreter
+  // *************************************************************
 
 TAO_Interpreter::~TAO_Interpreter (void)
 {
@@ -16,28 +27,29 @@ TAO_Interpreter::~TAO_Interpreter (void)
 }
 
 int
-TAO_Interpreter::build_tree (const char* constraints)
+TAO_Interpreter::build_tree(const char* constraints)
 {
-  TAO_Lex_String_Input::reset ((char*)constraints);
+  TAO_Lex_String_Input::reset((char*)constraints);
   int return_value = 0;
 
   yyval.constraint_ = 0;
-  return_value = ::yyparse ();
+  return_value = ::yyparse();
 
   if (return_value == 0 && yyval.constraint_ != 0)
     this->root_ = yyval.constraint_;
   else
     {
-      while (yylex () > 0)
-        continue;
+      while (yylex() > 0)
+        ;
       this->root_ = 0;
     }
 
   return return_value;
 }
 
+
 int
-TAO_Interpreter::is_empty_string (const char* str)
+TAO_Interpreter::is_empty_string(const char* str)
 {
   int return_value = 0;
 
@@ -59,57 +71,46 @@ TAO_Interpreter::is_empty_string (const char* str)
   return return_value;
 }
 
+  // *************************************************************
+  // TAO_Constraint_Interpreter
+  // *************************************************************
+
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                             const char* constraints,
-                            CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                   CORBA::NO_MEMORY))
+                            CORBA::Environment& TAO_IN_ENV)
+  ACE_THROW_SPEC ((CosTrading::IllegalConstraint))
   : TAO_Interpreter ()
 {
-  // @@ Throwing Exception from constructor is very nasty situation to
-  // deal with.
-
   TAO_Constraint_Validator type_checker (ts);
 
   if (TAO_Interpreter::is_empty_string (constraints))
-    {
-      ACE_NEW_THROW_EX (this->root_,
-                        TAO_Literal_Constraint ((CORBA::Boolean) 1),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
+    this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1);
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        TAO_THROW (CosTrading::IllegalConstraint (constraints));
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        TAO_THROW (CosTrading::IllegalConstraint (constraints));
     }
 }
 
 TAO_Constraint_Interpreter::
-TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
+TAO_Constraint_Interpreter(TAO_Constraint_Validator& validator,
                            const char* constraints,
-                           CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                   CORBA::NO_MEMORY))
+                           CORBA::Environment& TAO_IN_ENV)
+  ACE_THROW_SPEC ((CosTrading::IllegalConstraint))
 {
   if (TAO_Interpreter::is_empty_string (constraints))
-    {
-      ACE_NEW_THROW_EX (this->root_,
-                        TAO_Literal_Constraint ((CORBA::Boolean) 1),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
+    this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1);
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        TAO_THROW (CosTrading::IllegalConstraint (constraints));
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        TAO_THROW (CosTrading::IllegalConstraint (constraints));
     }
 }
 
@@ -125,64 +126,56 @@ TAO_Constraint_Interpreter::evaluate (CosTrading::Offer* offer)
 }
 
 CORBA::Boolean
-TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator)
+TAO_Constraint_Interpreter::evaluate(TAO_Constraint_Evaluator& evaluator)
 {
   return evaluator.evaluate_constraint (this->root_);
 }
 
+  // *************************************************************
+  // TAO_Preference_Interpreter
+  // *************************************************************
+
 TAO_Preference_Interpreter::
-TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
+TAO_Preference_Interpreter(const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                            const char* preference,
-                           CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                   CORBA::NO_MEMORY))
-    : TAO_Interpreter ()
+                           CORBA::Environment& TAO_IN_ENV)
+  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
+  : TAO_Interpreter ()
 {
   TAO_Constraint_Validator type_checker (ts);
 
   if (TAO_Interpreter::is_empty_string (preference))
-    {
-      ACE_NEW_THROW_EX (this->root_,
-                        TAO_Noop_Constraint (TAO_FIRST),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
+    this->root_ = new TAO_Noop_Constraint (TAO_FIRST);
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
     }
 }
 
 TAO_Preference_Interpreter::
-TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
+TAO_Preference_Interpreter(TAO_Constraint_Validator& validator,
                            const char* preference,
-                           CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                   CORBA::NO_MEMORY))
+                           CORBA::Environment& TAO_IN_ENV)
+  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
     : TAO_Interpreter ()
 {
   if (TAO_Interpreter::is_empty_string (preference))
-    {
-      ACE_NEW_THROW_EX (this->root_,
-                        TAO_Noop_Constraint (TAO_FIRST),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
+    this->root_ = new TAO_Noop_Constraint (TAO_FIRST);
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
     }
 }
 
-TAO_Preference_Interpreter::~TAO_Preference_Interpreter ()
+TAO_Preference_Interpreter::~TAO_Preference_Interpreter()
 {
 }
 
@@ -215,9 +208,9 @@ order_offer (TAO_Constraint_Evaluator& evaluator,
           // correct place in the queue.
           TAO_Expression_Type expr_type = this->root_->expr_type ();
 
-          if (expr_type == TAO_FIRST 
-              || (expr_type == TAO_WITH 
-                  && ! ACE_static_cast (CORBA::Boolean, pref_info.value_)))
+          if (expr_type == TAO_FIRST ||
+              (expr_type == TAO_WITH &&
+               ! ACE_static_cast (CORBA::Boolean, pref_info.value_)))
             this->offers_.enqueue_tail (pref_info);
           else
             this->offers_.enqueue_head (pref_info);
@@ -227,27 +220,25 @@ order_offer (TAO_Constraint_Evaluator& evaluator,
               Ordered_Offers::ITERATOR offer_iter (this->offers_);
 
               // Push the new item down the list until the min/max
-              // criterion is satisfied. Observe the evaluation failed
-              // / evaluation suceeded partion in the list.
+              // criterion is satisfied. Observe the evaluation
+              // failed / evaluation suceeded partion in the list.
               offer_iter.advance ();
-
               for (int i = 1;
-                   offer_iter.done () == 0;
+                   ! offer_iter.done ();
                    offer_iter.advance (), i++)
                 {
                   Preference_Info* current_offer;
                   offer_iter.next (current_offer);
 
                   // Maintain the sorted order in the first partition.
-                  if (current_offer->evaluated_ == 1 
-                      && ((expr_type == TAO_MIN 
-                        && pref_info.value_ > current_offer->value_) 
-                       || (expr_type == TAO_MAX 
-                           && pref_info.value_ < current_offer->value_)))
+                  if (current_offer->evaluated_ == 1 &&
+                      ((expr_type == TAO_MIN &&
+                       pref_info.value_ > current_offer->value_) ||
+                      (expr_type == TAO_MAX &&
+                       pref_info.value_ < current_offer->value_)))
                     {
                       // Swap the out of order pair
-                      this->offers_.set (*current_offer,
-                                         i - 1);
+                      this->offers_.set (*current_offer, i - 1);
                       this->offers_.set (pref_info, i);
                     }
                   else
@@ -296,9 +287,13 @@ remove_offer (CosTrading::Offer*& offer)
 int
 TAO_Preference_Interpreter::num_offers (void)
 {
-  return this->offers_.size ();
+  return this->offers_.size();
 }
 
+  // *************************************************************
+  // Ugly Lex/Yacc Stuff
+  // *************************************************************
+
 char* TAO_Lex_String_Input::string_ = 0;
 char* TAO_Lex_String_Input::current_ = 0;
 char* TAO_Lex_String_Input::end_ = 0;
@@ -306,16 +301,14 @@ char* TAO_Lex_String_Input::end_ = 0;
 // Routine to have Lex read its input from the constraint string.
 
 int
-TAO_Lex_String_Input::copy_into (char* buf, int max_size)
+TAO_Lex_String_Input::copy_into(char* buf, int max_size)
 {
   int chars_left =  TAO_Lex_String_Input::end_ - TAO_Lex_String_Input::current_;
-  int n = max_size > chars_left ? chars_left : max_size;
+  int n = (max_size > chars_left) ? chars_left : max_size;
 
   if (n > 0)
     {
-      ACE_OS:: memcpy (buf,
-                       TAO_Lex_String_Input::current_,
-                       n);
+      memcpy(buf, TAO_Lex_String_Input::current_, n);
       TAO_Lex_String_Input::current_ += n;
     }
 
@@ -323,12 +316,12 @@ TAO_Lex_String_Input::copy_into (char* buf, int max_size)
 }
 
 void
-TAO_Lex_String_Input::reset (char* input_string)
+TAO_Lex_String_Input::reset(char* input_string)
 {
   TAO_Lex_String_Input::string_ = input_string;
   TAO_Lex_String_Input::current_ = input_string;
   TAO_Lex_String_Input::end_ = input_string +
-    ACE_OS::strlen (TAO_Lex_String_Input::string_);
+    ACE_OS::strlen(TAO_Lex_String_Input::string_);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 63a76e05575..462e91ae51b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -23,23 +23,25 @@
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
+  // *************************************************************
+  // TAO_Interpreter
+  // *************************************************************
+
 class TAO_Interpreter
+// = TITLE
+//      TAO_Interpreter is the superclass for all interpreters. Its
+//      build tree method invokes the yacc parser to parse a constraint
+//      or preference string.
 {
-  // = TITLE
-  //      TAO_Interpreter is the superclass for all interpreters. Its
-  //      build tree method invokes the yacc parser to parse a constraint
-  //      or preference string.
 protected:
-  // = Initialization and termination methods.
-  TAO_Interpreter (void);
-  // Constructor.
+
+  TAO_Interpreter (void) : root_ (0) {}
 
   ~TAO_Interpreter (void);
-  // Destructor.
 
   int build_tree (const char* preferences);
-  // Using the Yacc generated parser, construct an expression tree
-  // representing <constraints> from the tokens returned by it.
+  // Using the Yacc generated parser, construct an expression
+  // tree representing <constraints> from the tokens returned by it.
 
   static int is_empty_string (const char* str);
 
@@ -48,36 +50,38 @@ protected:
   // successfully builds a tree from the constraints.
 };
 
+  // *************************************************************
+  // TAO_Constraint_Interpreter
+  // *************************************************************
+
 class TAO_Constraint_Interpreter : public TAO_Interpreter
+//
+// = TITLE
+//   TAO_Constraint_Interpreter will, given a constraint string whose
+//   syntax and semantics comply with the trader specification for the
+//   constraint language, determine if a CosTrading::Offer meets the
+//   constraints.
+//
+// = DESCRIPTION
+//   TAO_Constraint_Interpreter will first build an expression tree
+//   representing the constraint expression using Lex and Yacc. Then,
+//   using a TAO_Constraint_Validator, it will validate the semantic
+//   correctness of the tree. When the evaluate method is invoked with
+//   an Offer, the TAO_Constraint_Interpreter will construct an
+//   EvaluationVisitor, which will evaluate the tree and decide
+//   whether the offer meets the constraints.
 {
-  //
-  // = TITLE
-  //   TAO_Constraint_Interpreter will, given a constraint string whose
-  //   syntax and semantics comply with the trader specification for the
-  //   constraint language, determine if a CosTrading::Offer meets the
-  //   constraints.
-  //
-  // = DESCRIPTION
-  //   TAO_Constraint_Interpreter will first build an expression tree
-  //   representing the constraint expression using Lex and Yacc. Then,
-  //   using a TAO_Constraint_Validator, it will validate the semantic
-  //   correctness of the tree. When the evaluate method is invoked with
-  //   an Offer, the TAO_Constraint_Interpreter will construct an
-  //   EvaluationVisitor, which will evaluate the tree and decide
-  //   whether the offer meets the constraints.
 public:
-  // = Initialization and termination methods.
+
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* constraints,
-                              CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                     CORBA::NO_MEMORY));
+                              CORBA::Environment& env)
+    ACE_THROW_SPEC ((CosTrading::IllegalConstraint));
 
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
                               const char* constraints,
-                              CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
-                     CORBA::NO_MEMORY));
+                              CORBA::Environment& env)
+    ACE_THROW_SPEC ((CosTrading::IllegalConstraint));
   // This constructor builds an expression tree representing the
   // constraint specified in <constraints>, and throws an Illegal
   // Constraint exception if the constraint given has syntax errors or
@@ -94,33 +98,35 @@ public:
   // tree was constructed. This method is thread safe (hopefully).
 };
 
+  // *************************************************************
+  // TAO_Preference_Interpreter
+  // *************************************************************
+
 class TAO_Preference_Interpreter : public TAO_Interpreter
+// = TITLE
+//   The TAO_Preference_Interpreter will, given a valid preference
+//   string and offers, will order the offers based on the offers'
+//   compliance with the preferences.
+//
+// = DESCRIPTION
+//   Each time the order_offer method is invoked, the
+//   TAO_Preference_Interpreter stores the offer reference in the
+//   order dictated by its evaluation of the preference string. After
+//   the TAO_Preference_Interpreter client has finished ordering all
+//   the offers, it will extract the offers in order using the
+//   remove_offer method.
 {
-  // = TITLE
-  //   The TAO_Preference_Interpreter will, given a valid preference
-  //   string and offers, will order the offers based on the offers'
-  //   compliance with the preferences.
-  //
-  // = DESCRIPTION
-  //   Each time the order_offer method is invoked, the
-  //   TAO_Preference_Interpreter stores the offer reference in the
-  //   order dictated by its evaluation of the preference string. After
-  //   the TAO_Preference_Interpreter client has finished ordering all
-  //   the offers, it will extract the offers in order using the
-  //   remove_offer method.
 public:
-  // = Initialization and termination methods.
+
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* preference,
-                              CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                     CORBA::NO_MEMORY));
+                              CORBA::Environment& env)
+    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
 
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
                               const char* preference,
-                              CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
-                     CORBA::NO_MEMORY));
+                              CORBA::Environment& env)
+    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
 
   // Parse the preference string, determining first if it's
   // valid. Throw an IllegalPreference exception if the preference
@@ -175,10 +181,14 @@ private:
   // The ordered list of offers.
 };
 
+  // *************************************************************
+  // Ugly Lex/Yacc Stuff
+  // *************************************************************
+
 // Functions we need for parsing.
-extern int yyparse (void);
-extern void yyrestart (FILE*);
-extern int yylex (void);
+extern int yyparse(void);
+extern void yyrestart(FILE*);
+extern int yylex(void);
 
 // Have yylex read from the constraint string, not from stdin.
 #undef YY_INPUT
@@ -188,17 +198,18 @@ extern int yylex (void);
 #define yyerror(x)
 
 class TAO_Lex_String_Input
+// = TITLE
+//   Stupid hack to have Lex read from a string and not from
+//   stdin. Essentially, the interpreter needs to call yylex() until
+//   EOF, and call TAO_Lex_String_Input::reset() with the new string,
+//   prior to calling yyparse.
 {
-  // = TITLE
-  //   Have Lex read from a string and not from stdin. Essentially,
-  //   the interpreter needs to call yylex() until EOF, and call
-  //   TAO_Lex_String_Input::reset() with the new string, prior to
-  //   calling yyparse.
 public:
-  static void reset (char* input_string);
+
+  static void reset(char* input_string);
   // Reset the lex input.
 
-  static int copy_into (char* buf, int max_size);
+  static int copy_into(char* buf, int max_size);
   // Method lex will call to read from the input string.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index d2d220a111e..db7b154891a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -1,9 +1,26 @@
+// =====================================================================
 // $Id$
+//
+// = LIBRARY
+//    Lookup
+//
+// = FILENAME
+//    Constraint_Nodes.cpp
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// =====================================================================
+
 
 #include "Constraint_Nodes.h"
 #include "Constraint_Visitors.h"
 
-ACE_RCSID (Trader, Constraint_Nodes, "$Id$")
+ACE_RCSID(Trader, Constraint_Nodes, "$Id$")
+
+const CORBA::Long MAX_SIGNED_INTEGER = (~(CORBA::Long)0) >> 1;
+const CORBA::Long MIN_SIGNED_INTEGER = ~(MAX_SIGNED_INTEGER);
+const CORBA::ULong MAX_UNSIGNED_INTEGER = (~(CORBA::ULong)0);
 
 int
 TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor)
@@ -23,15 +40,15 @@ TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor)
 
 TAO_Binary_Constraint::
 TAO_Binary_Constraint (TAO_Expression_Type op_type,
-                       TAO_Constraint* left,
-                       TAO_Constraint* right)
-  : op_ (op_type),
+				TAO_Constraint* left,
+				TAO_Constraint* right)
+  : op_  (op_type),
     left_ (left),
     right_ (right)
 {
 }
 
-TAO_Binary_Constraint::~TAO_Binary_Constraint (void)
+TAO_Binary_Constraint::~TAO_Binary_Constraint ()
 {
   delete left_;
   delete right_;
@@ -61,7 +78,6 @@ static int (*dispatch_table[]) (TAO_Constraint_Visitor*,
 };
 
 // Simulate the fun of actual double dispatching.
-
 int
 TAO_Binary_Constraint::accept (TAO_Constraint_Visitor* visitor)
 {
@@ -69,7 +85,7 @@ TAO_Binary_Constraint::accept (TAO_Constraint_Visitor* visitor)
     return_value = -1;
 
   if (dispatch_table[offset] != 0)
-    return_value = dispatch_table[offset] (visitor, this);
+    return_value = dispatch_table[offset](visitor, this);
 
   return return_value;
 }
@@ -79,15 +95,15 @@ TAO_Binary_Constraint::
 visit_or (TAO_Constraint_Visitor* visitor,
 		  TAO_Binary_Constraint* expr)
 {
-  return visitor->visit_or (expr);
+  return visitor->visit_or(expr);
 }
 
 int
 TAO_Binary_Constraint::
 visit_and (TAO_Constraint_Visitor* visitor,
-           TAO_Binary_Constraint* expr)
+	  TAO_Binary_Constraint* expr)
 {
-  return visitor->visit_and (expr);
+  return visitor->visit_and(expr);
 }
 
 int
@@ -265,7 +281,7 @@ TAO_Property_Constraint::~TAO_Property_Constraint (void)
 }
 
 int
-TAO_Property_Constraint::accept (TAO_Constraint_Visitor* visitor)
+TAO_Property_Constraint::accept(TAO_Constraint_Visitor* visitor)
 {
   return visitor->visit_property (this);
 }
@@ -278,7 +294,6 @@ TAO_Property_Constraint::name (void) const
 
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
-  : TAO_Constraint (lit)
 {
   this->copy (lit);
 }
@@ -287,26 +302,14 @@ TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (CORBA::Any* any)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
   CORBA::Any& any_ref = *any;
   CORBA::TypeCode_var type = any_ref.type ();
-  // @@ No where to throw exception back.
-  CORBA::TCKind corba_type = CORBA::tk_null;
-  ACE_TRY
-    {
-      corba_type = type->kind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // @@ Seth: Don't know what else to do.  Make sure we can tell
-      // when this constructor fails.
-      return;
-    }
-  ACE_ENDTRY;
+  CORBA::TCKind corba_type = type->kind (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   this->type_ = TAO_Literal_Constraint::comparable_type (type.in ());
-  switch (this->type_)
+  switch(this->type_)
     {
     case TAO_SIGNED:
       this->op_.integer_ = 0;
@@ -314,7 +317,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
 	{
 	  CORBA::Short sh;
 	  any_ref >>= sh;
-	  this->op_.integer_ = (CORBA::Long) sh;
+	  this->op_.integer_ = (CORBA::Long)sh;
 	}
       else
 	any_ref >>= this->op_.integer_;
@@ -325,7 +328,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
 	{
 	  CORBA::UShort sh;
 	  any_ref >>= sh;
-	  this->op_.uinteger_ = (CORBA::ULong) sh;
+	  this->op_.uinteger_ = (CORBA::ULong)sh;
 	}
       else
 	any_ref >>= this->op_.uinteger_;
@@ -334,25 +337,25 @@ TAO_Literal_Constraint (CORBA::Any* any)
       if (corba_type == CORBA::tk_float)
 	{
 	  CORBA::Float fl;
-          (*any) >>= fl;
-	  this->op_.double_ = (CORBA::Double) fl;
+	  (*any) >>= fl;
+	  this->op_.double_ = (CORBA::Double)fl;
 	}
       else
-        (*any) >>= this->op_.double_;
+	(*any) >>= this->op_.double_;
       break;
     case TAO_BOOLEAN:
       {
-	CORBA_Any::to_boolean tmp (this->op_.bool_);
-        (*any) >>= tmp;
+	CORBA_Any::to_boolean tmp(this->op_.bool_);
+	(*any) >>= tmp;
       }
-    break;
+      break;
     case TAO_STRING:
       {
 	char* s;
 	any_ref >>= s;
 	this->op_.str_ = CORBA::string_dup (s);
       }
-    break;
+      break;
     case TAO_SEQUENCE:
       this->op_.any_ = any;
     }
@@ -397,7 +400,7 @@ TAO_Literal_Constraint::~TAO_Literal_Constraint (void)
 int
 TAO_Literal_Constraint::accept (TAO_Constraint_Visitor* visitor)
 {
-  return visitor->visit_literal (this);
+  return visitor->visit_literal(this);
 }
 
 void
@@ -419,13 +422,13 @@ TAO_Literal_Constraint::operator CORBA::ULong (void) const
     return_value = this->op_.uinteger_;
   else if (this->type_ == TAO_SIGNED)
     return_value =
-      (this->op_.integer_ > 0) ? (CORBA::ULong) this->op_.integer_ : 0;
+      (this->op_.integer_ > 0) ? (CORBA::ULong)this->op_.integer_ : 0;
   else if (this->type_ == TAO_DOUBLE)
     return_value =
       (this->op_.double_ > 0) ?
-      ((this->op_.double_ > ACE_UINT32_MAX) ?
-       ACE_UINT32_MAX :
-       (CORBA::ULong) this->op_.double_)
+      ((this->op_.double_ > MAX_UNSIGNED_INTEGER) ?
+       MAX_UNSIGNED_INTEGER :
+       (CORBA::ULong)this->op_.double_)
       : 0;
 
   return return_value;
@@ -439,17 +442,17 @@ TAO_Literal_Constraint::operator CORBA::Long (void) const
     return_value = this->op_.integer_;
   else if (this->type_ == TAO_UNSIGNED)
     return_value =
-      (this->op_.uinteger_ > (CORBA::ULong) ACE_INT32_MAX) ?
-      ACE_INT32_MAX : (CORBA::Long) this->op_.uinteger_;
+      (this->op_.uinteger_ > (CORBA::ULong) MAX_SIGNED_INTEGER) ?
+      MAX_SIGNED_INTEGER : (CORBA::Long) this->op_.uinteger_;
   else if (this->type_ == TAO_DOUBLE)
     return_value  =
       (this->op_.double_ > 0) ?
-      ((this->op_.double_ > ACE_INT32_MAX) ?
-       ACE_INT32_MAX :
-       (CORBA::Long) this->op_.double_) :
-    ((this->op_.double_ < ACE_INT32_MIN) ?
-     ACE_INT32_MIN :
-     (CORBA::Long) this->op_.double_);
+      ((this->op_.double_ > MAX_SIGNED_INTEGER) ?
+       MAX_SIGNED_INTEGER :
+       (CORBA::Long)this->op_.double_) :
+    ((this->op_.double_ < MIN_SIGNED_INTEGER) ?
+     MIN_SIGNED_INTEGER :
+     (CORBA::Long)this->op_.double_);
 
   return return_value;
 }
@@ -461,9 +464,9 @@ TAO_Literal_Constraint::operator CORBA::Double (void) const
   if (this->type_ == TAO_DOUBLE)
     return_value = this->op_.double_;
   else if (this->type_ == TAO_SIGNED)
-    return_value = (CORBA::Double) this->op_.integer_;
+    return_value = (CORBA::Double)this->op_.integer_;
   else if (this->type_ == TAO_UNSIGNED)
-    return_value = (CORBA::Double) this->op_.uinteger_;
+    return_value = (CORBA::Double)this->op_.uinteger_;
 
   return return_value;
 }
@@ -482,20 +485,10 @@ TAO_Expression_Type
 TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
 {
   // Convert a CORBA::TCKind into a TAO_Literal_Type
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
   TAO_Expression_Type return_value = TAO_UNKNOWN;
-  CORBA::TCKind kind = CORBA::tk_null;
-  ACE_TRY
-    {
-      kind = type->kind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return return_value;
-    }
-  ACE_ENDTRY;
-  // Since this is a "top level try block, no need to check again.
+  CORBA::TCKind kind = type->kind (env);
+  TAO_CHECK_ENV_RETURN (env, return_value);
 
   switch (kind)
     {
@@ -522,25 +515,15 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
       break;
     case CORBA::tk_alias:
       {
-        CORBA::TCKind kind = CORBA::tk_void;
-        ACE_TRY_EX (label2)
-          {
-            CORBA::TypeCode_ptr typecode = type->content_type (ACE_TRY_ENV);
-            ACE_TRY_CHECK_EX (label2);
-            kind = typecode->kind (ACE_TRY_ENV);
-            ACE_TRY_CHECK_EX (label2);;
-          }
-        ACE_CATCHANY
-          {
-            return return_value;
-          }
-        ACE_ENDTRY;
-        // Since this is a "top level try block, no need to check again.
+	CORBA::TypeCode_ptr typecode = type->content_type (env);
+	TAO_CHECK_ENV_RETURN (env, return_value);
+	CORBA::TCKind kind = typecode->kind (env);
+	TAO_CHECK_ENV_RETURN (env, return_value);
 
 	if (kind == CORBA::tk_sequence)
 	  return_value = TAO_SEQUENCE;
       }
-    break;
+      break;
     default:
       return_value = TAO_UNKNOWN;
     }
@@ -554,24 +537,24 @@ operator== (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) == 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) == 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left == (CORBA::Double) right;
+      return_value = (CORBA::Double)left == (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left == (CORBA::Long) right;
+      return_value = (CORBA::Long)left == (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left == (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left == (CORBA::ULong)right;
       break;
     case TAO_BOOLEAN:
-      return_value = (CORBA::Boolean) left == (CORBA::Boolean) right;
+      return_value = (CORBA::Boolean)left == (CORBA::Boolean)right;
       break;
     }
 
@@ -585,24 +568,24 @@ operator!= (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) != 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) != 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left != (CORBA::Double) right;
+      return_value = (CORBA::Double)left != (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left != (CORBA::Long) right;
+      return_value = (CORBA::Long)left != (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left != (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left != (CORBA::ULong)right;
       break;
     case TAO_BOOLEAN:
-      return_value = (CORBA::Boolean) left != (CORBA::Boolean) right;
+      return_value = (CORBA::Boolean)left != (CORBA::Boolean)right;
       break;
     }
 
@@ -615,21 +598,21 @@ operator< (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) < 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) < 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left < (CORBA::Double) right;
+      return_value = (CORBA::Double)left < (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left < (CORBA::Long) right;
+      return_value = (CORBA::Long)left < (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left < (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left < (CORBA::ULong)right;
       break;
     case TAO_BOOLEAN:
       return_value = (CORBA::Boolean) left < (CORBA::Boolean) right;
@@ -645,21 +628,21 @@ operator<= (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) <= 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) <= 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left <= (CORBA::Double) right;
+      return_value = (CORBA::Double)left <= (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left <= (CORBA::Long) right;
+      return_value = (CORBA::Long)left <= (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left <= (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left <= (CORBA::ULong)right;
       break;
     }
 
@@ -672,21 +655,21 @@ operator> (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) > 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) > 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left > (CORBA::Double) right;
+      return_value = (CORBA::Double)left > (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left > (CORBA::Long) right;
+      return_value = (CORBA::Long)left > (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left > (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left > (CORBA::ULong)right;
       break;
     }
 
@@ -699,21 +682,21 @@ operator>= (const TAO_Literal_Constraint& left,
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) >= 0);
+      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) >= 0);
       break;
     case TAO_DOUBLE:
-      return_value = (CORBA::Double) left >= (CORBA::Double) right;
+      return_value = (CORBA::Double)left >= (CORBA::Double)right;
       break;
     case TAO_SIGNED:
-      return_value = (CORBA::Long) left >= (CORBA::Long) right;
+      return_value = (CORBA::Long)left >= (CORBA::Long)right;
       break;
     case TAO_UNSIGNED:
-      return_value = (CORBA::ULong) left >= (CORBA::ULong) right;
+      return_value = (CORBA::ULong)left >= (CORBA::ULong)right;
       break;
     }
 
@@ -733,9 +716,9 @@ operator== (const TAO_String_Manager& left,
 {
   int result =  0;
 
-  if ((const char*) right != 0)
+  if ((const char*)right != 0)
     result = ACE_OS::strcmp ((const char*) left,
- (const char*) right) == 0;
+			     (const char*) right) == 0;
   return result;
 }
 
@@ -745,27 +728,27 @@ operator+ (const TAO_Literal_Constraint& left,
 	   const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+	CORBA::Double result = (CORBA::Double)left + (CORBA::Double)right;
+	return TAO_Literal_Constraint((CORBA::Double)result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+	CORBA::Long result = (CORBA::Long)left + (CORBA::Long)right;
+	return TAO_Literal_Constraint((CORBA::Long)result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+	CORBA::ULong result = (CORBA::ULong)left + (CORBA::ULong)right;
+	return TAO_Literal_Constraint((CORBA::ULong)result);
       }
     default:
-      return TAO_Literal_Constraint ((CORBA::Long)0);
+      return TAO_Literal_Constraint((CORBA::Long)0);
     }
 }
 
@@ -774,27 +757,27 @@ operator- (const TAO_Literal_Constraint& left,
 	   const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+	CORBA::Double result = (CORBA::Double)left - (CORBA::Double)right;
+	return TAO_Literal_Constraint((CORBA::Double)result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+	CORBA::Long result = (CORBA::Long)left - (CORBA::Long)right;
+	return TAO_Literal_Constraint((CORBA::Long)result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+	CORBA::ULong result = (CORBA::ULong)left - (CORBA::ULong)right;
+	return TAO_Literal_Constraint((CORBA::ULong)result);
       }
     default:
-      return TAO_Literal_Constraint ((CORBA::Long)0);
+      return TAO_Literal_Constraint((CORBA::Long)0);
     }
 }
 
@@ -803,27 +786,27 @@ operator* (const TAO_Literal_Constraint& left,
 	   const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+	CORBA::Double result = (CORBA::Double)left * (CORBA::Double)right;
+	return TAO_Literal_Constraint((CORBA::Double)result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+	CORBA::Long result = (CORBA::Long)left * (CORBA::Long)right;
+	return TAO_Literal_Constraint((CORBA::Long)result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+	CORBA::ULong result = (CORBA::ULong)left * (CORBA::ULong)right;
+	return TAO_Literal_Constraint((CORBA::ULong)result);
       }
     default:
-      return TAO_Literal_Constraint ((CORBA::Long)0);
+      return TAO_Literal_Constraint((CORBA::Long)0);
     }
 }
 
@@ -832,27 +815,27 @@ operator/ (const TAO_Literal_Constraint& left,
 	   const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type (left, right);
+    TAO_Literal_Constraint::widest_type(left, right);
 
   switch (widest_type)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+	CORBA::Double result = (CORBA::Double)left / (CORBA::Double)right;
+	return TAO_Literal_Constraint((CORBA::Double)result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+	CORBA::Long result = (CORBA::Long)left / (CORBA::Long)right;
+	return TAO_Literal_Constraint((CORBA::Long)result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+	CORBA::ULong result = (CORBA::ULong)left / (CORBA::ULong)right;
+	return TAO_Literal_Constraint((CORBA::ULong)result);
       }
     default:
-      return TAO_Literal_Constraint ((CORBA::Long)0);
+      return TAO_Literal_Constraint((CORBA::Long)0);
     }
 }
 
@@ -863,21 +846,21 @@ operator- (const TAO_Literal_Constraint& operand)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = - (CORBA::Double) operand;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+	CORBA::Double result = - (CORBA::Double)operand;
+	return TAO_Literal_Constraint((CORBA::Double)result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = - (CORBA::Long) operand;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+	CORBA::Long result = - (CORBA::Long)operand;
+	return TAO_Literal_Constraint((CORBA::Long)result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand);
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+	CORBA::Long result = - (CORBA::Long)((CORBA::ULong)operand);
+	return TAO_Literal_Constraint((CORBA::ULong)result);
       }
     default:
-      return TAO_Literal_Constraint ((CORBA::Long)0);
+      return TAO_Literal_Constraint((CORBA::Long)0);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index b4edeca43be..d2b6009b262 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1,11 +1,28 @@
 // $Id$
 
+// ========================================================================
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Constraint_Visitors.cpp
+//
+// = AUTHOR
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
+
 #include "Constraint_Visitors.h"
 #include "Constraint_Nodes.h"
 #include "Trader_T.h"
 
 ACE_RCSID(Trader, Constraint_Visitors, "$Id$")
 
+  // *************************************************************
+  // TAO_Constraint_Evaluator
+  // *************************************************************
+
 TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
 {
 }
@@ -488,21 +505,12 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      CORBA::Any *value = 0;
+      CORBA::Environment env;
       // Retrieve the value of the property from the Property_Evaluator
-      ACE_TRY
-        {
-          value = this->prop_eval_.property_value (prop_index, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          return -1;
-        }
-      ACE_ENDTRY;
-      //      ACE_CHECK_RETURN (-1);
+
+      CORBA::Any* value =
+        this->prop_eval_.property_value (prop_index, env);
+      TAO_CHECK_ENV_RETURN (env, -1);
 
       if (value != 0)
         {
@@ -544,22 +552,12 @@ sequence_does_contain (CORBA::Any* sequence,
   // wrapper uses the [] operator to locate the target element in the
   // sequence.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
   CORBA::Boolean return_value = 0;
   CORBA::TypeCode_var type = sequence->type ();
-  CORBA::TCKind sequence_type = CORBA::tk_void;
-  ACE_TRY
-    {
-      sequence_type =
-        TAO_Sequence_Extracter_Base::sequence_type (type.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return return_value;
-    }
-  ACE_ENDTRY;
-  //  ACE_CHECK_RETURN (return_value);
+  CORBA::TCKind sequence_type =
+    TAO_Sequence_Extracter_Base::sequence_type (type.in (), env);
+  TAO_CHECK_ENV_RETURN (env, return_value);
 
   if (sequence_type == CORBA::tk_void)
     return return_value;
@@ -623,146 +621,139 @@ sequence_does_contain (CORBA::Any* sequence,
 
 // Explicit template specializations
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::Short>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Short element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::Short value = dyn_any.get_short (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Short value = dyn_any.get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::UShort>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::UShort element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::UShort value = dyn_any.get_ushort (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::UShort value = dyn_any.get_ushort (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::Long>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Long element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::Long value = dyn_any.get_long (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Long value = dyn_any.get_long (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::ULong>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::ULong value = dyn_any.get_ulong (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::ULong value = dyn_any.get_ulong (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::Float>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Float element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::Float value = dyn_any.get_float (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Float value = dyn_any.get_float (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::Double>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Double element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      CORBA::Double value = dyn_any.get_short (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Double value = dyn_any.get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<CORBA::Boolean>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Boolean element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION int
+ACE_TEMPLATE_SPECIALIZATION int
 TAO_Element_Equal<const char*>::
 operator () (TAO_DynSequence_i& dyn_any,
              const char* element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      const char* value = dyn_any.get_string (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      const char* value = dyn_any.get_string (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       return_value = (ACE_OS::strcmp (value, element) == 0);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  TAO_CATCHANY {} TAO_ENDTRY;
   return return_value;
 }
 
+
+// *************************************************************
+// TAO_Constraint_Validator
+// *************************************************************
+
 TAO_Constraint_Validator::
 TAO_Constraint_Validator
 (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct)
@@ -1049,20 +1040,11 @@ visit_in (TAO_Binary_Constraint* binary_in)
 
   if (right_type == TAO_SEQUENCE)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      CORBA::Environment env;
       CORBA::Boolean types_match = 0;
-      CORBA::TCKind seq_type = CORBA::tk_void;
-      ACE_TRY
-        {
-          seq_type =
-            TAO_Sequence_Extracter_Base::sequence_type (prop_type, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          return return_value;
-        }
-      ACE_ENDTRY;
+      CORBA::TCKind seq_type =
+        TAO_Sequence_Extracter_Base::sequence_type (prop_type, env);
+      TAO_CHECK_ENV_RETURN (env, return_value);
 
       if (seq_type != CORBA::tk_void)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index 01e9fea8b1d..bf74dfdcb14 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -19,6 +19,10 @@
 
 #include "Trader.h"
 
+  // *************************************************************
+  // TAO_Constraint_Visitor
+  // *************************************************************
+
 class TAO_Constraint;
 class TAO_Unary_Constraint;
 class TAO_Binary_Constraint;
@@ -27,23 +31,22 @@ class TAO_Property_Constraint;
 class TAO_Noop_Constraint;
 
 class TAO_Constraint_Visitor
+//
+// = TITLE
+//     This is the base class for all visitors who wish to preform
+//     some operation from the state of the expression tree. Using
+//     double dispatching, subclasses of Constraint expression call
+//     back to the InterpreterVisitor subclass from the accept method.
+//
+// = DESCRIPTION
+//     Traversal of the expression tree uses the "Visitor" pattern. To
+//     "visit" a node, a client invokes the "accept" method on a
+//     subclass of ConstraintExpression, which, in turn, invokes the
+//     appropriate method on the visitor passed to it, based on its
+//     own type. So, the Constraint_Visitor has a method to deal with
+//     each possible type of node in an expression tree; one for each
+//     operator in the grammar.
 {
-  //
-  // = TITLE
-  //     This is the base class for all visitors who wish to preform
-  //     some operation from the state of the expression tree. Using
-  //     double dispatching, subclasses of Constraint expression call
-  //     back to the InterpreterVisitor subclass from the accept
-  //     method.
-  //
-  // = DESCRIPTION
-  //     Traversal of the expression tree uses the "Visitor"
-  //     pattern. To "visit" a node, a client invokes the "accept"
-  //     method on a subclass of ConstraintExpression, which, in turn,
-  //     invokes the appropriate method on the visitor passed to it,
-  //     based on its own type. So, the Constraint_Visitor has a
-  //     method to deal with each possible type of node in an
-  //     expression tree; one for each operator in the grammar.
 public:
 
   virtual ~TAO_Constraint_Visitor (void) {}
@@ -82,10 +85,13 @@ public:
   virtual int visit_property (TAO_Property_Constraint* literal) = 0;
 };
 
+  // *************************************************************
+  // TAO_Constraint_Validator
+  // *************************************************************
+
 #include "Constraint_Nodes.h"
 
 class TAO_Constraint_Validator : public TAO_Constraint_Visitor
-{
   //
   // = TITLE
   //     TAO_Constraint_Validator ensures that in an expression tree
@@ -105,10 +111,11 @@ class TAO_Constraint_Validator : public TAO_Constraint_Visitor
   //    on each operand until all return true or one returns false,
   //    at which point we can back out of the traversal and indicate
   //    failure.
+{
 public:
 
-  TAO_Constraint_Validator (const CosTradingRepos::ServiceTypeRepository::TypeStruct& 
-                            type_struct);
+  TAO_Constraint_Validator
+    (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct);
   // The constructor creates a map of property names to their values
   // from the Type Description retrieved from the
   // ServiceTypeRepository. The ServiceTypeRepository throws
@@ -180,7 +187,7 @@ private:
   // property names with their types.
 
   CORBA::TypeCode* extract_type (TAO_Constraint* expr_type,
-                                 TAO_Expression_Type& type);
+                                TAO_Expression_Type& type);
 
   int expr_returns_boolean (TAO_Expression_Type expr_type);
   // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
@@ -198,31 +205,34 @@ private:
   TAO_Constraint_Validator& operator= (const TAO_Constraint_Validator&);
 };
 
+  // *************************************************************
+  // TAO_Constraint_Evaluator
+  // *************************************************************
+
 #include "Trader_Utils.h"
 
 class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
+//
+// = TITLE
+//     TAO_Constraint_Evaluator traverse a constraint expression tree,
+//     and determines whether an offer fits the constraints
+//     represented by the tree
+//
+// = DESCRIPTION
+//     Using the Visitor pattern, the TAO_Constraint_Evaluator has each
+//     node of the expression tree call back to it with the method
+//     designated for its type. In that method, the visitor will
+//     evaluate its operands and perform the operation designated by
+//     that node's type, and return the result. Note: the
+//     TAO_Constraint_Evaluator assumes the tree is semantically correct,
+//     that is, the validate method on TAO_Constraint_Validator return
+//     true. The only possible evaluation time errors are a divide by a
+//     property whose value is zero and undefined properties.
 {
-  //
-  // = TITLE
-  //     TAO_Constraint_Evaluator traverse a constraint expression
-  //     tree, and determines whether an offer fits the constraints
-  //     represented by the tree
-  //
-  // = DESCRIPTION
-  //     Using the Visitor pattern, the TAO_Constraint_Evaluator has
-  //     each node of the expression tree call back to it with the
-  //     method designated for its type. In that method, the visitor
-  //     will evaluate its operands and perform the operation
-  //     designated by that node's type, and return the result. Note:
-  //     the TAO_Constraint_Evaluator assumes the tree is semantically
-  //     correct, that is, the validate method on
-  //     TAO_Constraint_Validator return true. The only possible
-  //     evaluation time errors are a divide by a property whose value
-  //     is zero and undefined properties.
 public:
 
   TAO_Constraint_Evaluator (CosTrading::Offer* offer,
-                            CORBA::Boolean supports_dynamic_properties = 1);
+                           CORBA::Boolean supports_dynamic_properties = 1);
 
   CORBA::Boolean evaluate_constraint (TAO_Constraint* root);
   // Evaluate returns 1 if the offer satisfies the constraints
@@ -231,7 +241,7 @@ public:
   // automatically fails.
 
   int evaluate_preference (TAO_Constraint* root,
-                           TAO_Literal_Constraint& result);
+                          TAO_Literal_Constraint& result);
   // The result of the preference evaluation is stored in result. The
   // method returns 0 upon success, -1 upon failure.
 
@@ -301,10 +311,10 @@ public:
 private:
 
   class Operand_Queue :
-    public ACE_Unbounded_Queue <TAO_Literal_Constraint>
-  // = TITLE
-  // A queue adapter with methods to setting and getting operands
-  // from the expression evaluation results.
+  public ACE_Unbounded_Queue <TAO_Literal_Constraint>
+    // = TITLE
+    // A queue adapter with methods to setting and getting operands
+    // from the expression evaluation results.
   {
   public:
 
@@ -349,42 +359,45 @@ private:
   // The result of a non_boolean operation.
 };
 
+  // *************************************************************
+  // Utilities
+  // *************************************************************
+
 #include "tao/DynSequence_i.h"
 
 // Forward declaration
 template <class ELEMENT_TYPE> class TAO_Element_Equal;
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::Short>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::Short element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::UShort>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::UShort element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::Long>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::Long element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::ULong>
 {
 public:
@@ -395,44 +408,45 @@ public:
 
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::Float>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::Float element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::Double>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::Double element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<CORBA::Boolean>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    CORBA::Boolean element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
-ACE_TEMPLATE_SPECIALIZATION
 class TAO_Element_Equal<const char*>
 {
 public:
   int operator () (TAO_DynSequence_i& dyn_any,
                    const char* element) const;
-  // Calls the correct method on dyn_seq to extract the element type,
-  // then uses the appropriate form of equals comparison.
+  // Calls the correct method on dyn_seq to extract the element type, then
+  // uses the appropriate form of equals comparison.
+
 };
 
+
 #endif /* CONSTRAINT_VISITORS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
index 486744579d7..7c906d9aef0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
@@ -40,6 +40,7 @@ noinst_HEADERS = \
         Constraint_Nodes.h \
         Constraint_Tokens.h \
         Constraint_Visitors.h \
+        Locking.h \
         Offer_Database.h \
         Offer_Iterators.h \
         Offer_Iterators_T.h \
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index eba2d98f969..c8bb93f31ce 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -69,24 +69,19 @@ insert_offer (const char* type, CosTrading::Offer* offer)
         {
           // Add the new entry; upgrade lock.
           ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
-          this->offer_db_.bind (service_type,
-                                new_offer_map_entry,
-                                database_entry);
+          this->offer_db_.bind (service_type, new_offer_map_entry, database_entry);
         }
 
       if (this->db_lock_.acquire_read () == -1)
         return 0;
     }
 
-  Offer_Map_Entry* offer_map_entry =
-    database_entry->int_id_;
+  Offer_Map_Entry* offer_map_entry = database_entry->int_id_;
   ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon2, offer_map_entry->lock_, 0);
 
   // Add the offer to the service offer table for this service type.
-  offer_map_entry->offer_map_->bind (offer_map_entry->counter_,
-                                     offer);
-  return_value = this->generate_offer_id (type,
-                                          offer_map_entry->counter_);
+  offer_map_entry->offer_map_->bind (offer_map_entry->counter_, offer);
+  return_value = this->generate_offer_id (type, offer_map_entry->counter_);
   offer_map_entry->counter_++;
 
   return return_value;
@@ -149,23 +144,18 @@ remove_offer (const char* type, CORBA::ULong id)
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& ACE_TRY_ENV)
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   char* stype = 0;
   CORBA::ULong index;
 
-  this->parse_offer_id (offer_id,
-                        stype,
-                        index,
-                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->parse_offer_id (offer_id, stype, index, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
-  if (this->remove_offer (stype,
-                          index) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id),
-                      -1);
+  if (this->remove_offer (stype, index) == -1)
+    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), -1);
 
   return 0;
 }
@@ -174,17 +164,17 @@ template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
               char*& type_name,
-              CORBA::Environment& ACE_TRY_ENV)
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (offer);
+  this->parse_offer_id (offer_id, type_name, index, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
+    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
 
   return offer;
 }
@@ -193,7 +183,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& ACE_TRY_ENV)
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -201,11 +191,11 @@ lookup_offer (const CosTrading::OfferId offer_id,
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
 
-  this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (offer);
+  this->parse_offer_id (offer_id, type_name, index, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
-    ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
+    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
 
   return offer;
 }
@@ -241,10 +231,7 @@ TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void)
   // exported to the TAO_Offer_Database. Iterates through the entire
   // map, cramming offer_id strings into a newly constructed
   // TAO_Offer_Id_Iterator.
-  TAO_Offer_Id_Iterator* id_iterator;
-  ACE_NEW_RETURN (id_iterator,
-                  TAO_Offer_Id_Iterator (),
-                  0);
+  TAO_Offer_Id_Iterator* id_iterator = new TAO_Offer_Id_Iterator ();
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
 
   for (ACE_TYPENAME Offer_Database::iterator type_iter (this->offer_db_);
@@ -276,10 +263,9 @@ TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
                 CORBA::ULong& id,
-                CORBA::Environment& ACE_TRY_ENV)
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   // Get service type: it is everything from 17th character to the end.
   service_type = (char *) offer_id + 16;
 
@@ -293,7 +279,7 @@ parse_offer_id (const CosTrading::OfferId offer_id,
   *start_of_type = temp;
 
   if (! TAO_Trader_Base::is_valid_identifier_name (service_type))
-    ACE_THROW (CosTrading::IllegalOfferId (offer_id));
+    TAO_THROW (CosTrading::IllegalOfferId (offer_id));
 }
 
 template <class LOCK_TYPE> CosTrading::OfferId
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 0924c25142f..7edebd44946 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -64,12 +64,12 @@ public:
   // for it. Returns 0 on failure.
 
   int remove_offer (const CosTrading::OfferId offer_id,
-                    CORBA::Environment& _ACE_TRY_ENV)
+                    CORBA::Environment& _env)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   CORBA::Environment& _env)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose offer_id is <offer_id>, and return
@@ -77,7 +77,7 @@ public:
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
                                    char*& type_name,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   CORBA::Environment& _env)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose OfferId is <offer_id> and return in
@@ -130,7 +130,7 @@ private:
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
                               CORBA::ULong& id,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::Environment& _env)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
   // Take in a previously generated offer id and return the type
   // and id that were used to generate the offer id.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index e247a322004..670a6d28e1b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,9 +1,26 @@
+// ========================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//   Offer_Iterators.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
 
 #include "Offer_Iterators.h"
 
 ACE_RCSID(Trader, Offer_Iterators, "$Id$")
 
+  // *************************************************************
+  // TAO_Offer_Iterator
+  // *************************************************************
+
 TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter)
   : pfilter_ (pfilter)
 {
@@ -14,23 +31,36 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 }
 
 void
-TAO_Offer_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Iterator::destroy (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
 
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
+      poa->deactivate_object (id.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+    }
+  TAO_ENDTRY;
 }
 
+  // *************************************************************
+  // TAO_Query_Only_Offer_Iterator
+  // *************************************************************
+
 TAO_Query_Only_Offer_Iterator::
 TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter)
   : TAO_Offer_Iterator (pfilter)
@@ -81,6 +111,10 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
   return offers_in_sequence != 0;
 }
 
+  // *************************************************************
+  // TAO_Offer_Iterator_Collection
+  // *************************************************************
+
 TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection (void)
 {
 }
@@ -92,19 +126,15 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
       CosTrading::OfferIterator* offer_iter;
       this->iters_.dequeue_head (offer_iter);
 
-      ACE_TRY_NEW_ENV
+      TAO_TRY
         {
-          offer_iter->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          offer_iter->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CORBA::release (offer_iter);
         }
-      ACE_CATCHANY
-        {
-          // Don't let the exceptions propagate since we're in a
-          // destructor!
-        }
-      ACE_ENDTRY;
+      TAO_CATCHANY {}
+      TAO_ENDTRY;
     }
 }
 
@@ -119,18 +149,14 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
                                        CosTrading::OfferSeq_out offers,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
   CORBA::Boolean return_value = 1;
   CosTrading::OfferSeq_var out_offers;
 
-  ACE_NEW_THROW_EX (offers,
-                    CosTrading::OfferSeq,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (return_value);
-
+  ACE_NEW_RETURN (offers, CosTrading::OfferSeq, return_value);
   while (offers_left > 0 && ! this->iters_.is_empty ())
     {
       CORBA::ULong offset = 0;
@@ -141,30 +167,36 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       // Determine how many offers we should retrieve from this
       // iterator.
 
-      // Retrieve the set of offers.
-      any_left =
-        iter->next_n (offers_left,
-                      CosTrading::OfferSeq_out (out_offers.out ()),
-                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (return_value);
-
-      // If we've exhausted this iterator, destroy it.
-      if (any_left == 0)
+      TAO_TRY
         {
-          iter->destroy (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (return_value);
-          CORBA::release (iter);
+          // Retrieve the set of offers.
+          any_left =
+            iter->next_n (offers_left,
+                          CosTrading::OfferSeq_out (out_offers.out ()),
+                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          // If we've exhausted this iterator, destroy it.
+          if (any_left == 0)
+            {
+              iter->destroy (env);
+              CORBA::release (iter);
+            }
+          else
+            this->iters_.enqueue_head (iter);
+
+          // Merge it with the passed set.
+          offset = offers->length ();
+          offers->length (out_offers->length () + offset);
+          for (int j = out_offers->length () - 1; j >= 0; j--)
+            offers[j + offset] = out_offers[j];
+
+          offers_left -= out_offers->length ();
         }
-      else
-        this->iters_.enqueue_head (iter);
-
-      // Merge it with the passed set.
-      offset = offers->length ();
-      offers->length (out_offers->length () + offset);
-      for (int j = out_offers->length () - 1; j >= 0; j--)
-        offers[j + offset] = out_offers[j];
-
-      offers_left -= out_offers->length ();
+      TAO_CATCHANY
+        {
+        }
+      TAO_ENDTRY;
     }
 
   // Determine if we have anything left to offer.
@@ -175,7 +207,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
@@ -186,33 +218,44 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV)
       CosTrading::OfferIterator** iter = 0;
 
       iters_iter.next (iter);
-      (*iter)->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
+      (*iter)->destroy (TAO_IN_ENV);
     }
 
   // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
 
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
+      poa->deactivate_object (id.in (), TAO_TRY_ENV);
+    }
+  TAO_CATCHANY
+    {
+    }
+  TAO_ENDTRY;
 }
 
 CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::UnknownMaxLeft))
 {
-  ACE_THROW_RETURN (CosTrading::UnknownMaxLeft(),
-                    0);
+  TAO_THROW_RETURN (CosTrading::UnknownMaxLeft(), 0);
 }
 
+  // *************************************************************
+  // TAO_Offer_Id_Iterator
+  // *************************************************************
+
+
 TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator (void)
 {
 }
@@ -241,22 +284,30 @@ TAO_Offer_Id_Iterator::max_left (CORBA::Environment &)
 }
 
 void
-TAO_Offer_Id_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Id_Iterator::destroy (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
 
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+      poa->deactivate_object (id.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+    }
+  TAO_ENDTRY;
 }
 
 CORBA::Boolean
@@ -272,9 +323,9 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
   CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0);
 
   if (returnable_items == 0)
-    ACE_NEW_RETURN (_ids,
-                    CosTrading::OfferIdSeq,
-                    return_value);
+    {
+      ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value);
+    }
   else
     {
       // Allocate space for the returned OfferIds.
@@ -291,7 +342,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
 	      this->ids_.dequeue_head (offer_id);
 	      id_buf[i] = offer_id;
 	    }
-
+	
 	  // Place them into an OfferIdSeq.
 	  ACE_NEW_RETURN (_ids,
 			  CosTrading::OfferIdSeq (returnable_items,
@@ -301,9 +352,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
 			  return_value);
 	}
       else
-	ACE_NEW_RETURN (_ids,
-                        CosTrading::OfferIdSeq,
-                        return_value);
+	ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value);
     }
 
   // Return true only if there are items left to be returned in
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index f079bf42d2a..c5cd1c2448d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ============================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -48,7 +48,7 @@ public:
 
   virtual ~TAO_Offer_Iterator (void);
 
-  virtual void destroy (CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // BEGIN SPEC
   // The destroy operation destroys the iterator. No further
@@ -61,7 +61,7 @@ public:
   // Add an offer to the collection of offers the iterator will
   // iterate over.
 
-  virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft)) = 0;
 
@@ -75,7 +75,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // BEGIN SPEC
   // The next_n operation returns a set of service offers in the
@@ -127,12 +127,12 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
 
-  virtual CORBA::ULong max_left (CORBA::Environment& ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // Return the number of items left in the iterator.
@@ -183,15 +183,15 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Retrieve n offers from the set of iterators.
 
-  virtual void destroy (CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the collection of iterators.
 
-  virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Determine how many offers are left in the collection.
@@ -238,7 +238,7 @@ class TAO_Offer_Id_Iterator :
 
   ~TAO_Offer_Id_Iterator (void);
 
-  virtual CORBA::ULong max_left(CORBA::Environment& ACE_TRY_ENV)
+  virtual CORBA::ULong max_left(CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // The max_left operation returns the number of offer identifiers
@@ -247,7 +247,7 @@ class TAO_Offer_Id_Iterator :
   // identifiers (e.g., if the iterator determines its set of offer
   // identifiers through lazy evaluation).
 
-  virtual void destroy(CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy(CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The destroy operation destroys the iterator. No further
   // operations can be invoked on an iterator after it has been
@@ -255,7 +255,7 @@ class TAO_Offer_Id_Iterator :
 
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
                                 CosTrading::OfferIdSeq_out _ids,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns a set of offer identifiers in the
   // output parameter "ids." The operation returns n offer identifiers
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index dc7688d1bb5..2a501a94c7b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -1,4 +1,17 @@
+// ============================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Offer_Iterators_T.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//    Irfan Pyarali <irfan@cs.wustl.edu>
+// ============================================================================
 
 #ifndef TAO_OFFER_ITERATORS_T_C
 #define  TAO_OFFER_ITERATORS_T_C
@@ -32,14 +45,14 @@ TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 template <class MAP_LOCK_TYPE> void
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 add_offer (CosTrading::OfferId id,
-           const CosTrading::Offer* /* offer */)
+           const CosTrading::Offer* offer)
 {
   this->offer_ids_.enqueue_tail (id);
 }
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (CORBA::Environment&)
+max_left (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -50,7 +63,7 @@ template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
         CosTrading::OfferSeq_out offers,
-        CORBA::Environment& ACE_TRY_ENV)
+        CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
@@ -58,11 +71,7 @@ next_n (CORBA::ULong n,
   CORBA::ULong max_possible_offers_in_sequence =
     (n <  this->offer_ids_.size ()) ? n : this->offer_ids_.size ();
 
-  ACE_NEW_THROW_EX (offers,
-                    CosTrading::OfferSeq,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
+  ACE_NEW_RETURN (offers, CosTrading::OfferSeq, 0);
   offers->length (max_possible_offers_in_sequence);
 
   // While there are entries left and we haven't filled <offers>
@@ -76,13 +85,17 @@ next_n (CORBA::ULong n,
       CosTrading::OfferId id;
       this->offer_ids_.dequeue_head (id);
 
-      CosTrading::OfferId_var offerid_var (id);
-      CosTrading::Offer* offer = this->db_.lookup_offer (id, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (offer != 0)
-        this->pfilter_.filter_offer (offer,
-                                     offers[ret_offers++]);
+      TAO_TRY
+        {
+          CosTrading::OfferId_var offerid_var (id);
+          CosTrading::Offer* offer = this->db_.lookup_offer (id, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          if (offer != 0)
+            this->pfilter_.filter_offer (offer, offers[ret_offers++]);
+        }
+      TAO_CATCHANY {}
+      TAO_ENDTRY;
     }
 
   // Reset the length to the correct value
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index e2f21ef876f..1af30631650 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index bbdfa28cc33..a9386747480 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,5 +1,20 @@
+// ========================================================================
+//
 // $Id$
-
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//   Service_Type_Repository.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
+
+#include "Locking.h"
 #include "Service_Type_Repository.h"
 
 ACE_RCSID(Trader, Service_Type_Repository, "$Id$")
@@ -18,10 +33,10 @@ TAO_Service_Type_Repository (ACE_Lock* lock)
              ACE_Lock_Adapter<ACE_Null_Mutex> ());
 }
 
+
 TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 {
   {
-    // Make sure not to throw exceptions in destructors...
     ACE_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
     for (Service_Type_Map_Iterator service_map_iterator (this->type_map_);
@@ -36,6 +51,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
   delete this->lock_;
 }
 
+
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
 TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
       ACE_THROW_SPEC (())
@@ -62,7 +78,7 @@ add_type (const char * name,
           const char * if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
           const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-          CORBA::Environment& ACE_TRY_ENV)
+          CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -80,52 +96,48 @@ add_type (const char * name,
   inc_num.low = 0;
   inc_num.high = 0;
   ACE_UNUSED_ARG (inc_num); // With exceptions enabled, inc_num isn't used.
-  ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (inc_num);
+  TAO_WRITE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, inc_num);
 
   // make sure Type name is valid
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name),
+    TAO_THROW_RETURN (CosTrading::IllegalServiceType (name),
                       this->incarnation_);
 
   // check if the service type already exists.
   TAO_String_Hash_Key type_name (name);
   if (this->type_map_.find (type_name) == 0)
-    ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists (),
+    TAO_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists (),
                       this->incarnation_);
 
   // make sure all property names are valid and appear only once.
-  this->validate_properties (prop_map, props, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (this->incarnation_);
+  this->validate_properties (prop_map, props, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, this->incarnation_);
 
   // check that all super_types exist, and none are duplicated.
-  this->validate_supertypes (super_map, super_types, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (this->incarnation_);
+  this->validate_supertypes (super_map, super_types, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, this->incarnation_);
 
   // NOTE: I don't really know a way to do this without an Interface
   // Repository, since the Interface Repository IDs don't contain
   // information about supertypes.
   //
   // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types, ACE_TRY_ENV);
-  //  ACE_CHECK_RETURN (this->incarnation);
+  //  this->validate_interface (if_name, super_types, TAO_IN_ENV);
+  //  TAO_CHECK_ENV_RETURN(TAO_IN_ENV, this->incarnation);
   //
   // Instead, we do this:
   //
   if (if_name == 0)
-    ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch (),
+    TAO_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch (),
                       this->incarnation_);
 
-  // collect and make sure that properties of all supertypes and this
-  // type are compatible.  We can use prop_map and super_types_map for
-  // the job.
-  this->validate_inheritance (prop_map,
-                              super_types,
-                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (this->incarnation_);
+  // collect and make sure that properties of all supertypes and this type
+  // are compatible.  We can use prop_map and super_types_map for the job.
+  this->validate_inheritance (prop_map, super_types, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, this->incarnation_);
 
-  // we can now use prop_map to construct a sequence of all properties
-  // the this type.
+  // we can now use prop_map to construct a sequence of all properties the
+  // this type.
   this->update_type_map (name,
                          if_name,
                          props,
@@ -148,27 +160,26 @@ add_type (const char * name,
 
 void
 TAO_Service_Type_Repository::remove_type (const char * name,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    TAO_THROW (CosTrading::IllegalServiceType (name));
 
-  ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK;
+  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
   // Check if the type exists.
   Service_Type_Map::ENTRY* type_entry = 0; ;
   if (this->type_map_.find (name, type_entry) == -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    TAO_THROW (CosTrading::UnknownServiceType (name));
 
   // Check if it has any subtypes.
   Type_Info* type_info = type_entry->int_id_;
   if (type_info->has_subtypes_)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, ""));
+    TAO_THROW (CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, ""));
 
   // remove the type from the map.
   this->type_map_.unbind (type_entry);
@@ -178,11 +189,10 @@ TAO_Service_Type_Repository::remove_type (const char * name,
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq*
 TAO_Service_Type_Repository::
 list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types,
-            CORBA::Environment& ACE_TRY_ENV)
+            CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+  TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
   CORBA::ULong i = 0,
     length = this->type_map_.current_size ();
@@ -216,35 +226,32 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes&
 CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
 describe_type (const char * name,
-               CORBA::Environment& ACE_TRY_ENV)
+               CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW_RETURN
+    TAO_THROW_RETURN
       (CosTrading::IllegalServiceType (name),
        (CosTradingRepos::ServiceTypeRepository::TypeStruct*) 0);
 
-  ACE_READ_GUARD_THROW_EX
+  TAO_READ_GUARD_RETURN
     (ACE_Lock,
      ace_mon,
      *this->lock_,
-     CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+     (CosTradingRepos::ServiceTypeRepository::TypeStruct*) 0);
 
   // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY* type_entry = 0;
   if (this->type_map_.find (type_name, type_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name),
+    TAO_THROW_RETURN (CosTrading::UnknownServiceType (name),
                       (CosTradingRepos::ServiceTypeRepository::TypeStruct*) 0);
 
-  // Return appropriate information about the type.
+  // return appropriate information about the type.
   CosTradingRepos::ServiceTypeRepository::TypeStruct* descr = 0;
-  ACE_NEW_RETURN (descr,
-                  CosTradingRepos::ServiceTypeRepository::TypeStruct,
-                  0);
+  ACE_NEW_RETURN (descr, CosTradingRepos::ServiceTypeRepository::TypeStruct, 0);
   CosTradingRepos::ServiceTypeRepository::TypeStruct & s =
     type_entry->int_id_->type_struct_;
 
@@ -266,28 +273,25 @@ describe_type (const char * name,
 CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
 fully_describe_type (const char * name,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW_RETURN (CosTrading::IllegalServiceType (name), 0);
+    TAO_THROW_RETURN (CosTrading::IllegalServiceType (name), 0);
 
-  ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+  TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
   // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY* type_entry = 0;
   if (this->type_map_.find (type_name, type_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (name), 0);
+    TAO_THROW_RETURN (CosTrading::UnknownServiceType (name), 0);
 
   // return appropriate information about the type.
   CosTradingRepos::ServiceTypeRepository::TypeStruct* descr = 0;
-  ACE_NEW_RETURN (descr,
-                  CosTradingRepos::ServiceTypeRepository::TypeStruct,
-                  0);
+  ACE_NEW_RETURN (descr, CosTradingRepos::ServiceTypeRepository::TypeStruct, 0);
   CosTradingRepos::ServiceTypeRepository::TypeStruct & s =
     type_entry->int_id_->type_struct_;
 
@@ -304,31 +308,32 @@ fully_describe_type (const char * name,
   return descr;
 }
 
+
 void
 TAO_Service_Type_Repository::
 mask_type (const char * name,
-           CORBA::Environment& ACE_TRY_ENV)
+           CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
 {
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    TAO_THROW (CosTrading::IllegalServiceType (name));
 
-  ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
+  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
   // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY* type_entry = 0;
   if (this->type_map_.find (type_name, type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    TAO_THROW (CosTrading::UnknownServiceType (name));
 
   // make sure the type is unmasked.
   CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked;
 
   if (mask == 1)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
+    TAO_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
   else
     mask = 1;
 }
@@ -337,27 +342,27 @@ mask_type (const char * name,
 void
 TAO_Service_Type_Repository::
 unmask_type (const char * name,
-             CORBA::Environment& ACE_TRY_ENV)
+             CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTradingRepos::ServiceTypeRepository::NotMasked))
 {
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    TAO_THROW (CosTrading::IllegalServiceType (name));
 
-  ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
+  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
   // make sure the type exists.
   TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY* type_entry = 0;
   if (this->type_map_.find (type_name, type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    TAO_THROW (CosTrading::UnknownServiceType (name));
 
   // make sure the type is masked.
   CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked;
   if (mask == 0)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
+    TAO_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
   else
     mask = 0;
 }
@@ -376,7 +381,6 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct&
     num_types = service_type_queue.size ();
 
   TAO_String_Queue::ITERATOR iterator (service_type_queue);
-
   for (; ! iterator.done (); iterator.advance ())
     {
       char** next_type_name = 0;
@@ -434,6 +438,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
       Service_Type_Map::ENTRY* next_type_entry = 0;
       TAO_String_Hash_Key next_type_name (type_struct.super_types[i]);
 
+      //ACE_DEBUG ((LM_DEBUG, "%s\n", next_type_name.in ()));
       if (this->type_map_.find (next_type_name, next_type_entry) != -1)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct&
@@ -452,7 +457,7 @@ void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map& prop_map,
                      const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
@@ -460,7 +465,7 @@ validate_properties (Prop_Map& prop_map,
     {
       const char* n = props[i].name;
       if (! TAO_Trader_Base::is_valid_identifier_name (n))
-        ACE_THROW (CosTrading::IllegalPropertyName (n));
+        TAO_THROW (CosTrading::IllegalPropertyName (n));
       else
         {
           TAO_String_Hash_Key prop_name (n);
@@ -468,7 +473,7 @@ validate_properties (Prop_Map& prop_map,
             (CosTradingRepos::ServiceTypeRepository::PropStruct*) &props[i];
 
           if (prop_map.bind (prop_name, prop_val) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (n));
+            TAO_THROW (CosTrading::DuplicatePropertyName (n));
         }
     }
 }
@@ -477,7 +482,7 @@ void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map& super_map,
                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTrading::DuplicatePropertyName))
@@ -485,19 +490,20 @@ validate_supertypes (Service_Type_Map& super_map,
   for (CORBA::ULong i = 0; i < super_types.length (); i++)
     {
       const char* type =  super_types[i];
+      //      ACE_DEBUG ((LM_DEBUG, "%s\n", type));
 
       if (! TAO_Trader_Base::is_valid_identifier_name (type))
-        ACE_THROW (CosTrading::IllegalServiceType (type));
+        TAO_THROW (CosTrading::IllegalServiceType (type));
       else
         {
           TAO_String_Hash_Key s_type (type);
           Service_Type_Map::ENTRY* type_entry = 0;
           if (this->type_map_.find (s_type, type_entry) == -1)
-            ACE_THROW (CosTrading::UnknownServiceType (type));
+            TAO_THROW (CosTrading::UnknownServiceType (type));
           else
             {
               if (super_map.bind (s_type, type_entry->int_id_) == 1)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (type));
+                TAO_THROW (CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (type));
             }
         }
     }
@@ -507,7 +513,7 @@ void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map& prop_map,
                       const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
-                      CORBA::Environment& ACE_TRY_ENV)
+                      CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
@@ -545,32 +551,16 @@ validate_inheritance (Prop_Map& prop_map,
               const CosTradingRepos::ServiceTypeRepository::PropStruct&
                 property_in_map = *existing_prop->int_id_;
 
-
               CORBA::TypeCode_ptr prop_type = property_in_map.value_type.in ();
-              int compare = 0;
-              ACE_TRY
-                {
-                  compare = super_props[j].value_type->equal (prop_type, ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-
-                }
-              ACE_CATCHANY
+              if (! super_props[j].value_type->equal (prop_type, TAO_IN_ENV) ||
+                  super_props[j].mode > property_in_map.mode)
                 {
-                ACE_TRY_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                               (super_props[j].name,
-                                super_props[j],
-                                property_in_map.name,
-                                property_in_map));
+                  TAO_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
+                             (super_props[j].name,
+                              super_props[j],
+                              property_in_map.name,
+                              property_in_map));
                 }
-              ACE_ENDTRY;
-              ACE_CHECK;
-
-              if (! compare || super_props[j].mode > property_in_map.mode)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                           (super_props[j].name,
-                            super_props[j],
-                            property_in_map.name,
-                            property_in_map));
             }
         }
     }
@@ -599,8 +589,7 @@ update_type_map (const char* name,
   // all parameters are valid, create an entry for this service type
   // in the this->type_map_.
   Type_Info* type = 0;
-  ACE_NEW (type,
-           Type_Info);
+  ACE_NEW (type, Type_Info);
 
   type->type_struct_.props = props;
   type->type_struct_.if_name = if_name;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 3583056e222..ebb9b61f7f4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
-// $Id$
-
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -36,7 +35,7 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (CORBA::Environment &)
+    incarnation (CORBA::Environment &_env)
       ACE_THROW_SPEC (());
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
@@ -44,7 +43,7 @@ public:
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-            CORBA::Environment &)
+            CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -98,7 +97,7 @@ public:
   // END SPEC
 
   virtual void remove_type (const char  *name,
-                            CORBA::Environment &)
+                            CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -114,7 +113,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
   list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
-              CORBA::Environment &)
+              CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -130,7 +129,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   describe_type (const char *name,
-                 CORBA::Environment &)
+                 CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -144,7 +143,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   fully_describe_type (const char *name,
-                       CORBA::Environment &)
+                       CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -161,7 +160,7 @@ public:
   // END SPEC
 
   virtual void mask_type (const char *name,
-                          CORBA::Environment &)
+                          CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -180,7 +179,7 @@ public:
   // END SPEC
 
   virtual void unmask_type (const char  *name,
-                            CORBA::Environment &)
+                            CORBA::Environment &_env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -243,7 +242,7 @@ public:
 
   void validate_properties (Prop_Map &prop_map,
                             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                            CORBA::Environment &)
+                            CORBA::Environment &_env)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
@@ -251,7 +250,7 @@ public:
 
   void validate_supertypes (Service_Type_Map &super_map,
                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                            CORBA::Environment &)
+                            CORBA::Environment &_env)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::DuplicatePropertyName));
@@ -259,7 +258,7 @@ public:
 
   void validate_inheritance (Prop_Map &prop_map,
                              const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                             CORBA::Environment &)
+                             CORBA::Environment &_env)
     ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index b4ea13e0984..5c857ff1a1e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,4 +1,17 @@
+// ============================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Trader_Base.cpp
+//
+// = AUTHOR
+//    Irfan Pyarali <irfan@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ============================================================================
 
 #include "Trader.h"
 #include "Offer_Iterators_T.h"
@@ -8,6 +21,10 @@
 
 ACE_RCSID(Trader, Trader, "$Id$")
 
+  // *************************************************************
+  // TAO_Trader_Base
+  // *************************************************************
+
 TAO_Trader_Base::TAO_Trader_Base (void)
   : trading_components_ (*this),
     import_attributes_ (*this),
@@ -93,6 +110,10 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident)
   return return_value;
 }
 
+  // *************************************************************
+  // Attribute Classes
+  // *************************************************************
+
 TAO_Support_Attributes_i::
 TAO_Support_Attributes_i (TAO_Lockable &locker)
   : locker_ (locker),
@@ -170,14 +191,12 @@ void
 TAO_Support_Attributes_i::
 type_repos (CosTrading::TypeRepository_ptr new_value)
 {
-  // @@ Seth, There is no way to propagate the exception out.
+  CORBA::Environment TAO_IN_ENV;
   ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->type_repos_ = new_value;
-  // @@ What can we do even if we catch this?
   this->service_type_repos_ =
-    CosTradingRepos::ServiceTypeRepository::_narrow (new_value, ACE_TRY_ENV);
+    CosTradingRepos::ServiceTypeRepository::_narrow (new_value, TAO_IN_ENV);
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
@@ -605,6 +624,10 @@ operator== (const CosTrading::Admin::OctetSeq& left,
   return return_value;
 }
 
+  // *************************************************************
+  // TAO_Trader_Factory
+  // *************************************************************
+
 #include "ace/Arg_Shifter.h"
 #include "Trader_T.h"
 
@@ -804,8 +827,8 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv)
                 }
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-TSdef_follow_policy") == 0
-               || ACE_OS::strcmp (current_arg, "-TSmax_follow_policy") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-TSdef_follow_policy") == 0 ||
+               ACE_OS::strcmp (current_arg, "-TSmax_follow_policy") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
@@ -837,39 +860,32 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv)
     }
 }
 
+  // *************************************************************
+  // TAO_Sequence_Extracter_Base
+  // *************************************************************
+
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
 sequence_type (CORBA::TypeCode* type_code,
-               CORBA::Environment& ACE_TRY_ENV)
+               CORBA::Environment& env)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // @@ Seth, why do you use a comma to separate the two statements?
   CORBA::TCKind return_value = CORBA::tk_void,
-  type_kind = type_code->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (return_value);
+    type_kind = type_code->kind (env);
 
-  if (type_kind == CORBA::tk_alias
-      || type_kind == CORBA::tk_sequence)
+  if (type_kind == CORBA::tk_alias || type_kind == CORBA::tk_sequence)
     {
       CORBA::TypeCode_ptr base = type_code;
 
-      while (base->kind (ACE_TRY_ENV) == CORBA::tk_alias)
-        {
-          base = base->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (return_value);
-        }
-
-      CORBA::TCKind base_kind = base->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (return_value);
+      while (base->kind (env) == CORBA::tk_alias)
+        base = base->content_type (env);
 
-      if (base_kind == CORBA::tk_sequence)
+      if (base->kind (env) == CORBA::tk_sequence)
         {
-          base = base->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (return_value);
+          base = base->content_type (env);
+          TAO_CHECK_ENV_RETURN (env, return_value);
 
-          base_kind = base->kind (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (return_value);
-          return_value = base_kind;
+          return_value = base->kind (env);
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 99acbc7f2ea..48ee2779794 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ============================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 332624a3ee4..d4fe3eaf7fe 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1,4 +1,17 @@
+// ========================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Trader_Interfaces.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//
+// ========================================================================
 
 #if !defined (TAO_TRADER_INTERFACES_C)
 #define TAO_TRADER_INTERFACES_C
@@ -9,6 +22,10 @@
 
 ACE_RCSID(Trader, Trader_Interfaces, "$Id$")
 
+  // *************************************************************
+  // TAO_Lookup
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
@@ -45,7 +62,7 @@ query (const char *type,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
        CosTrading::PolicyNameSeq_out returned_limits_applied,
-       CORBA::Environment& ACE_TRY_ENV)
+       CORBA::Environment& env)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -59,21 +76,19 @@ query (const char *type,
                    CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
-  TAO_Policies policies (this->trader_, in_policies, ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_Policies policies (this->trader_, in_policies, env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // If a federated query returns to us, ignore it to prevent
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
-  int check = this->seen_request_id (policies, request_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (check)
+  if (this->seen_request_id (policies, request_id, env))
     {
       returned_offers = new CosTrading::OfferSeq;
       returned_limits_applied = new CosTrading::PolicyNameSeq;
       return;
     }
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // The presence of a link interface determines whether we should
   // attempt to forward or propagate queries.
@@ -82,9 +97,8 @@ query (const char *type,
 
   // If the importer has specified a starting trader, foward the
   // query.
-  CosTrading::TraderName* trader_name =
-    policies.starting_trader (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::TraderName* trader_name = policies.starting_trader (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   if (! CORBA::is_nil (link_if) && trader_name != 0)
     {
@@ -101,8 +115,8 @@ query (const char *type,
                            returned_offers,
                            returned_offer_iterator,
                            returned_limits_applied,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
+                           env);
+      TAO_CHECK_ENV_RETURN_VOID (env);
       return;
     }
 
@@ -112,38 +126,30 @@ query (const char *type,
   CosTradingRepos::ServiceTypeRepository_ptr rep =
     support_attrs.service_type_repos ();
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
-  ACE_CHECK;
+    rep->fully_describe_type (type, env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
-  // @@ Should throw a NO_MEMORY exception here...
-  ACE_NEW (returned_offers,
-           CosTrading::OfferSeq);
+  ACE_NEW (returned_offers, CosTrading::OfferSeq);
 
   // Obtain a reference to the offer database.
-  TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database =
-    this->trader_.offer_database ();
+  TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database = this->trader_.offer_database ();
 
   // TAO_Offer_Filter -- ensures that we don't consider offers with
   // modifiable or dynamic properties if the Trader doesn't support
   // them, or the importer has turned them off using policies.
   // TAO_Constraint_Validator -- validates the constraint with the
-  // property types in the supplied type.  TAO_Constraint_Interpreter
-  // -- parses the constraint string, and determines whether an offer
-  // meets those constraints.  TAO_Preference_Interpreter -- parses
-  // the preference string and orders offers according to those
-  // constraints.
-  TAO_Offer_Filter offer_filter (policies,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
+  // property types in the supplied type.
+  // TAO_Constraint_Interpreter -- parses the constraint string, and
+  // determines whether an offer meets those constraints.
+  // TAO_Preference_Interpreter -- parses the preference string and
+  // orders offers according to those constraints.
+  TAO_Offer_Filter offer_filter (policies, env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
   TAO_Constraint_Validator validator (type_struct.in ());
-  TAO_Constraint_Interpreter constr_inter (validator,
-                                           constraint,
-                                           ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_Preference_Interpreter pref_inter (validator,
-                                         preferences,
-                                         ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_Constraint_Interpreter constr_inter (validator, constraint, env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+  TAO_Preference_Interpreter pref_inter (validator, preferences, env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // Try to find the map of offers of desired service type.
   offer_filter.configure_type (type_struct.ptr ());
@@ -153,27 +159,24 @@ query (const char *type,
                          pref_inter,
                          offer_filter);
 
-  CORBA::Boolean result = policies.exact_type_match (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!result)
+  if (! policies.exact_type_match (env))
     {
-      // If the importer hasn't demanded an exact match search, we
-      // search all the subtypes of the supplied type. NOTE: Only the
-      // properties belonging to the provided type are considered on
+      // If the importer hasn't demanded an exact match search, we search
+      // all the subtypes of the supplied type. NOTE: Only the properties
+      // belonging to the provided type are considered on
       // subtypes. Additional properties on the subtype are generally
-      // ignored. This is as it should be, consistent with the notions
-      // of type inheritence.
+      // ignored. This is as it should be, consistent with the notions of
+      // type inheritence.
+      TAO_CHECK_ENV_RETURN_VOID (env);
       this->lookup_all_subtypes (type,
                                  type_struct->incarnation,
                                  offer_database,
                                  rep,
                                  constr_inter,
                                  pref_inter,
-                                 offer_filter,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
+                                 offer_filter);
     }
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // Take note of the limits applied in this query.
   returned_limits_applied = offer_filter.limits_applied ();
@@ -187,8 +190,8 @@ query (const char *type,
                             pref_inter,
                             *returned_offers.ptr (),
                             returned_offer_iterator,
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // The following steps are only appropriate for a linked trader.
   if (! CORBA::is_nil (link_if))
@@ -200,8 +203,8 @@ query (const char *type,
         this->retrieve_links (policies,
                               offers_returned,
                               CosTrading::LinkNameSeq_out (links.out ()),
-                              ACE_TRY_ENV);
-      ACE_CHECK;
+                              env);
+      TAO_CHECK_ENV_RETURN_VOID (env);
 
       if (should_follow && links->length () != 0)
         {
@@ -218,8 +221,8 @@ query (const char *type,
                                  *returned_offers.ptr (),
                                  returned_offer_iterator.ptr (),
                                  *returned_limits_applied.ptr (),
-                                 ACE_TRY_ENV);
-          ACE_CHECK;
+                                 env);
+          TAO_CHECK_ENV_RETURN_VOID (env);
         }
     }
 }
@@ -285,8 +288,7 @@ lookup_all_subtypes (const char* type,
                      CosTradingRepos::ServiceTypeRepository_ptr rep,
                      TAO_Constraint_Interpreter& constr_inter,
                      TAO_Preference_Interpreter& pref_inter,
-                     TAO_Offer_Filter& offer_filter,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     TAO_Offer_Filter& offer_filter)
 {
   // BEGIN SPEC
   // The trader may return a service offer of a subtype of the "type"
@@ -307,8 +309,14 @@ lookup_all_subtypes (const char* type,
   // types with lower incarnation numbers.
   sst.incarnation (inc_num);
 
-  all_types = rep->list_types (sst, ACE_TRY_ENV);
-  ACE_CHECK;
+  //  TAO_TRY
+  //    {
+  CORBA::Environment env;
+  all_types = rep->list_types (sst, env);
+  //      TAO_CHECK_ENV;
+  //    }
+  //  TAO_CATCHANY { return; }
+  //  TAO_ENDTRY;
 
   // Scan all types inserted after the super types. If the transitive
   // closure of a type's super type relation includes the super type
@@ -319,44 +327,51 @@ lookup_all_subtypes (const char* type,
        i < num_types && offer_filter.ok_to_consider_more ();
        i++)
     {
-      // Obtain a description of the prospective type.
-      type_struct = rep->fully_describe_type (all_types[i],
-                                              ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          // Obtain a description of the prospective type.
+          type_struct = rep->fully_describe_type (all_types[i], TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-      CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
-        super_types = type_struct->super_types;
-      CORBA::ULong num_super_types = super_types.length ();
+          CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
+            super_types = type_struct->super_types;
+          CORBA::ULong num_super_types = super_types.length ();
 
-      for (CORBA::ULong j = 0; j < num_super_types; j++)
-        {
-          if (ACE_OS::strcmp (type_struct->super_types[j], type) == 0)
+          for (CORBA::ULong j = 0; j < num_super_types; j++)
             {
-              // Egads, a subtype! This type has the type passed
-              // to query in its list of super_types.
-              offer_filter.configure_type (type_struct.ptr ());
-              this->lookup_one_type (all_types[i],
-                                     offer_database,
-                                     constr_inter,
-                                     pref_inter,
-                                     offer_filter);
-              break;
+              if (ACE_OS::strcmp (type_struct->super_types[j], type) == 0)
+                {
+                  // Egads, a subtype! This type has the type passed
+                  // to query in its list of super_types.
+                  offer_filter.configure_type (type_struct.ptr ());
+                  this->lookup_one_type (all_types[i],
+                                         offer_database,
+                                         constr_inter,
+                                         pref_inter,
+                                         offer_filter);
+                  break;
+                }
             }
         }
+      TAO_CATCHANY
+        {
+        }
+      TAO_ENDTRY;
     }
 }
 
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 int
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-fill_receptacles (const char* /* type */,
+fill_receptacles (const char* type,
                   CORBA::ULong how_many,
                   const CosTrading::Lookup::SpecifiedProps& desired_props,
                   TAO_Policies& policies,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
                   CosTrading::OfferIterator_ptr& offer_itr,
-                  CORBA::Environment& ACE_TRY_ENV)
+                  CORBA::Environment& env)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
@@ -371,14 +386,14 @@ fill_receptacles (const char* /* type */,
   // "offer_itr" will be nil.
   // END SPEC
 
-  TAO_Property_Filter prop_filter (desired_props, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Property_Filter prop_filter (desired_props, env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // RETURNING: Calculate how many offers go into the sequence
   //  Calculate how many go into the iterator
 
-  CORBA::ULong return_card = policies.return_card (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong return_card = policies.return_card (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   CORBA::ULong i = 0;
   CORBA::ULong size = pref_inter.num_offers ();
@@ -386,15 +401,13 @@ fill_receptacles (const char* /* type */,
   CORBA::ULong offers_in_iterator = size - offers_in_sequence;
 
   // Ensure the total number of offers returned doesn't exceed return_card.
-  offers_in_sequence = offers_in_sequence > return_card
-    ? return_card
-    : offers_in_sequence;
+  offers_in_sequence =
+    (offers_in_sequence > return_card) ? return_card : offers_in_sequence;
 
   return_card -= offers_in_sequence;
 
-  offers_in_iterator = offers_in_iterator > return_card
-    ? return_card
-    : offers_in_iterator;
+  offers_in_iterator =
+    (offers_in_iterator > return_card) ? return_card : offers_in_iterator;
 
   CORBA::ULong total_offers = offers_in_sequence + offers_in_iterator;
   offers.length (offers_in_sequence);
@@ -405,8 +418,7 @@ fill_receptacles (const char* /* type */,
       CosTrading::Offer* offer = 0;
       CosTrading::OfferId offer_id = 0;
 
-      // Pull the next ordered offer out of the preference
-      // interpreter.
+      // Pull the next ordered offer out of the preference interpreter.
       pref_inter.remove_offer (offer, offer_id);
 
       // Filter out the undesired properties.
@@ -418,14 +430,12 @@ fill_receptacles (const char* /* type */,
   if (offers_in_iterator > 0)
     {
       // Create an iterator implementation
-      TAO_Offer_Iterator *oi =
-        this->create_offer_iterator (prop_filter);
+      TAO_Offer_Iterator *oi = this->create_offer_iterator (prop_filter);
 
       // Register it with the POA.
-      offer_itr = oi->_this (ACE_TRY_ENV);
-      // @@ Seth, ACE_CHECK_RETURN (what?);
-      oi->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (total_offers - offers_in_iterator);
+      offer_itr = oi->_this (env);
+      oi->_remove_ref (env);
+      TAO_CHECK_ENV_RETURN (env, total_offers - offers_in_iterator);
 
       // Add to the iterator
       for (i = 0; i < offers_in_iterator; i++)
@@ -475,14 +485,14 @@ create_offer_iterator (const TAO_Property_Filter& pfilter)
   TAO_Offer_Iterator* iterator = 0;
 
   if (CORBA::is_nil (this->trader_.trading_components ().register_if ()))
-    ACE_NEW_RETURN (iterator,
-                    TAO_Query_Only_Offer_Iterator (pfilter),
-                    0);
+    iterator = new TAO_Query_Only_Offer_Iterator (pfilter);
   else
-    ACE_NEW_RETURN (iterator,
-                    TAO_Register_Offer_Iterator<MAP_LOCK_TYPE> (this->trader_.offer_database (),
-                                                                pfilter),
-                    0);
+    {
+      iterator =
+        new TAO_Register_Offer_Iterator<MAP_LOCK_TYPE> (this->trader_.offer_database (),
+                                                        pfilter);
+    }
+
   return iterator;
 }
 
@@ -492,22 +502,21 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
                 CosTrading::LinkNameSeq_out links,
-                CORBA::Environment& ACE_TRY_ENV)
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
-  CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (should_follow);
+  CosTrading::FollowOption follow_rule = policies.link_follow_rule (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, should_follow);
 
   // Determine whether or not a federated query is warranted. A query
   // is waranted if the follow_rule governing this query is 'always'
   // or if_no_local and the local query returned nothing.
   if ((follow_rule == CosTrading::always ||
        (follow_rule == CosTrading::if_no_local && offers_returned == 0))
-      && policies.hop_count (ACE_TRY_ENV) > 0)
+      && policies.hop_count (TAO_IN_ENV) > 0)
     should_follow = 1;
-  ACE_CHECK_RETURN (0);
 
   if (should_follow)
     {
@@ -516,8 +525,8 @@ retrieve_links (TAO_Policies& policies,
       CosTrading::Link_ptr link_if =
         this->trader_.trading_components ().link_if ();
 
-      links = link_if->list_links (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      links = link_if->list_links (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
       // Determine which of the links registered with the Link
       // interface are suitable to follow.
@@ -528,18 +537,18 @@ retrieve_links (TAO_Policies& policies,
         {
           // Grab the link information.
           CosTrading::Link::LinkInfo_var
-            link_info (link_if->describe_link (links[i], ACE_TRY_ENV));
-          ACE_CHECK_RETURN (should_follow);
+            link_info (link_if->describe_link (links[i], TAO_IN_ENV));
+          TAO_CHECK_ENV_RETURN (TAO_IN_ENV, should_follow);
 
           // Compute the link follow rule.
           CosTrading::FollowOption link_rule =
-            policies.link_follow_rule (link_info.in (), ACE_TRY_ENV);
-          ACE_CHECK_RETURN (should_follow);
+            policies.link_follow_rule (link_info.in (), TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_IN_ENV, should_follow);
 
           // Determine if the link follow rule applies.
-          if (link_rule == CosTrading::always
-              || (link_rule == CosTrading::if_no_local
-                  && offers_returned == 0))
+          if (link_rule == CosTrading::always ||
+              (link_rule == CosTrading::if_no_local &&
+               offers_returned == 0))
             {
               // Add the link to the list of links to follow.
               if (i > j)
@@ -555,6 +564,7 @@ retrieve_links (TAO_Policies& policies,
   return should_follow;
 }
 
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
@@ -570,7 +580,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
                  CosTrading::PolicyNameSeq& limits,
-                 CORBA::Environment& ACE_TRY_ENV)
+                 CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -602,8 +612,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
   // iterators, which if traversed in its entirety is probably hugely
   // inefficient, but oh well, I can't think of a better solution.
   TAO_Offer_Iterator_Collection* offer_iter_collection;
-  ACE_NEW (offer_iter_collection,
-           TAO_Offer_Iterator_Collection);
+  ACE_NEW (offer_iter_collection, TAO_Offer_Iterator_Collection);
   offer_iter_collection->add_offer_iterator (offer_iter);
 
   CosTrading::PolicySeq policies_to_pass;
@@ -615,18 +624,18 @@ federated_query (const CosTrading::LinkNameSeq& links,
       CosTrading::OfferIterator_ptr out_offer_iter = 0;
       CosTrading::PolicyNameSeq_ptr out_limits = 0;
 
-      ACE_TRY
+      TAO_TRY
         {
           // Obtain information about the link we're traversing.
           CosTrading::Link::LinkInfo_var link_info =
-            link_interface->describe_link (links[i], ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            link_interface->describe_link (links[i], TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Set the link follow policy for the query over the link.
           policies.copy_in_follow_option (policies_to_pass,
                                           link_info.in (),
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CosTrading::Lookup_var remote_lookup =
             CosTrading::Lookup::_duplicate (link_info->target.in ());
@@ -641,8 +650,8 @@ federated_query (const CosTrading::LinkNameSeq& links,
                                 CosTrading::OfferSeq_out (out_offers),
                                 CosTrading::OfferIterator_out (out_offer_iter),
                                 CosTrading::PolicyNameSeq_out (out_limits),
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CORBA::ULong j = 0;
           CosTrading::OfferSeq_var out_offers_var (out_offers);
@@ -670,23 +679,19 @@ federated_query (const CosTrading::LinkNameSeq& links,
           for (j = 0; j < source_length; j++)
             offers[j + target_length] = out_offers_var[j];
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
           // Ah, well, this query failed, move on to the next one.
         }
-      ACE_ENDTRY;
-      //      ACE_CHECK;
+      TAO_ENDTRY;
     }
 
   // Sort the sequence in preference order.
   this->order_merged_sequence (pref_inter, offers);
 
   // Return the collection of offer iterators.
-  offer_iter = offer_iter_collection->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  offer_iter_collection->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK;
+  offer_iter = offer_iter_collection->_this (TAO_IN_ENV);
+  offer_iter_collection->_remove_ref (TAO_IN_ENV);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -739,7 +744,7 @@ forward_query (const char* next_hop,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
                CosTrading::PolicyNameSeq_out limits_applied,
-               CORBA::Environment& ACE_TRY_ENV)
+               CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -756,21 +761,21 @@ forward_query (const char* next_hop,
   CosTrading::Link_ptr link_interface
     = this->trader_.trading_components ().link_if ();
 
-  ACE_TRY
+  TAO_TRY
     {
       CosTrading::Link::LinkInfo_var link_info =
-        link_interface->describe_link (next_hop, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        link_interface->describe_link (next_hop, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosTrading::Lookup_var remote_lookup =
         CosTrading::Lookup::_duplicate (link_info->target.in ());
 
-      CORBA::Object_var us = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var us = this->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Boolean self_loop =
-        remote_lookup->_is_equivalent (us.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        remote_lookup->_is_equivalent (us.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (! self_loop)
         {
@@ -784,8 +789,8 @@ forward_query (const char* next_hop,
                                 offers,
                                 offer_itr,
                                 limits_applied,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
       else
         {
@@ -798,19 +803,18 @@ forward_query (const char* next_hop,
                        offers,
                        offer_itr,
                        limits_applied,
-                       ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                       TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       CosTrading::Policy policy;
       policy.name = TAO_Policies::POLICY_NAMES[TAO_Policies::STARTING_TRADER];
       policy.value <<= next_hop;
-      ACE_TRY_THROW (CosTrading::Lookup::InvalidPolicyValue (policy));
+      TAO_THROW (CosTrading::Lookup::InvalidPolicyValue (policy));
     }
-  ACE_ENDTRY;
-  //  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -818,34 +822,35 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
                  CosTrading::Admin::OctetSeq*& seq,
-                 CORBA::Environment& ACE_TRY_ENV)
+                 CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
 
-  seq = policies.request_id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (1);
+  seq = policies.request_id (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 1);
 
   if (seq == 0)
     {
       CosTrading::Admin_ptr admin_if =
         this->trader_.trading_components ().admin_if ();
-      seq = admin_if->request_id_stem (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (1);
+      seq = admin_if->request_id_stem (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 1);
     }
   else
     {
       // Allocate memory so memory mangement is the same for both
       // cases.
-      ACE_NEW_THROW_EX (seq,
-                        CosTrading::Admin::OctetSeq (*seq),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (1);
+      ACE_NEW_RETURN (seq,
+                      CosTrading::Admin::OctetSeq (*seq),
+                      0);
     }
 
-  ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1);
+  if (seq == 0)
+    TAO_THROW_RETURN (CORBA::NO_MEMORY (), 1);
 
+  ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1);
   for (Request_Ids::ITERATOR riter (this->request_ids_);
        ! riter.done ();
        riter.advance ())
@@ -875,6 +880,10 @@ seen_request_id (TAO_Policies& policies,
   return return_value;
 }
 
+  // *************************************************************
+  // TAO_Register
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Register (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   : TAO_Trader_Components<POA_CosTrading::Register> (trader.trading_components ()),
@@ -894,7 +903,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
              const CosTrading::PropertySeq &properties,
-             CORBA::Environment& ACE_TRY_ENV)
+             CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -908,7 +917,7 @@ _cxx_export (CORBA::Object_ptr reference,
 {
   // For robustness purposes --
   if (CORBA::is_nil (reference))
-    ACE_THROW_RETURN (CosTrading::Register::InvalidObjectRef (), 0);
+    TAO_THROW_RETURN (CosTrading::Register::InvalidObjectRef (), 0);
 
   // Get service type map
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
@@ -922,30 +931,27 @@ _cxx_export (CORBA::Object_ptr reference,
   // Yank our friend, the type struct, and confirm that the given
   // properties match the type definition.
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+    rep->fully_describe_type (type, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   // Oops the type is masked, we shouldn't let exporters know the type
   // exists.
   if (type_struct->masked)
-    ACE_THROW_RETURN (CosTrading::UnknownServiceType (type), 0);
+    TAO_THROW_RETURN (CosTrading::UnknownServiceType (type), 0);
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
-  int check = (! reference->_is_a (type_struct->if_name, ACE_TRY_ENV));
-  ACE_CHECK_RETURN (0);
-  if (check)
-    ACE_THROW_RETURN (CosTrading::Register::
+  if (! reference->_is_a (type_struct->if_name, TAO_IN_ENV))
+    TAO_THROW_RETURN (CosTrading::Register::
                       InterfaceTypeMismatch (type, reference), 0);
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
-  this->validate_properties (type, type_struct.ptr (), properties, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  this->validate_properties (type, type_struct.ptr (), properties, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   // CORBA::ULong plength = properties.length ();
-  ACE_NEW_THROW_EX (offer, CosTrading::Offer, CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_RETURN (offer, CosTrading::Offer, 0);
 
   // No copying, no memory leaks. Violates the "in" parameter semantics
   // when this object is colocated with the client, however.
@@ -971,7 +977,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw (const char *id,
-          CORBA::Environment& ACE_TRY_ENV)
+          CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -979,14 +985,14 @@ withdraw (const char *id,
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
-  offer_database.remove_offer ((CosTrading::OfferId) id, ACE_TRY_ENV);
+  offer_database.remove_offer ((CosTrading::OfferId) id, TAO_IN_ENV);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe (const char *id,
-          CORBA::Environment& ACE_TRY_ENV)
+          CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -998,12 +1004,11 @@ describe (const char *id,
 
   // Perform a lookup to find the offer.
   CosTrading::Offer* offer =
-    offer_database.lookup_offer ((CosTrading::OfferId) id, type, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+    offer_database.lookup_offer ((CosTrading::OfferId) id, type, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, (CosTrading::Register::OfferInfo *) 0);
 
   CosTrading::Register::OfferInfo *offer_info = 0;
-  ACE_NEW_THROW_EX (offer_info, CosTrading::Register::OfferInfo, CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_RETURN (offer_info, CosTrading::Register::OfferInfo, 0);
 
   offer_info->reference = CORBA::Object::_duplicate (offer->reference.in ());
   offer_info->type = CORBA::string_dup (type);
@@ -1022,7 +1027,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
         const CosTrading::PropertySeq& modify_list,
-        CORBA::Environment& ACE_TRY_ENV)
+        CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
@@ -1038,11 +1043,8 @@ modify (const char *id,
 {
   // Throw an exception if the trader is not configured
   // to support properties modification.
-  int check =  (! this->supports_modifiable_properties (ACE_TRY_ENV));
-  ACE_CHECK;
-
-  if (check)
-    ACE_THROW (CosTrading::NotImplemented ());
+  if (! this->supports_modifiable_properties (TAO_IN_ENV))
+    TAO_THROW (CosTrading::NotImplemented ());
 
   char* type = 0;
   TAO_Support_Attributes_i& support_attrs =
@@ -1052,23 +1054,23 @@ 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_TRY_ENV);
-  ACE_CHECK;
+    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   if (offer != 0)
     {
       // Yank our friend, the type struct.
       CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-        rep->fully_describe_type (type, ACE_TRY_ENV);
-      ACE_CHECK;
+        rep->fully_describe_type (type, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
       TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
 
       // Delete, add, and change properties of the offer.
-      offer_mod.delete_properties (del_list, ACE_TRY_ENV);
-      ACE_CHECK;
+      offer_mod.delete_properties (del_list, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-      offer_mod.merge_properties (modify_list, ACE_TRY_ENV);
-      ACE_CHECK;
+      offer_mod.merge_properties (modify_list, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
       // Alter our reference to the offer. We do this last, since the
       // spec says: modify either suceeds completely or fails
@@ -1082,7 +1084,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
                            const char *constr,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -1099,27 +1101,27 @@ withdraw_using_constraint (const char *type,
 
   // Retrieve the type struct
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
-  ACE_CHECK;
+    rep->fully_describe_type (type, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Try to find the map of offers of desired service type.
   // @@ Again, should be Offer_Database::offer_iterator
   {
-#if defined (_MSC_VER)
+#if defined(_MSC_VER)
     TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
       offer_iter (type, offer_database);
 #else
-    // MSVC won't grok this for some reason, but it's necessary for
-    // the HP compiler, which seriously requires the typename keyword
+    // MSVC won't grok this for some reason, but it's necessary for the
+    // HP compiler, which seriously requires the typename keyword
     // here. I apologize if this ifdef offends some ACE users'
     // sensibilities --- it certainly offends mine.
     ACE_TYPENAME TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
       offer_iter (type, offer_database);
-#endif /* _MSC_VER */
+#endif
 
     TAO_Constraint_Validator validator (type_struct.in ());
-    TAO_Constraint_Interpreter constr_inter (validator, constr, ACE_TRY_ENV);
-    ACE_CHECK;
+    TAO_Constraint_Interpreter constr_inter (validator, constr, TAO_IN_ENV);
+    TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
     while (offer_iter.has_more_offers ())
       {
@@ -1141,20 +1143,19 @@ withdraw_using_constraint (const char *type,
           char* offer_id = 0;
 
           ids.dequeue_head (offer_id);
-          offer_database.remove_offer (offer_id, ACE_TRY_ENV);
-          ACE_CHECK;
+          offer_database.remove_offer (offer_id, TAO_IN_ENV);
           CORBA::string_free (offer_id);
         }
     }
   else
-    ACE_THROW (CosTrading::Register::NoMatchingOffers (constr));
+    TAO_THROW (CosTrading::Register::NoMatchingOffers (constr));
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 resolve (const CosTrading::TraderName &name,
-         CORBA::Environment& ACE_TRY_ENV)
+         CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
@@ -1162,7 +1163,7 @@ resolve (const CosTrading::TraderName &name,
 {
   // Determine if the first link is a legal link name.
   if (! TAO_Trader_Base::is_valid_identifier_name (name[0]))
-    ACE_THROW_RETURN (CosTrading::Register::IllegalTraderName (name),
+    TAO_THROW_RETURN (CosTrading::Register::IllegalTraderName (name),
                       CosTrading::Register::_nil ());
 
   // Grab a reference to the link interface, and get a link description.
@@ -1176,26 +1177,26 @@ resolve (const CosTrading::TraderName &name,
   CosTrading::Link::LinkInfo_var link_info;
   CosTrading::Register_var remote_reg;
 
-  ACE_TRY
+  TAO_TRY
     {
       // Ensure that the link to the next trader exists.
-      link_info = link_if->describe_link (name[0], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      link_info = link_if->describe_link (name[0], TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       remote_reg =
-        CosTrading::Register::_narrow (link_info->target_reg.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosTrading::Register::_narrow (link_info->target_reg.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_THROW (CosTrading::Register::UnknownTraderName (name));
+      TAO_THROW_RETURN (CosTrading::Register::UnknownTraderName (name),
+                        CosTrading::Register::_nil ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTrading::Register::_nil ());
+  TAO_ENDTRY;
 
   // Ensure that the register pointer isn't nil.
   if (! CORBA::is_nil (remote_reg.in ()))
-    ACE_THROW_RETURN (CosTrading::Register::RegisterNotSupported (name),
+    TAO_THROW_RETURN (CosTrading::Register::RegisterNotSupported (name),
                       CosTrading::Register::_nil ());
 
   CosTrading::Register_ptr return_value = remote_reg.in ();
@@ -1207,8 +1208,8 @@ resolve (const CosTrading::TraderName &name,
       for (int i = trader_name.length () - 1; i >= 0; i--)
         trader_name[i] = name[i + 1];
 
-      return_value = remote_reg->resolve (trader_name, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CosTrading::Register::_nil ());
+      return_value = remote_reg->resolve (trader_name, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_IN_ENV, CosTrading::Register::_nil ());
     }
 
   return return_value;
@@ -1220,7 +1221,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                      const CosTrading::PropertySeq& properties,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
@@ -1230,12 +1231,11 @@ validate_properties (const char* type,
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
     prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties, ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_Property_Evaluator_By_Name prop_eval (properties, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Perform property validation
   length = prop_types.length ();
-
   for (CORBA::ULong i = 0; i < length; i++)
     {
       const CosTradingRepos::ServiceTypeRepository::PropStruct&
@@ -1250,29 +1250,28 @@ validate_properties (const char* type,
           // Offer cannot have a missing mandatory property.
           if (prop_types[i].mode ==
               CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY)
-            ACE_THROW (CosTrading::MissingMandatoryProperty (type, prop_name));
+            TAO_THROW (CosTrading::MissingMandatoryProperty (type, prop_name));
         }
       else
         {
-          int check =
-            (! prop_type->equal (prop_struct.value_type.in (),
-                                 ACE_TRY_ENV));
-          ACE_CHECK;
-          if (check)
+          if (! prop_type->equal (prop_struct.value_type.in (), TAO_IN_ENV))
             {
               // Offer cannot redefine the type of an property.
-              const CosTrading::Property* prop =
-                prop_eval.get_property (prop_name);
-              ACE_THROW (CosTrading::PropertyTypeMismatch (type, *prop));
+              const CosTrading::Property* prop = prop_eval.get_property (prop_name);
+              TAO_THROW (CosTrading::PropertyTypeMismatch (type, *prop));
             }
           else if (prop_struct.mode ==
                    CosTradingRepos::ServiceTypeRepository::PROP_READONLY &&
                    prop_eval.is_dynamic_property (prop_name))
-            ACE_THROW (CosTrading::ReadonlyDynamicProperty (type, prop_name));
+            TAO_THROW (CosTrading::ReadonlyDynamicProperty (type, prop_name));
         }
     }
 }
 
+  // *************************************************************
+  // TAO_Admin
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
@@ -1285,15 +1284,14 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
 {
   // A random 4-bytes will prefix the sequence number space for each
   // trader, making it extremely unlikely that the sequence spaces for
-  // two traders will over lap.  @@ TODO: This is a bad way to
-  // generate pseudo random numbers.
+  // two traders will over lap.
+  // @@ TODO: This is a bad way to generate pseudo random numbers.
 
   // Ok, then, Carlos, we'll do it a different way: ip addr + pid.
   ACE_UINT32 ip_addr = 0;
   ASYS_TCHAR host_name[BUFSIZ];
 
-  if (ACE_OS::hostname (host_name,
-                        BUFSIZ) != -1)
+  if (ACE_OS::hostname (host_name, BUFSIZ) != -1)
     {
       ACE_INET_Addr addr ((u_short) 0, host_name);
       ip_addr = addr.get_ip_address ();
@@ -1338,7 +1336,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
@@ -1361,7 +1359,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value,
-                     CORBA::Environment& )
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1375,7 +1373,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value,
-                     CORBA::Environment& )
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1389,7 +1387,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value,
-                    CORBA::Environment& )
+                    CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1403,7 +1401,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value,
-                    CORBA::Environment& )
+                    CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1417,7 +1415,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value,
-                     CORBA::Environment& )
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1431,7 +1429,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value,
-                     CORBA::Environment& )
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1445,7 +1443,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value,
-              CORBA::Environment& )
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1459,7 +1457,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value,
-                                    CORBA::Environment& )
+                                    CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1473,7 +1471,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value,
-                                 CORBA::Environment& )
+                                 CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1487,7 +1485,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value,
-                           CORBA::Environment& )
+                           CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1501,7 +1499,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value,
-                   CORBA::Environment& )
+                   CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1515,7 +1513,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value,
-                   CORBA::Environment& )
+                   CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1529,7 +1527,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy,
-                       CORBA::Environment& )
+                       CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1543,7 +1541,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy,
-                       CORBA::Environment& )
+                       CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1557,7 +1555,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_link_follow_policy (CosTrading::FollowOption policy,
-                            CORBA::Environment&)
+                            CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1571,7 +1569,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_type_repos (CosTrading::TypeRepository_ptr repository,
-                CORBA::Environment&)
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
@@ -1585,11 +1583,10 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-                       CORBA::Environment&)
+                       CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
-                    &this->stem_id_);
+  ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, &this->stem_id_);
   this->stem_id_ = stem;
   return &this->stem_id_;
 }
@@ -1600,12 +1597,12 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
              CosTrading::OfferIdIterator_out id_itr,
-             CORBA::Environment& ACE_TRY_ENV)
+             CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
   if (CORBA::is_nil (this->trader_.trading_components().register_if()))
-    ACE_THROW (CosTrading::NotImplemented());
+    TAO_THROW (CosTrading::NotImplemented());
 
   TAO_Offer_Database<MAP_LOCK_TYPE>& type_map = this->trader_.offer_database ();
   TAO_Offer_Id_Iterator* offer_id_iter = type_map.retrieve_all_offer_ids ();
@@ -1613,15 +1610,11 @@ list_offers (CORBA::ULong how_many,
   id_itr = CosTrading::OfferIdIterator::_nil ();
   if (how_many > 0)
     {
-      int check = offer_id_iter->next_n (how_many, ids, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (check == 1)
+      if (offer_id_iter->next_n (how_many, ids, TAO_IN_ENV) == 1)
         {
-          id_itr = offer_id_iter->_this (ACE_TRY_ENV);
-          ACE_CHECK;
-          offer_id_iter->_remove_ref (ACE_TRY_ENV);
-          ACE_CHECK;
+          id_itr = offer_id_iter->_this (TAO_IN_ENV);
+          offer_id_iter->_remove_ref (TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
       else
         delete offer_id_iter;
@@ -1633,16 +1626,20 @@ list_offers (CORBA::ULong how_many,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-list_proxies (CORBA::ULong,
-              CosTrading::OfferIdSeq_out,
-              CosTrading::OfferIdIterator_out,
-              CORBA::Environment& ACE_TRY_ENV)
+list_proxies (CORBA::ULong how_many,
+              CosTrading::OfferIdSeq_out ids,
+              CosTrading::OfferIdIterator_out id_itr,
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
-  ACE_THROW (CosTrading::NotImplemented ());
+  TAO_THROW (CosTrading::NotImplemented ());
 }
 
+  // *************************************************************
+  // TAO_Link
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   : TAO_Trader_Components <POA_CosTrading::Link> (trader.trading_components ()),
@@ -1664,7 +1661,7 @@ add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
           CosTrading::FollowOption limiting_follow_rule,
-          CORBA::Environment& ACE_TRY_ENV)
+          CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
@@ -1674,28 +1671,28 @@ add_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
   TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name) == 0)
-    ACE_THROW (CosTrading::Link::DuplicateLinkName (name));
+    TAO_THROW (CosTrading::Link::DuplicateLinkName (name));
 
   // Ensure the lookup_ptr isn't nil.
   if (CORBA::is_nil (target))
-    ACE_THROW (CosTrading::InvalidLookupRef (target));
+    TAO_THROW (CosTrading::InvalidLookupRef (target));
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
+    TAO_THROW (CosTrading::Link::DefaultFollowTooPermissive
                (def_pass_on_follow_rule, limiting_follow_rule));
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
-  if (limiting_follow_rule < this->max_link_follow_policy (ACE_TRY_ENV))
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, this->max_link_follow_policy (ACE_TRY_ENV)));
+  if (limiting_follow_rule < this->max_link_follow_policy (TAO_IN_ENV))
+    TAO_THROW (CosTrading::Link::LimitingFollowTooPermissive
+               (limiting_follow_rule, this->max_link_follow_policy (TAO_IN_ENV)));
 
   // Create a link info structure for this link of the federation.
   CosTrading::Link::LinkInfo link_info;
@@ -1704,7 +1701,7 @@ add_link (const char *name,
 
   link_info.def_pass_on_follow_rule = def_pass_on_follow_rule;
   link_info.limiting_follow_rule = limiting_follow_rule;
-  ACE_CHECK;
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Insert this link into the collection of links.
   this->links_.bind (link_name, link_info);
@@ -1714,19 +1711,19 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 remove_link (const char *name,
-             CORBA::Environment& ACE_TRY_ENV)
+             CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
   TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    TAO_THROW (CosTrading::Link::UnknownLinkName (name));
 
   // Erase the link state from the map.
   this->links_.unbind (link_name);
@@ -1735,30 +1732,26 @@ remove_link (const char *name,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
-                                               CORBA::Environment& ACE_TRY_ENV)
+                                               CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
+    TAO_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
 
   // Ensure this isn't a duplicate link name.
   ACE_TYPENAME Links::ENTRY* link_entry = 0;
   TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
-    ACE_THROW_RETURN (CosTrading::Link::UnknownLinkName (name),
-                      0);
+    TAO_THROW_RETURN (CosTrading::Link::UnknownLinkName (name), 0);
 
   // Build a new Link Info structure.
   CosTrading::Link::LinkInfo* new_link_info = 0;
   CosTrading::Link::LinkInfo& old_link_info = link_entry->int_id_;
 
-  ACE_NEW_THROW_EX (new_link_info,
-                    CosTrading::Link::LinkInfo,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_RETURN (new_link_info, CosTrading::Link::LinkInfo, 0);
 
   new_link_info->def_pass_on_follow_rule = old_link_info.def_pass_on_follow_rule;
   new_link_info->limiting_follow_rule = old_link_info.limiting_follow_rule;
@@ -1769,8 +1762,8 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
   // This avoids the nested upcall that would occur were we to invoke
   // this method in the add_link method.
 
-  new_link_info->target_reg = old_link_info.target->register_if (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (new_link_info);
+  new_link_info->target_reg = old_link_info.target->register_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, new_link_info);
 
   // return the link information for this link name.
   return new_link_info;
@@ -1778,7 +1771,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment&)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
@@ -1802,7 +1795,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
              CosTrading::FollowOption limiting_follow_rule,
-             CORBA::Environment& ACE_TRY_ENV)
+             CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
@@ -1810,26 +1803,25 @@ modify_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
   ACE_TYPENAME Links::ENTRY* link_entry = 0;
   TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    TAO_THROW (CosTrading::Link::UnknownLinkName (name));
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
+    TAO_THROW (CosTrading::Link::DefaultFollowTooPermissive
                (def_pass_on_follow_rule, limiting_follow_rule));
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
-  // @@ Seth, rethrowing an exception?  This is probably not exception safe.
-  if (limiting_follow_rule < this->max_link_follow_policy (ACE_TRY_ENV))
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, this->max_link_follow_policy (ACE_TRY_ENV)));
+  if (limiting_follow_rule < this->max_link_follow_policy (TAO_IN_ENV))
+    TAO_THROW (CosTrading::Link::LimitingFollowTooPermissive
+               (limiting_follow_rule, this->max_link_follow_policy (TAO_IN_ENV)));
 
   // Adjust the link settings
   CosTrading::Link::LinkInfo& link_info = link_entry->int_id_;
@@ -1837,6 +1829,10 @@ modify_link (const char *name,
   link_info.limiting_follow_rule = limiting_follow_rule;
 }
 
+  // *************************************************************
+  // TAO_Proxy
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
@@ -1854,13 +1850,13 @@ TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy (void)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::OfferId
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-export_proxy (CosTrading::Lookup_ptr,
-              const char *,
-              const CosTrading::PropertySeq&,
-              CORBA::Boolean,
-              const char *,
-              const CosTrading::PolicySeq&,
-              CORBA::Environment& ACE_TRY_ENV)
+export_proxy (CosTrading::Lookup_ptr target,
+              const char *type,
+              const CosTrading::PropertySeq& properties,
+              CORBA::Boolean if_match_all,
+              const char * recipe,
+              const CosTrading::PolicySeq& policies_to_pass_on,
+              CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -1873,46 +1869,46 @@ export_proxy (CosTrading::Lookup_ptr,
                   CosTrading::DuplicatePropertyName,
                   CosTrading::DuplicatePolicyName))
 {
-  ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (), 0);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw_proxy (const char *,
-                CORBA::Environment& ACE_TRY_ENV)
+withdraw_proxy (const char *id,
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  TAO_THROW (CORBA::UNKNOWN ());
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe_proxy (const char *,
-                CORBA::Environment& ACE_TRY_ENV)
+describe_proxy (const char *id,
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (), 0);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-list_proxies (CORBA::ULong,
-                CosTrading::OfferIdSeq*&,
-                CosTrading::OfferIdIterator_ptr&,
-                CORBA::Environment& ACE_TRY_ENV)
+list_proxies (CORBA::ULong how_many,
+                CosTrading::OfferIdSeq*& ids,
+                CosTrading::OfferIdIterator_ptr& id_itr,
+                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  TAO_THROW (CORBA::UNKNOWN ());
 }
 
 #endif /* TAO_TRADER_INTERFACES_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 08654434253..00561a27cf0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -171,8 +171,7 @@ private:
                             CosTradingRepos::ServiceTypeRepository_ptr rep,
                             TAO_Constraint_Interpreter& constr_inter,
                             TAO_Preference_Interpreter& pref_inter,
-                            TAO_Offer_Filter& offer_filter,
-                            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                            TAO_Offer_Filter& offer_filter);
   // Traverse the type hierarchy to pull the matching offers from all
   // subtypes of the root type.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 6294daf8559..962fb11863a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -1,4 +1,18 @@
+// ============================================================================
 // $Id$
+//
+// = LIBRARY
+//    orbsvcs
+//
+// = FILENAME
+//    Trader.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//    Seth Widoff <sbw1@cs.wustl.edu>
+//    Irfan Pyarali <irfan@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef TAO_TRADER_C
 #define TAO_TRADER_C
@@ -8,85 +22,56 @@
 
 ACE_RCSID(Trader, Trader_T, "$Id$")
 
+  // *************************************************************
+  // TAO_Trader
+  // *************************************************************
+
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 TAO_Trader (TAO_Trader_Base::Trader_Components components)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // @@ Seth, we need a way to propagate the exception out.  This will
-  // not work on platforms using environment variable.
+  CORBA::Environment env;
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
     this->ifs_[i] = 0;
 
   if (ACE_BIT_ENABLED (components, LOOKUP))
     {
-      TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* lookup;
-
-      ACE_NEW (lookup,
-               (TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
-
-      this->trading_components ().lookup_if (lookup->_this (ACE_TRY_ENV));
-      ACE_CHECK;
-      lookup->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* lookup =
+        new TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> (*this);
+      this->trading_components ().lookup_if (lookup->_this (env));
+      lookup->_remove_ref (env);
       this->ifs_[LOOKUP_IF] = lookup;
     }
   if (ACE_BIT_ENABLED (components, REGISTER))
     {
-      TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* reg;
-
-      ACE_NEW (reg,
-               (TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
-
-      this->trading_components ().register_if (reg->_this (ACE_TRY_ENV));
-      ACE_CHECK;
-      reg->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* reg =
+        new TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
+      this->trading_components ().register_if (reg->_this (env));
+      reg->_remove_ref (env);
       this->ifs_[REGISTER_IF] = reg;
     }
   if (ACE_BIT_ENABLED (components, ADMIN))
     {
-      TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* admin;
-
-      ACE_NEW (admin,
-               (TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
-
-      this->trading_components ().admin_if (admin->_this (ACE_TRY_ENV));
-      ACE_CHECK;
-      admin->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* admin =
+        new TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
+      this->trading_components ().admin_if (admin->_this (env));
+      admin->_remove_ref (env);
       this->ifs_[ADMIN_IF] = admin;
     }
   if (ACE_BIT_ENABLED (components, PROXY))
     {
-      TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* proxy;
-
-      ACE_NEW (proxy,
-               (TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
-
-      this->trading_components ().proxy_if (proxy->_this (ACE_TRY_ENV));
-      ACE_CHECK;
-      proxy->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* proxy =
+        new TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
+      this->trading_components ().proxy_if (proxy->_this (env));
+      proxy->_remove_ref (env);
       this->ifs_[PROXY_IF] = proxy;
     }
   if (ACE_BIT_ENABLED (components, LINK))
     {
-      TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* link;
-
-      ACE_NEW (link,
-               (TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
-
-      this->trading_components ().link_if (link->_this (ACE_TRY_ENV));
-      ACE_CHECK;
-      link->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* link =
+        new TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
+      this->trading_components ().link_if (link->_this (env));
+      link->_remove_ref (env);
       this->ifs_[LINK_IF] = link;
     }
 }
@@ -95,32 +80,32 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
 {
   // Remove Trading Components from POA
-
-  ACE_DECLARE_NEW_CORBA_ENV;
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
 
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
     {
       if (this->ifs_[i] != 0)
         {
-          ACE_TRY
+          TAO_TRY
             {
               PortableServer::POA_var poa =
-                this->ifs_[i]->_default_POA (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                this->ifs_[i]->_default_POA (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               PortableServer::ObjectId_var id =
-                poa->servant_to_id (this->ifs_[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                poa->servant_to_id (this->ifs_[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
-              poa->deactivate_object (id.in (), ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              poa->deactivate_object (id.in (), TAO_TRY_ENV);
+              TAO_CHECK_ENV;              
             }
-          ACE_CATCHANY
+          TAO_CATCHANY
             {
-              // Don't let exceptions propagate out of this call since
-              // it's the destructor!
             }
-          ACE_ENDTRY;
+          TAO_ENDTRY;
         }
     }
 }
@@ -138,6 +123,10 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock (void)
   return this->lock_;
 }
 
+  // *************************************************************
+  // Template Attribute Classes
+  // *************************************************************
+
 template <class IF>
 TAO_Trader_Components<IF>::
 TAO_Trader_Components (const TAO_Trading_Components_i& comps)
@@ -146,35 +135,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::lookup_if (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::register_if (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::admin_if (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::proxy_if (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::link_if (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
@@ -187,28 +176,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& )
+TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
@@ -222,77 +211,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_list (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
@@ -306,12 +295,17 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &)
+TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &env)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
 }
 
+
+  // *************************************************************
+  // TAO_Sequence_Extracter
+  // *************************************************************
+
 template <class OPERAND_TYPE> CORBA::Boolean
 TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
 {
@@ -319,11 +313,21 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   TAO_Element_Equal<OPERAND_TYPE> functor;
   TAO_DynSequence_i dyn_seq (sequence);
 
-  CORBA::ULong length = dyn_seq.length ();
-
-  for (CORBA::ULong i = 0; i < length && ! return_value; i++)
-    if (functor (dyn_seq, element))
-      return_value = 1;
+  TAO_TRY
+    {
+      CORBA::ULong length = dyn_seq.length (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
+      for (CORBA::ULong i = 0; i < length && ! return_value; i++)
+        {
+          if (functor (dyn_seq, element))
+            {
+              //ACE_DEBUG ((LM_DEBUG, "TAO_find::success\n"));
+              return_value = 1;
+            }
+        }
+    }
+  TAO_CATCHANY {} TAO_ENDTRY;
 
   return return_value;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index fac6e20a948..ca513621416 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 18b1cce247c..fe50b9767f8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -4,6 +4,10 @@
 
 ACE_RCSID(Trader, Trader_Utils, "$Id$")
 
+  // *************************************************************
+  // TAO_Policy_Creator
+  // *************************************************************
+
 TAO_Policy_Creator::TAO_Policy_Creator (int num_policies)
   : policies_ (num_policies),
     num_policies_ (0)
@@ -138,8 +142,7 @@ TAO_Policy_Creator::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type)
       index = this->num_policies_ - 1;
 
       // Ensure the starting trader policy gets the first slot.
-      if (pol_type != TAO_Policies::STARTING_TRADER 
-          || index == 0)
+      if (pol_type != TAO_Policies::STARTING_TRADER || index == 0)
         {
           this->policies_[index].name = TAO_Policies::POLICY_NAMES[pol_type];
           this->poltable_[pol_type] = index;
@@ -177,6 +180,11 @@ TAO_Policy_Creator::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type)
   return this->policies_[index];
 }
 
+
+  // *************************************************************
+  // TAO_Property_Evaluator
+  // *************************************************************
+
 // Constructor
 
 TAO_Property_Evaluator::
@@ -202,16 +210,20 @@ TAO_Property_Evaluator(CosTrading::Offer& offer,
     dp_cache_ (new CORBA::Any*[offer.properties.length ()])
 {
   if (this->dp_cache_ != 0)
-    for (CORBA::ULong i = 0; i < this->props_.length (); i++)
-      this->dp_cache_[i] = 0;
+    {
+      for (CORBA::ULong i = 0; i < this->props_.length (); i++)
+        this->dp_cache_[i] = 0;
+    }
 }
 
 TAO_Property_Evaluator::~TAO_Property_Evaluator (void)
 {
   // Clean up the results of any dynamic properties.
   for (CORBA::ULong i = 0; i < this->props_.length (); i++)
-    if (this->dp_cache_[i] != 0)
-      delete this->dp_cache_[i];
+    {
+      if (this->dp_cache_[i] != 0)
+        delete this->dp_cache_[i];
+    }
 
   delete [] this->dp_cache_;
 }
@@ -219,6 +231,7 @@ TAO_Property_Evaluator::~TAO_Property_Evaluator (void)
 int
 TAO_Property_Evaluator::is_dynamic_property (int index)
 {
+  CORBA::Environment env;
   int return_value = 0,
     num_properties = this->props_.length();
 
@@ -229,20 +242,17 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
       const CORBA::Any& value = this->props_[index].value;
       CORBA::TypeCode_var type = value.type ();
 
-      // @@ Seth, this will not work on platforms using environment variable.
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      if (type->equal (CosTradingDynamic::_tc_DynamicProp,
-                       ACE_TRY_ENV))
+      if (type->equal (CosTradingDynamic::_tc_DynamicProp, env))
         return_value = 1;
     }
 
   return return_value;
 }
 
+
 CORBA::Any*
 TAO_Property_Evaluator::property_value (int index,
-                                        CORBA::Environment& ACE_TRY_ENV)
+                                        CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
@@ -268,7 +278,7 @@ TAO_Property_Evaluator::property_value (int index,
 
       if (CORBA::is_nil (dp_eval.in ()))
         {
-          ACE_THROW_RETURN (CosTradingDynamic::
+          TAO_THROW_RETURN (CosTradingDynamic::
                             DPEvalFailure (name,
                                            CORBA::TypeCode::_nil (),
                                            CORBA::Any ()),
@@ -279,22 +289,22 @@ TAO_Property_Evaluator::property_value (int index,
           CORBA::TypeCode* type = dp_struct->returned_type.in ();
           CORBA::Any& info = dp_struct->extra_info;
 
-          ACE_TRY
+          TAO_TRY
             {
               // Retrieve the value of the dynamic property.
-              prop_val = dp_eval->evalDP(name, type, info, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              prop_val = dp_eval->evalDP(name, type, info, TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               if (this->dp_cache_ != 0)
                 this->dp_cache_[index] = prop_val;
             }
-          ACE_CATCH (CORBA::SystemException, excp)
+          TAO_CATCH (CORBA::SystemException, excp)
             {
-              ACE_TRY_THROW
-                (CosTradingDynamic::DPEvalFailure (name, type, info));
+              TAO_THROW_RETURN
+                (CosTradingDynamic::DPEvalFailure (name, type, info),
+                 prop_val);
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (prop_val);
+          TAO_ENDTRY;
         }
     }
 
@@ -324,9 +334,13 @@ TAO_Property_Evaluator::property_type (int index)
   return prop_type;
 }
 
+  // *************************************************************
+  // TAO_Property_Evaluator_By_Name
+  // *************************************************************
+
 TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-                                CORBA::Environment& ACE_TRY_ENV,
+                                CORBA::Environment& TAO_IN_ENV,
                                 CORBA::Boolean supports_dp)
   ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
@@ -339,11 +353,11 @@ 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))
-        ACE_THROW (CosTrading::IllegalPropertyName (prop.name));
+        TAO_THROW (CosTrading::IllegalPropertyName (prop.name));
 
       TAO_String_Hash_Key prop_name = prop.name.in ();
       if (this->table_.bind (prop_name, i))
-        ACE_THROW (CosTrading::DuplicatePropertyName (prop.name));
+        TAO_THROW (CosTrading::DuplicatePropertyName (prop.name));
     }
 }
 
@@ -378,7 +392,7 @@ is_dynamic_property(const char* property_name)
 
 CORBA::Any*
 TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
-                                                CORBA::Environment& ACE_TRY_ENV)
+                                                CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
@@ -388,12 +402,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
   // If the property name is in the map, delegate evaluation to our
   // superclass. Otherwise, throw an exception.
   if (this->table_.find (prop_name, index) == 0)
-    {
-      prop_value =
-        this->TAO_Property_Evaluator::property_value (index,
-                                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
+    prop_value = this->TAO_Property_Evaluator::property_value (index, TAO_IN_ENV);
 
   return prop_value;
 }
@@ -426,6 +435,10 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name)
   return property;
 }
 
+  // *************************************************************
+  // TAO_Dynamic_Property
+  // *************************************************************
+
 TAO_Dynamic_Property::~TAO_Dynamic_Property (void)
 {
 }
@@ -440,28 +453,31 @@ construct_dynamic_prop (const char* name,
 
   CosTradingDynamic::DynamicProp* dp_struct = 0;
 
-  ACE_NEW_RETURN (dp_struct,
-                  CosTradingDynamic::DynamicProp,
-                  0);
+  ACE_NEW_RETURN (dp_struct, CosTradingDynamic::DynamicProp, 0);
 
-  if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
+  TAO_TRY
     {
-      // Seth, we need a way to either propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      this->prop_ = this->_this (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
+        {
+          this->prop_ = this->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-      this->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
+          this->_remove_ref (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
 
-  dp_struct->eval_if =
-    CosTradingDynamic::DynamicPropEval::_duplicate (this->prop_.in ());
+      dp_struct->eval_if =
+        CosTradingDynamic::DynamicPropEval::_duplicate (this->prop_.in ());
+      TAO_CHECK_ENV;
 
-  dp_struct->returned_type =
-    CORBA::TypeCode::_duplicate (returned_type);
-  dp_struct->extra_info = extra_info;
+      dp_struct->returned_type = CORBA::TypeCode::_duplicate (returned_type);
+      dp_struct->extra_info = extra_info;
+    }
+  TAO_CATCHANY
+    {
+      return 0;
+    }
+  TAO_ENDTRY;
 
   return dp_struct;
 }
@@ -469,24 +485,31 @@ construct_dynamic_prop (const char* name,
 void
 TAO_Dynamic_Property::destroy (void)
 {
-  if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
+  TAO_TRY
+    {
+      if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
+        {
+          PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          PortableServer::ObjectId_var id =
+            poa->servant_to_id (this, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          poa->deactivate_object (id.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCHANY
     {
-      // @@ Seth, we need a way to propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      poa->deactivate_object (id.in (),
-                              ACE_TRY_ENV);
-      ACE_CHECK;
     }
+  TAO_ENDTRY;
 }
 
+  // *************************************************************
+  // TAO_Policies
+  // *************************************************************
+
 const char* TAO_Policies::POLICY_NAMES[] =
 {
   "starting_trader",
@@ -504,7 +527,7 @@ const char* TAO_Policies::POLICY_NAMES[] =
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
                             const CosTrading::PolicySeq& policies,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
@@ -514,12 +537,12 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
 
   for (CORBA::ULong j = 0; j < policies.length (); j++)
     {
-      const char *pol_name = (const char *) policies[j].name;
+      const char* pol_name = (const char*) policies[j].name;
       size_t length = (pol_name == 0) ? 0 : ACE_OS::strlen (pol_name);
       int index = -1;
 
       if (length < ACE_OS::strlen (POLICY_NAMES[HOP_COUNT]))
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
+        TAO_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
 
       switch (pol_name[0])
         {
@@ -559,11 +582,14 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
       // Match the name of the policy, and insert its value into the
       // vector.
       if (index == -1 || ACE_OS::strcmp (POLICY_NAMES[index], pol_name) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
-      else if (this->policies_[index] != 0)
-        ACE_THROW (CosTrading::DuplicatePolicyName (pol_name));
+        TAO_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
       else
-        this->policies_[index] = (CosTrading::Policy *) &(policies[j]);
+        {
+          if (this->policies_[index] != 0)
+            TAO_THROW (CosTrading::DuplicatePolicyName (pol_name));
+          else
+            this->policies_[index] = (CosTrading::Policy *) &(policies[j]);
+        }
     }
 }
 
@@ -573,7 +599,7 @@ TAO_Policies::~TAO_Policies (void)
 
 CORBA::ULong
 TAO_Policies::ulong_prop (POLICY_TYPE pol,
-                          CORBA::Environment& ACE_TRY_ENV) const
+                          CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
@@ -611,9 +637,8 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      // @@ Seth, rethrowing a different exception?  need ACE_CHECK_RETURN here.
-      if (!type->equal (CORBA::_tc_ulong, ACE_TRY_ENV))
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
+      if (!type->equal (CORBA::_tc_ulong, TAO_IN_ENV))
+        TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
                           return_value);
       else
         value >>= return_value;
@@ -626,29 +651,29 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
 }
 
 CORBA::ULong
-TAO_Policies::search_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::search_card (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (SEARCH_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (SEARCH_CARD, TAO_IN_ENV);
 }
 
 CORBA::ULong
-TAO_Policies::match_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::match_card (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (MATCH_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (MATCH_CARD, TAO_IN_ENV);
 }
 
 CORBA::ULong
-TAO_Policies::return_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::return_card (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (RETURN_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (RETURN_CARD, TAO_IN_ENV);
 }
 
 CORBA::Boolean
 TAO_Policies::boolean_prop (POLICY_TYPE pol,
-                            CORBA::Environment& ACE_TRY_ENV) const
+                            CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
@@ -680,9 +705,8 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      // Seth, should we need to check the exception before throwing another one?
-      if (!type->equal (CORBA::_tc_boolean, ACE_TRY_ENV))
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
+      if (!type->equal (CORBA::_tc_boolean, TAO_IN_ENV))
+        TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
                           return_value);
       else
         value >>= CORBA::Any::to_boolean (return_value);
@@ -699,36 +723,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
 
 
 CORBA::Boolean
-TAO_Policies::use_modifiable_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_modifiable_properties (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, ACE_TRY_ENV);
+  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, TAO_IN_ENV);
 }
 
 CORBA::Boolean
-TAO_Policies::use_dynamic_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_dynamic_properties (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES, ACE_TRY_ENV);
+  return this->boolean_prop (USE_DYNAMIC_PROPERTIES, TAO_IN_ENV);
 }
 
 CORBA::Boolean
-TAO_Policies::use_proxy_offers (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_proxy_offers (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_PROXY_OFFERS, ACE_TRY_ENV);
+  return this->boolean_prop (USE_PROXY_OFFERS, TAO_IN_ENV);
 }
 
 CORBA::Boolean
-TAO_Policies::exact_type_match (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::exact_type_match (CORBA::Environment& TAO_IN_ENV) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (EXACT_TYPE_MATCH, ACE_TRY_ENV);
+  return this->boolean_prop (EXACT_TYPE_MATCH, TAO_IN_ENV);
 }
 
 
 CosTrading::TraderName*
-TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::starting_trader (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -740,11 +764,9 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
       CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      // @@ Seth, complex statements are not portable, exception-wise
-      // We also need to check here.
-      if (! (type->equal (CosTrading::_tc_TraderName, ACE_TRY_ENV) ||
-             type->equal (CosTrading::_tc_LinkNameSeq, ACE_TRY_ENV)))
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
+      if (! (type->equal (CosTrading::_tc_TraderName, TAO_IN_ENV) ||
+             type->equal (CosTrading::_tc_LinkNameSeq, TAO_IN_ENV)))
+        TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
                           trader_name);
       else
         value >>= trader_name;
@@ -754,7 +776,7 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::link_follow_rule (CORBA::Environment& TAO_IN_ENV) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
@@ -770,8 +792,8 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
       CORBA::TypeCode_var type = value.type ();
 
       // Extract the link follow rule
-      if (!type->equal (CosTrading::_tc_FollowOption, ACE_TRY_ENV))
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
+      if (!type->equal (CosTrading::_tc_FollowOption, TAO_IN_ENV))
+        TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
                           return_value);
       else
         value >>= return_value;
@@ -785,7 +807,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
 
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
-                                CORBA::Environment& ACE_TRY_ENV) const
+                                CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
@@ -799,8 +821,8 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
 
   // If not defined defaults to trader.def_link_follow_rule
   CosTrading::FollowOption query_link_follow_rule =
-    this->link_follow_rule (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (return_value);
+    this->link_follow_rule (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, return_value);
 
   return_value = (query_link_follow_rule < trader_max_follow_policy)
     ? query_link_follow_rule : trader_max_follow_policy;
@@ -811,14 +833,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
 }
 
 CORBA::ULong
-TAO_Policies::hop_count (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::hop_count (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (HOP_COUNT, ACE_TRY_ENV);
+  return this->ulong_prop (HOP_COUNT, TAO_IN_ENV);
 }
 
 CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::request_id (CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
@@ -829,9 +851,11 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
       CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      if (!type->equal (CosTrading::Admin::_tc_OctetSeq, ACE_TRY_ENV))
-        ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-                          request_id);
+      if (!type->equal (CosTrading::Admin::_tc_OctetSeq, TAO_IN_ENV))
+        {
+          TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
+                            request_id);
+        }
       else
         value >>= request_id;
     }
@@ -843,46 +867,47 @@ void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                        const CosTrading::Link::LinkInfo& link_info,
-                       CORBA::Environment& ACE_TRY_ENV) const
+                       CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
   CosTrading::FollowOption follow_option = CosTrading::local_only;
   CosTrading::FollowOption trader_max_follow_policy =
     this->trader_.import_attributes ().max_follow_policy ();
 
-  // @@ Seth, I am quite lost here, are you tring to catch an exception here,
-  // or, you are trying to pass exceptions out?  Why do you use a different env here?
   if (this->policies_[LINK_FOLLOW_RULE] != 0)
     {
       CORBA::Environment env;
       CosTrading::FollowOption query_link_follow_rule =
         this->link_follow_rule (env);
-      ACE_CHECK;
-
-      follow_option = link_info.limiting_follow_rule < trader_max_follow_policy
-        ? (link_info.limiting_follow_rule < query_link_follow_rule
-           ? link_info.limiting_follow_rule 
-           : query_link_follow_rule) 
-        : (trader_max_follow_policy < query_link_follow_rule
-           ? trader_max_follow_policy 
-           : query_link_follow_rule);
+      TAO_CHECK_ENV_RETURN_VOID (env);
+
+      follow_option =
+        (link_info.limiting_follow_rule < trader_max_follow_policy) ?
+        ((link_info.limiting_follow_rule < query_link_follow_rule) ?
+         link_info.limiting_follow_rule : query_link_follow_rule) :
+        ((trader_max_follow_policy < query_link_follow_rule) ?
+         trader_max_follow_policy : query_link_follow_rule);
     }
   else
-    follow_option = link_info.def_pass_on_follow_rule < trader_max_follow_policy
-      ? link_info.def_pass_on_follow_rule 
-      : trader_max_follow_policy;
+    {
+      follow_option =
+        (link_info.def_pass_on_follow_rule < trader_max_follow_policy) ?
+        link_info.def_pass_on_follow_rule : trader_max_follow_policy;
+    }
 
   CORBA::ULong i = 0;
   for (i = 0; i < policy_seq.length (); i++)
-    if (ACE_OS::strcmp (policy_seq[i].name,
-                        POLICY_NAMES[LINK_FOLLOW_RULE]) == 0)
-      {
-        policy_seq[i].value <<= follow_option;
-        break;
-      }
+    {
+      if (ACE_OS::strcmp (policy_seq[i].name,
+                          POLICY_NAMES[LINK_FOLLOW_RULE]) == 0)
+        {
+          policy_seq[i].value <<= follow_option;
+          break;
+        }
+    }
 
   if (i == policy_seq.length ())
     {
@@ -926,7 +951,6 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
       // We always require a hop count.
       if (i == HOP_COUNT)
         {
-          // @@ Seth, Same thing here, are you trying to catch the exception??? (and forget about it?)
           CORBA::Environment env;
           new_policy.name = POLICY_NAMES[HOP_COUNT];
           new_policy.value <<= this->hop_count (env) - 1;
@@ -937,12 +961,10 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
         }
     }
 
-  policy_seq.replace (REQUEST_ID + 1,
-                      counter,
-                      policy_buffer,
-                      1);
+  policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, 1);
 }
 
+
 void
 TAO_Policies::copy_to_forward (CosTrading::PolicySeq& policy_seq,
                                const CosTrading::TraderName& trader_name) const
@@ -1002,11 +1024,13 @@ TAO_Policies::copy_to_forward (CosTrading::PolicySeq& policy_seq,
     }
 
   // Create the new sequence
-  policy_seq.replace (REQUEST_ID + 1,
-                      counter,
-                      policy_buffer, 1);
+  policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, 1);
 }
 
+  // *************************************************************
+  // TAO_Offer_Modifier
+  // *************************************************************
+
 TAO_Offer_Modifier::
 TAO_Offer_Modifier (const char* type_name,
                     const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
@@ -1072,7 +1096,7 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 void
 TAO_Offer_Modifier::
 delete_properties (const CosTrading::PropertyNameSeq& deletes,
-                   CORBA::Environment& ACE_TRY_ENV)
+                   CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
@@ -1087,16 +1111,16 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes,
     {
       const char* dname = ACE_static_cast (const char*,  deletes[i]);
       if (! TAO_Trader_Base::is_valid_identifier_name (dname))
-        ACE_THROW (CosTrading::IllegalPropertyName (dname));
+        TAO_THROW (CosTrading::IllegalPropertyName (dname));
       else
         {
           TAO_String_Hash_Key prop_name (dname);
           if (this->mandatory_.find (prop_name) == 0)
-            ACE_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
+            TAO_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
           else if (delete_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (dname));
+            TAO_THROW (CosTrading::DuplicatePropertyName (dname));
           else if (this->props_.find (prop_name) == -1)
-            ACE_THROW (CosTrading::Register::UnknownPropertyName (dname));
+            TAO_THROW (CosTrading::Register::UnknownPropertyName (dname));
         }
     }
 
@@ -1112,7 +1136,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes,
 void
 TAO_Offer_Modifier::
 merge_properties (const CosTrading::PropertySeq& modifies,
-                  CORBA::Environment& ACE_TRY_ENV)
+                  CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
@@ -1136,9 +1160,9 @@ merge_properties (const CosTrading::PropertySeq& modifies,
               // Can't assign a dynamic property to a property with
               // readonly mode, and can't reassign a readonly property.
               if (prop_eval.is_dynamic_property (i))
-                ACE_THROW (CosTrading::ReadonlyDynamicProperty (this->type_, mname));
+                TAO_THROW (CosTrading::ReadonlyDynamicProperty (this->type_, mname));
               else if (this->props_.find (prop_name) == 0)
-                ACE_THROW (CosTrading::Register::ReadonlyProperty (this->type_, mname));
+                TAO_THROW (CosTrading::Register::ReadonlyProperty (this->type_, mname));
             }
 
           // Validate the property type if the property is defined in
@@ -1146,19 +1170,18 @@ merge_properties (const CosTrading::PropertySeq& modifies,
           CORBA::TypeCode_ptr type_def = 0;
           if (this->prop_types_.find (prop_name, type_def) == 0)
             {
-              // @@ Seth, are we trying to ignore the exception here?
-              CORBA::Environment ACE_TRY_ENV;
+              CORBA::Environment TAO_IN_ENV;
               CORBA::TypeCode_var prop_type = prop_eval.property_type (i);
 
-              if (! type_def->equal (prop_type.in (), ACE_TRY_ENV))
-                ACE_THROW (CosTrading::PropertyTypeMismatch (mname, modifies[i]));
+              if (! type_def->equal (prop_type.in (), TAO_IN_ENV))
+                TAO_THROW (CosTrading::PropertyTypeMismatch (mname, modifies[i]));
             }
 
           if (modify_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (mname));
+            TAO_THROW (CosTrading::DuplicatePropertyName (mname));
         }
       else
-        ACE_THROW (CosTrading::IllegalPropertyName (mname));
+        TAO_THROW (CosTrading::IllegalPropertyName (mname));
     }
 }
 
@@ -1172,7 +1195,6 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   // Merge these properties with the original set.
   CORBA::ULong i = 0,
     merge_length = modifies.length ();
-
   for (i = 0; i < merge_length; i++)
     {
       Property_Table::ENTRY* entry = 0;
@@ -1181,8 +1203,10 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
       CosTrading::Property* prop =
         ACE_const_cast (CosTrading::Property*, &modifies[i]);
       if (this->props_.bind (prop_name, prop, entry) == 1)
-        // We need to rebind here.
-        entry->int_id_ = prop;
+        {
+          // We need to rebind here.
+          entry->int_id_ = prop;
+        }
     }
 
   CORBA::ULong num_modified = 0,
@@ -1221,18 +1245,21 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   //  CosTrading::PropertySeq::freebuf (prop_buf);
 }
 
+
+
+  // *************************************************************
+  // TAO_Offer_Filter
+  // *************************************************************
+
 TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies,
-                                    CORBA::Environment& ACE_TRY_ENV)
-  // @@ Seth, this is definitely no exception safe.  But I don't know of a better way.
-  : search_card_ (policies.search_card (ACE_TRY_ENV)),
-    match_card_ (policies.match_card (ACE_TRY_ENV)),
-    return_card_ (policies.return_card (ACE_TRY_ENV)),
-    dp_ (policies.use_dynamic_properties (ACE_TRY_ENV)),
-    mod_ (policies.use_modifiable_properties (ACE_TRY_ENV))
-{
-  ACE_CHECK;
-  // @@ Seth, need another ACE_CHECK here.
-  if (policies.exact_type_match (ACE_TRY_ENV) == 1)
+                                    CORBA::Environment& TAO_IN_ENV)
+  : search_card_ (policies.search_card (TAO_IN_ENV)),
+    match_card_ (policies.match_card (TAO_IN_ENV)),
+    return_card_ (policies.return_card (TAO_IN_ENV)),
+    dp_ (policies.use_dynamic_properties (TAO_IN_ENV)),
+    mod_ (policies.use_modifiable_properties (TAO_IN_ENV))
+{
+  if (policies.exact_type_match (TAO_IN_ENV) == 1)
     {
       TAO_String_Hash_Key exact_match
         (TAO_Policies::POLICY_NAMES[TAO_Policies::EXACT_TYPE_MATCH]);
@@ -1383,9 +1410,13 @@ TAO_Offer_Filter::limits_applied (void)
   return new CosTrading::PolicyNameSeq (size, size, temp, 1);
 }
 
+  // *************************************************************
+  // TAO_Property_Filter
+  // *************************************************************
+
 TAO_Property_Filter::
 TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
@@ -1405,10 +1436,10 @@ TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
             {
               TAO_String_Hash_Key prop_name (pname);
               if (this->props_.insert (prop_name) == 1)
-                ACE_THROW (CosTrading::DuplicatePropertyName (pname));
+                TAO_THROW (CosTrading::DuplicatePropertyName (pname));
             }
           else
-            ACE_THROW (CosTrading::IllegalPropertyName (pname));
+            TAO_THROW (CosTrading::IllegalPropertyName (pname));
         }
     }
 }
@@ -1471,9 +1502,11 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
         }
     }
   else if (this->policy_ == CosTrading::Lookup::all)
-    //      CosTrading::Property* props = s_props.get_buffer (0);
-    //      d_props.replace (length, length, props, 0);
-    d_props = s_props;
+    {
+      d_props = s_props;
+      //      CosTrading::Property* props = s_props.get_buffer (0);
+      //      d_props.replace (length, length, props, 0);
+    }
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 2b768f69707..1770754512f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
-// $Id$
 
 // ========================================================================
+// $Id$
 //
 // = LIBRARY
 //    orbsvcs
@@ -33,19 +33,24 @@
 
 #include "Trader.h"
 
+  // *************************************************************
+  // TAO_Property_Evaluator
+  // *************************************************************
+
 class TAO_ORBSVCS_Export TAO_Property_Evaluator
+//
+// = TITLE
+//   This class abstracts away the details of obtaining property
+//   values and property types. Since the procedure for obtaining the
+//   value or type of a dynamic property is disparate from the method
+//   for a static property, TAO_Property_Evaluator provides methods
+//   that will unify the two approaches under a single
+//   interface. Since dynamic properties aren't necessarily supported
+//   by a trader, this class accounts for that contingency. The use of
+//   indexed lookups allows them to occur in constant time on the
+//   CORBA sequences, but requires that the client know the layout of
+//   properties ahead of time.
 {
-  // = TITLE
-  //   This class abstracts away the details of obtaining property
-  //   values and property types. Since the procedure for obtaining the
-  //   value or type of a dynamic property is disparate from the method
-  //   for a static property, TAO_Property_Evaluator provides methods
-  //   that will unify the two approaches under a single
-  //   interface. Since dynamic properties aren't necessarily supported
-  //   by a trader, this class accounts for that contingency. The use of
-  //   indexed lookups allows them to occur in constant time on the
-  //   CORBA sequences, but requires that the client know the layout of
-  //   properties ahead of time.
 public:
 
   TAO_Property_Evaluator(const CosTrading::PropertySeq& properties,
@@ -83,7 +88,7 @@ public:
   // property name. If the index is out of bounds, the method returns
   // a null pointer (that is, 0).
 
-protected:
+ protected:
 
   typedef CosTradingDynamic::DynamicProp DP_Struct;
   typedef CosTradingDynamic::DynamicPropEval DP_Eval;
@@ -102,23 +107,29 @@ protected:
   // cause seg faults, since the client wouldn't be able to tell
   // whether or not the return value should be freed.
 
-private:
+ private:
 
   TAO_Property_Evaluator (const TAO_Property_Evaluator&);
   TAO_Property_Evaluator& operator= (const TAO_Property_Evaluator&);
 };
 
-class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator
+  // *************************************************************
+  // TAO_Property_Evaluator_By_Name
+  // *************************************************************
+
+class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name :
+  public TAO_Property_Evaluator
+//
+// = TITLE
+//    This class extends the TAO_Property_Evaluator to allow lookups
+//    based on the property name of interest. Since the property
+//    information is contained within an integer indexed array,
+//    lookups may occur in O(n) time, where n is the length of the
+//    array. To make lookups by name more efficient,
+//    TAO_Property_Evaluator_By_Name creates a mapping of property
+//    names to integer indicies, upon which lookups are guaranteed to
+//    be O(lg n).
 {
-  // = TITLE
-  //    This class extends the TAO_Property_Evaluator to allow lookups
-  //    based on the property name of interest. Since the property
-  //    information is contained within an integer indexed array,
-  //    lookups may occur in O(n) time, where n is the length of the
-  //    array. To make lookups by name more efficient,
-  //    TAO_Property_Evaluator_By_Name creates a mapping of property
-  //    names to integer indicies, upon which lookups are guaranteed to
-  //    be O(lg n).
 public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
@@ -163,16 +174,23 @@ private:
   // constructor.
 };
 
-class TAO_ORBSVCS_Export TAO_Dynamic_Property : public virtual POA_CosTradingDynamic::DynamicPropEval, public virtual PortableServer::RefCountServantBase
+  // *************************************************************
+  // TAO_Dynamic_Property
+  // *************************************************************
+
+class TAO_ORBSVCS_Export TAO_Dynamic_Property :
+  public virtual POA_CosTradingDynamic::DynamicPropEval,
+  public virtual PortableServer::RefCountServantBase
+// = TITLE
+//   Little helper class that you can extend to have your dynamic
+//   property handler construct CosTradingDynamic::DynamicProp structs.
 {
-  // = TITLE
-  //   Little helper class that you can extend to have your dynamic
-  //   property handler construct CosTradingDynamic::DynamicProp structs.
 public:
 
   TAO_Dynamic_Property (void) {}
+
   TAO_Dynamic_Property (const TAO_Dynamic_Property &) {}
-  void operator= (const TAO_Dynamic_Property &) {}
+
   virtual ~TAO_Dynamic_Property (void);
 
   void destroy (void);
@@ -186,31 +204,37 @@ public:
   // Dynamic property evaluation call-back method.
 
   CosTradingDynamic::DynamicProp*
-  construct_dynamic_prop (const char* name,
-                          CORBA::TypeCode_ptr returned_type,
-                          const CORBA::Any& extra_info);
+    construct_dynamic_prop (const char* name,
+                            CORBA::TypeCode_ptr returned_type,
+                            const CORBA::Any& extra_info);
   // Method to construct a dynamic property structure suitable for
   // exporting in a CosTrading::PropertyStruct to the Trading Service.
 
-private:
+ private:
 
   CosTradingDynamic::DynamicPropEval_var prop_;
 };
 
+
+  // *************************************************************
+  // TAO_Policies
+  // *************************************************************
+
 class TAO_Policies
+//
+// = TITLE
+// This class ensures that policies submitted to Lookup make sense,
+// have the correct value types, and don't exceed the maximums set
+// through the Admin Interface.
+//
+// = DESCRIPTION
+// TAO_Policies does an admirable job of reconciling differences
+// between the default parameter settings of the Trader and the import
+// and other policies set by the client. Unbeknownst to its client
+// TAO_Policies hides this arbitration, and records whether the user
+// policy was chosen, or the default. This information gets returned
+// to the invoker of the query method.
 {
-  // = TITLE
-  // This class ensures that policies submitted to Lookup make sense,
-  // have the correct value types, and don't exceed the maximums set
-  // through the Admin Interface.
-  //
-  // = DESCRIPTION
-  // TAO_Policies does an admirable job of reconciling differences
-  // between the default parameter settings of the Trader and the import
-  // and other policies set by the client. Unbeknownst to its client
-  // TAO_Policies hides this arbitration, and records whether the user
-  // policy was chosen, or the default. This information gets returned
-  // to the invoker of the query method.
 public:
 
 #define TAO_NUM_POLICIES  11
@@ -356,7 +380,7 @@ public:
 
   CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-                     CosTrading::Lookup::InvalidPolicyValue));
+                    CosTrading::Lookup::InvalidPolicyValue));
   // BEGIN SPEC
   // The "starting_trader" policy facilitates the distribution of the
   // trading service itself. It allows an importer to scope a search
@@ -463,6 +487,10 @@ private:
   // For the validating identifier names.
 };
 
+  // *************************************************************
+  // TAO_Policy_Creator
+  // *************************************************************
+
 class TAO_ORBSVCS_Export TAO_Policy_Creator
 {
   // = TITLE
@@ -543,12 +571,17 @@ private:
   // The number of policies so far in the sequence.
 };
 
+
+  // *************************************************************
+  // TAO_Offer_Modifier
+  // *************************************************************
+
 class TAO_Offer_Modifier
+// = TITLE
+//   This class deletes, modifies, and adds properties to a given
+//   offer according to the rules of the modify method on the Register
+//   interface.
 {
-  // = TITLE
-  //   This class deletes, modifies, and adds properties to a given
-  //   offer according to the rules of the modify method on the Register
-  //   interface.
 public:
 
   TAO_Offer_Modifier (const char* type,
@@ -562,9 +595,9 @@ public:
   void delete_properties (const CosTrading::PropertyNameSeq& deletes,
                           CORBA::Environment& _env)
     ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
-                     CosTrading::Register::MandatoryProperty,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName));
+                    CosTrading::Register::MandatoryProperty,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::DuplicatePropertyName));
   // Delete the properties whose names were given to the
   // constructor. Ensure we don't delete mandatory properties.
 
@@ -588,14 +621,17 @@ private:
   TAO_Offer_Modifier (const TAO_Offer_Modifier&);
   TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&);
 
-  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
-                                   CosTrading::Property *,
-                                   ACE_Hash<TAO_String_Hash_Key>,
-                                   ACE_Equal_To<TAO_String_Hash_Key>,
-                                   ACE_Null_Mutex>
-          Property_Table;
-
-  const char *type_;
+  typedef ACE_Hash_Map_Manager_Ex
+    <
+    TAO_String_Hash_Key,
+    CosTrading::Property*,
+    ACE_Hash<TAO_String_Hash_Key>,
+    ACE_Equal_To<TAO_String_Hash_Key>,
+    ACE_Null_Mutex
+    >
+    Property_Table;
+
+  const char* type_;
   // The type of the offer.
 
   Property_Table props_;
@@ -612,22 +648,26 @@ private:
   // A reference to the offer undergoing change.
 };
 
+  // *************************************************************
+  // TAO_Offer_Filter
+  // *************************************************************
+
 class TAO_Offer_Filter
+// = TITLE
+//    The purpose of this class is to ensure that offers that
+//    shouldn't be considered by the TAO_Constraint_Interpreter
+//    aren't.
+//
+// = DESCRIPTION
+//    There two classes of reasons why an offer for a correct
+//    type shouldn't be considered: 1) The default parameters of the
+//    Trader or policies passed to the Lookup::query method deem it
+//    inappropriate to consider offers with modifiable (i.e., not
+//    readonly) or dynamic properties. 2) We've exceeded the
+//    default or provided cardinality constraints. TAO_Offer_Filter
+//    ensures that violation of policies doesn't occur. It's the
+//    enforcer.
 {
-  // = TITLE
-  //    The purpose of this class is to ensure that offers that
-  //    shouldn't be considered by the TAO_Constraint_Interpreter
-  //    aren't.
-  //
-  // = DESCRIPTION
-  //    There two classes of reasons why an offer for a correct
-  //    type shouldn't be considered: 1) The default parameters of the
-  //    Trader or policies passed to the Lookup::query method deem it
-  //    inappropriate to consider offers with modifiable (i.e., not
-  //    readonly) or dynamic properties. 2) We've exceeded the
-  //    default or provided cardinality constraints. TAO_Offer_Filter
-  //    ensures that violation of policies doesn't occur. It's the
-  //    enforcer.
 public:
 
   TAO_Offer_Filter (TAO_Policies& policies,
@@ -694,13 +734,17 @@ private:
   // may be bad.
 };
 
+  // *************************************************************
+  // TAO_Property_Filter
+  // *************************************************************
+
 class TAO_Property_Filter
+// = TITLE
+//
+//   The Ace_Property_Filter copies those properties specified in a
+//   CosTrading::Lookup::SpecifiedProps from a source
+//   CosTrading::Offer to a destination CosTrading::Offer.
 {
-  // = TITLE
-  //
-  //   The Ace_Property_Filter copies those properties specified in a
-  //   CosTrading::Lookup::SpecifiedProps from a source
-  //   CosTrading::Offer to a destination CosTrading::Offer.
 public:
 
   typedef CosTrading::Lookup::SpecifiedProps SPECIFIED_PROPS;
@@ -730,4 +774,8 @@ private:
   CosTrading::Lookup::HowManyProps policy_;
 };
 
+  // *************************************************************
+  // Miscellaneous
+  // *************************************************************
+
 #endif /* TAO_TRADER_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 180e78f38e5..df4f163cf8a 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="ORB Services DLL" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="orbsvcs" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=ORB Services DLL - Win32 Debug

+CFG=orbsvcs - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,22 +14,24 @@ CFG=ORB Services DLL - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs.mak" CFG="ORB Services DLL - Win32 Debug"

+!MESSAGE NMAKE /f "orbsvcs.mak" CFG="orbsvcs - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ORB Services DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ORB Services DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ORB Services DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ORB Services DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "orbsvcs - Win32 Release" (based on\

+ "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "orbsvcs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "orbsvcs - Win32 Alpha Release" (based on\

+ "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "orbsvcs - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -44,7 +46,7 @@ CFG=ORB Services DLL - Win32 Debug
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

@@ -59,7 +61,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

 # ADD LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\orbsvcs.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -74,7 +76,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

 # SUBTRACT CPP /WX /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

@@ -89,7 +91,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -103,12 +105,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /nologo /MT /Gt0 /W3 /GX /O2 /I "../" /I" I "../../../" /D"NDEBUG" /D "WIN32" /FD /c

-# ADD CPP /Gt0 /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 Gt0 Gt0 nologo MT Gt0 W3 GX O2 I "..\\ /I" I "..\..\..\\ /D" D "WIN32" D "..\..\\ NDEBUG"

+# ADD CPP /Gt0 nologo MD Gt0 W3 GX O2 I "..\\ I " ..\..\..\\ I "..\..\\ D " WIN32" D "_WINDOWS" D "NDEBUG" D TAO_ORBSVCS_HAS_DLL=1 D "TAO_ORBSVCS_BUILD_DLL"

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -119,7 +121,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -133,12 +135,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /nologo /W3 /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D "WIN32" /D "_DEBUG" /FD /MTd /c

-# ADD CPP /Gt0 /nologo /W3 /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D "WIN32" /D "_DEBUG" /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

+CPP=cl.exe

+# ADD BASE CPP /Gt0 Gt0 Gt0 nologo Gt0 W3 GX Zi Od I "..\\ /I" I "..\..\..\\ /D" D "_WINDOWS" D TAO_ORBSVCS_HAS_DLL=1 D "TAO_ORBSVCS_BUILD_DLL" D "WIN32" FD MTd ..\..\\ _DEBUG" c

+# ADD CPP /Gt0 nologo Gt0 W3 GX Zi Od I "..\\ I " ..\..\\ I "..\..\..\\ D " _WINDOWS" D TAO_ORBSVCS_HAS_DLL=1 D "TAO_ORBSVCS_BUILD_DLL" D "WIN32" D "_DEBUG" FD MDd c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -153,10 +155,10 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "ORB Services DLL - Win32 Release"

-# Name "ORB Services DLL - Win32 Debug"

-# Name "ORB Services DLL - Win32 Alpha Release"

-# Name "ORB Services DLL - Win32 Alpha Debug"

+# Name "orbsvcs - Win32 Release"

+# Name "orbsvcs - Win32 Debug"

+# Name "orbsvcs - Win32 Alpha Release"

+# Name "orbsvcs - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -164,13 +166,159 @@ LINK32=link.exe
 

 SOURCE=.\AV\AVStreams_i.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_AVSTR=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Process.h"\

+	"..\..\..\ace\Process.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	".\AV\AVStreams_i.h"\

+	".\AV\Endpoint_Strategy.h"\

+	".\AV\Endpoint_Strategy_T.cpp"\

+	".\AV\Endpoint_Strategy_T.h"\

+	".\orbsvcs_export.h"\

+	".\Trader\Trader.h"\

+	

+NODEP_CPP_AVSTR=\

+	"..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	".\AV\AVStreams_i_T.cpp"\

+	".\AV\AVStreams_i_T.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -179,13 +327,13 @@ SOURCE=.\AV\AVStreams_i.cpp
 

 SOURCE=.\AVStreamsC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -194,13 +342,13 @@ SOURCE=.\AVStreamsC.cpp
 

 SOURCE=.\AVStreamsS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -209,43 +357,1403 @@ SOURCE=.\AVStreamsS.cpp
 

 SOURCE=.\Event\BCU.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_BCU_C=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\BCU.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_BCU_C=\

+	"..\..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\Concurrency\CC_LockSet.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CC_LO=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSet.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_CC_LO=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Config_Scheduler.cpp

+SOURCE=.\Concurrency\CC_LockSetFactory.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CC_LOC=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSet.h"\

+	".\Concurrency\CC_LockSetFactory.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_CC_LOC=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\Concurrency\Concurrency_Utils.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONCU=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSetFactory.h"\

+	".\Concurrency\Concurrency_Utils.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_CONCU=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Trader\Constraint_Interpreter.cpp

+SOURCE=.\Sched\Config_Scheduler.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONFI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\Config_Scheduler.h"\

+	".\Sched\Config_Scheduler.i"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Sched\Scheduler_Generic.h"\

+	".\Sched\Scheduler_Generic.i"\

+	".\Sched\Strategy_Scheduler.h"\

+	".\Sched\Strategy_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_CONFI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\Trader\Constraint_Interpreter.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONST=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_CONST=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -254,13 +1762,266 @@ SOURCE=.\Trader\Constraint_Interpreter.cpp
 

 SOURCE=.\Trader\Constraint_l.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONSTR=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_CONSTR=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -269,13 +2030,265 @@ SOURCE=.\Trader\Constraint_l.cpp
 

 SOURCE=.\Trader\Constraint_Nodes.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONSTRA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_CONSTRA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -284,13 +2297,275 @@ SOURCE=.\Trader\Constraint_Nodes.cpp
 

 SOURCE=.\Trader\Constraint_Visitors.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONSTRAI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Offer_Database.cpp"\

+	".\Trader\Offer_Database.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Offer_Iterators_T.cpp"\

+	".\Trader\Offer_Iterators_T.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Interfaces.cpp"\

+	".\Trader\Trader_Interfaces.h"\

+	".\Trader\Trader_T.cpp"\

+	".\Trader\Trader_T.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_CONSTRAI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -299,28 +2574,838 @@ SOURCE=.\Trader\Constraint_Visitors.cpp
 

 SOURCE=.\Trader\Constraint_y.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONSTRAIN=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_CONSTRAIN=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

+

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_CONSU=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\CosEvent\ConsumerAdmin_i.h"\

+	".\CosEvent\ProxyPushSupplier_i.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+SOURCE=.\CosConcurrencyControlC.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSCO=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSCO=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\CosConcurrencyControlS.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSCON=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSCON=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -329,13 +3414,13 @@ SOURCE=.\CosEvent\ConsumerAdmin_i.cpp
 

 SOURCE=.\CosEvent_Utilities.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -344,13 +3429,13 @@ SOURCE=.\CosEvent_Utilities.cpp
 

 SOURCE=.\CosEventChannelAdminC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -359,13 +3444,13 @@ SOURCE=.\CosEventChannelAdminC.cpp
 

 SOURCE=.\CosEventChannelAdminS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -374,13 +3459,13 @@ SOURCE=.\CosEventChannelAdminS.cpp
 

 SOURCE=.\CosEventCommC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -389,13 +3474,13 @@ SOURCE=.\CosEventCommC.cpp
 

 SOURCE=.\CosEventCommS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -404,13 +3489,267 @@ SOURCE=.\CosEventCommS.cpp
 

 SOURCE=.\CosLifeCycleC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSLI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSLI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -419,13 +3758,267 @@ SOURCE=.\CosLifeCycleC.cpp
 

 SOURCE=.\CosLifeCycleS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSLIF=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSLIF=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -434,13 +4027,260 @@ SOURCE=.\CosLifeCycleS.cpp
 

 SOURCE=.\CosNamingC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSNA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSNA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -449,13 +4289,260 @@ SOURCE=.\CosNamingC.cpp
 

 SOURCE=.\CosNamingS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSNAM=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSNAM=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -464,13 +4551,47 @@ SOURCE=.\CosNamingS.cpp
 

 SOURCE=.\Property\CosPropertyService_i.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSPR=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSPR=\

+	"..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -479,13 +4600,13 @@ SOURCE=.\Property\CosPropertyService_i.cpp
 

 SOURCE=.\CosPropertyServiceC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -494,13 +4615,13 @@ SOURCE=.\CosPropertyServiceC.cpp
 

 SOURCE=.\CosPropertyServiceS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -509,13 +4630,260 @@ SOURCE=.\CosPropertyServiceS.cpp
 

 SOURCE=.\CosTradingC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSTR=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTR=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -524,13 +4892,13 @@ SOURCE=.\CosTradingC.cpp
 

 SOURCE=.\CosTradingDynamicC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -539,13 +4907,13 @@ SOURCE=.\CosTradingDynamicC.cpp
 

 SOURCE=.\CosTradingDynamicS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -554,13 +4922,13 @@ SOURCE=.\CosTradingDynamicS.cpp
 

 SOURCE=.\CosTradingReposC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -569,13 +4937,13 @@ SOURCE=.\CosTradingReposC.cpp
 

 SOURCE=.\CosTradingReposS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -584,13 +4952,260 @@ SOURCE=.\CosTradingReposS.cpp
 

 SOURCE=.\CosTradingS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_COSTRA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTRA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -599,13 +5214,329 @@ SOURCE=.\CosTradingS.cpp
 

 SOURCE=.\Event\Dispatching_Modules.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_DISPA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_DISPA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -614,13 +5545,266 @@ SOURCE=.\Event\Dispatching_Modules.cpp
 

 SOURCE=.\Sched\DynSched.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_DYNSC=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_DYNSC=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -629,13 +5813,360 @@ SOURCE=.\Sched\DynSched.cpp
 

 SOURCE=.\Event\EC_Basic_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_BA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\RB_Tree.cpp"\

+	"..\..\..\ace\RB_Tree.h"\

+	"..\..\..\ace\RB_Tree.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Basic_Factory.h"\

+	".\Event\EC_Basic_Factory.i"\

+	".\Event\EC_Basic_Filter_Builder.h"\

+	".\Event\EC_Basic_Filter_Builder.i"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_Null_Scheduling.h"\

+	".\Event\EC_Null_Scheduling.i"\

+	".\Event\EC_ObserverStrategy.h"\

+	".\Event\EC_ObserverStrategy.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

+	".\Event\EC_ProxyPushSupplier_Set_T.h"\

+	".\Event\EC_ProxyPushSupplier_Set_T.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Reactive_Timeout_Generator.h"\

+	".\Event\EC_Reactive_Timeout_Generator.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\Event\EC_Trivial_Supplier_Filter.h"\

+	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_BA=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -644,13 +6175,100 @@ SOURCE=.\Event\EC_Basic_Factory.cpp
 

 SOURCE=.\Event\EC_Basic_Filter_Builder.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_BAS=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\EC_Basic_Filter_Builder.h"\

+	".\Event\EC_Basic_Filter_Builder.i"\

+	".\Event\EC_Conjunction_Filter.h"\

+	".\Event\EC_Conjunction_Filter.i"\

+	".\Event\EC_Disjunction_Filter.h"\

+	".\Event\EC_Disjunction_Filter.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Type_Filter.h"\

+	".\Event\EC_Type_Filter.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -659,13 +6277,43 @@ SOURCE=.\Event\EC_Basic_Filter_Builder.cpp
 

 SOURCE=.\Event\EC_Busy_Lock.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_BU=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -674,13 +6322,20 @@ SOURCE=.\Event\EC_Busy_Lock.cpp
 

 SOURCE=.\Event\EC_Conjunction_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_CO=\

+	".\Event\EC_Conjunction_Filter.h"\

+	".\Event\EC_Conjunction_Filter.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -689,13 +6344,326 @@ SOURCE=.\Event\EC_Conjunction_Filter.cpp
 

 SOURCE=.\Event\EC_ConsumerAdmin.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_CON=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_CON=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -704,13 +6672,371 @@ SOURCE=.\Event\EC_ConsumerAdmin.cpp
 

 SOURCE=.\Event\EC_Default_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_DE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Arg_Shifter.h"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\RB_Tree.cpp"\

+	"..\..\..\ace\RB_Tree.h"\

+	"..\..\..\ace\RB_Tree.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Basic_Filter_Builder.h"\

+	".\Event\EC_Basic_Filter_Builder.i"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Default_Factory.h"\

+	".\Event\EC_Default_Factory.i"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_Null_Scheduling.h"\

+	".\Event\EC_Null_Scheduling.i"\

+	".\Event\EC_ObserverStrategy.h"\

+	".\Event\EC_ObserverStrategy.i"\

+	".\Event\EC_Per_Supplier_Filter.h"\

+	".\Event\EC_Per_Supplier_Filter.i"\

+	".\Event\EC_Priority_Dispatching.h"\

+	".\Event\EC_Priority_Dispatching.i"\

+	".\Event\EC_Priority_Scheduling.h"\

+	".\Event\EC_Priority_Scheduling.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

+	".\Event\EC_ProxyPushSupplier_Set_T.h"\

+	".\Event\EC_ProxyPushSupplier_Set_T.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Reactive_Timeout_Generator.h"\

+	".\Event\EC_Reactive_Timeout_Generator.i"\

+	".\Event\EC_Sched_Filter_Builder.h"\

+	".\Event\EC_Sched_Filter_Builder.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\Event\EC_Trivial_Supplier_Filter.h"\

+	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_DE=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -719,13 +7045,20 @@ SOURCE=.\Event\EC_Default_Factory.cpp
 

 SOURCE=.\Event\EC_Disjunction_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_DI=\

+	".\Event\EC_Disjunction_Filter.h"\

+	".\Event\EC_Disjunction_Filter.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -734,13 +7067,22 @@ SOURCE=.\Event\EC_Disjunction_Filter.cpp
 

 SOURCE=.\Event\EC_Dispatching.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_DIS=\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -749,13 +7091,146 @@ SOURCE=.\Event\EC_Dispatching.cpp
 

 SOURCE=.\Event\EC_Dispatching_Task.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_DISP=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\EC_Dispatching_Task.h"\

+	".\Event\EC_Dispatching_Task.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -764,13 +7239,339 @@ SOURCE=.\Event\EC_Dispatching_Task.cpp
 

 SOURCE=.\Event\EC_Event_Channel.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_EV=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\RB_Tree.cpp"\

+	"..\..\..\ace\RB_Tree.h"\

+	"..\..\..\ace\RB_Tree.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Default_Factory.h"\

+	".\Event\EC_Default_Factory.i"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ObserverStrategy.h"\

+	".\Event\EC_ObserverStrategy.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_EV=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -779,13 +7580,308 @@ SOURCE=.\Event\EC_Event_Channel.cpp
 

 SOURCE=.\Event\EC_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_FA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_FA=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -794,13 +7890,18 @@ SOURCE=.\Event\EC_Factory.cpp
 

 SOURCE=.\Event\EC_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_FI=\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -809,13 +7910,20 @@ SOURCE=.\Event\EC_Filter.cpp
 

 SOURCE=.\Event\EC_Filter_Builder.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_FIL=\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -824,13 +7932,280 @@ SOURCE=.\Event\EC_Filter_Builder.cpp
 

 SOURCE=.\Event\EC_Gateway.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_GA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Channel_Clients_T.cpp"\

+	".\Channel_Clients_T.h"\

+	".\Channel_Clients_T.i"\

+	".\Event\EC_Gateway.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_GA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -839,13 +8214,293 @@ SOURCE=.\Event\EC_Gateway.cpp
 

 SOURCE=.\Event\EC_Gateway_UDP.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_GAT=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_CODgram.h"\

+	"..\..\..\ace\SOCK_CODgram.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\EC_Gateway_UDP.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_GAT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -854,13 +8509,13 @@ SOURCE=.\Event\EC_Gateway_UDP.cpp
 

 SOURCE=.\Event\EC_MT_Dispatching.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -869,13 +8524,358 @@ SOURCE=.\Event\EC_MT_Dispatching.cpp
 

 SOURCE=.\Event\EC_Null_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_NU=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\RB_Tree.cpp"\

+	"..\..\..\ace\RB_Tree.h"\

+	"..\..\..\ace\RB_Tree.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_Null_Factory.h"\

+	".\Event\EC_Null_Factory.i"\

+	".\Event\EC_Null_Scheduling.h"\

+	".\Event\EC_Null_Scheduling.i"\

+	".\Event\EC_ObserverStrategy.h"\

+	".\Event\EC_ObserverStrategy.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

+	".\Event\EC_ProxyPushSupplier_Set_T.h"\

+	".\Event\EC_ProxyPushSupplier_Set_T.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Reactive_Timeout_Generator.h"\

+	".\Event\EC_Reactive_Timeout_Generator.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\Event\EC_Trivial_Supplier_Filter.h"\

+	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_NU=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -884,13 +8884,22 @@ SOURCE=.\Event\EC_Null_Factory.cpp
 

 SOURCE=.\Event\EC_Null_Scheduling.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_NUL=\

+	".\Event\EC_Null_Scheduling.h"\

+	".\Event\EC_Null_Scheduling.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -899,13 +8908,339 @@ SOURCE=.\Event\EC_Null_Scheduling.cpp
 

 SOURCE=.\Event\EC_ObserverStrategy.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_OB=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\RB_Tree.cpp"\

+	"..\..\..\ace\RB_Tree.h"\

+	"..\..\..\ace\RB_Tree.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ObserverStrategy.h"\

+	".\Event\EC_ObserverStrategy.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_OB=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -914,13 +9249,337 @@ SOURCE=.\Event\EC_ObserverStrategy.cpp
 

 SOURCE=.\Event\EC_Per_Supplier_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_PE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Per_Supplier_Filter.h"\

+	".\Event\EC_Per_Supplier_Filter.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_PE=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -929,13 +9588,323 @@ SOURCE=.\Event\EC_Per_Supplier_Filter.cpp
 

 SOURCE=.\Event\EC_Priority_Dispatching.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_PR=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Dispatching_Task.h"\

+	".\Event\EC_Dispatching_Task.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Priority_Dispatching.h"\

+	".\Event\EC_Priority_Dispatching.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_PR=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -944,13 +9913,28 @@ SOURCE=.\Event\EC_Priority_Dispatching.cpp
 

 SOURCE=.\Event\EC_Priority_Scheduling.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_PRI=\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Priority_Scheduling.h"\

+	".\Event\EC_Priority_Scheduling.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -959,13 +9943,318 @@ SOURCE=.\Event\EC_Priority_Scheduling.cpp
 

 SOURCE=.\Event\EC_ProxyConsumer.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_PRO=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_PRO=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -974,13 +10263,318 @@ SOURCE=.\Event\EC_ProxyConsumer.cpp
 

 SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_PROX=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_PROX=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -989,13 +10583,320 @@ SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp
 

 SOURCE=.\Event\EC_ProxySupplier.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_PROXY=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Dispatching.h"\

+	".\Event\EC_Dispatching.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_PROXY=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1004,13 +10905,18 @@ SOURCE=.\Event\EC_ProxySupplier.cpp
 

 SOURCE=.\Event\EC_QOS_Info.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_QO=\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1019,13 +10925,316 @@ SOURCE=.\Event\EC_QOS_Info.cpp
 

 SOURCE=.\Event\EC_Reactive_Timeout_Generator.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_RE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Reactive_Timeout_Generator.h"\

+	".\Event\EC_Reactive_Timeout_Generator.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_RE=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1034,13 +11243,22 @@ SOURCE=.\Event\EC_Reactive_Timeout_Generator.cpp
 

 SOURCE=.\Event\EC_Sched_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_SC=\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Sched_Filter.h"\

+	".\Event\EC_Sched_Filter.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1049,13 +11267,331 @@ SOURCE=.\Event\EC_Sched_Filter.cpp
 

 SOURCE=.\Event\EC_Sched_Filter_Builder.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_SCH=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Conjunction_Filter.h"\

+	".\Event\EC_Conjunction_Filter.i"\

+	".\Event\EC_Disjunction_Filter.h"\

+	".\Event\EC_Disjunction_Filter.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Filter_Builder.h"\

+	".\Event\EC_Filter_Builder.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Sched_Filter.h"\

+	".\Event\EC_Sched_Filter.i"\

+	".\Event\EC_Sched_Filter_Builder.h"\

+	".\Event\EC_Sched_Filter_Builder.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Type_Filter.h"\

+	".\Event\EC_Type_Filter.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_SCH=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1064,13 +11600,20 @@ SOURCE=.\Event\EC_Sched_Filter_Builder.cpp
 

 SOURCE=.\Event\EC_Scheduling_Strategy.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+DEP_CPP_EC_SCHE=\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Scheduling_Strategy.h"\

+	".\Event\EC_Scheduling_Strategy.i"\

+	

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1079,13 +11622,18 @@ SOURCE=.\Event\EC_Scheduling_Strategy.cpp
 

 SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_SU=\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1094,13 +11642,318 @@ SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp
 

 SOURCE=.\Event\EC_SupplierAdmin.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_SUP=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxyConsumer.h"\

+	".\Event\EC_ProxyConsumer.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_SupplierAdmin.h"\

+	".\Event\EC_SupplierAdmin.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_SUP=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1109,13 +11962,18 @@ SOURCE=.\Event\EC_SupplierAdmin.cpp
 

 SOURCE=.\Event\EC_SupplierFiltering.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_SUPP=\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1124,13 +11982,323 @@ SOURCE=.\Event\EC_SupplierFiltering.cpp
 

 SOURCE=.\Event\EC_Timeout_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_TI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_TI=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1139,13 +12307,92 @@ SOURCE=.\Event\EC_Timeout_Filter.cpp
 

 SOURCE=.\Event\EC_Timeout_Generator.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_TIM=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Timeout_Filter.h"\

+	".\Event\EC_Timeout_Filter.i"\

+	".\Event\EC_Timeout_Generator.h"\

+	".\Event\EC_Timeout_Generator.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1154,13 +12401,332 @@ SOURCE=.\Event\EC_Timeout_Generator.cpp
 

 SOURCE=.\Event\EC_Trivial_Supplier_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_TR=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\EC_Busy_Lock.cpp"\

+	".\Event\EC_Busy_Lock.h"\

+	".\Event\EC_Busy_Lock.i"\

+	".\Event\EC_Command.cpp"\

+	".\Event\EC_Command.h"\

+	".\Event\EC_Command.i"\

+	".\Event\EC_ConsumerAdmin.h"\

+	".\Event\EC_ConsumerAdmin.i"\

+	".\Event\EC_Event_Channel.h"\

+	".\Event\EC_Event_Channel.i"\

+	".\Event\EC_Factory.h"\

+	".\Event\EC_Factory.i"\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_ProxyPushSupplier_Set.h"\

+	".\Event\EC_ProxyPushSupplier_Set.i"\

+	".\Event\EC_ProxySupplier.h"\

+	".\Event\EC_ProxySupplier.i"\

+	".\Event\EC_QOS_Info.h"\

+	".\Event\EC_QOS_Info.i"\

+	".\Event\EC_Supplier_Filter_Builder.h"\

+	".\Event\EC_Supplier_Filter_Builder.i"\

+	".\Event\EC_SupplierFiltering.h"\

+	".\Event\EC_SupplierFiltering.i"\

+	".\Event\EC_Trivial_Supplier_Filter.h"\

+	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_EC_TR=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1169,13 +12735,20 @@ SOURCE=.\Event\EC_Trivial_Supplier_Filter.cpp
 

 SOURCE=.\Event\EC_Type_Filter.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EC_TY=\

+	".\Event\EC_Filter.h"\

+	".\Event\EC_Filter.i"\

+	".\Event\EC_Type_Filter.h"\

+	".\Event\EC_Type_Filter.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1184,13 +12757,43 @@ SOURCE=.\Event\EC_Type_Filter.cpp
 

 SOURCE=.\Event\EC_UDP_Admin.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EC_UD=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\Event\EC_UDP_Admin.h"\

+	".\orbsvcs_export.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1199,13 +12802,159 @@ SOURCE=.\Event\EC_UDP_Admin.cpp
 

 SOURCE=.\AV\Endpoint_Strategy.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_ENDPO=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Process.h"\

+	"..\..\..\ace\Process.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	".\AV\AVStreams_i.h"\

+	".\AV\Endpoint_Strategy.h"\

+	".\AV\Endpoint_Strategy_T.cpp"\

+	".\AV\Endpoint_Strategy_T.h"\

+	".\orbsvcs_export.h"\

+	".\Trader\Trader.h"\

+	

+NODEP_CPP_ENDPO=\

+	"..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	".\AV\AVStreams_i_T.cpp"\

+	".\AV\AVStreams_i_T.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1214,13 +12963,256 @@ SOURCE=.\AV\Endpoint_Strategy.cpp
 

 SOURCE=.\Naming\Entries.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_ENTRI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Naming\Entries.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_ENTRI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1229,13 +13221,334 @@ SOURCE=.\Naming\Entries.cpp
 

 SOURCE=.\Event\Event_Channel.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EVENT=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Channel_Clients_T.cpp"\

+	".\Channel_Clients_T.h"\

+	".\Channel_Clients_T.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\EC_Gateway.h"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\Module_Factory.h"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EVENT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1244,13 +13557,18 @@ SOURCE=.\Event\Event_Channel.cpp
 

 SOURCE=.\Event\Event_Manip.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_EVENT_=\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1259,13 +13577,266 @@ SOURCE=.\Event\Event_Manip.cpp
 

 SOURCE=.\Event_Utilities.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EVENT_U=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EVENT_U=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1274,13 +13845,49 @@ SOURCE=.\Event_Utilities.cpp
 

 SOURCE=.\CosEvent\EventChannel_i.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_EVENTC=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\CosEvent\ConsumerAdmin_i.h"\

+	".\CosEvent\EventChannel_i.h"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\CosEvent\ProxyPushSupplier_i.h"\

+	".\CosEvent\SupplierAdmin_i.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1289,13 +13896,311 @@ SOURCE=.\CosEvent\EventChannel_i.cpp
 

 SOURCE=.\Naming\Hash_Naming_Context.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_HASH_=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Naming\Entries.h"\

+	".\Naming\Hash_Naming_Context.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1304,13 +14209,13 @@ SOURCE=.\Naming\Hash_Naming_Context.cpp
 

 SOURCE=.\ImplRepoC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1319,13 +14224,13 @@ SOURCE=.\ImplRepoC.cpp
 

 SOURCE=.\ImplRepoS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1334,73 +14239,1887 @@ SOURCE=.\ImplRepoS.cpp
 

 SOURCE=.\IOR_Multicast.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_IOR_M=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\IOR_Multicast.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_IOR_M=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\IR_Helper.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\LifeCycleServiceC.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LIFEC=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LIFEC=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\LifeCycleServiceC.h"\

+	".\LifeCycleServiceC.i"\

+	".\LifeCycleServiceS.h"\

+	".\LifeCycleServiceS.i"\

+	".\LifeCycleServiceS_T.cpp"\

+	".\LifeCycleServiceS_T.h"\

+	".\LifeCycleServiceS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycleServiceC.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\LifeCycleServiceS.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LIFECY=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LIFECY=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\LifeCycleServiceC.h"\

+	".\LifeCycleServiceC.i"\

+	".\LifeCycleServiceS.h"\

+	".\LifeCycleServiceS.i"\

+	".\LifeCycleServiceS_T.cpp"\

+	".\LifeCycleServiceS_T.h"\

+	".\LifeCycleServiceS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycleServiceS.cpp

+SOURCE=.\Event\Local_ESTypes.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LOCAL=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_LOCAL=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\Log\Logger_i.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LOGGE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Log\Logger_i.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGE=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\Local_ESTypes.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+SOURCE=.\LoggerC.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LOGGER=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGER=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+# End Source File

+# Begin Source File

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+SOURCE=.\LoggerS.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_LOGGERS=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_LOGGERS=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1409,13 +16128,325 @@ SOURCE=.\Event\Local_ESTypes.cpp
 

 SOURCE=.\Event\Memory_Pools.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_MEMOR=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_MEMOR=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1424,13 +16455,324 @@ SOURCE=.\Event\Memory_Pools.cpp
 

 SOURCE=.\Event\Module_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_MODUL=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Module_Factory.h"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_MODUL=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1439,13 +16781,17 @@ SOURCE=.\Event\Module_Factory.cpp
 

 SOURCE=.\Naming\Naming_Context.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+DEP_CPP_NAMIN=\

+	".\Naming\Naming_Context.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1454,13 +16800,269 @@ SOURCE=.\Naming\Naming_Context.cpp
 

 SOURCE=.\Naming\Naming_Utils.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_NAMING=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Arg_Shifter.h"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\IOR_Multicast.h"\

+	".\Naming\Entries.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_NAMING=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\Naming\CosNaming_i.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1469,13 +17071,13 @@ SOURCE=.\Naming\Naming_Utils.cpp
 

 SOURCE=.\Null_MediaCtrlC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1484,13 +17086,13 @@ SOURCE=.\Null_MediaCtrlC.cpp
 

 SOURCE=.\Null_MediaCtrlS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1499,13 +17101,263 @@ SOURCE=.\Null_MediaCtrlS.cpp
 

 SOURCE=.\Trader\Offer_Iterators.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_OFFER=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_OFFER=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1514,13 +17366,309 @@ SOURCE=.\Trader\Offer_Iterators.cpp
 

 SOURCE=.\Naming\Persistent_Context_Index.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_PERSI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Naming\Persistent_Context_Index.h"\

+	".\Naming\Persistent_Entries.h"\

+	".\Naming\Shared_Hash_Map_T.cpp"\

+	".\Naming\Shared_Hash_Map_T.h"\

+	

+NODEP_CPP_PERSI=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1529,13 +17677,308 @@ SOURCE=.\Naming\Persistent_Context_Index.cpp
 

 SOURCE=.\Naming\Persistent_Entries.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_PERSIS=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Naming\Persistent_Entries.h"\

+	".\Naming\Shared_Hash_Map_T.cpp"\

+	".\Naming\Shared_Hash_Map_T.h"\

+	

+NODEP_CPP_PERSIS=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1544,88 +17987,802 @@ SOURCE=.\Naming\Persistent_Entries.cpp
 

 SOURCE=.\Naming\Persistent_Naming_Context.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_PERSIST=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Naming\Persistent_Context_Index.h"\

+	".\Naming\Persistent_Entries.h"\

+	".\Naming\Persistent_Naming_Context.h"\

+	".\Naming\Shared_Hash_Map_T.cpp"\

+	".\Naming\Shared_Hash_Map_T.h"\

+	

+NODEP_CPP_PERSIST=\

+	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	".\Naming\Persistent_Bindings_Map.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

+SOURCE=.\PingC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

+SOURCE=.\PingS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\ReactorTask.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_PROXY=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Sched_Utils.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_PROXYP=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\CosEvent\ProxyPushSupplier_i.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Scheduler.cpp

-

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+SOURCE=.\Event\ReactorTask.cpp

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_REACT=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_REACT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1634,13 +18791,330 @@ SOURCE=.\Sched\Reconfig_Scheduler.cpp
 

 SOURCE=.\Event\RT_Task.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RT_TA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Debug_Macros.h"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_RT_TA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1649,13 +19123,281 @@ SOURCE=.\Event\RT_Task.cpp
 

 SOURCE=.\RtecEventChannelAdminC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECE=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1664,13 +19406,281 @@ SOURCE=.\RtecEventChannelAdminC.cpp
 

 SOURCE=.\RtecEventChannelAdminS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECEV=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEV=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1679,13 +19689,267 @@ SOURCE=.\RtecEventChannelAdminS.cpp
 

 SOURCE=.\RtecEventCommC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECEVE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEVE=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1694,13 +19958,267 @@ SOURCE=.\RtecEventCommC.cpp
 

 SOURCE=.\RtecEventCommS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECEVEN=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECEVEN=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1709,13 +20227,267 @@ SOURCE=.\RtecEventCommS.cpp
 

 SOURCE=.\RtecSchedulerC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECS=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECS=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1724,13 +20496,267 @@ SOURCE=.\RtecSchedulerC.cpp
 

 SOURCE=.\RtecSchedulerS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RTECSC=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_RTECSC=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1739,13 +20765,13 @@ SOURCE=.\RtecSchedulerS.cpp
 

 SOURCE=.\RtecUDPAdminC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1754,13 +20780,13 @@ SOURCE=.\RtecUDPAdminC.cpp
 

 SOURCE=.\RtecUDPAdminS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1769,13 +20795,275 @@ SOURCE=.\RtecUDPAdminS.cpp
 

 SOURCE=.\Runtime_Scheduler.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_RUNTI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_RUNTI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1784,13 +21072,262 @@ SOURCE=.\Runtime_Scheduler.cpp
 

 SOURCE=.\Sched\SchedEntry.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SCHED=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHED=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1799,13 +21336,264 @@ SOURCE=.\Sched\SchedEntry.cpp
 

 SOURCE=.\Sched\Scheduler.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SCHEDU=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHEDU=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1814,13 +21602,273 @@ SOURCE=.\Sched\Scheduler.cpp
 

 SOURCE=.\Scheduler_Factory.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SCHEDUL=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	

+NODEP_CPP_SCHEDUL=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1829,13 +21877,266 @@ SOURCE=.\Scheduler_Factory.cpp
 

 SOURCE=.\Sched\Scheduler_Generic.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SCHEDULE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Sched\Scheduler_Generic.h"\

+	".\Sched\Scheduler_Generic.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_SCHEDULE=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1844,13 +22145,259 @@ SOURCE=.\Sched\Scheduler_Generic.cpp
 

 SOURCE=.\Scheduler_Utilities.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SCHEDULER=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Utilities.h"\

+	".\Scheduler_Utilities.i"\

+	

+NODEP_CPP_SCHEDULER=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1859,13 +22406,262 @@ SOURCE=.\Scheduler_Utilities.cpp
 

 SOURCE=.\Trader\Service_Type_Repository.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SERVI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Service_Type_Repository.h"\

+	".\Trader\Trader.h"\

+	

+NODEP_CPP_SERVI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1874,13 +22670,87 @@ SOURCE=.\Trader\Service_Type_Repository.cpp
 

 SOURCE=.\AV\sfp.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SFP_C=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\ARGV.h"\

+	"..\..\..\ace\ARGV.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\AV\sfp.h"\

+	".\orbsvcs_export.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1889,13 +22759,13 @@ SOURCE=.\AV\sfp.cpp
 

 SOURCE=.\sfpC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1904,13 +22774,13 @@ SOURCE=.\sfpC.cpp
 

 SOURCE=.\sfpS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1919,13 +22789,268 @@ SOURCE=.\sfpS.cpp
 

 SOURCE=.\Sched\Strategy_Scheduler.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_STRAT=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Sched\Strategy_Scheduler.h"\

+	".\Sched\Strategy_Scheduler.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_STRAT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1934,13 +23059,46 @@ SOURCE=.\Sched\Strategy_Scheduler.cpp
 

 SOURCE=.\CosEvent\SupplierAdmin_i.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_SUPPL=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\CosEvent\SupplierAdmin_i.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1949,13 +23107,318 @@ SOURCE=.\CosEvent\SupplierAdmin_i.cpp
 

 SOURCE=.\Time\TAO_Time_Service_Clerk.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TAO_T=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\IOR_Multicast.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	".\Time\TAO_Time_Service_Clerk.h"\

+	".\Time\TAO_TIO.h"\

+	".\Time\TAO_UTO.h"\

+	".\Time\Timer_Helper.h"\

+	

+NODEP_CPP_TAO_T=\

+	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1964,13 +23427,147 @@ SOURCE=.\Time\TAO_Time_Service_Clerk.cpp
 

 SOURCE=.\Time\TAO_Time_Service_Server.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TAO_TI=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	".\Time\TAO_Time_Service_Server.h"\

+	".\Time\TAO_TIO.h"\

+	".\Time\TAO_UTO.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1979,13 +23576,146 @@ SOURCE=.\Time\TAO_Time_Service_Server.cpp
 

 SOURCE=.\Time\TAO_TIO.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TAO_TIO=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	".\Time\TAO_TIO.h"\

+	".\Time\TAO_UTO.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -1994,13 +23724,146 @@ SOURCE=.\Time\TAO_TIO.cpp
 

 SOURCE=.\Time\TAO_UTO.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TAO_U=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	".\Time\TAO_TIO.h"\

+	".\Time\TAO_UTO.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2009,13 +23872,257 @@ SOURCE=.\Time\TAO_UTO.cpp
 

 SOURCE=.\Time_Utilities.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TIME_=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_TIME_=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2024,13 +24131,260 @@ SOURCE=.\Time_Utilities.cpp
 

 SOURCE=.\TimeBaseC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TIMEB=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMEB=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2039,13 +24393,260 @@ SOURCE=.\TimeBaseC.cpp
 

 SOURCE=.\TimeBaseS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TIMEBA=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_TIMEBA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\TimeBaseC.h"\

+	".\TimeBaseC.i"\

+	".\TimeBaseS.h"\

+	".\TimeBaseS.i"\

+	".\TimeBaseS_T.cpp"\

+	".\TimeBaseS_T.h"\

+	".\TimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2054,13 +24655,315 @@ SOURCE=.\TimeBaseS.cpp
 

 SOURCE=.\Time\Timer_Helper.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TIMER=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\IOR_Multicast.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	".\Time\TAO_Time_Service_Clerk.h"\

+	".\Time\Timer_Helper.h"\

+	

+NODEP_CPP_TIMER=\

+	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2069,13 +24972,346 @@ SOURCE=.\Time\Timer_Helper.cpp
 

 SOURCE=.\Event\Timer_Module.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TIMER_=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Active_Map_Manager.h"\

+	"..\..\..\ace\Active_Map_Manager.i"\

+	"..\..\..\ace\Active_Map_Manager_T.cpp"\

+	"..\..\..\ace\Active_Map_Manager_T.h"\

+	"..\..\..\ace\Active_Map_Manager_T.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map.h"\

+	"..\..\..\ace\Map.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Map_T.cpp"\

+	"..\..\..\ace\Map_T.h"\

+	"..\..\..\ace\Map_T.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Pair.h"\

+	"..\..\..\ace\Pair.i"\

+	"..\..\..\ace\Pair_T.cpp"\

+	"..\..\..\ace\Pair_T.h"\

+	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\Context.h"\

+	"..\..\tao\Context.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\corbafwd.i"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DomainC.h"\

+	"..\..\tao\DomainC.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\Key_Adapters.h"\

+	"..\..\tao\Key_Adapters.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\MProfile.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_Adapter.h"\

+	"..\..\tao\Object_Adapter.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\ObjectIDList.h"\

+	"..\..\tao\ObjectIDList.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\Pluggable.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\POAManager.h"\

+	"..\..\tao\POAManager.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\Policy_Manager.h"\

+	"..\..\tao\Policy_Manager.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\PollableC.h"\

+	"..\..\tao\PollableC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\Resource_Factory.h"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\Services.h"\

+	"..\..\tao\Services.i"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\ValueBase.h"\

+	"..\..\tao\ValueBase.i"\

+	"..\..\tao\ValueFactory.h"\

+	"..\..\tao\ValueFactory.i"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	"..\..\tao\WrongTransactionC.h"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_TIMER_=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	".\Event\ace\ReactorEx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2084,13 +25320,13 @@ SOURCE=.\Event\Timer_Module.cpp
 

 SOURCE=.\TimeServiceC.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2099,13 +25335,13 @@ SOURCE=.\TimeServiceC.cpp
 

 SOURCE=.\TimeServiceS.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2114,13 +25350,276 @@ SOURCE=.\TimeServiceS.cpp
 

 SOURCE=.\Trader\Trader.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TRADE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Arg_Shifter.h"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Offer_Database.cpp"\

+	".\Trader\Offer_Database.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Offer_Iterators_T.cpp"\

+	".\Trader\Offer_Iterators_T.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Interfaces.cpp"\

+	".\Trader\Trader_Interfaces.h"\

+	".\Trader\Trader_T.cpp"\

+	".\Trader\Trader_T.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_TRADE=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2129,13 +25628,262 @@ SOURCE=.\Trader\Trader.cpp
 

 SOURCE=.\Trader\Trader_Utils.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+DEP_CPP_TRADER=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc.h"\

+	"..\..\..\ace\Malloc.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\ace\Malloc_T.h"\

+	"..\..\..\ace\Malloc_T.i"\

+	"..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\ace\Managed_Object.h"\

+	"..\..\..\ace\Managed_Object.i"\

+	"..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\ace\Map_Manager.h"\

+	"..\..\..\ace\Map_Manager.i"\

+	"..\..\..\ace\Mem_Map.h"\

+	"..\..\..\ace\Mem_Map.i"\

+	"..\..\..\ace\Memory_Pool.h"\

+	"..\..\..\ace\Memory_Pool.i"\

+	"..\..\..\ace\Message_Block.h"\

+	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

+	"..\..\..\ace\Object_Manager.h"\

+	"..\..\..\ace\Object_Manager.i"\

+	"..\..\..\ace\OS.h"\

+	"..\..\..\ace\OS.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_IO.h"\

+	"..\..\..\ace\SOCK_IO.i"\

+	"..\..\..\ace\SOCK_Stream.h"\

+	"..\..\..\ace\SOCK_Stream.i"\

+	"..\..\..\ace\SString.h"\

+	"..\..\..\ace\SString.i"\

+	"..\..\..\ace\Strategies.h"\

+	"..\..\..\ace\Strategies.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\ace\Svc_Handler.i"\

+	"..\..\..\ace\Synch.h"\

+	"..\..\..\ace\Synch.i"\

+	"..\..\..\ace\Synch_Options.h"\

+	"..\..\..\ace\Synch_Options.i"\

+	"..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\ace\Synch_T.h"\

+	"..\..\..\ace\Synch_T.i"\

+	"..\..\..\ace\Task.h"\

+	"..\..\..\ace\Task.i"\

+	"..\..\..\ace\Task_T.cpp"\

+	"..\..\..\ace\Task_T.h"\

+	"..\..\..\ace\Task_T.i"\

+	"..\..\..\ace\Thread.h"\

+	"..\..\..\ace\Thread.i"\

+	"..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\CDR_Interpreter.h"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+NODEP_CPP_TRADER=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Object_Table.h"\

+	"..\..\tao\ORB_Strategies_T.cpp"\

+	"..\..\tao\ORB_Strategies_T.h"\

+	"..\..\tao\ORB_Strategies_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2144,13 +25892,13 @@ SOURCE=.\Trader\Trader_Utils.cpp
 

 SOURCE=.\Naming\Transient_Naming_Context.cpp

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -2189,6 +25937,18 @@ SOURCE=.\Naming\Bindings_Iterator_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Concurrency\CC_LockSet.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\CC_LockSetFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\Concurrency_Utils.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sched\Config_Scheduler.h

 # End Source File

 # Begin Source File

@@ -2209,6 +25969,14 @@ SOURCE=.\Trader\Constraint_Visitors.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\CosConcurrencyControlC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControlS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosEvent_Utilities.h

 # End Source File

 # Begin Source File

@@ -2481,10 +26249,6 @@ SOURCE=.\IOR_Multicast.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IR_Helper.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\LifeCycleServiceC.h

 # End Source File

 # Begin Source File

@@ -2501,6 +26265,14 @@ SOURCE=.\Trader\Locking.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\LoggerC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\LoggerS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Event\Memory_Pools.h

 # End Source File

 # Begin Source File

@@ -2553,15 +26325,19 @@ SOURCE=.\Naming\Persistent_Naming_Context.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\ReactorTask.h

+SOURCE=.\PingC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Sched_Utils.h

+SOURCE=.\PingS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Scheduler.h

+SOURCE=.\PingS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Event\ReactorTask.h

 # End Source File

 # Begin Source File

 

@@ -2633,6 +26409,10 @@ SOURCE=.\sfpS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Shared_Hash_Map_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sched\Strategy_Scheduler.h

 # End Source File

 # Begin Source File

@@ -2709,6 +26489,14 @@ SOURCE=.\Naming\Transient_Naming_Context.h
 # PROP Default_Filter ".i"

 # Begin Source File

 

+SOURCE=.\CosConcurrencyControlC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControlS.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosLifeCycleC.i

 # End Source File

 # Begin Source File

@@ -2991,16 +26779,17 @@ SOURCE=.\TimeServiceS_T.i
 

 SOURCE=.\AVStreams.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__AVSTRE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\AVStreams.idl

 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3030,16 +26819,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\tao_idl.exe"	

+USERDEP__AVSTRE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\AVStreams.idl

 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3069,16 +26859,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__AVSTRE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\AVStreams.idl

 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3108,16 +26899,184 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\tao_idl.exe"	

+USERDEP__AVSTRE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\AVStreams.idl

 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControl.idl

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCONC="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCONC="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCONC="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCONC="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3154,7 +27113,7 @@ BuildCmds= \
 

 SOURCE=.\CosEventChannelAdmin.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEV="..\..\..\bin\Release\tao_idl.exe"	

@@ -3163,7 +27122,8 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3193,7 +27153,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEV="..\..\..\bin\tao_idl.exe"	

@@ -3202,7 +27162,8 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3232,7 +27193,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEV="..\..\..\bin\Release\tao_idl.exe"	

@@ -3241,7 +27202,8 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3271,7 +27233,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEV="..\..\..\bin\tao_idl.exe"	

@@ -3280,7 +27242,8 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3317,7 +27280,7 @@ BuildCmds= \
 

 SOURCE=.\CosEventComm.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEVE="..\..\..\bin\Release\tao_idl.exe"	

@@ -3326,7 +27289,8 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3356,7 +27320,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEVE="..\..\..\bin\tao_idl.exe"	

@@ -3365,7 +27329,8 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3395,7 +27360,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEVE="..\..\..\bin\Release\tao_idl.exe"	

@@ -3404,7 +27369,8 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3434,7 +27400,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSEVE="..\..\..\bin\tao_idl.exe"	

@@ -3443,7 +27409,8 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3480,16 +27447,17 @@ BuildCmds= \
 

 SOURCE=.\CosLifeCycle.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSLIFE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3519,16 +27487,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSLIFE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3558,16 +27527,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSLIFE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3597,16 +27567,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSLIFE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3643,16 +27614,17 @@ BuildCmds= \
 

 SOURCE=.\CosNaming.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSNAMI="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3682,16 +27654,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSNAMI="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3721,16 +27694,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSNAMI="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3760,16 +27734,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSNAMI="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3806,16 +27781,17 @@ BuildCmds= \
 

 SOURCE=.\CosPropertyService.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSPRO="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3845,16 +27821,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSPRO="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3884,16 +27861,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSPRO="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3923,16 +27901,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSPRO="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3969,16 +27948,17 @@ BuildCmds= \
 

 SOURCE=.\CosTrading.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4008,16 +27988,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4047,16 +28028,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4086,16 +28068,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4132,16 +28115,17 @@ BuildCmds= \
 

 SOURCE=.\CosTradingDynamic.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRA="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRADI="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingDynamic.idl

 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4171,16 +28155,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRA="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRADI="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosTradingDynamic.idl

 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4210,16 +28195,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRA="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRADI="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingDynamic.idl

 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4249,16 +28235,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRA="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRADI="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingDynamic.idl

 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4295,16 +28282,17 @@ BuildCmds= \
 

 SOURCE=.\CosTradingRepos.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRADIN="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingRepos.idl

 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4334,16 +28322,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRADIN="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\CosTradingRepos.idl

 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4373,16 +28362,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRADIN="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingRepos.idl

 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4412,16 +28402,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRADIN="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosTradingRepos.idl

 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4458,7 +28449,7 @@ BuildCmds= \
 

 SOURCE=.\ImplRepo.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__IMPLR="..\..\..\bin\Release\tao_idl.exe"	

@@ -4467,7 +28458,8 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4497,7 +28489,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__IMPLR="..\..\..\bin\tao_idl.exe"	

@@ -4506,7 +28498,8 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4536,7 +28529,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__IMPLR="..\..\..\bin\Release\tao_idl.exe"	

@@ -4545,7 +28538,8 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4575,7 +28569,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__IMPLR="..\..\..\bin\tao_idl.exe"	

@@ -4584,7 +28578,8 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4621,16 +28616,17 @@ BuildCmds= \
 

 SOURCE=.\LifeCycleService.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__LIFECYC="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4660,16 +28656,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\tao_idl.exe"	

+USERDEP__LIFECYC="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4699,16 +28696,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__LIFECYC="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4738,16 +28736,184 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\tao_idl.exe"	

+USERDEP__LIFECYC="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Logger.idl

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__LOGGER_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Logger.idl

+InputName=Logger

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__LOGGER_="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+InputPath=.\Logger.idl

+InputName=Logger

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__LOGGER_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Logger.idl

+InputName=Logger

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__LOGGER_="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Logger.idl

+InputName=Logger

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4784,7 +28950,7 @@ BuildCmds= \
 

 SOURCE=.\Null_MediaCtrl.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__NULL_="..\..\..\bin\Release\tao_idl.exe"	

@@ -4793,7 +28959,8 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4823,7 +28990,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__NULL_="..\..\..\bin\tao_idl.exe"	

@@ -4832,7 +28999,8 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4862,7 +29030,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__NULL_="..\..\..\bin\Release\tao_idl.exe"	

@@ -4871,7 +29039,8 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4901,7 +29070,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__NULL_="..\..\..\bin\tao_idl.exe"	

@@ -4910,7 +29079,175 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Ping.idl

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__PING_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Ping.idl

+InputName=Ping

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__PING_="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+InputPath=.\Ping.idl

+InputName=Ping

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__PING_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Ping.idl

+InputName=Ping

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__PING_="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Ping.idl

+InputName=Ping

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4947,16 +29284,17 @@ BuildCmds= \
 

 SOURCE=.\RtecEventChannelAdmin.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECEVENT="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -4986,16 +29324,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECEVENT="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5025,16 +29364,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECEVENT="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5064,16 +29404,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECEVENT="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5110,16 +29451,17 @@ BuildCmds= \
 

 SOURCE=.\RtecEventComm.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECEVENTC="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5149,16 +29491,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECEVENTC="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5188,16 +29531,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECEVENTC="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5227,16 +29571,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECEVENTC="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5273,16 +29618,17 @@ BuildCmds= \
 

 SOURCE=.\RtecScheduler.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECSCH="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5312,16 +29658,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECSCH="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5351,16 +29698,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECSCH="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5390,16 +29738,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECSCH="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5436,7 +29785,7 @@ BuildCmds= \
 

 SOURCE=.\RtecUDPAdmin.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECU="..\..\..\bin\Release\tao_idl.exe"	

@@ -5445,7 +29794,8 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5475,7 +29825,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECU="..\..\..\bin\tao_idl.exe"	

@@ -5484,7 +29834,8 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5514,7 +29865,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECU="..\..\..\bin\Release\tao_idl.exe"	

@@ -5523,7 +29874,8 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5553,7 +29905,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECU="..\..\..\bin\tao_idl.exe"	

@@ -5562,7 +29914,8 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5599,7 +29952,7 @@ BuildCmds= \
 

 SOURCE=.\sfp.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__SFP_I="..\..\..\bin\Release\tao_idl.exe"	

@@ -5608,7 +29961,8 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5638,7 +29992,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__SFP_I="..\..\..\bin\tao_idl.exe"	

@@ -5647,7 +30001,8 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5677,7 +30032,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__SFP_I="..\..\..\bin\Release\tao_idl.exe"	

@@ -5686,7 +30041,8 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5716,7 +30072,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__SFP_I="..\..\..\bin\tao_idl.exe"	

@@ -5725,7 +30081,8 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5762,16 +30119,17 @@ BuildCmds= \
 

 SOURCE=.\TimeBase.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TIMEBAS="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeBase.idl

 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5801,16 +30159,19 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__TIMEBAS="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler on TimeBase.idl

 InputPath=.\TimeBase.idl

 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1                  -I../../ \

+                     -Wb,export_macro=TAO_ORBSVCS_Export \

+                                                                -Wb,export_include=orbsvcs_export.h                  $(InputName).idl \

+                   -I..\..\ 

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5840,16 +30201,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TIMEBAS="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeBase.idl

 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5879,16 +30241,17 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\tao_idl.exe"	

+USERDEP__TIMEBAS="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeBase.idl

 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5925,7 +30288,7 @@ BuildCmds= \
 

 SOURCE=.\TimeService.idl

 

-!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TIMES="..\..\..\bin\Release\tao_idl.exe"	

@@ -5934,7 +30297,8 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -I../../   -Wb,export_macro=TAO_ORBSVCS_Export            -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+         -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -5964,7 +30328,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TIMES="..\..\..\bin\tao_idl.exe"	

@@ -5973,7 +30337,8 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6003,7 +30368,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TIMES="..\..\..\bin\Release\tao_idl.exe"	

@@ -6012,7 +30377,8 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -i../../   -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6042,7 +30408,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TIMES="..\..\..\bin\tao_idl.exe"	

@@ -6051,7 +30417,8 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export                                                   -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -6116,7 +30483,26 @@ SOURCE=.\CosTradingReposS_T.cpp
 # Begin Source File

 

 SOURCE=.\CosTradingS_T.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -6131,11 +30517,54 @@ SOURCE=.\ImplRepoS_T.cpp
 # Begin Source File

 

 SOURCE=.\Trader\Offer_Database.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Offer_Iterators_T.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Naming\Shared_Hash_Map_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

@@ -6146,12 +30575,50 @@ SOURCE=.\TimeServiceS_T.cpp
 # Begin Source File

 

 SOURCE=.\Trader\Trader_Interfaces.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trader\Trader_T.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 9877b4b4abf..d9762df67dc 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -17,16 +17,16 @@ CFG=ORB Services Static - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ORB Services Static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "ORB Services Static - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "ORB Services Static - Win32 Release" (based on\

+ "Win32 (x86) Static Library")

+!MESSAGE "ORB Services Static - Win32 Debug" (based on\

+ "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

@@ -40,11 +40,12 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -64,10 +65,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /YX /FD /c

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /YX /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -102,6 +104,18 @@ SOURCE=.\Event\BCU.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Concurrency\CC_LockSet.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\CC_LockSetFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\Concurrency_Utils.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sched\Config_Scheduler.cpp

 # End Source File

 # Begin Source File

@@ -130,6 +144,14 @@ SOURCE=.\CosEvent\ConsumerAdmin_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\CosConcurrencyControlC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControlS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosEvent_Utilities.cpp

 # End Source File

 # Begin Source File

@@ -486,14 +508,6 @@ SOURCE=.\Event\ReactorTask.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Sched_Utils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Reconfig_Scheduler.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\RT_Task.cpp

 # End Source File

 # Begin Source File

@@ -646,6 +660,18 @@ SOURCE=.\Naming\Bindings_Iterator_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Concurrency\CC_LockSet.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\CC_LockSetFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\Concurrency_Utils.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sched\Config_Scheduler.h

 # End Source File

 # Begin Source File

@@ -666,6 +692,14 @@ SOURCE=.\Trader\Constraint_Visitors.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\CosConcurrencyControlC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControlS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosEvent_Utilities.h

 # End Source File

 # Begin Source File

@@ -1034,14 +1068,6 @@ SOURCE=.\Event\ReactorTask.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\Reconfig_Sched_Utils.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Reconfig_Scheduler.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\RT_Task.h

 # End Source File

 # Begin Source File

@@ -1098,6 +1124,10 @@ SOURCE=.\Trader\Service_Type_Repository.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Shared_Hash_Map_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sched\Strategy_Scheduler.h

 # End Source File

 # Begin Source File

@@ -1170,6 +1200,14 @@ SOURCE=.\Naming\Transient_Naming_Context.h
 # PROP Default_Filter "i"

 # Begin Source File

 

+SOURCE=.\CosConcurrencyControlC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControlS.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\CosLifeCycleC.i

 # End Source File

 # Begin Source File

@@ -1357,7 +1395,9 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1396,7 +1436,96 @@ InputPath=.\AVStreams.idl
 InputName=AVStreams

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\CosConcurrencyControl.idl

+

+!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCO="..\..\..\bin\Release\tao_idl_static -Ge 1 .exe"	

+# Begin Custom Build - Invoking TAO_IDL

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__COSCO="..\..\..\bin\tao_idl_static -Ge 1 .exe"	

+# Begin Custom Build - Invoking TAO_IDL

+InputPath=.\CosConcurrencyControl.idl

+InputName=CosConcurrencyControl

+

+BuildCmds= \

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1442,7 +1571,9 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1481,7 +1612,8 @@ InputPath=.\CosEventChannelAdmin.idl
 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1527,7 +1659,9 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1566,7 +1700,8 @@ InputPath=.\CosEventComm.idl
 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1612,7 +1747,9 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1651,7 +1788,8 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1697,7 +1835,9 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1736,7 +1876,8 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1782,7 +1923,9 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1821,7 +1964,8 @@ InputPath=.\CosPropertyService.idl
 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1867,7 +2011,9 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1906,7 +2052,8 @@ InputPath=.\CosTrading.idl
 InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1952,7 +2099,9 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1991,7 +2140,8 @@ InputPath=.\CosTradingDynamic.idl
 InputName=CosTradingDynamic

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2037,7 +2187,9 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2076,7 +2228,8 @@ InputPath=.\CosTradingRepos.idl
 InputName=CosTradingRepos

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2122,7 +2275,9 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2161,7 +2316,8 @@ InputPath=.\ImplRepo.idl
 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2207,7 +2363,9 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2246,7 +2404,8 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2292,7 +2451,9 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2331,7 +2492,8 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2377,7 +2539,9 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2416,7 +2580,8 @@ InputPath=.\Null_MediaCtrl.idl
 InputName=Null_MediaCtrl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2462,7 +2627,9 @@ InputPath=.\Ping.idl
 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2501,7 +2668,8 @@ InputPath=.\Ping.idl
 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2547,7 +2715,9 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2586,7 +2756,8 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2632,7 +2803,9 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2671,7 +2844,8 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2717,7 +2891,9 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2756,7 +2932,8 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2802,7 +2979,9 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2841,7 +3020,8 @@ InputPath=.\RtecUDPAdmin.idl
 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2887,7 +3067,9 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2926,7 +3108,8 @@ InputPath=.\sfp.idl
 InputName=sfp

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2972,7 +3155,9 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3011,7 +3196,8 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3057,7 +3243,9 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../         -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h         $(InputName).idl

+	..\..\..\bin\Release\tao_idl_static -Ge 1  -I../../\

+        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+        $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3096,7 +3284,8 @@ InputPath=.\TimeService.idl
 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl_static -Ge 1  -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3174,6 +3363,11 @@ SOURCE=.\PingS_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Shared_Hash_Map_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\TimeServiceS_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile b/TAO/orbsvcs/tests/AVStreams/Makefile
index 50a029af0e2..b6329eed1a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile
@@ -9,7 +9,9 @@
 #----------------------------------------------------------------------------
 
 DIRS  =	benchmark \
-	sfp
+	mpeg \
+	server_discovery \
+	sfp \
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index b871a5f98e0..be9fdc648e5 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -1,15 +1,15 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Top-level Makefile for Benchmarking of AVStreams of TAO.
+#	Top-level Makefile for Benchmarking of AVStreams of TAO.
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     = -lorbsvcs -lTAO
+LIBS     += -lorbsvcs -lTAO
 
 SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
@@ -23,19 +23,19 @@ endif
 
 FILES = client server child child_process
 DEFS    = $(addsuffix .h,$(FILES))
-LSRC    = $(addsuffix .cpp,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
 
 BIN2 = server client child_process
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # AV
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -48,8 +48,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
-            -I$(TAO_ROOT) $(TSS_ORB_FLAG)
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 
 server:$(addprefix $(VDIR),$(SERVER_OBJS))
@@ -61,9 +60,6 @@ client:$(addprefix $(VDIR),$(CLIENT_OBJS))
 child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -130,73 +126,6 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -204,6 +133,13 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -234,15 +170,25 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -268,8 +214,20 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map.i \
@@ -291,54 +249,93 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -353,17 +350,9 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
  $(ACE_ROOT)/ace/ATM_Addr.h \
  $(ACE_ROOT)/ace/ATM_Addr.i \
@@ -419,13 +408,6 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -622,27 +604,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -664,8 +633,23 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map.i \
@@ -687,54 +671,38 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -816,15 +784,11 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- client.h \
- $(ACE_ROOT)/ace/ARGV.h \
+ client.h $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
- child.h \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
+ child.h $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 .obj/child.o .obj/child.so .shobj/child.o .shobj/child.so: child.cpp child.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -1012,27 +976,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1054,8 +1005,23 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map.i \
@@ -1077,54 +1043,38 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -1206,10 +1156,7 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- client.h \
- $(ACE_ROOT)/ace/ARGV.h \
+ client.h $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i
@@ -1399,27 +1346,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1441,8 +1375,23 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map.i \
@@ -1464,54 +1413,38 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
@@ -1593,10 +1526,7 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- client.h \
- $(ACE_ROOT)/ace/ARGV.h \
+ client.h $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
index df6d86c031d..924c1046a04 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
@@ -24,29 +24,29 @@ Bench_Server_StreamEndPoint::handle_close (void)
 }
 
 int
-Bench_Server_StreamEndPoint::handle_stop (const AVStreams::flowSpec &/* the_spec */,
-                                          CORBA::Environment &/* env */) 
+Bench_Server_StreamEndPoint::handle_stop (const AVStreams::flowSpec &the_spec,
+                                          CORBA::Environment &env) 
 {
   return 0;
 }
   
 int
-Bench_Server_StreamEndPoint::handle_start (const AVStreams::flowSpec &/* the_spec */,  
-                                           CORBA::Environment &/* env */) 
+Bench_Server_StreamEndPoint::handle_start (const AVStreams::flowSpec &the_spec,  
+                                           CORBA::Environment &env) 
 {
  return 0;
 }
   
 int
-Bench_Server_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &/* the_spec */,  
-                                             CORBA::Environment &/* env */) 
+Bench_Server_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &the_spec,  
+                                             CORBA::Environment &env) 
 {
   return 0;
 }
 
 CORBA::Boolean 
 Bench_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &the_spec,  
-                                                          CORBA::Environment &/* env */) 
+                                                          CORBA::Environment &env) 
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Bench_Server_StreamEndPoint::handle_connection_requested:() length =%d\n",
               the_spec.length ()));
@@ -117,7 +117,7 @@ ttcp_Stream_Handler::get_handle (void) const
 // Called by the Reactor when data is ready to be read from the
 // video control handle, which indicates a control message from the client.
 int
-ttcp_Stream_Handler::handle_input (ACE_HANDLE /* handle */)
+ttcp_Stream_Handler::handle_input (ACE_HANDLE handle)
 {
   //  ACE_DEBUG ((LM_DEBUG,"(%P|%t) Bench_Server_StreamEndPoint::handle_input ()\n"));
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
index 457b56fefa7..2bfd8c9d7b8 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -38,7 +38,7 @@ Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec)
 // server streamendpoints' flowspec which we use to connect our
 // datagram socket.
 CORBA::Boolean
-Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& /* server_spec */)
+Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& server_spec)
 {
   //  return 1;
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) handle_postconnect called \n"));
@@ -46,24 +46,24 @@ Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& /* server_spec *
 }
 
 int
-Client_StreamEndPoint::handle_start (const AVStreams::flowSpec &/* the_spec */,
-                                     CORBA::Environment &/* env */) 
+Client_StreamEndPoint::handle_start (const AVStreams::flowSpec &the_spec,
+                                           CORBA::Environment &env) 
 
 {
   return -1;
 }
 
 int
-Client_StreamEndPoint::handle_stop (const AVStreams::flowSpec &/* the_spec */,
-                                    CORBA::Environment &/* env */) 
+Client_StreamEndPoint::handle_stop (const AVStreams::flowSpec &the_spec,
+                                          CORBA::Environment &env) 
 
 {
   return -1;
 }
 
 int
-Client_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &/* the_spec */,
-                                       CORBA::Environment &/* env */) 
+Client_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &the_spec,
+                                             CORBA::Environment &env) 
 
 {
   return -1;
@@ -126,7 +126,7 @@ ttcp_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec)
 }
 
 CORBA::Boolean
-ttcp_Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& /* server_spec */)
+ttcp_Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& server_spec)
 {
   ACE_DEBUG ((LM_DEBUG,"ttcp_Client_StreamEndPoint::handle_postconnect \n"));
   this->client_->set_stream (this->peer ());
@@ -159,7 +159,7 @@ Client::set_stream (ACE_SOCK_Stream & control)
 
 Globals::Globals (void)
   :ready_cond_ (ready_mtx_),
-   hostname_ (0),
+   hostname_ (""),
    port_ (0)
 {
 }
@@ -174,7 +174,6 @@ Globals::parse_args (int argc,
   this->strategy_ = TTCP_REACTIVE;
   this->block_size_ = 1;
   this->number_ = 10;
-  this->hostname_ = ACE_OS::strdup ("");
   while ((c = opts ()) != -1)
     switch (c)
       {
@@ -218,14 +217,12 @@ Client::svc (void)
 
   if (GLOBALS::instance ()->parse_args (this->argc_,this->argv_) == -1)
     return -1;
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_manager_.init (this->argc_,
                                this->argv_,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->task_id_ == 0)
         {
@@ -262,8 +259,8 @@ Client::svc (void)
 
       // activate the client MMDevice with the ORB
       this->orb_manager_.activate (this->client_mmdevice_,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->bind_to_server () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, 
@@ -276,20 +273,20 @@ Client::svc (void)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) All threads finished, starting tests.\n"));
 
       ACE_Time_Value tv (0);
-      this->orb_manager_.run (ACE_TRY_ENV,&tv);
-      ACE_TRY_CHECK;
+      this->orb_manager_.run (TAO_TRY_ENV,&tv);
+      TAO_CHECK_ENV;
       AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
       AVStreams::flowSpec_var the_flows (new AVStreams::flowSpec);
       // Bind the client and server mmdevices.
 
       timer.start ();
       this->streamctrl_.bind_devs
-        (this->client_mmdevice_->_this (),
+        (this->client_mmdevice_->_this (TAO_TRY_ENV),
          this->server_mmdevice_.in (),
          the_qos.inout (),
          the_flows.in (),
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       timer.stop ();
       timer.elapsed_time (tv1);
@@ -347,13 +344,12 @@ Client::svc (void)
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) Thruput for block size is:%d\t%f Mb/s \n",
                   buffer_siz,total_data/(total_time*1024.0*1024.0)));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"streamctrl.bind_devs:");
+      TAO_TRY_ENV.print_exception ("streamctrl.bind_devs:");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
   
   return 0;
 }
@@ -361,8 +357,7 @@ Client::svc (void)
 int
 Client::bind_to_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       /*
 	CORBA::Object_var naming_obj =
@@ -373,8 +368,8 @@ Client::bind_to_server (void)
 	-1);
 	CosNaming::NamingContext_var naming_context =
 	CosNaming::NamingContext::_narrow (naming_obj.in (),
-	ACE_TRY_ENV);
-	ACE_TRY_CHECK;
+	TAO_TRY_ENV);
+	TAO_CHECK_ENV;
       */
 
       // Initialize the naming services
@@ -390,26 +385,25 @@ Client::bind_to_server (void)
       server_mmdevice_name [0].id = CORBA::string_dup ("Bench_Server_MMDevice");
       CORBA::Object_var server_mmdevice_obj =
         my_name_client_->resolve (server_mmdevice_name,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->server_mmdevice_ =
         AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve Server_Mmdevice in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Command_Handler::resolve_reference\n");
+      TAO_TRY_ENV.print_exception ("Command_Handler::resolve_reference");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) MMDevice successfully resolved.\n"));
   return 0;
@@ -423,25 +417,23 @@ Client::establish_stream (void)
   AVStreams::flowSpec_var the_flows (new AVStreams::flowSpec);
   // Bind the client and server mmdevices.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->streamctrl_.bind_devs
-        (this->client_mmdevice_->_this (),
+        (this->client_mmdevice_->_this (TAO_TRY_ENV),
          this->server_mmdevice_.in (),
          the_qos.inout (),
          the_flows.in (),
-         ACE_TRY_ENV);
+         TAO_TRY_ENV);
       
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "streamctrl.bind_devs:");
+      TAO_TRY_ENV.print_exception ("streamctrl.bind_devs:");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index 13aee01facd..8e45e308169 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -5,76 +5,53 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
+$tao_root = $ENV{TAO_ROOT};
+# This is a Perl script that runs the Naming Service, client and servers
+
 unshift @INC, '../../../../../bin';
 require Process;
-require ACEutils;
+require Uniqueid;
 
 # amount of delay between running the servers
 
 $sleeptime = 6;
-$status = 0;
-local $nsior = "ns.ior";
 
 # variables for parameters
 
+$nsport = 20000 + uniqueid ();
 sub name_server
 {
-    my $args = "-o $nsior";
-    my $prog = "..".$DIR_SEPARATOR
-      ."..".$DIR_SEPARATOR
-	."..".$DIR_SEPARATOR
-	  ."Naming_Service".$DIR_SEPARATOR
-	."Naming_Service ".$EXE_EXT;
-    print ("\nNaming_Service $args\n");
+    my $args = "-ORBnameserviceport $nsport";
+    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service "
+	.$EXE_EXT;
+    print ("\nNaming_Service: $prog$EXE_EXT $args\n");
     $NS = Process::Create ($prog, $args);
-    if (ACE::waitforfile_timed ($nsior, 5) == -1) {
-      print STDERR "ERROR: cannot find naming service IOR file\n";
-      $NS->Kill (); $NS->TimedWait (1);
-      exit 1;
-    }
 }
 
 
 sub server
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nServer: $args\n");
-    $SV = Process::Create (".".$DIR_SEPARATOR."server".$EXE_EXT, $args);
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nServer: server$EXE_EXT $args\n");
+    $SV = Process::Create ('.' . $DIR_SEPARATOR . "server " .$EXE_EXT . $args);
 }
 
 
 sub client
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nclient: $args\n");
-    $CL = Process::Create (".".$DIR_SEPARATOR."client".$EXE_EXT, $args);
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nclient: client $args\n");
+    $CL = Process::Create ('.' . $DIR_SEPARATOR . "client " .$EXE_EXT . $args);
 }
 
 name_server ();
+sleep $sleeptime;
 
 server ();
-
 sleep $sleeptime;
 
 client ();
+$CL->Wait ();
 
-if ($CL->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-  
-$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate naming service\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-  
-exit $status;
+$NS->Kill (); $NS->Wait ();
+$SV->Kill (); $SV->Wait ();
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
index 57193844f71..73222c61835 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -126,82 +126,81 @@ Server::Server (void)
 int
 Server::init (int argc,
               char *argv[],
-              CORBA::Environment& ACE_TRY_ENV)
+              CORBA::Environment& env)
 {
-  ACE_TRY
+  // Initialize the orb_manager
+  this->orb_manager_.init_child_poa (argc,
+                                     argv,
+                                     "child_poa",
+                                     env);
+  TAO_CHECK_ENV_RETURN (env,
+                        -1);
+
+  CORBA::ORB_var orb =
+    this->orb_manager_.orb ();
+
+  PortableServer::POA_var child_poa =
+    this->orb_manager_.child_poa ();
+
+
+  int result = this->parse_args (argc,argv);
+  if (result == -1)
+    ACE_ERROR_RETURN  ((LM_ERROR,"parse args failed\n"),-1);
+  // Initialize the naming services
+
+  if (my_name_client_.init (orb.in ()) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
+
+  // Register the video mmdevice object with the ORB
+  switch (this->strategy_)
     {
-      // Initialize the orb_manager
-      this->orb_manager_.init_child_poa (argc,
-                                         argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::ORB_var orb =
-        this->orb_manager_.orb ();
-
-      PortableServer::POA_var child_poa =
-        this->orb_manager_.child_poa ();
-
-
-      int result = this->parse_args (argc,argv);
-      if (result == -1)
-        ACE_ERROR_RETURN  ((LM_ERROR,"parse args failed\n"),-1);
-      // Initialize the naming services
-
-      if (my_name_client_.init (orb.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
-
-      // Register the video mmdevice object with the ORB
-      switch (this->strategy_)
-        {
-        case REACTIVE_STRATEGY:
-          ACE_NEW_RETURN (this->mmdevice_,
-                          TAO_MMDevice (&this->reactive_strategy_),
-                          -1);
-          break;
-        case PROCESS_STRATEGY:
-          ACE_NEW_RETURN (this->mmdevice_,
-                          TAO_MMDevice (&this->process_strategy_),
-                          -1);
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,"Invalid strategy\n"),-1);
-        }
+    case REACTIVE_STRATEGY:
+      ACE_NEW_RETURN (this->mmdevice_,
+                      TAO_MMDevice (&this->reactive_strategy_),
+                      -1);
+      break;
+    case PROCESS_STRATEGY:
+      ACE_NEW_RETURN (this->mmdevice_,
+                      TAO_MMDevice (&this->process_strategy_),
+                      -1);
+      break;
+    default:
+      ACE_ERROR_RETURN ((LM_ERROR,"Invalid strategy\n"),-1);
+    }
 
-      // create the video server mmdevice with the naming service pointer.
-      this->orb_manager_.activate_under_child_poa ("Bench_Server_MMDevice",
-                                                   this->mmdevice_,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // create the video server mmdevice with the naming service pointer.
+  this->orb_manager_.activate_under_child_poa ("Bench_Server_MMDevice",
+                                               this->mmdevice_,
+                                               env);
+  TAO_CHECK_ENV_RETURN (env,-1);
 
   // Register the mmdevice with the naming service.
-      CosNaming::Name server_mmdevice_name (1);
-      server_mmdevice_name.length (1);
-      server_mmdevice_name [0].id = CORBA::string_dup ("Bench_Server_MMDevice");
+  CosNaming::Name server_mmdevice_name (1);
+  server_mmdevice_name.length (1);
+  server_mmdevice_name [0].id = CORBA::string_dup ("Bench_Server_MMDevice");
 
-      // Register the video control object with the naming server.
-      this->my_name_client_->rebind (server_mmdevice_name,
-                                     this->mmdevice_->_this (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      //   result = this->signal_handler_.register_handler ();
-
-      //   if (result < 0)
-      //     ACE_ERROR_RETURN ((LM_ERROR,
-      //                        "(%P|%t) Error registering signal handler"),
-      //                       -1);
-    }
-  ACE_CATCHANY
+  // Register the video control object with the naming server.
+  this->my_name_client_->bind (server_mmdevice_name,
+                               this->mmdevice_->_this (env),
+                               env);
+
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server::init");
-      return -1;
+      env.clear ();
+      this->my_name_client_->rebind (server_mmdevice_name,
+                              this->mmdevice_->_this (env),
+                              env);
+      TAO_CHECK_ENV_RETURN (env,-1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+//   result = this->signal_handler_.register_handler ();
+
+//   if (result < 0)
+//     ACE_ERROR_RETURN ((LM_ERROR,
+//                        "(%P|%t) Error registering signal handler"),
+//                       -1);
   return 0;
 }
 
@@ -213,7 +212,7 @@ Server::parse_args (int argc,char **argv)
   char child_name [BUFSIZ], buf[BUFSIZ];
   ACE_OS::strcpy (child_name,"child_process");
   this->strategy_ = REACTIVE_STRATEGY;
-  int c;
+  char c;
   while ((c = opts ()) != -1)
     {
       switch (c)
@@ -230,6 +229,7 @@ Server::parse_args (int argc,char **argv)
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,"Usage: server [-p/-r]"),-1);
+          break;
         }
     }
   ACE_OS::sprintf (buf,"%s -ORBobjrefstyle url",child_name);
@@ -239,13 +239,12 @@ Server::parse_args (int argc,char **argv)
 
 // Runs the server
 int
-Server::run (CORBA::Environment& ACE_TRY_ENV)
+Server::run (CORBA::Environment& env)
 {
   // Run the ORB event loop
   while (1)
     {
-      this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
+      this->orb_manager_.run (env);
       if (errno== EINTR)
         continue;
       else
@@ -275,23 +274,21 @@ int
 main (int argc, char **argv)
 {
   Server server;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      server.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      server.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Bench_Server::Exception \n");
+      TAO_TRY_ENV.print_exception ("Bench_Server::Exception");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
index 180eaab23bd..5f0ea44102a 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
@@ -1,6 +1,8 @@
-# $Id$
+# $Id: svc.conf,v 1.
+6 1999/06/08 20:46:51 schmidt Exp $
 #
 
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection"
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
index ee685a87c00..f7a4dea4ec8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
@@ -23,7 +23,7 @@ BIN2 = vcr
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # AV
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
index 28fef79f620..4fadaab1df6 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
@@ -57,7 +57,7 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
index 153119a8e25..8c14d8a0851 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
@@ -36,7 +36,7 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
index 6a1edd68a98..76c34372e40 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
@@ -27,7 +27,7 @@ CPPFLAGS += -I$(MPEG_ROOT)
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
index 2fecb4b7d35..f756a1d14fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
@@ -39,7 +39,7 @@ LIBS 	+= -lTAO -lACE
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
index 2e259de641a..caa8796b159 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
@@ -39,7 +39,7 @@ BIN2 = augmented_server server vs as
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # AV
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index 8d36d536681..c25b22626e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -45,7 +45,7 @@ include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BUILD := TAO_VR.module $(BUILD)
   BIN = $(BIN2)
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
index 95c2c3a0b97..9f72c4e7fc4 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
@@ -9,13 +9,7 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
-            -I$(TAO_ROOT)
-LDLIBS    =  -lorbsvcs -lTAO 
+LDLIBS    =  -lorbsvcs -lTAO -lACE
 
 PROG_SRCS =  client.cpp server.cpp
 
@@ -24,11 +18,13 @@ LSRC = $(PROG_SRCS)
 AVStreams_SERVER_OBJS = server.o
 AVStreams_CLIENT_OBJS = client.o
 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
 BIN2 = client server
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # AV
@@ -39,16 +35,27 @@ endif # AV
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.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
 
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
+
 server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
+	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS)
 
 client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
+	$(LINK.cc) $(LDFLAGS) -o $@@ $^ $(VLDLIBS)
+
+#main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))
+#	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS)
 
 # realclean: clean
 #	-$(RM)
@@ -60,551 +67,6 @@ client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp common.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp common.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/TAO.h
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp b/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
index aed0cf49330..d0aeb51d306 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
@@ -2,10 +2,8 @@
 
 #include "common.h"
 #include "ace/Event_Handler.h"
-#include "ace/Get_Opt.h"
 
-static char *data;
-static char *addr;
+char *data = "Hello how are you";
 int fragment = 0;
 
 class frame_handler: public ACE_Event_Handler
@@ -20,14 +18,14 @@ class frame_handler: public ACE_Event_Handler
     {
       reactor->schedule_timer (this,
                                0,
-                               10);
+                               20);
     }
 
   // Called when timer expires.  
-  int handle_timeout (const ACE_Time_Value &/* tv */,
-                      const void */* arg */)
+  int handle_timeout (const ACE_Time_Value &tv,
+                      const void *arg = 0)
     {
-      //       ACE_DEBUG ((LM_DEBUG,"frame_handler:handle_timeout\n"));
+       ACE_DEBUG ((LM_DEBUG,"frame_handler:handle_timeout\n"));
        if (fragment)
          {
            size_t mb_len = SFP_MAX_PACKET_SIZE*2;
@@ -67,41 +65,16 @@ private:
 };
 
 int
-parse_args (int argc,char **argv)
-{
-  ACE_Get_Opt opts (argc,argv,"fa:");
-  int c;
-  while ((c = opts ()) != -1)
-    {	
-      switch (c)
-        {
-        case 'f':
-          fragment = 1;
-          break;
-        case 'a':
-          addr = ACE_OS::strdup (opts.optarg);
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,"Usage:client [-f] [-a addr]"),-1); 
-        }	
-    }
-  return 0;	
-}
-
-
-int
 main (int argc, char **argv)
 {
-  server_addr = ACE_OS::strdup ("localhost:10000");
-  addr = server_addr;
-  data = ACE_OS::strdup ("Hello how are you");
   TAO_ORB_Manager orb_manager;
   
   orb_manager.init (argc,argv);
 
-  int result = parse_args (argc,argv);    
-  if (result < 0)
-    return 1;
+  if (argc > 1)
+    if (ACE_OS::strcmp (argv[1],"-f") == 0)
+      fragment = 1;
+    
   ACE_Time_Value timeout1 (5),timeout2 (50);
 
   TAO_SFP sfp (orb_manager.orb (),
@@ -110,7 +83,9 @@ main (int argc, char **argv)
            timeout2,
            0);
 
-  result = sfp.start_stream (addr);
+  int result;
+
+  result = sfp.start_stream (server_addr);
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,"sfp start failed\n"),1);
 
@@ -119,9 +94,9 @@ main (int argc, char **argv)
                          TAO_ORB_Core_instance ()->reactor ());
 
   result = orb_manager.run ();
-//   if (result == 0)
-//     ACE_DEBUG ((LM_DEBUG,"ORB run timed out\n"));
-//   else if (result == -1)
-//     ACE_DEBUG ((LM_DEBUG,"ORB run error\n"));
+  if (result == 0)
+    ACE_DEBUG ((LM_DEBUG,"ORB run timed out\n"));
+  else if (result == -1)
+    ACE_DEBUG ((LM_DEBUG,"ORB run error\n"));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/common.h b/TAO/orbsvcs/tests/AVStreams/sfp/common.h
index c4d4dd097c7..dbbdc597fb6 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/common.h
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/common.h
@@ -7,6 +7,6 @@
 #include "orbsvcs/AV/sfp.h"
 #include "tao/TAO.h"
 
-static char *server_addr;
+const char *server_addr = "calypso.cs.wustl.edu:10000";
 
 #endif /* _COMMON_H_ */
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/run_test.pl b/TAO/orbsvcs/tests/AVStreams/sfp/run_test.pl
deleted file mode 100755
index d5e93e70196..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/run_test.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-$tao_root = $ENV{TAO_ROOT};
-# This is a Perl script that runs the Naming Service, client and servers
-
-unshift @INC, '../../../../../bin';
-require Process;
-require Uniqueid;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-
-# variables for parameters
-
-sub run_test
-{
-    my $args = "";
-    print ("\nServer: server$Process::EXE_EXT $args\n");
-    $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", $args);
-
-    my $args = "";
-    print ("\nclient: client $args\n");
-    $CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT", $args);
-    
-    $client = $CL->TimedWait (60);
-    if ($client == -1) {
-        print STDERR "ERROR: client timedout\n";
-        $CL->Kill (); $CL->TimedWait (1);
-    }
-
-    $server = $SV->TimedWait (2);
-    if ($server == -1) {
-        print STDERR "ERROR: server timedout\n";
-        $SV->Kill (); $SV->TimedWait (1);
-    }
-    
-}
-
-run_test;
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp b/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
index 4694b430a43..d0053a0e8fc 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
@@ -49,7 +49,6 @@ class mySFP_Callback: public SFP_Callback
 int
 main (int argc, char **argv)
 {
-  server_addr = ACE_OS::strdup ("localhost:10000");
   TAO_ORB_Manager orb_manager;
   
   orb_manager.init (argc,argv);
@@ -70,9 +69,9 @@ main (int argc, char **argv)
     return 1;
   
   result = orb_manager.run ();
-//   if (result == 0)
-//     ACE_DEBUG ((LM_DEBUG,"ORB run timed out\n"));
-//   else if (result == -1)
-//     ACE_DEBUG ((LM_DEBUG,"ORB run error\n"));
+  if (result == 0)
+    ACE_DEBUG ((LM_DEBUG,"ORB run timed out\n"));
+  else if (result == -1)
+    ACE_DEBUG ((LM_DEBUG,"ORB run error\n"));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 52340cd37ce..92d6cc7ce50 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -14,7 +14,7 @@
 //      This file contains the main function for the test.
 //
 // = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
+//	Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -354,19 +354,18 @@ CC_Client::print_usage (void)
 int
 CC_Client::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       ACE_NEW_RETURN (naming_service_,
-                      CC_naming_service (this->orb_, ACE_TRY_ENV),
+                      CC_naming_service (this->orb_, TAO_TRY_ENV),
                       -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -377,15 +376,14 @@ CC_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -408,15 +406,15 @@ CC_Client::init (int argc, char **argv)
 
           CORBA::Object_var factory_object =
             this->orb_->string_to_object (this->cc_factory_key_,
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
 #if 0
           // The test cannot currently run without the naming service.
           this->factory_ =
             CosConcurrencyControl::LockSetFactory::_narrow
-            (factory_object.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            (factory_object.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (CORBA::is_nil (this->factory_.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -430,12 +428,12 @@ CC_Client::init (int argc, char **argv)
                   "Factory received OK\n"));
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CC_Client::init");
+      TAO_TRY_ENV.print_exception ("CC_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
index 152f6fe028d..40b8420b51c 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
@@ -39,7 +39,6 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

@@ -50,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "CC_client - Win32 Debug"

 

diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 3741b090b76..78ce7402c2a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -11,7 +11,7 @@
 //      This is the command classes for the test of the concurrency service.
 //
 // = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
+//	Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -40,22 +40,21 @@ CC_Command::CC_Command(void)
 }
 
 CosConcurrencyControl::LockSet_var
-CC_Command::GetLockSet (char *lock_set_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+CC_Command::GetLockSet(char *lock_set_name, CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       if(ACE_OS::strcmp(lock_set_name, "")!=0)
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name (ACE_const_cast (char *, ""), lock_set_name,
-                                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                              TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CosConcurrencyControl::LockSet_var ccls =
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                     ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           return ccls;
         }
@@ -64,17 +63,19 @@ CC_Command::GetLockSet (char *lock_set_name,
           // No lock set name was given. Use the global lock set.
           if(cc_lockset_.in()==0)
             {
-              ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
+              TAO_TRY_ENV.clear();
+              TAO_TRY_ENV.exception (new CORBA::UNKNOWN ());
             }
           else
             return cc_lockset_;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN(0);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
+  // We should never get here
   return 0;
 }
 
@@ -158,16 +159,15 @@ int CC_CreateLockSet_Cmd::execute(void)
 
   printf("Executing create command (lock set: %s)\n", name_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosConcurrencyControl::LockSet_ptr lock_set =
         CC_TestUtils::create_lock_set();
       if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name
         {
           CC_naming_service::Instance()->bind_name(name_,
-                                                   lock_set, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                   lock_set, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       else
         {
@@ -175,12 +175,12 @@ int CC_CreateLockSet_Cmd::execute(void)
           cc_lockset_ = lock_set;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_CreateLockSet_Cmd::execute(void)");
+      TAO_TRY_ENV.print_exception("CC_CreateLockSet_Cmd::execute(void)");
+      excep_ = TAO_TRY_ENV.exception();
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -210,22 +210,21 @@ int CC_Lock_Cmd::execute(void)
   printf("Executing lock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ccls->lock (mode_,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Lock_Cmd::execute(void)");
-      return 0;
+      TAO_TRY_ENV.print_exception ("CC_Lock_Cmd::execute(void)");
+      excep_ = TAO_TRY_ENV.exception();
+      //      return 0; // should be CC_FAIL
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -254,24 +253,23 @@ int CC_UnLock_Cmd::execute(void)
   printf("Executing unlock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ccls->unlock (mode_,
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_UnLock_Cmd::execute(void)");
-      return 0;
+      TAO_TRY_ENV.print_exception ("CC_UnLock_Cmd::execute(void)");
+      excep_ = TAO_TRY_ENV.exception();
+      //      return 0; // should be CC_FAIL
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -302,15 +300,14 @@ int CC_TryLock_Cmd::execute(void)
 
   CORBA::Boolean lock_not_held;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       lock_not_held = ccls->try_lock (mode_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (lock_not_held)
         {
@@ -323,13 +320,13 @@ int CC_TryLock_Cmd::execute(void)
                     "%s lock held\n",
                     CC_TestUtils::get_lock_mode_name (mode_)));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_TryLock_Cmd::execute(void)");
-      return 0;
+      TAO_TRY_ENV.print_exception ("CC_TryLock_Cmd::execute(void)");
+      excep_ = TAO_TRY_ENV.exception();
+      //      return 0; // Should be CC_FAIL
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -363,29 +360,30 @@ int CC_ChangeMode_Cmd::execute(void)
          name_, CC_TestUtils::get_lock_mode_name(held_mode_),
          CC_TestUtils::get_lock_mode_name(new_mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ccls->change_mode (held_mode_, new_mode_,
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_ChangeMode_Cmd::execute(void)");
+      TAO_TRY_ENV.print_exception ("CC_ChangeMode_Cmd::execute(void)");
+      excep_ = TAO_TRY_ENV.exception();
+      //      return 0; // CC_FAIL
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
 CC_Sleep_Cmd::CC_Sleep_Cmd(int seconds)
   : time_ (seconds)
 {
+  //  printf("CC_Sleep_Cmd::CC_Sleep_Cmd: time: %i\n", seconds);
 }
 
 CC_Sleep_Cmd::~CC_Sleep_Cmd()
@@ -411,6 +409,7 @@ int CC_Sleep_Cmd::execute(void)
 CC_Repeat_Cmd::CC_Repeat_Cmd(int times)
   : times_ (times)
 {
+  //  printf("CC_Repeat_Cmd::CC_Repeat_Cmd: times: %i\n", times);
 }
 
 CC_Repeat_Cmd::~CC_Repeat_Cmd()
@@ -435,6 +434,7 @@ int CC_Repeat_Cmd::execute(void)
 CC_Wait_Cmd::CC_Wait_Cmd(char *prompt)
   : prompt_ (prompt)
 {
+  //  printf("CC_Wait_Cmd::CC_Wait_Cmd: prompt: %s\n", prompt);
 }
 
 CC_Wait_Cmd::~CC_Wait_Cmd()
@@ -561,29 +561,29 @@ CC_Lookup_Cmd::execute(void)
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name (ACE_const_cast (char *, ""), name_,
-                                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                              TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CosConcurrencyControl::LockSet_var ccls =
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                     ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           cc_lockset_ = ccls;
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "CC_UnLock_Cmd::execute(void)");
+          TAO_TRY_ENV.print_exception ("CC_UnLock_Cmd::execute(void)");
+          excep_ = TAO_TRY_ENV.exception();
+          //      return 0; // CC_FAIL
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
   return 1; // CC_SUCCESS
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 066c1049268..31fe4279211 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -21,15 +21,12 @@
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
-CC_naming_service::CC_naming_service (CORBA::ORB_var orb,
-                                      CORBA::Environment &ACE_TRY_ENV)
-  : cc_factory_key_ (0),
-    orb_ (0),
-    factory_ (0)
+  CC_naming_service::CC_naming_service (CORBA::ORB_var orb, CORBA::Environment &TAO_IN_ENV)
+    : cc_factory_key_ (0),
+      orb_ (0),
+      factory_ (0)
 {
-  this->Init(orb, ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->Init(orb, TAO_IN_ENV);
   instance_ = this;
 }
 
@@ -41,14 +38,13 @@ CC_naming_service::CC_naming_service(void)
 }
 
 void
-CC_naming_service::Init(CORBA::ORB_var orb,
-                        CORBA::Environment &ACE_TRY_ENV)
+CC_naming_service::Init(CORBA::ORB_var orb, CORBA::Environment &TAO_IN_ENV)
 {
   this->orb_ = orb;
 
   int success = init_naming_service ();
-  if (success < 0)
-    ACE_THROW (CORBA::INTERNAL ());
+  if(success<0)
+    TAO_THROW (CORBA::INTERNAL ());
 }
 
 CC_naming_service::~CC_naming_service (void)
@@ -70,20 +66,20 @@ CC_naming_service::Instance(void)
 
 CORBA::Object_var
 CC_naming_service::get_obj_from_name (char *c_name, char *name,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name));
   CORBA::Object_var obj;
 
-  ACE_TRY
+  TAO_TRY
     {
       if (ACE_OS::strlen (c_name) == 0)
         {
           CosNaming::Name ns_name (1);
           ns_name.length (1);
           ns_name[0].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          obj = my_name_client_->resolve (ns_name, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       else
         {
@@ -91,47 +87,45 @@ CC_naming_service::get_obj_from_name (char *c_name, char *name,
           ns_name.length (2);
           ns_name[0].id = CORBA::string_dup (c_name);
           ns_name[1].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          obj = my_name_client_->resolve (ns_name, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       if (CORBA::is_nil (obj.in ()) )
-        ACE_DEBUG((LM_DEBUG,
-                   "OBJ was nill (aieee)\n"));
+	ACE_DEBUG((LM_DEBUG,
+		   "OBJ was nill (aieee)\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::get_obj_from_name (...)");
-      return obj;
+      TAO_TRY_ENV.print_exception ("CC_Client::get_obj_from_name (...)");
+      return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return obj;
 }
 
 void
 CC_naming_service::bind_name (char *n,
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV)
+			      CORBA::Object_ptr obj,
+			      CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name ns_name (1);
       ns_name.length (1);
       ns_name[0].id = CORBA::string_dup (n);
       my_name_client_->bind (ns_name,
-                             obj,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+			     obj,
+			     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::bind_name (...)");
+      TAO_TRY_ENV.print_exception ("CC_Client::bind_name (...)");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 CosConcurrencyControl::LockSetFactory_var
@@ -143,38 +137,36 @@ CC_naming_service::get_lock_set_factory (void)
 int
 CC_naming_service::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize the naming services
       if (my_name_client_.init (orb_.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   " (%P|%t) Unable to initialize "
+			   "the TAO_Naming_Client. \n"),
+			  -1);
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
                                                          "LockSetFactory",
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->factory_ =
         CosConcurrencyControl::LockSetFactory::_narrow
-        (factory_obj.in (),ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        (factory_obj.in (),TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->factory_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve lock set factory in Naming service\n"),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::init_naming_service");
+      TAO_TRY_ENV.print_exception ("CC_Client::init_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 5d9174c5da8..024655175f3 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -13,7 +13,7 @@
 //      concurrency service test.
 //
 // = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
+//	Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -63,8 +63,7 @@ CC_TestUtils::create_lock_set (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ACE_TRY_ENV.print_exception ("CC_Client::create_lock_set");
       return 0;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 46fb2157294..46939a5fc8c 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -51,8 +51,7 @@ CC_Test::create_lock_set (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ACE_TRY_ENV.print_exception ("CC_Client::create_lock_set");
       return 0;
     }
   ACE_ENDTRY;
@@ -152,8 +151,7 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Single_Lock_With_Mode::run");
+      ACE_TRY_ENV.print_exception ("Test_Single_Lock_With_Mode::run");
       return CC_FAIL;
     }
   ACE_ENDTRY;
@@ -200,8 +198,7 @@ Test_Setup_LockSet::run (int /* times_to_run */)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ACE_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
   ACE_ENDTRY;
@@ -247,8 +244,7 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ACE_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
   ACE_ENDTRY;
@@ -291,8 +287,7 @@ Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unlock_Already_Created_LockSet::run");
+      ACE_TRY_ENV.print_exception ("Test_Unlock_Already_Created_LockSet::run");
       return CC_FAIL;
     }
   ACE_ENDTRY;
@@ -372,8 +367,7 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Release_Not_Held_Lock::run");
+      ACE_TRY_ENV.print_exception ("Test_Release_Not_Held_Lock::run");
       return CC_FAIL;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index f091c372ba2..5d8b7cc925a 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -33,7 +33,7 @@ BIN2 = CC_client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Concurrency
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index 40bf99cc392..da01784bb1a 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -17,7 +17,7 @@ BIN2 = CosEC_Basic
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # CosEvent
@@ -155,25 +155,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -221,9 +212,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -520,25 +515,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -586,9 +572,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -792,25 +782,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -858,9 +839,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
index bb104bf6422..bda8218b3a6 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
@@ -97,7 +97,7 @@ CosECConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CosECConsumer::push (const CORBA::Any &,
+CosECConsumer::push (const CORBA::Any &data,
                      CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index 24fb6ed7521..92525ef2d77 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -35,7 +35,7 @@ BIN2 = supplier \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # CosEvent
@@ -182,25 +182,16 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -248,9 +239,13 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -466,25 +461,16 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -532,9 +518,13 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -761,25 +751,16 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -827,9 +808,13 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
index 78ee631e29b..6876233521a 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
@@ -11,7 +11,6 @@ require ACEutils;
 
 #event count
 $ev_count = 2;
-$status = 0;
 
 # setup CosEC params such that..
 # cos event service name = "cosec1"
@@ -28,110 +27,70 @@ $CosEC2_params = "-n cosec2 -e 20 -o 5 -p \"6 21\"";
 sub cosec_multiple_test1
 {
     # first start the Naming service..
-    $SV1 = Process::Create ("..".$DIR_SEPARATOR
-			    ."..".$DIR_SEPARATOR
-			    ."Naming_Service".$DIR_SEPARATOR
-			    ."Naming_Service".$EXE_EXT, "");
+    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT,"");
 
     sleep 10;
 
     # now start the Rt EC..
-    $SV2 = Process::Create ("..".$DIR_SEPARATOR
-			    ."..".$DIR_SEPARATOR
-			    ."Event_Service".$DIR_SEPARATOR
-			    ."Event_Service".$EXE_EXT, "-t new");
+    $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT,"");
 
     sleep 10;
 
     # now start the CosEC1..
-    $SV3 = Process::Create ("..".$DIR_SEPARATOR
-			    ."..".$DIR_SEPARATOR
-			    ."CosEvent_Service".$DIR_SEPARATOR
-			    ."CosEvent_Service".$EXE_EXT, $CosEC1_params);
+    $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT,$CosEC1_params);
 
     sleep 10;
 
     # now start the CosEC2..
-    $SV4 = Process::Create ("..".$DIR_SEPARATOR
-			    ."..".$DIR_SEPARATOR
-			    ."CosEvent_Service".$DIR_SEPARATOR
-			    ."CosEvent_Service".$EXE_EXT, $CosEC2_params);
+    $SV4 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT,$CosEC2_params);
 
     sleep 10;
 
     #start 1 consumer that uses CosEC1 to receive events
-    $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, "-n cosec1 -c $ev_count");
+    $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT,"-n cosec1 -c $ev_count");
 
     sleep 10;
 
     #start 1 supplier  that uses CosEC2 to send events
-    $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, "-n cosec2 -c $ev_count");
+    $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT,"-n cosec2 -c $ev_count");
 
     sleep 10;
 
     #wait for the supplier to finish
-    if ($SUPP->TimedWait (60) == -1) {
-      print STDERR "ERROR: supplier timedout\n";
-      $status = 1;
-      $SUPP->Kill (); $SUPP->TimedWait (1);
-    }
+    $SUPP->Wait ();
 
 
     #wait for the consumer to finish
-    if ($CONS->TimedWait (60) == -1) {
-      print STDERR "ERROR: consumer timedout\n";
-      $status = 1;
-      $CONS->Kill (); $CONS->TimedWait (1);
-    }
+    $CONS->Wait ();
 
     #----------
  #start 1 consumer that uses CosEC1 to receive events
-    $CONS2 = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, "-n cosec2 -c $ev_count");
+    $CONS2 = Process::Create ($EXEPREFIX."consumer".$EXE_EXT,"-n cosec2 -c $ev_count");
 
     sleep 10;
 
     #start 1 supplier  that uses CosEC2 to send events
-    $SUPP2 = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, "-n cosec1 -c $ev_count");
+    $SUPP2 = Process::Create ($EXEPREFIX."supplier".$EXE_EXT,"-n cosec1 -c $ev_count");
 
     sleep 10;
 
     #wait for the supplier to finish
-    if ($SUPP2->TimedWait (60) == -1) {
-      print STDERR "ERROR: supplier2 timedout\n";
-      $status = 1;
-      $SUPP2->Kill (); $SUPP2->TimedWait (1);
-    }
+    $SUPP2->Wait ();
 
 
     #wait for the consumer to finish
-    if ($CONS2->TimedWait (60) == -1) {
-      print STDERR "ERROR: consumer2 timedout\n";
-      $status = 1;
-      $CONS2->Kill (); $CONS2->TimedWait (1);
-    }
-
+    $CONS2->Wait ();
     #----------
     # cleanup..
-    $SV1->Terminate ();
-    $SV2->Terminate ();
-    $SV3->Terminate ();
-    $SV4->Terminate ();
-
-    if ($SV1->TimedWait (5) == -1 ||
-        $SV2->TimedWait (5) == -1 ||
-        $SV3->TimedWait (5) == -1 ||
-        $SV4->TimedWait (5)) {
-      $SV1->Kill ();
-      $SV2->Kill ();
-      $SV3->Kill ();
-      $SV4->Kill ();
-      $SV1->TimedWait (1);
-      $SV2->TimedWait (1);
-      $SV3->TimedWait (1);
-      $SV4->TimedWait (1);
-      print STDERR "ERROR: couldn't terminate servers nicely\n";
-      $status = 1;
-    }
+    $SV1->Kill ();
+    $SV2->Kill ();
+    $SV3->Kill ();
+    $SV4->Kill ();
+
+    $SV1->Wait ();
+    $SV2->Wait ();
+    $SV3->Wait ();
+    $SV4->Wait ();
 }
 
 # Parse the arguments
@@ -155,5 +114,3 @@ for ($i = 0; $i <= $#ARGV; $i++)
 }
 
 cosec_multiple_test1 ();
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
index 6f30b6ee0c8..af4a642e6e0 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
@@ -12,22 +12,21 @@ require ACEutils;
 $con_count = 10;
 $sup_count = 10;
 $ev_count = 8;
-$status = 0;
 
 sub cosec_multiple_test2
 {
     # first start the Naming service..
-    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT, "");
+    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT,"");
 
     sleep 10;
 
     # now start the Rt EC..
-    $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT, "");
+    $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT,"");
 
     sleep 10;
 
     # now start the CosEC1..
-    $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT, "");
+    $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT);
 
     sleep 10;
 
@@ -51,19 +50,11 @@ sub cosec_multiple_test2
     }
 
     print "waiting for the last supplier to finish\n";
-    if ($SUPP->TimedWait (60) == -1) {
-      print STDERR "ERROR: supplier timedout\n";
-      $status = 1;
-      $SUPP->Kill (); $SUPP->TimedWait (1);
-    }
+    $SUPP->Wait ();
 
 
     print "waiting for the last consumer to finish\n";
-    if ($CONS->TimedWait (60) == -1) {
-      print STDERR "ERROR: consumer timedout\n";
-      $status = 1;
-      $CONS->Kill (); $CONS->TimedWait (1);
-    }
+    $CONS->Wait ();
 
 
     print "cleanup...\n";
@@ -71,9 +62,9 @@ sub cosec_multiple_test2
     $SV2->Kill ();
     $SV3->Kill ();
 
-    $SV1->TimedWait (1);
-    $SV2->TimedWait (1);
-    $SV3->TimedWait (1);
+    $SV1->Wait ();
+    $SV2->Wait ();
+    $SV3->Wait ();
 
     print "done!.\n";
 }
@@ -112,5 +103,3 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 
 cosec_multiple_test2 ();
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index 100af69739d..1186e323e2e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -39,15 +39,14 @@ ECB_Driver::ECB_Driver (void)
 int
 ECB_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_ =
         CORBA::ORB_init (argc,
                          argv,
                          "",
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references ("RootPOA");
@@ -58,12 +57,12 @@ ECB_Driver::run (int argc, char* argv[])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -88,13 +87,13 @@ ECB_Driver::run (int argc, char* argv[])
 
       ACE_Config_Scheduler scheduler_impl;
       RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        scheduler_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
         this->orb_->object_to_string (scheduler.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The (local) scheduler IOR is <%s>\n",
                   str.in ()));
@@ -109,23 +108,23 @@ ECB_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       str = this->orb_->object_to_string (ec.in (),
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The (local) EC IOR is <%s>\n",
                   str.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var local_ec =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ec_impl.activate ();
 
@@ -139,8 +138,8 @@ ECB_Driver::run (int argc, char* argv[])
       supplier_id_test.run (this->orb_.in (),
                             local_ec.in (),
                             scheduler.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (supplier_id_test.dump_results () != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -156,8 +155,8 @@ ECB_Driver::run (int argc, char* argv[])
       correlation_test.run (this->orb_.in (),
                             local_ec.in (),
                             scheduler.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (correlation_test.dump_results () != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -170,15 +169,15 @@ ECB_Driver::run (int argc, char* argv[])
                   "EC_Basic: shutdown the EC\n"));
       ec_impl.shutdown ();
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -231,11 +230,11 @@ void
 ECB_Consumer::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
                     RtecScheduler::Scheduler_ptr scheduler,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Environment& TAO_IN_ENV)
 {
   this->rt_info_ =
-    scheduler->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -250,63 +249,63 @@ ECB_Consumer::open (const char* name,
                   time,
                   0,
                   RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_admin_ = ec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
 ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-ECB_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECB_Consumer::disconnect (CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-ECB_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+ECB_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_IN_ENV);
   this->consumer_admin_ =
     RtecEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
 ECB_Consumer::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->test_->push (this->consumer_id_,
                      events,
-                     ACE_TRY_ENV);
+                     TAO_IN_ENV);
 }
 
 void
@@ -328,11 +327,11 @@ void
 ECB_Supplier::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
                     RtecScheduler::Scheduler_ptr scheduler,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
 {
   this->rt_info_ =
-    scheduler->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // The execution times are set to reasonable values, but actually
   // they are changed on the real execution, i.e. we lie to the
@@ -350,68 +349,69 @@ ECB_Supplier::open (const char* name,
                   time,
                   1,
                   RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // = Connect as a consumer.
-  this->supplier_admin_ = ec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_admin_ = ec->for_suppliers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
 ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushSupplier_var objref = this->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-ECB_Supplier::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECB_Supplier::disconnect (CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->supplier_admin_ =
-    RtecEventChannelAdmin::SupplierAdmin::_nil ();
-
-  RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
-    this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->consumer_proxy_ =
+    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-ECB_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+ECB_Supplier::close (CORBA::Environment &TAO_IN_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_IN_ENV);
+  this->supplier_admin_ =
+    RtecEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
 ECB_Supplier::send_event (RtecEventComm::EventSet& events,
-                          CORBA::Environment& ACE_TRY_ENV)
+                          CORBA::Environment& TAO_IN_ENV)
 {
   // RtecEventComm::EventSet copy = events;
-  this->consumer_proxy_->push (events, ACE_TRY_ENV);
+  this->consumer_proxy_->push (events, TAO_IN_ENV);
 }
 
 void
-ECB_Supplier::disconnect_push_supplier (CORBA::Environment& /* ACE_TRY_ENV */)
+ECB_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+  // this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
 }
 
 // ****************************************************************
@@ -428,7 +428,7 @@ void
 ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
                           RtecEventChannelAdmin::EventChannel_ptr ec,
                           RtecScheduler::Scheduler_ptr scheduler,
-                          CORBA::Environment& ACE_TRY_ENV)
+                          CORBA::Environment& TAO_IN_ENV)
 {
   ACE_UNUSED_ARG (orb);
 
@@ -444,23 +444,23 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
   this->consumer0_.open ("SupplierID/consumer0",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer1_.open ("SupplierID/consumer1",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier0_.open ("SupplierID/supplier0",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.open ("SupplierID/supplier1",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Precompute the QoS for the consumers and suppliers.
   ACE_ConsumerQOS_Factory consumer0_qos;
@@ -509,144 +509,144 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
   this->phase_ = ECB_SupplierID_Test::PHASE_0;
 
   this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 1, test disconnection of a single supplier.
   this->phase_ = ECB_SupplierID_Test::PHASE_1;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 2, test reconnection of the supplier.
   this->phase_ = ECB_SupplierID_Test::PHASE_2;
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 3, test disconnect of one consumer
   this->phase_ = ECB_SupplierID_Test::PHASE_3;
-  this->consumer1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 4, test reconnection of one consumer
   this->phase_ = ECB_SupplierID_Test::PHASE_4;
   this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 5, test disconnection of two consumers.
   this->phase_ = ECB_SupplierID_Test::PHASE_5;
-  this->consumer0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->consumer1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 6, test reconnection of two consumers.
   this->phase_ = ECB_SupplierID_Test::PHASE_6;
   this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 7, test disconnect/reconnect of both suppliers.
   this->phase_ = ECB_SupplierID_Test::PHASE_7;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (events, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE END, any events received after this are errors.
   this->phase_ = ECB_SupplierID_Test::PHASE_END;
 
   // Finish
-  this->supplier1_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer1_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer0_.close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier1_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->consumer1_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->consumer0_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 int
@@ -704,10 +704,10 @@ ECB_SupplierID_Test::dump_results (void)
 void
 ECB_SupplierID_Test::push (int consumer_id,
                            const RtecEventComm::EventSet& events,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   ACE_UNUSED_ARG (events);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
   switch (this->phase_)
     {
@@ -766,7 +766,7 @@ void
 ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
                            RtecEventChannelAdmin::EventChannel_ptr ec,
                            RtecScheduler::Scheduler_ptr scheduler,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           CORBA::Environment& TAO_IN_ENV)
 {
   ACE_UNUSED_ARG (orb);
 
@@ -782,18 +782,18 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
   this->consumer_.open ("Correlation/consumer",
                         ec,
                         scheduler,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier0_.open ("Correlation/supplier0",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.open ("Correlation/supplier1",
                          ec,
                          scheduler,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Precompute the QoS for the consumers and suppliers.
   ACE_ConsumerQOS_Factory consumer_qos;
@@ -895,175 +895,175 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
   this->phase_ = ECB_Correlation_Test::PHASE_0;
 
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_b, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 1, test disconnection of a single supplier.
   this->phase_ = ECB_Correlation_Test::PHASE_1;
-  this->consumer_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_ab, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_ab, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_ab, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_ab, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 2, test reconnection of the supplier.
   this->phase_ = ECB_Correlation_Test::PHASE_2;
-  this->consumer_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier0_.send_event (event_b, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_b, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier0_.send_event (event_b, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 3
   this->phase_ = ECB_Correlation_Test::PHASE_3;
-  this->consumer_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_ab, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_ab, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 4
   this->phase_ = ECB_Correlation_Test::PHASE_4;
-  this->consumer_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_b, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE 5
   this->phase_ = ECB_Correlation_Test::PHASE_5;
-  this->consumer_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier1_.disconnect (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+                           TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
-  ACE_CHECK;
+                            TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->supplier0_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->supplier1_.send_event (event_a, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 
   // PHASE END, any events received after this are errors.
   this->phase_ = ECB_Correlation_Test::PHASE_END;
 
   // Finish
-  this->supplier1_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier0_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer_.close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier1_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->supplier0_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->consumer_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 int
@@ -1118,10 +1118,13 @@ ECB_Correlation_Test::dump_results (void)
 }
 
 void
-ECB_Correlation_Test::push (int,
+ECB_Correlation_Test::push (int consumer_id,
                             const RtecEventComm::EventSet& events,
-                            CORBA::Environment &)
+                            CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_UNUSED_ARG (consumer_id);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+
   if (events.length () != 2)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index a85e96ed75e..14da57c2bf7 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -14,7 +14,7 @@ BIN2 = EC_Basic
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event
@@ -157,25 +157,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -223,9 +214,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
index de8e80bc32f..aacf3f21d54 100755
--- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
@@ -5,18 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-unshift @INC, '../../../../bin';
-require ACEutils;
-require Process;
-$status = 0;
-
-$TEST = Process::Create ($EXEPREFIX."EC_Basic".$EXE_EXT, "");
-
-if ($TEST->TimedWait (60) == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $status = 1;
-  $TEST->Kill (); $TEST->TimedWait (1);
-}
+$status = system ($EXEPREFIX."EC_Basic".$EXE_EXT, "");
 
 # @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index dd75b26bcab..35431480684 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -7,8 +7,10 @@
 #include "tao/Timeprobe.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/Event/Event_Channel.h"
 #include "ECM_Consumer.h"
 #include "ECM_Data.h"
 
@@ -38,12 +40,11 @@ Driver::Driver (void)
 int
 Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -53,12 +54,12 @@ Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -119,30 +120,33 @@ Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (ACE_Scheduler_Factory::use_config (naming_context.in ()) == -1)
+        return -1;
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->connect_consumers (channel.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect_consumers (channel.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
@@ -151,21 +155,21 @@ Driver::run (int argc, char* argv[])
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      this->disconnect_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      channel->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      channel->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -173,7 +177,7 @@ void
 Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_hrtime_t /* arrival */,
                        const RtecEventComm::EventSet& events,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_IN_ENV)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -233,8 +237,8 @@ Driver::push_consumer (void* /* consumer_cookie */,
       TAO_InputCDR cdr (mb, byte_order);
 
       ECM_IDLData::Info info;
-      cdr.decode (ECM_IDLData::_tc_Info, &info, 0, ACE_TRY_ENV);
-      ACE_CHECK;
+      cdr.decode (ECM_IDLData::_tc_Info, &info, 0, TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
 
       ECM_Data other;
       cdr >> other;
@@ -263,7 +267,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
 
 void
 Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -273,21 +277,22 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel,
       ACE_NEW (this->consumers_[i],
                Test_Consumer (this, this->consumers_ + i));
 
-      this->consumers_[i]->connect (this->event_a_,
+      this->consumers_[i]->connect (buf,
+                                    this->event_a_,
                                     this->event_b_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
 void
-Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+Driver::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -368,55 +373,77 @@ Test_Consumer::Test_Consumer (Driver *driver, void *cookie)
 }
 
 void
-Test_Consumer::connect (int event_a,
-                        int event_b,
+Test_Consumer::connect (const char* name,
+                        int event_a, int event_b,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+                        CORBA::Environment& TAO_IN_ENV)
 {
+  RtecScheduler::Scheduler_ptr server =
+    ACE_Scheduler_Factory::server ();
+
+  RtecScheduler::handle_t rt_info =
+    server->create (name, TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
+
+  // The worst case execution time is far less than 2
+  // milliseconds, but that is a safe estimate....
+  ACE_Time_Value tv (0, 2000);
+  TimeBase::TimeT time;
+  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  server->set (rt_info,
+               RtecScheduler::VERY_HIGH_CRITICALITY,
+               time, time, time,
+               0,
+               RtecScheduler::VERY_LOW_IMPORTANCE,
+               time,
+               0,
+               RtecScheduler::OPERATION,
+               TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
+
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
-  qos.insert_type (ACE_ES_EVENT_SHUTDOWN, 0);
-  qos.insert_type (event_a, 0);
-  qos.insert_type (event_b, 0);
+  qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info);
+  qos.insert_type (event_a, rt_info);
+  qos.insert_type (event_b, rt_info);
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    ec->for_consumers (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
-
+                                                TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 }
 
 void
-Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::disconnect (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
-    this->supplier_proxy_._retn ();
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
-  proxy->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_ = 0;
 }
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->driver_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV);
+  this->driver_->push_consumer (this->cookie_, arrival, events, TAO_IN_ENV);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 62b9bdca96f..07bb0856a0f 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -31,7 +31,8 @@ class Test_Consumer : public POA_RtecEventComm::PushConsumer
 public:
   Test_Consumer (Driver* driver, void* cookie);
 
-  void connect (int event_a,
+  void connect (const char* name,
+                int event_a,
                 int event_b,
                 RtecEventChannelAdmin::EventChannel_ptr ec,
                 CORBA::Environment& _env);
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index b824e35626d..b21f12ec045 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -7,8 +7,10 @@
 #include "tao/Timeprobe.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/Event/Event_Channel.h"
 #include "ECM_Supplier.h"
 #include "ECM_Data.h"
 
@@ -39,12 +41,11 @@ ECMS_Driver::ECMS_Driver (void)
 int
 ECMS_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -54,12 +55,12 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -124,35 +125,38 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (ACE_Scheduler_Factory::use_config (naming_context.in ()) == -1)
+        return -1;
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->connect_suppliers (channel.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect_suppliers (channel.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -165,20 +169,20 @@ ECMS_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "suppliers finished\n"));
 
-      this->disconnect_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->disconnect_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -186,8 +190,7 @@ int
 ECMS_Driver::supplier_task (Test_Supplier *supplier,
                        void* /* cookie */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       ACE_Time_Value tv (0, this->event_period_);
 
@@ -225,8 +228,8 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
       // general the CDR interface is not specified).
       // @@ TODO once the compiled marshalling approach is in place
       // this will read: cdr << info;
-      cdr.encode (ECM_IDLData::_tc_Info, &info, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      cdr.encode (ECM_IDLData::_tc_Info, &info, 0, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Here we marshall a non-IDL type.
       cdr << other;
@@ -265,29 +268,29 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
           // in just one memory allocation;
           event[0].data.payload.replace (mblen, mb);
 
-          supplier->consumer_proxy ()->push(event, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          supplier->consumer_proxy ()->push(event, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
           ACE_OS::sleep (tv);
         }
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 void
 ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -299,9 +302,10 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel,
       this->suppliers_[i]->connect (buf,
                                     this->event_a_,
                                     this->event_b_,
+                                    this->event_period_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -315,12 +319,12 @@ ECMS_Driver::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECMS_Driver::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -425,54 +429,90 @@ void
 Test_Supplier::connect (const char* name,
                         int event_a,
                         int event_b,
+                        int event_period,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &TAO_IN_ENV)
 {
-  this->supplier_id_ = ACE::crc32 (name);
-  ACE_DEBUG ((LM_DEBUG,
-              "ID for <%s> is %04.4x\n",
-              name,
-              this->supplier_id_));
-
-  ACE_SupplierQOS_Factory qos;
-  qos.insert (this->supplier_id_,
-              event_a,
-              0, 1);
-  qos.insert (this->supplier_id_,
-              event_b,
-              0, 1);
-  qos.insert (this->supplier_id_,
-              ACE_ES_EVENT_SHUTDOWN,
-              0, 1);
-
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
+
+      RtecScheduler::handle_t rt_info =
+        server->create (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_Time_Value tv (0, event_period);
+      RtecScheduler::Period_t rate = tv.usec () * 10;
+
+      // The execution times are set to reasonable values, but
+      // actually they are changed on the real execution, i.e. we
+      // lie to the scheduler to obtain right priorities; but we
+      // don't care if the set is schedulable.
+      tv.set (0, 2000);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      server->set (rt_info,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   time, time, time,
+                   rate,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   time,
+                   1,
+                   RtecScheduler::OPERATION,
+                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_id_ = ACE::crc32 (name);
+      ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
+                  this->supplier_id_));
+
+      ACE_SupplierQOS_Factory qos;
+      qos.insert (this->supplier_id_,
+                  event_a,
+                  rt_info, 1);
+      qos.insert (this->supplier_id_,
+                  event_b,
+                  rt_info, 1);
+      qos.insert (this->supplier_id_,
+                  ACE_ES_EVENT_SHUTDOWN,
+                  rt_info, 1);
+
+      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
+        ec->for_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->consumer_proxy_ =
+        supplier_admin->obtain_push_consumer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      RtecEventComm::PushSupplier_var objref =
+        this->supplier_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->consumer_proxy_->connect_push_supplier (objref.in (),
+                                                    qos.get_SupplierQOS (),
+                                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
-Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::disconnect (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
-    this->consumer_proxy_._retn ();
+  this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_ = 0;
 }
 
 int
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 50ba18dc32e..261db73a419 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -39,6 +39,7 @@ public:
   void connect (const char* name,
                 int event_a,
                 int event_b,
+                int event_period,
                 RtecEventChannelAdmin::EventChannel_ptr ec,
                 CORBA::Environment& _env);
   // This method connects the supplier to the EC.
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index f95867e97ff..b9d0cb993a7 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -23,7 +23,7 @@ BIN2 = ECM_Supplier ECM_Consumer
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event
@@ -180,25 +180,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -246,9 +237,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -340,9 +335,41 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- ECM_Supplier.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -354,17 +381,32 @@ realclean:
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
+ ECM_Supplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
  ECM_Data.h dataC.h dataC.i
@@ -488,25 +530,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -554,9 +587,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -648,9 +685,41 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- ECM_Consumer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -662,17 +731,32 @@ realclean:
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
+ ECM_Consumer.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
  ECM_Data.h dataC.h dataC.i
@@ -785,25 +869,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -851,9 +926,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -933,7 +1012,7 @@ realclean:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- dataC.i
+ dataC.i dataS.h dataS_T.h dataS_T.i dataS_T.cpp dataS.i
 .obj/dataS.o .obj/dataS.so .shobj/dataS.o .shobj/dataS.so: dataS.cpp dataS.h dataC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1043,25 +1122,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1109,9 +1179,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1305,25 +1379,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1368,9 +1433,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 82d4989007a..5e1b901737d 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -6,65 +6,36 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 unshift @INC, '../../../../bin';
-require ACEutils;
 require Process;
 
 $NS_ior = "NameService.ior";
 $sleeptime = 5;
-$status = 0;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT.
                        " -o $NS_ior ");
-
-if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
-  print STDERR "ERROR: waiting for naming service IOR file\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
+sleep $sleeptime;
 
 $ES = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Event_Service".$DIR_SEPARATOR.
-                       "Event_Service".$EXE_EXT,
-		       "-ORBNameServiceIOR file://$NS_ior -t new");
-
-sleep $sleeptime;
+                       "Event_Service".$EXE_EXT);
 
-$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT,
-		      "-ORBNameServiceIOR file://$NS_ior");
+$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT);
 
 sleep $sleeptime;
 
-$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT,
-		      "-ORBNameServiceIOR file://$NS_ior");
+$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT);
 
-if ($C->TimedWait (60) == -1) {
-  $status = 1;
-  print STDERR "ERROR: consumer timedout\n";
-  $C->Kill (); $C->TimedWait (1);
-}
+$C->Wait ();
+$S->Wait ();
 
-if ($S->TimedWait (60) == -1) {
-  $status =1;
-  print STDERR "ERROR: supplier timedout\n";
-  $S->Kill (); $S->TimedWait (1);
-}
-
-$NS->Terminate();
-$ES->Terminate();
-if ($NS->TimedWait (5) == -1 || $ES->TimedWait (5) == -1) {
-  print STDERR "ERROR: couldn't terminate the services nicely\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  $ES->Kill (); $ES->TimedWait (1);
-  $status = 1;
-}
+$NS->Kill (); $NS->Wait ();
+$ES->Kill (); $ES->Wait ();
 
 unlink $NS_ior;
 
 # @@ Capture the errors from the processes.
-exit $status;
-
-
+exit 0;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 65590386122..0a598f3e9e9 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -33,12 +33,11 @@ ECM_Driver::ECM_Driver (void)
 int
 ECM_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
@@ -48,12 +47,12 @@ ECM_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -125,76 +124,75 @@ ECM_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      ec_impl.activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ec_impl.activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
       this->open_federations (ec.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
       this->open_senders (ec.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
       this->open_receivers (ec.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
       this->activate_federations (ec.in (),
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: running the test\n"));
-      while (this->federations_running_ > 0)
-        this->orb_->perform_work ();
+      if (this->orb_->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
       this->dump_results ();
 
-      this->close_receivers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->close_senders (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->close_receivers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      this->close_senders (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->close_federations (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->close_federations (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
 
-      ec_impl.shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
+      ec_impl.shutdown (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
-    { 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -204,25 +202,26 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation,
 {
   ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n",
               federation->name ()));
-  if (this->federations_running_ > 0)
-    this->federations_running_--;
+  this->federations_running_--;
+  if (this->federations_running_ <= 0)
+    this->orb_->shutdown ();
 }
 
 void
 ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec, ACE_TRY_ENV);
-      ACE_CHECK;
+                                         ec, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
 ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &TAO_IN_ENV)
 {
   this->federations_running_ = this->local_federations_count_;
   RtecEventComm::Time interval = this->event_period_;
@@ -231,31 +230,31 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       this->local_federations_[i]->activate (ec,
                                              interval,
-                                             ACE_TRY_ENV);
-      ACE_CHECK;
+                                             TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
-ECM_Driver::close_federations (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_federations (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->local_federations_[i]->close (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
 ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &TAO_IN_ENV)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
       // @@ TODO throw an application specific exception.
-      ACE_THROW (CORBA::COMM_FAILURE ());
+      TAO_IN_ENV.exception (new CORBA::COMM_FAILURE ());
+      return;
     }
-
   ACE_INET_Addr ignore_from;
   this->endpoint_.dgram ().get_local_addr (ignore_from);
   ACE_DEBUG ((LM_DEBUG, "ECM_Driver::open_senders - "
@@ -266,42 +265,42 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       this->all_federations_[i]->open (&this->endpoint_,
                                        ec,
-                                       ACE_TRY_ENV);
-      ACE_CHECK;
+                                       TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
-ECM_Driver::close_senders (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_senders (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
-      this->all_federations_[i]->close (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->all_federations_[i]->close (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
   this->endpoint_.dgram ().close ();
 }
 
 void
 ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open_receiver (ec,
                                                   &this->endpoint_,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK;
+                                                  TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
-ECM_Driver::close_receivers (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_receivers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close_receiver (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->local_federations_[i]->close_receiver (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
@@ -576,17 +575,17 @@ ECM_Federation::ECM_Federation (char* name,
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &TAO_IN_ENV)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->addr_server (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->addr_server (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->sender_.init (ec,
                       addr_server.in (),
                       endpoint,
-                      ACE_TRY_ENV);
-  ACE_CHECK;
+                      TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // @@ TODO Make this a parameter....
   this->sender_.mtu (64);
@@ -604,17 +603,17 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
       qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
-  this->sender_.open (qos_copy, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->sender_.open (qos_copy, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-ECM_Federation::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Federation::close (CORBA::Environment &TAO_IN_ENV)
 {
-  this->sender_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->sender_.shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->sender_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->sender_.shutdown (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 RtecUDPAdmin::AddrServer_ptr
@@ -634,7 +633,7 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 void
 ECM_Supplier::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -652,30 +651,30 @@ ECM_Supplier::open (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    ec->for_suppliers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushSupplier_var objref = this->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Supplier::close (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_ = 0;
 }
@@ -683,7 +682,7 @@ ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
 void
 ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
                         RtecEventComm::Time interval,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &TAO_IN_ENV)
 {
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
@@ -693,21 +692,21 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    ec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_->connect_push_consumer (cref.in (),
                                                 consumer_qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 int
@@ -718,7 +717,7 @@ ECM_Supplier::supplier_id (void) const
 
 void
 ECM_Supplier::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Environment& TAO_IN_ENV)
 {
   for (u_int i = 0; i < events.length (); ++i)
     {
@@ -727,18 +726,18 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events,
         continue;
 
       this->federation_->supplier_timeout (this->consumer_proxy_.in (),
-                                           ACE_TRY_ENV);
-      ACE_CHECK;
+                                           TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV)
+ECM_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
-  // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  // this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
 }
 
 void
@@ -759,7 +758,7 @@ void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
                     ACE_RANDR_TYPE &seed,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Environment& TAO_IN_ENV)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -768,22 +767,22 @@ ECM_Consumer::open (const char*,
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_admin_ = ec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  this->connect (seed, ACE_TRY_ENV);
+  this->connect (seed, TAO_IN_ENV);
 }
 
 void
 ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -809,43 +808,43 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
       qos.insert_type (federation->consumer_ipaddr (i), 0);
     }
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECM_Consumer::disconnect (CORBA::Environment& TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_IN_ENV);
   this->consumer_admin_ =
     RtecEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
 ECM_Consumer::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->federation_->consumer_push (arrival, events, ACE_TRY_ENV);
+  this->federation_->consumer_push (arrival, events, TAO_IN_ENV);
 }
 
 void
@@ -886,7 +885,7 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 void
 ECM_Local_Federation::open (int event_count,
                             RtecEventChannelAdmin::EventChannel_ptr ec,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            CORBA::Environment& TAO_IN_ENV)
 {
   this->event_count_ = event_count;
 
@@ -895,38 +894,38 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_.open (buf, ec, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.open (buf, ec, this->seed_, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
 
 void
-ECM_Local_Federation::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Local_Federation::close (CORBA::Environment &TAO_IN_ENV)
 {
-  this->consumer_.close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  this->supplier_.close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
 ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
                                 RtecEventComm::Time interval,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                CORBA::Environment& TAO_IN_ENV)
 {
-  this->supplier_.activate (ec, interval, ACE_TRY_ENV);
+  this->supplier_.activate (ec, interval, TAO_IN_ENV);
 }
 
 void
 ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &TAO_IN_ENV)
 {
   RtecEventComm::EventSet sent (1);
   sent.length (1);
@@ -950,14 +949,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   if (this->event_count_ < 0)
     {
-      this->driver_->federation_has_shutdown (this, ACE_TRY_ENV);
+      this->driver_->federation_has_shutdown (this, TAO_IN_ENV);
       return;
     }
   int i = this->event_count_ % this->federation_->supplier_types ();
   s.header.type = this->federation_->supplier_ipaddr (i);
 
-  consumer->push (sent, ACE_TRY_ENV);
-  ACE_CHECK;
+  consumer->push (sent, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->send_count_++;
 
@@ -973,10 +972,10 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
       ACE_DEBUG ((LM_DEBUG,
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
-      this->consumer_.disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
-      this->consumer_.connect (this->seed_, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumer_.disconnect (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      this->consumer_.connect (this->seed_, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }
@@ -984,9 +983,9 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 void
 ECM_Local_Federation::consumer_push (ACE_hrtime_t,
                                      const RtecEventComm::EventSet &event,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
   if (event.length () == 0)
     {
@@ -1018,11 +1017,11 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                                      TAO_ECG_UDP_Out_Endpoint* ignore_from,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_IN_ENV)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->federation_->addr_server (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->federation_->addr_server (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor ();
 
@@ -1035,8 +1034,8 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                         reactor,
                         expire_interval,
                         max_timeouts,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   const int bufsize = 512;
   char buf[bufsize];
@@ -1047,8 +1046,8 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->mcast_eh_.reactor (reactor);
 
-  this->mcast_eh_.open (ec, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->mcast_eh_.open (ec, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_SupplierQOS_Factory qos;
   for (int i = 0; i < this->consumer_types (); ++i)
@@ -1060,21 +1059,21 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
     qos.get_SupplierQOS ();
-  this->receiver_.open (qos_copy, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->receiver_.open (qos_copy, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
 
 }
 
 void
-ECM_Local_Federation::close_receiver (CORBA::Environment &ACE_TRY_ENV)
+ECM_Local_Federation::close_receiver (CORBA::Environment &TAO_IN_ENV)
 {
-  this->receiver_.close (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->receiver_.shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->mcast_eh_.close (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->receiver_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->receiver_.shutdown (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->mcast_eh_.close (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index c79e0244ee5..1b392f4a59f 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -14,7 +14,7 @@ BIN2 = EC_Mcast
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event2
@@ -159,25 +159,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -225,9 +216,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
deleted file mode 100755
index e9dd7a1b37f..00000000000
--- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../bin';
-require Process;
-
-# Run two copies of the same test...
-$T1 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT,
-		       " -c sample.cfg -n 100 -t 50000 -f Set02");
-$T2 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT,
-		       " -c sample.cfg -n 100 -t 50000 -f Set02");
-
-if ($T1->TimedWait (60) == -1) {
-  print STDERR "ERROR: test1 timedout\n";
-  $T1->Kill (); $T1->TimedWait (1);
-  $T2->Kill (); $T2->TimedWait (1);
-  exit 1;
-}
-
-if ($T2->TimedWait (60) == -1) {
-  print STDERR "ERROR: test2 timedout\n";
-  $T2->Kill (); $T2->TimedWait (1);
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index acb9cf2f702..7f5fc421bc2 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -122,12 +122,11 @@ print_priority_info (const char *const name)
 int
 Test_ECG::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -137,12 +136,12 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -249,8 +248,8 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
       RtecScheduler::Scheduler_var scheduler;
@@ -271,8 +270,8 @@ Test_ECG::run (int argc, char* argv[])
           }
           if (scheduler_impl.get () == 0)
             return -1;
-          scheduler = scheduler_impl->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           break;
 
         case Test_ECG::ss_runtime:
@@ -294,8 +293,8 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0)
             {
@@ -315,8 +314,8 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0)
             {
@@ -336,8 +335,8 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
           else
             {
@@ -350,8 +349,8 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
           break;
 
@@ -373,8 +372,8 @@ Test_ECG::run (int argc, char* argv[])
         case Test_ECG::ss_runtime:
           {
             CORBA::String_var str =
-              orb->object_to_string (scheduler.in (), ACE_TRY_ENV);
-            ACE_TRY_CHECK;
+              orb->object_to_string (scheduler.in (), TAO_TRY_ENV);
+            TAO_CHECK_ENV;
             ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                         str.in ()));
 
@@ -385,8 +384,8 @@ Test_ECG::run (int argc, char* argv[])
             CosNaming::Name schedule_name (1);
             schedule_name.length (1);
             schedule_name[0].id = CORBA::string_dup (buf);
-            naming_context->bind (schedule_name, scheduler.in (), ACE_TRY_ENV);
-            ACE_TRY_CHECK;
+            naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
+            TAO_CHECK_ENV;
 
             if (ACE_Scheduler_Factory::use_config (naming_context.in (),
                                                    buf) == -1)
@@ -402,12 +401,12 @@ Test_ECG::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_OS::sleep (5);
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -418,15 +417,15 @@ Test_ECG::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (buf);
-      naming_context->bind (channel_name, ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
 
       ACE_Time_Value tv (15, 0);
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->rmt_name_ != 0)
         {
@@ -439,23 +438,23 @@ Test_ECG::run (int argc, char* argv[])
       RtecEventChannelAdmin::EventChannel_var local_ec =
         this->get_ec (naming_context.in (),
                       this->lcl_name_,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
 
       for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
         {
-          this->connect_suppliers (local_ec.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          this->disconnect_suppliers (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->connect_suppliers (local_ec.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          this->disconnect_suppliers (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
         }
 
-      this->connect_suppliers (local_ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect_suppliers (local_ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
 
@@ -469,8 +468,8 @@ Test_ECG::run (int argc, char* argv[])
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
                           this->rmt_name_,
-                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
 
           CosNaming::Name rsch_name (1);
@@ -483,18 +482,18 @@ Test_ECG::run (int argc, char* argv[])
             }
           rsch_name[0].id = CORBA::string_dup (buf);
           CORBA::Object_var tmpobj =
-            naming_context->resolve (rsch_name, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            naming_context->resolve (rsch_name, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           RtecScheduler::Scheduler_var remote_sch =
-            RtecScheduler::Scheduler::_narrow (tmpobj.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            RtecScheduler::Scheduler::_narrow (tmpobj.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           this->connect_ecg (local_ec.in (),
                              remote_ec.in (),
                              remote_sch.in (),
-                             ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                             TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
@@ -503,29 +502,29 @@ Test_ECG::run (int argc, char* argv[])
             ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
           RtecEventChannelAdmin::Observer_ptr observer =
-            this->ecg_._this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            this->ecg_._this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           observer_handle = ec_impl.append_observer (observer,
-                                                     ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
         {
-          this->connect_consumers (local_ec.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          this->disconnect_consumers (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->connect_consumers (local_ec.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          this->disconnect_consumers (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
         }
-      this->connect_consumers (local_ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect_consumers (local_ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
 
-      this->activate_suppliers (local_ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_suppliers (local_ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -543,8 +542,8 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          ec_impl.remove_observer (observer_handle, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          ec_impl.remove_observer (observer_handle, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       // Create the EC internal threads
@@ -586,38 +585,38 @@ Test_ECG::run (int argc, char* argv[])
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out, configs_out, anomalies_out, ACE_TRY_ENV);
+             infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
           ACE_Scheduler_Factory::server ()->compute_scheduling
             (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV);
+             infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                                 configs.in (),
                                                 anomalies.in (),
                                                 this->schedule_file_);
         }
 
-      naming_context->unbind (channel_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      naming_context->unbind (channel_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->rmt_name_ != 0)
         {
-          this->ecg_.close (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          this->ecg_.shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ecg_.close (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          this->ecg_.shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
-      this->disconnect_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->disconnect_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      this->disconnect_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
@@ -625,22 +624,22 @@ Test_ECG::run (int argc, char* argv[])
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
 Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
                   const char* process_name,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  CORBA::Environment &TAO_IN_ENV)
 {
   const int bufsize = 512;
   char buf[bufsize];
@@ -652,93 +651,100 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
   channel_name[0].id = CORBA::string_dup (buf);
 
   CORBA::Object_var ec_ptr =
-    naming_context->resolve (channel_name, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ());
-  if (CORBA::is_nil (ec_ptr.in ()))
+    naming_context->resolve (channel_name, TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0 || CORBA::is_nil (ec_ptr.in ()))
     return RtecEventChannelAdmin::EventChannel::_nil ();
 
   return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in (),
-                                                       ACE_TRY_ENV);
+                                                       TAO_IN_ENV);
 }
 
 void
-Test_ECG::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
-      this->suppliers_[i]->close (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->suppliers_[i]->close (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
 void
 Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &TAO_IN_ENV)
 {
-  int i;
-  for (i = 0; i < this->hp_suppliers_; ++i)
+  TAO_TRY
     {
-      // Limit the number of messages sent by each supplier
-      int mc = this->hp_message_count_ / this->hp_suppliers_;
-      if (mc == 0)
-        mc = 1;
-
-      char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "hp_supplier_%02.2d@%s", i, this->lcl_name_);
-
-      ACE_NEW (this->suppliers_[i],
-               Test_Supplier (this, this->suppliers_ + i));
-
-      this->suppliers_[i]->open (buf,
-                                 this->hps_event_a_,
-                                 this->hps_event_b_,
-                                 mc,
-                                 this->hp_interval_ * 10,
-                                 local_ec,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+      int i;
+      for (i = 0; i < this->hp_suppliers_; ++i)
+        {
+          // Limit the number of messages sent by each supplier
+          int mc = this->hp_message_count_ / this->hp_suppliers_;
+          if (mc == 0)
+            mc = 1;
+
+          char buf[BUFSIZ];
+          ACE_OS::sprintf (buf, "hp_supplier_%02.2d@%s", i, this->lcl_name_);
+
+          ACE_NEW (this->suppliers_[i],
+                   Test_Supplier (this, this->suppliers_ + i));
+
+          this->suppliers_[i]->open (buf,
+                                     this->hps_event_a_,
+                                     this->hps_event_b_,
+                                     mc,
+                                     this->hp_interval_ * 10,
+                                     local_ec,
+                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+
+      for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
+        {
+          // Limit the number of messages sent by each supplier
+          int mc = this->lp_message_count_ / this->lp_suppliers_;
+          if (mc == 0)
+            mc = 1;
+
+          char buf[BUFSIZ];
+          ACE_OS::sprintf (buf, "lp_supplier_%02.2d@%s",
+                           i - this->hp_suppliers_, this->lcl_name_);
 
-  for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
+          ACE_NEW (this->suppliers_[i],
+                   Test_Supplier (this, this->suppliers_ + i));
+
+          this->suppliers_[i]->open (buf,
+                                     this->lps_event_a_,
+                                     this->lps_event_b_,
+                                     mc,
+                                     this->lp_interval_ * 10,
+                                     local_ec,
+                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCHANY
     {
-      // Limit the number of messages sent by each supplier
-      int mc = this->lp_message_count_ / this->lp_suppliers_;
-      if (mc == 0)
-        mc = 1;
-
-      char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "lp_supplier_%02.2d@%s",
-                       i - this->hp_suppliers_, this->lcl_name_);
-
-      ACE_NEW (this->suppliers_[i],
-               Test_Supplier (this, this->suppliers_ + i));
-
-      this->suppliers_[i]->open (buf,
-                                 this->lps_event_a_,
-                                 this->lps_event_b_,
-                                 mc,
-                                 this->lp_interval_ * 10,
-                                 local_ec,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_RETHROW;
     }
+  TAO_ENDTRY;
 }
 
 void
-Test_ECG::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
-      this->consumers_[i]->close (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumers_[i]->close (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
 void
 Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       int i;
       for (i = 0; i < this->hp_suppliers_; ++i)
@@ -754,8 +760,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
                                          local_ec,
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -772,123 +778,136 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
           this->suppliers_[i]->activate (buf,
                                          this->lp_interval_ * 10,
                                          local_ec,
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
 Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &TAO_IN_ENV)
 {
-  int i;
-  for (i = 0; i < this->hp_consumers_; ++i)
+  TAO_TRY
     {
-      char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "hp_consumer_%02.2d@%s", i, this->lcl_name_);
-
-      ACE_NEW (this->consumers_[i],
-               Test_Consumer (this, this->consumers_ + i));
-
-      this->consumers_[i]->open (buf,
-                                 this->hpc_event_a_,
-                                 this->hpc_event_b_,
-                                 local_ec,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-      this->stats_[i].total_time_ = 0;
-      this->stats_[i].lcl_count_ = 0;
-      this->stats_[i].rmt_count_ = 0;
-    }
+      int i;
+      for (i = 0; i < this->hp_consumers_; ++i)
+        {
+          char buf[BUFSIZ];
+          ACE_OS::sprintf (buf, "hp_consumer_%02.2d@%s", i, this->lcl_name_);
+
+          ACE_NEW (this->consumers_[i],
+                   Test_Consumer (this, this->consumers_ + i));
+
+          this->consumers_[i]->open (buf,
+                                     this->hpc_event_a_,
+                                     this->hpc_event_b_,
+                                     local_ec,
+                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          this->stats_[i].total_time_ = 0;
+          this->stats_[i].lcl_count_ = 0;
+          this->stats_[i].rmt_count_ = 0;
+        }
 
-  for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
+      for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
+        {
+          char buf[BUFSIZ];
+          ACE_OS::sprintf (buf, "lp_consumer_%02.2d@%s",
+                           i - this->hp_consumers_, this->lcl_name_);
+
+          ACE_NEW (this->consumers_[i],
+                   Test_Consumer (this, this->consumers_ + i));
+
+          this->consumers_[i]->open (buf,
+                                     this->lpc_event_a_,
+                                     this->lpc_event_b_,
+                                     local_ec,
+                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          this->stats_[i].total_time_ = 0;
+          this->stats_[i].lcl_count_ = 0;
+          this->stats_[i].rmt_count_ = 0;
+        }
+      this->running_consumers_ = this->hp_consumers_ + this->lp_consumers_;
+    }
+  TAO_CATCHANY
     {
-      char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "lp_consumer_%02.2d@%s",
-                       i - this->hp_consumers_, this->lcl_name_);
-
-      ACE_NEW (this->consumers_[i],
-               Test_Consumer (this, this->consumers_ + i));
-
-      this->consumers_[i]->open (buf,
-                                 this->lpc_event_a_,
-                                 this->lpc_event_b_,
-                                 local_ec,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-      this->stats_[i].total_time_ = 0;
-      this->stats_[i].lcl_count_ = 0;
-      this->stats_[i].rmt_count_ = 0;
+      TAO_RETHROW;
     }
-  this->running_consumers_ = this->hp_consumers_ + this->lp_consumers_;
+  TAO_ENDTRY;
 }
 
 void
 Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                        RtecEventChannelAdmin::EventChannel_ptr remote_ec,
                        RtecScheduler::Scheduler_ptr remote_sch,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_IN_ENV)
 {
-  RtecScheduler::Scheduler_ptr local_sch =
-    ACE_Scheduler_Factory::server ();
+  TAO_TRY
+    {
+      RtecScheduler::Scheduler_ptr local_sch =
+        ACE_Scheduler_Factory::server ();
 
-  // ECG name.
-  const int bufsize = 512;
-  char ecg_name[bufsize];
-  ACE_OS::strcpy (ecg_name, "ecg_");
-  ACE_OS::strcat (ecg_name, this->lcl_name_);
-
-  // We could use the same name on the local and remote scheduler,
-  // but that fails when using a global scheduler.
-  char rmt[BUFSIZ];
-  ACE_OS::strcpy (rmt, ecg_name);
-  ACE_OS::strcat (rmt, "@");
-  ACE_OS::strcat (rmt, this->rmt_name_);
-
-  // We could use the same name on the local and remote scheduler,
-  // but that fails when using a global scheduler.
-  char lcl[bufsize];
-  ACE_OS::strcpy (lcl, ecg_name);
-  ACE_OS::strcat (lcl, "@");
-  ACE_OS::strcat (lcl, this->lcl_name_);
-
-  this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
-                   rmt, lcl, ACE_TRY_ENV);
-  ACE_CHECK;
+      // ECG name.
+      const int bufsize = 512;
+      char ecg_name[bufsize];
+      ACE_OS::strcpy (ecg_name, "ecg_");
+      ACE_OS::strcat (ecg_name, this->lcl_name_);
+
+      // We could use the same name on the local and remote scheduler,
+      // but that fails when using a global scheduler.
+      char rmt[BUFSIZ];
+      ACE_OS::strcpy (rmt, ecg_name);
+      ACE_OS::strcat (rmt, "@");
+      ACE_OS::strcat (rmt, this->rmt_name_);
+
+      // We could use the same name on the local and remote scheduler,
+      // but that fails when using a global scheduler.
+      char lcl[bufsize];
+      ACE_OS::strcpy (lcl, ecg_name);
+      ACE_OS::strcat (lcl, "@");
+      ACE_OS::strcat (lcl, this->lcl_name_);
+
+      this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
+                       rmt, lcl, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
 Test_ECG::push_supplier (void * /* cookie */,
                          RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                          const RtecEventComm::EventSet &events,
-                         CORBA::Environment & ACE_TRY_ENV)
+                         CORBA::Environment & TAO_IN_ENV)
 {
   this->wait_until_ready ();
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n"));
   // @@ TODO we could keep somekind of stats here...
   if (!this->short_circuit_)
     {
-      consumer->push (events, ACE_TRY_ENV);
-      ACE_CHECK;
+      consumer->push (events, TAO_IN_ENV);
     }
   else
     {
       int i = 0;
-      for (; i < this->hp_consumers_; ++i)
+      for (; i < this->hp_consumers_ && !TAO_IN_ENV.exception (); ++i)
         {
-          this->consumers_[i]->push (events, ACE_TRY_ENV);
-          ACE_CHECK;
+          this->consumers_[i]->push (events, TAO_IN_ENV);
         }
-      for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
+      for (; i < this->hp_consumers_ + this->lp_consumers_ && !TAO_IN_ENV.exception (); ++i)
         {
-          this->consumers_[i]->push (events, ACE_TRY_ENV);
-          ACE_CHECK;
+          this->consumers_[i]->push (events, TAO_IN_ENV);
         }
     }
 }
@@ -991,7 +1010,7 @@ Test_ECG::wait_until_ready (void)
 void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
                              RtecEventComm::PushConsumer_ptr consumer,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             CORBA::Environment& TAO_IN_ENV)
 {
 
   this->running_suppliers_--;
@@ -1010,7 +1029,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
       s.header.ec_recv_time = ORBSVCS_Time::zero ();
       s.header.ec_send_time = ORBSVCS_Time::zero ();
       s.header.type = ACE_ES_EVENT_SHUTDOWN;
-      consumer->push (shutdown, ACE_TRY_ENV);
+      consumer->push (shutdown, TAO_IN_ENV);
     }
 }
 
@@ -1032,14 +1051,14 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_ECG::shutdown (CORBA::Environment& TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
   if (this->rmt_name_ != 0)
     {
-      this->ecg_.shutdown (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
+      this->ecg_.shutdown (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return -1;
     }
 
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -1293,153 +1312,170 @@ Test_Supplier::open (const char* name,
                      int message_count,
                      const RtecScheduler::Period_t& rate,
                      RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_IN_ENV)
 {
   this->event_a_ = event_a;
   this->event_b_ = event_b;
   this->message_count_ = message_count;
 
-  RtecScheduler::Scheduler_ptr server =
-    ACE_Scheduler_Factory::server ();
-
-  RtecScheduler::handle_t rt_info =
-    server->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // The execution times are set to reasonable values, but
-  // actually they are changed on the real execution, i.e. we
-  // lie to the scheduler to obtain right priorities; but we
-  // don't care if the set is schedulable.
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  ACE_DEBUG ((LM_DEBUG, "register supplier \"%s\"\n", name));
-  server->set (rt_info,
-               RtecScheduler::VERY_HIGH_CRITICALITY,
-               time, time, time,
-               rate,
-               RtecScheduler::VERY_LOW_IMPORTANCE,
-               time,
-               1,
+  TAO_TRY
+    {
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
+
+      RtecScheduler::handle_t rt_info =
+        server->create (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // The execution times are set to reasonable values, but
+      // actually they are changed on the real execution, i.e. we
+      // lie to the scheduler to obtain right priorities; but we
+      // don't care if the set is schedulable.
+      ACE_Time_Value tv (0, 2000);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      ACE_DEBUG ((LM_DEBUG, "register supplier \"%s\"\n", name));
+      server->set (rt_info,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   time, time, time,
+                   rate,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   time,
+                   1,
                    RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_id_ = ACE::crc32 (name);
-  ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
-              this->supplier_id_));
-
-  ACE_SupplierQOS_Factory qos;
-  qos.insert (this->supplier_id_,
-              this->event_a_,
-              rt_info, 1);
-  qos.insert (this->supplier_id_,
-              this->event_b_,
-              rt_info, 1);
-  qos.insert (this->supplier_id_,
-              ACE_ES_EVENT_SHUTDOWN,
-              rt_info, 1);
-
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_id_ = ACE::crc32 (name);
+      ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
+                  this->supplier_id_));
+
+      ACE_SupplierQOS_Factory qos;
+      qos.insert (this->supplier_id_,
+                  this->event_a_,
+                  rt_info, 1);
+      qos.insert (this->supplier_id_,
+                  this->event_b_,
+                  rt_info, 1);
+      qos.insert (this->supplier_id_,
+                  ACE_ES_EVENT_SHUTDOWN,
+                  rt_info, 1);
+
+      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
+        ec->for_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->consumer_proxy_ =
+        supplier_admin->obtain_push_consumer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      RtecEventComm::PushSupplier_var objref = this->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->consumer_proxy_->connect_push_supplier (objref.in (),
+                                                    qos.get_SupplierQOS (),
+                                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
-Test_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::close (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
-    this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV);
+  this->consumer_proxy_ =
+    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
 Test_Supplier::activate (const char* name,
                          const RtecScheduler::Period_t& rate,
                          RtecEventChannelAdmin::EventChannel_ptr ec,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &TAO_IN_ENV)
 {
-  RtecScheduler::Scheduler_ptr server =
-    ACE_Scheduler_Factory::server ();
-
-  const int bufsize = 512;
-  char buf[bufsize];
-  ACE_OS::strcpy (buf, "consumer_");
-  ACE_OS::strcat (buf, name);
-  RtecScheduler::handle_t rt_info =
-    server->create (buf, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // The execution times are set to reasonable values, but
-  // actually they are changed on the real execution, i.e. we
-  // lie to the scheduler to obtain right priorities; but we
-  // don't care if the set is schedulable.
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  ACE_DEBUG ((LM_DEBUG, "activate \"%s\"\n", buf));
-  server->set (rt_info,
-               RtecScheduler::VERY_HIGH_CRITICALITY,
-               time, time, time,
-               rate,
-               RtecScheduler::VERY_LOW_IMPORTANCE,
-               time,
-               1,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Also connect our consumer for timeout events from the EC.
-  int interval = rate / 10;
-  ACE_Time_Value tv_timeout (interval / ACE_ONE_SECOND_IN_USECS,
-                             interval % ACE_ONE_SECOND_IN_USECS);
-  TimeBase::TimeT timeout;
-  ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
-
-  ACE_ConsumerQOS_Factory consumer_qos;
-  consumer_qos.start_disjunction_group ();
-  consumer_qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-                            timeout,
-                            rt_info);
-
-  // = Connect as a consumer.
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
 
-  this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_proxy_->connect_push_consumer (
-       cref.in (),
-       consumer_qos.get_ConsumerQOS (),
-       ACE_TRY_ENV);
-  ACE_CHECK;
+      const int bufsize = 512;
+      char buf[bufsize];
+      ACE_OS::strcpy (buf, "consumer_");
+      ACE_OS::strcat (buf, name);
+      RtecScheduler::handle_t rt_info =
+        server->create (buf, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+
+      // The execution times are set to reasonable values, but
+      // actually they are changed on the real execution, i.e. we
+      // lie to the scheduler to obtain right priorities; but we
+      // don't care if the set is schedulable.
+      ACE_Time_Value tv (0, 2000);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      ACE_DEBUG ((LM_DEBUG, "activate \"%s\"\n", buf));
+      server->set (rt_info,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   time, time, time,
+                   rate,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   time,
+                   1,
+                   RtecScheduler::OPERATION,
+                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Also connect our consumer for timeout events from the EC.
+      int interval = rate / 10;
+      ACE_Time_Value tv_timeout (interval / ACE_ONE_SECOND_IN_USECS,
+                                 interval % ACE_ONE_SECOND_IN_USECS);
+      TimeBase::TimeT timeout;
+      ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
+
+      ACE_ConsumerQOS_Factory consumer_qos;
+      consumer_qos.start_disjunction_group ();
+      consumer_qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
+                                timeout,
+                                rt_info);
+
+      // = Connect as a consumer.
+      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
+        ec->for_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_proxy_ =
+        consumer_admin->obtain_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      RtecEventComm::PushConsumer_var cref =
+        this->consumer_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_proxy_->connect_push_consumer (cref.in (),
+                                                    consumer_qos.get_ConsumerQOS (),
+                                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
 Test_Supplier::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
 {
 #if 0
    const int bufsize = 128;
@@ -1482,11 +1518,11 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
 
       if (this->message_count_ < 0)
         {
-          //this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-          //if (ACE_TRY_ENV.exception () != 0) return;
+          //this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+          //if (TAO_IN_ENV.exception () != 0) return;
           this->test_->shutdown_supplier (this->cookie_,
                                           this->consumer_proxy_.in (),
-                                          ACE_TRY_ENV);
+                                          TAO_IN_ENV);
         }
       if (this->message_count_ % 2 == 0)
         {
@@ -1501,17 +1537,17 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
   this->test_->push_supplier (this->cookie_,
                               this->consumer_proxy_.in (),
                               sent,
-                              ACE_TRY_ENV);
+                              TAO_IN_ENV);
 }
 
 void
-Test_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV)
+Test_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
 }
 
 void
@@ -1537,74 +1573,82 @@ void
 Test_Consumer::open (const char* name,
                      int event_a, int event_b,
                      RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_IN_ENV)
 {
-  RtecScheduler::Scheduler_ptr server =
-    ACE_Scheduler_Factory::server ();
-
-  RtecScheduler::handle_t rt_info =
-    server->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // The worst case execution time is far less than 2
-  // milliseconds, but that is a safe estimate....
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  ACE_DEBUG ((LM_DEBUG, "register consumer \"%s\"\n", name));
-  server->set (rt_info,
-               RtecScheduler::VERY_HIGH_CRITICALITY,
-               time, time, time,
-               0,
-               RtecScheduler::VERY_LOW_IMPORTANCE,
-               time,
-               0,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_ConsumerQOS_Factory qos;
-  qos.start_disjunction_group ();
-  qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info);
-  qos.insert_type (event_a, rt_info);
-  qos.insert_type (event_b, rt_info);
-
-  // = Connect as a consumer.
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
+
+      RtecScheduler::handle_t rt_info =
+        server->create (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // The worst case execution time is far less than 2
+      // milliseconds, but that is a safe estimate....
+      ACE_Time_Value tv (0, 2000);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      ACE_DEBUG ((LM_DEBUG, "register consumer \"%s\"\n", name));
+      server->set (rt_info,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   time, time, time,
+                   0,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   time,
+                   0,
+                   RtecScheduler::OPERATION,
+                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_ConsumerQOS_Factory qos;
+      qos.start_disjunction_group ();
+      qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info);
+      qos.insert_type (event_a, rt_info);
+      qos.insert_type (event_b, rt_info);
+
+      // = Connect as a consumer.
+      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
+        ec->for_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_proxy_ =
+        consumer_admin->obtain_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      RtecEventComm::PushConsumer_var objref = this->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->supplier_proxy_->connect_push_consumer (objref.in (),
+                                                    qos.get_ConsumerQOS (),
+                                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
-Test_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
-    this->supplier_proxy_._retn ();
-  proxy->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+  this->supplier_proxy_ =
+    RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->test_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV);
+  this->test_->push_consumer (this->cookie_, arrival, events, TAO_IN_ENV);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
index 72422a83105..e2e9c42fe0f 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
@@ -40,10 +40,9 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "EC_Multiple - Win32 Debug"

 

diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 67b74fad970..aaad8b4f95d 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -14,7 +14,7 @@ BIN2 = EC_Multiple
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event
@@ -24,18 +24,11 @@ endif # Event
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  # This test causes g++ 2.7.2.3 (the compiler) to core dump.
-  all clean realclean:
-	@echo orbsvcs/tests/EC_Multiple is not built with older versions of g++
-else # ! ACE_HAS_GNUG_PRE_2_8
-  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.local.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-endif # ! ACE_HAS_GNUG_PRE_2_8
+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.local.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 
 #### Local rules and variables...
 
@@ -164,25 +157,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -230,9 +214,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index de2b010c3c8..afb9ce8439a 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -7,36 +7,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 unshift @INC, '../../../../bin';
 require Process;
-require ACEutils;
 
 $NS_ior = "NameService.ior";
-$status = 0;
-
-$NS = Process::Create ("..".$DIR_SEPARATOR.
-                       "..".$DIR_SEPARATOR.
-                       "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
-                       " -o $NS_ior ");
-if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
-  print STDERR "ERROR: waiting for naming service IOR file\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
+$sleeptime = 3;
+
+$NS = Process::Create ("../../Naming_Service/Naming_Service".$EXE_EXT,
+		       " -o $NS_ior ");
+
+sleep $sleeptime;
 
 # This is a very simple test, no multiple consumers and no gateways.
-$TEST = Process::Create ($EXEPREFIX."EC_Multiple".$EXE_EXT,
-			 "-ORBNameServiceIOR file://$NS_ior"
-			 ." -s local");
-if ($TEST->TimedWait (60) == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $status = 1;
-  $TEST->Kill (); $TEST->TimedWait (1);
-}
-
-$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate naming service\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}  
+$status = system ($EXEPREFIX."EC_Multiple".$EXE_EXT.
+                  " -s local");
+
+$NS->Kill ();
+
+unlink $NS_ior;
 
+# @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 5802b7ce7e3..d9b3c321ec2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -29,11 +29,11 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int type_start,
                         int type_count,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+                        CORBA::Environment& TAO_IN_ENV)
 {
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -48,8 +48,8 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                   time,
                   0,
                   RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -61,43 +61,43 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    ec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::disconnect (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
+    poa->servant_to_id (this, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  poa->deactivate_object (id.in (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
@@ -121,7 +121,7 @@ Test_Consumer::accumulate (ECT_Driver::Latency_Stats& stats) const
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -163,8 +163,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
               // We stop the timer as soon as we realize it is time to
               // do so.
               this->throughput_.stop ();
-              this->driver_->shutdown_consumer (this->cookie_, ACE_TRY_ENV);
-              ACE_CHECK;
+              this->driver_->shutdown_consumer (this->cookie_, TAO_IN_ENV);
             }
         }
       else
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index a5080690263..912c35b0ddf 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -40,12 +40,11 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
 int
 ECT_Consumer_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
@@ -55,12 +54,12 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -121,44 +120,44 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (schedule_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
         RtecScheduler::Scheduler::_narrow (sched_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->connect_consumers (scheduler.in (), channel.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect_consumers (scheduler.in (), channel.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
@@ -169,24 +168,24 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->shutdown_event_channel_ != 0)
         {
-          channel->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          channel->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -210,7 +209,7 @@ void
 ECT_Consumer_Driver::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Environment &TAO_IN_ENV)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -231,8 +230,8 @@ ECT_Consumer_Driver::connect_consumers
                                     this->type_start_,
                                     this->type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
@@ -256,12 +255,12 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 1275047e924..80eca900ec1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -34,7 +34,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int type_start,
                         int type_count,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &TAO_IN_ENV)
 {
   this->burst_count_ = burst_count;
   this->burst_size_ = burst_size;
@@ -44,8 +44,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->type_count_ = type_count;
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_Time_Value tv (0, burst_pause);
   RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -65,8 +65,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                   time,
                   1,
                   RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -84,51 +84,51 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    ec->for_suppliers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->supplier_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::disconnect (CORBA::Environment &TAO_IN_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->supplier_._default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->supplier_._default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
+    poa->servant_to_id (&this->supplier_, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  poa->deactivate_object (id.in (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 int
 Test_Supplier::svc ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize a time value to pace the test
       ACE_Time_Value tv (0, this->burst_pause_);
@@ -167,9 +167,9 @@ Test_Supplier::svc ()
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                              now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event, ACE_TRY_ENV);
+              this->consumer_proxy ()->push (event, TAO_TRY_ENV);
 
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
             }
           this->throughput_.sample ();
 
@@ -189,21 +189,21 @@ Test_Supplier::svc ()
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
-      this->consumer_proxy ()->push(event, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->consumer_proxy ()->push(event, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       this->throughput_.sample ();
       this->throughput_.stop ();
 
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Supplier %4.4x completed\n",
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 5f3d8ecb03d..7ccdb843f82 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -47,12 +47,11 @@ ECT_Supplier_Driver::shutdown_consumer (void*,
 int
 ECT_Supplier_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -62,12 +61,12 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -134,50 +133,50 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (schedule_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
         RtecScheduler::Scheduler::_narrow (sched_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->connect_suppliers (scheduler.in (),
                                channel.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -192,20 +191,20 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->disconnect_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -213,7 +212,7 @@ void
 ECT_Supplier_Driver::connect_suppliers
     (RtecScheduler::Scheduler_ptr scheduler,
      RtecEventChannelAdmin::EventChannel_ptr channel,
-     CORBA::Environment &ACE_TRY_ENV)
+     CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -231,8 +230,8 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->type_start_,
                                     this->type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
@@ -246,12 +245,12 @@ ECT_Supplier_Driver::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index f6d58ede385..440b4dbcd83 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -330,7 +330,7 @@ ECT_Throughput::run (int argc, char* argv[])
         ACE_TRY_CHECK;
         poa->deactivate_object (id.in (), ACE_TRY_ENV);
         ACE_TRY_CHECK;
-
+        
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
       }
     }
@@ -350,7 +350,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 void
 ECT_Throughput::shutdown_consumer (void*,
-                                   CORBA::Environment &)
+                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -364,7 +364,7 @@ ECT_Throughput::shutdown_consumer (void*,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0, ACE_TRY_ENV);
+      // Not needed: this->orb_->shutdown ();
     }
 }
 
@@ -372,7 +372,7 @@ void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Environment &TAO_IN_ENV)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -396,8 +396,8 @@ ECT_Throughput::connect_consumers
                                     start,
                                     this->consumer_type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -405,7 +405,7 @@ void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -424,8 +424,8 @@ ECT_Throughput::connect_suppliers
                                     start,
                                     this->supplier_type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -449,22 +449,22 @@ ECT_Throughput::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
 void
-ECT_Throughput::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index ccc3198f4d6..06523308d30 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -21,7 +21,7 @@ BIN2 = ECT_Supplier ECT_Consumer ECT_Throughput
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
     ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
@@ -180,25 +180,16 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -246,9 +237,13 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -485,25 +480,16 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -551,9 +537,13 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -792,25 +782,16 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -858,9 +839,13 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1163,25 +1148,16 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1229,9 +1205,13 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1473,25 +1453,16 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1539,9 +1510,13 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 950053d6afd..7f22ca966ee 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -68,7 +68,7 @@ $S = Process::Create ($EXEPREFIX."ECT_Supplier".$EXE_EXT,
 		      " -ORBNameServiceIOR file://$ns_ior "
 		      . " -s 1 -u 10000 -n 1 -t 0");
 
-if ($S->TimedWait (120) == -1) {
+if ($S->TimedWait (60) == -1) {
   print STDERR "ERROR: supplier timedout\n";
   $S->Kill (); $S->TimedWait (1);
   $C->Kill (); $C->TimedWait (1);
@@ -100,4 +100,5 @@ $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
 
 unlink $ns_ior;
 
+# @@ Capture the errors from the processes.
 exit 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
deleted file mode 100644
index 12562118f7e..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-// $Id$
-
-#include "BCast.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Gateway_UDP.h"
-#include "ace/Arg_Shifter.h"
-
-ACE_RCSID(EC_Tests_Basic, BCast, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_BCast driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_BCast::EC_BCast (void)
-  : bcast_port_ (12345)
-{
-}
-
-int
-EC_BCast::parse_args (int& argc, char* argv[])
-{
-  if (this->EC_Driver::parse_args (argc, argv) != 0)
-    return -1;
-
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-port") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->bcast_port_ = ACE_OS::atoi (arg_shifter.get_current ());
-        }
-
-      arg_shifter.ignore_arg ();
-    }
-
-  return 0;
-}
-
-void
-EC_BCast::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-}
-
-void
-EC_BCast::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-}
-
-void
-EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
-{
-}
-
-void
-EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_ECG_UDP_Sender sender;
-  TAO_ECG_UDP_Out_Endpoint endpoint;
-
-  ACE_INET_Addr udp_addr (this->bcast_port_, "128.252.165.255");
-
-  Simple_Address_Server address_server_impl (udp_addr);
-  RtecUDPAdmin::AddrServer_var address_server =
-    address_server_impl._this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Cannot open send endpoint\n"));
-      return;
-    }
-
-  sender.init (this->event_channel_.in (),
-               address_server.in (),
-               &endpoint,
-               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventChannelAdmin::ConsumerQOS sub;
-  int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  sender.open (sub, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  TAO_ECG_UDP_Receiver receiver;
-
-  TAO_ECG_UDP_EH udp_eh (&receiver);
-
-  ACE_Time_Value expire (0, 50000);
-  receiver.init (this->event_channel_.in (),
-                 &endpoint,
-                 address_server.in (),
-                 this->orb_->orb_core ()->reactor (),
-                 expire, 5,
-                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  udp_eh.reactor (this->orb_->orb_core ()->reactor ());
-  ACE_INET_Addr local_addr (this->bcast_port_);
-  if (udp_eh.open (local_addr) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Cannot open EH %p\n"));
-    }
-
-  RtecEventChannelAdmin::SupplierQOS pub;
-  this->build_supplier_qos (0, pub, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  receiver.open (pub, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->allocate_tasks () == -1)
-    return;
-
-  this->activate_tasks (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers are active\n"));
-
-  ACE_Time_Value tv (30, 0);
-  this->orb_->run (tv);
-
-  // Wait for the supplier threads...
-  if (ACE_Thread_Manager::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "BCast (%P|%t) Thread_Manager wait failed\n"));
-    }
-
-  if (udp_eh.close () == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Cannot close EH %p\n"));
-    }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n"));
-
-  receiver.close (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  sender.close (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // @@ Deactivate all the objects...!
-
-  {
-    // Deactivate the Address Server
-    PortableServer::POA_var poa =
-      address_server_impl._default_POA (ACE_TRY_ENV);
-    ACE_CHECK;
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (&address_server_impl, ACE_TRY_ENV);
-    ACE_CHECK;
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (this->verbose ())
-      ACE_DEBUG ((LM_DEBUG, "EC_BCast (%P|%t) address server deactivated\n"));
-  }
-}
-
-void
-EC_BCast::dump_results (void)
-{
-  this->EC_Driver::dump_results ();
-}
-
-// ****************************************************************
-
-Simple_Address_Server::
-Simple_Address_Server (const ACE_INET_Addr& address)
-{
-  this->address_.ipaddr = address.get_ip_address ();
-  this->address_.port   = address.get_port_number ();
-}
-
-void
-Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
-                                 RtecUDPAdmin::UDP_Addr& address,
-                                 CORBA::Environment &)
-    ACE_THROW_SPEC (())
-{
-  address = this->address_;
-}
-
-#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/tests/Event/Basic/BCast.dsp b/TAO/orbsvcs/tests/Event/Basic/BCast.dsp
deleted file mode 100644
index 8a3fd6caa0b..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="BCast" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=BCast - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "BCast.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "BCast.mak" CFG="BCast - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "BCast - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "BCast - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "BCast - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "BCast - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "BCast"

-# PROP BASE Intermediate_Dir "BCast"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "BCast - Win32 Release"

-# Name "BCast - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\BCast.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\BCast.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
deleted file mode 100644
index ecb93ad3da7..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   BCast
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_BCAST_H
-#define EC_BCAST_H
-
-#include "Driver.h"
-#include "orbsvcs/RtecUDPAdminS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_BCast : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC bcast
-  //
-  // = DESCRIPTION
-  //
-public:
-  EC_BCast (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_args (void) const;
-  virtual void print_usage (void);
-  // add some command line args to enable/disable bcastions
-
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // set the bcastion flags
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers, just test connect and disconnect calls.
-
-  void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
-
-private:
-  u_short bcast_port_;
-  // The port used to send and receive bcast messages...
-};
-
-// ****************************************************************
-
-class Simple_Address_Server : public POA_RtecUDPAdmin::AddrServer
-{
-  // = DESCRIPTION
-  //   A fixed address server
-public:
-  Simple_Address_Server (const ACE_INET_Addr& address);
-  // constructo
-
-  virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address,
-                         CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC (());
-
-private:
-  RtecUDPAdmin::UDP_Addr address_;
-  // The UDP addres...
-};
-
-#endif /* EC_BCAST_H */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Basic.dsw b/TAO/orbsvcs/tests/Event/Basic/Basic.dsw
index d25151d33de..b731389ca68 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Basic.dsw
+++ b/TAO/orbsvcs/tests/Event/Basic/Basic.dsw
@@ -3,18 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "BCast"=.\BCast.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Observer"=.\Observer.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index ef8ffd97a84..253238b240c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -15,12 +15,11 @@ endif # ! TAO_ROOT
 BIN2 =   Reconnect \
 	Shutdown \
 	Schedule \
-	Observer \
-	BCast
+	Observer
 
 #### If the orbsvcs library wasn't built with all components, don't
 #### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event2
@@ -188,19 +187,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -246,9 +236,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -494,19 +488,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -552,9 +537,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -793,19 +782,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -851,9 +831,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1116,19 +1100,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1174,9 +1149,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1301,335 +1280,5 @@ endif
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i
-.obj/BCast.o .obj/BCast.so .shobj/BCast.o .shobj/BCast.so: BCast.cpp BCast.h ../lib/Driver.h ../lib/ectest_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i \
- ../lib/Consumer.h ../lib/Supplier.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 413e0cd260f..fad34d41af7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -120,10 +120,6 @@ EC_Master::run (int argc, char* argv[])
           }
       }
 
-      this->root_poa_->destroy (1,
-                                1,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
    }
   ACE_CATCHANY
     {
@@ -212,8 +208,7 @@ EC_Observer::EC_Observer (EC_Master *master,
                           int id)
   : master_ (master),
     seed_ (seed),
-    id_ (id),
-    gwys_ (0)
+    id_ (id)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 2f9c403cd6a..7fa81ad13d2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -147,6 +147,7 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
                                "Expected AlreadyConnected exception");
         }
       ACE_ENDTRY;
+      ACE_TRY_ENV.clear ();
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
         this->event_channel_->for_consumers (ACE_TRY_ENV);
@@ -208,6 +209,7 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
                                "Expected AlreadyConnected exception");
         }
       ACE_ENDTRY;
+      ACE_TRY_ENV.clear ();
 
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
         this->event_channel_->for_suppliers (ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Event/Event.dsw b/TAO/orbsvcs/tests/Event/Event.dsw
index 359704ee199..36f9e5e4d8d 100644
--- a/TAO/orbsvcs/tests/Event/Event.dsw
+++ b/TAO/orbsvcs/tests/Event/Event.dsw
@@ -3,21 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "BCast"=.\Basic\BCast.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "Connect"=.\Performance\Connect.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 99962528d43..db93aaa9dee 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -17,7 +17,7 @@ BIN2 =  Throughput \
 
 #### If the orbsvcs library wasn't built with all components, don't
 #### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event2
@@ -185,19 +185,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -243,9 +234,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -491,19 +486,10 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -549,9 +535,13 @@ endif
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
index ac2e3808597..3c775d16d5f 100755
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
@@ -18,7 +18,7 @@ $status = 0;
 print STDERR "\n\nThroughput/Latency single threaded configuration\n";
 $T = Process::Create ($prefix . "Throughput".$EXE_EXT,
 		      " -ORBsvcconf ec.st.conf "
-		      . "-burstsize 2000 -burstcount 1");
+		      . "-burstsize 100000 -burstcount 1");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -28,7 +28,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration\n";
 $T = Process::Create ($prefix . "Throughput".$EXE_EXT,
-		      " -burstsize 2000"
+		      " -burstsize 100000"
 		      ." -burstcount 1");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
@@ -39,7 +39,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration, 4 consumers\n";
 $T = Process::Create ($prefix . "Throughput".$EXE_EXT,
-		      " -burstsize 2000"
+		      " -burstsize 100000"
 		      ." -burstcount 1 -consumers 4");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
@@ -51,7 +51,7 @@ if ($T->TimedWait (60) == -1) {
 print STDERR "\n\nThroughput/Latency MT-safe configuration,",
   " 4 consumers 4 suppliers\n";
 $T = Process::Create ($prefix . "Throughput".$EXE_EXT,
-		      " -burstsize 2000"
+		      " -burstsize 100000"
 		      ." -burstcount 1 -consumers 4 -suppliers 4");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
@@ -63,7 +63,7 @@ if ($T->TimedWait (60) == -1) {
 print STDERR "\n\nThroughput/Latency MT-safe configuration,",
   " 4 consumers 4 suppliers\n";
 $T = Process::Create ($prefix . "Throughput".$EXE_EXT,
-		      " -burstsize 2000"
+		      " -burstsize 100000"
 		      ." -burstcount 1 -consumers 4 -suppliers 4"
 		      ." -consumers_tshift 0 -suppliers_tshift 0");
 if ($T->TimedWait (60) == -1) {
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 0622ed6eb4e..7d25fe17bfb 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -11,8 +11,7 @@ EC_Consumer::EC_Consumer (EC_Driver *driver,
   : driver_ (driver),
     cookie_ (cookie),
     push_count_ (0),
-    shutdown_event_type_ (ACE_ES_EVENT_SHUTDOWN),
-    is_active_ (0)
+    shutdown_event_type_ (ACE_ES_EVENT_SHUTDOWN)
 {
 }
 
@@ -43,7 +42,6 @@ EC_Consumer::connect (
 
   RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
   ACE_CHECK;
-  this->is_active_ = 1;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos,
@@ -68,13 +66,6 @@ EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-}
-
-void
-EC_Consumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!this->is_active_)
-    return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
@@ -85,7 +76,6 @@ EC_Consumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
   poa->deactivate_object (id.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  this->is_active_ = 0;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 68231280d09..e764d31666d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -67,9 +67,6 @@ public:
   // The application can invoke this method to disconnect from the EC
   // and deactivate this class.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
-  // The application is shutting down, deactivate the consumer.
-
   void accumulate (EC_Driver::Throughput_Stats& throughput,
                    EC_Driver::Latency_Stats& latency) const;
   // Accumulate our statistics to the totals.
@@ -111,9 +108,6 @@ private:
 
   int shutdown_event_type_;
   // The type used to indicate shutdown
-
-  int is_active_;
-  // Is the consumer active in the POA?
 };
 
 #endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 324d59ed016..68d14eb5687 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -139,9 +139,6 @@ EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV)
   this->disconnect_clients (ACE_TRY_ENV);
   ACE_CHECK;
 
-  this->shutdown_clients (ACE_TRY_ENV);
-  ACE_CHECK;
-
   this->destroy_ec (ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -504,16 +501,6 @@ EC_Driver::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Driver::shutdown_clients (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->shutdown_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->shutdown_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
 EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -733,30 +720,6 @@ EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Driver::shutdown_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->suppliers_[i]->shutdown (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers deactivated\n"));
-}
-
-void
-EC_Driver::shutdown_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->consumers_[i]->shutdown (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers deactivated\n"));
-}
-
-void
 EC_Driver::dump_results (void)
 {
   EC_Driver::Throughput_Stats throughput;
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 40f4b51833d..f64ea4d7398 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -96,10 +96,6 @@ public:
   // By default disconnect the suppliers and then the consumers, other
   // orders should work too.
 
-  virtual void shutdown_clients (CORBA::Environment &env);
-  // By default deactivate the suppliers and then the consumers, other
-  // orders should work too.
-
   virtual void connect_consumers (CORBA::Environment& env);
   // Connect all the consumers, by default it lets each consumer
   // connect itself.
@@ -148,12 +144,6 @@ public:
   virtual void disconnect_suppliers (CORBA::Environment& env);
   // Disconnect all the suppliers.
 
-  virtual void shutdown_consumers (CORBA::Environment& env);
-  // Deactivate all the consumers.
-
-  virtual void shutdown_suppliers (CORBA::Environment& env);
-  // Deactivate all the suppliers.
-
   virtual void destroy_ec (CORBA::Environment& env);
   // Call EC->destroy
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index 6b182b07c99..ed0e242590d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -13,7 +13,7 @@ LIBNAME  = libECTests
 LIB2      = $(LIBNAME).a
 SHLIB2    = $(LIBNAME).$(SOEXT)
 
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
@@ -182,19 +182,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -240,9 +231,13 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -497,19 +492,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -555,9 +541,13 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -787,19 +777,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -845,9 +826,13 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 33d9d45af56..42226e8d78d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -15,8 +15,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver,
      burst_size_ (0),
      payload_size_ (0),
      burst_pause_ (0),
-     shutdown_event_type_ (0),
-     is_active_ (0)
+     shutdown_event_type_ (0)
 {
 }
 
@@ -126,9 +125,9 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
   this->qos_ = qos;
   this->shutdown_event_type_ = shutdown_event_type;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushSupplier_var objref =
+    this->_this (ACE_TRY_ENV);
   ACE_CHECK;
-  this->is_active_ = 1;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos,
@@ -147,13 +146,6 @@ EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-}
-
-void
-EC_Supplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!this->is_active_)
-    return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
@@ -164,7 +156,6 @@ EC_Supplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
   poa->deactivate_object (id.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  this->is_active_ = 0;
 }
 
 void
@@ -214,33 +205,31 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 int
 EC_Supplier_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY_NEW_ENV
+    {
+      // Initialize a time value to pace the test
+      ACE_Time_Value tv (0, this->burst_pause_);
 
-  // Initialize a time value to pace the test
-  ACE_Time_Value tv (0, this->burst_pause_);
+      RtecEventComm::EventSet event (1);
+      event.length (1);
 
-  RtecEventComm::EventSet event (1);
-  event.length (1);
+      event[0].header.ttl = 1;
 
-  event[0].header.ttl = 1;
+      ACE_hrtime_t t = ACE_OS::gethrtime ();
+      ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
+      event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
+      event[0].header.ec_send_time = ORBSVCS_Time::zero ();
 
-  ACE_hrtime_t t = ACE_OS::gethrtime ();
-  ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
-  event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
-  event[0].header.ec_send_time = ORBSVCS_Time::zero ();
+      event[0].data.x = 0;
+      event[0].data.y = 0;
 
-  event[0].data.x = 0;
-  event[0].data.y = 0;
-
-  // We use replace to minimize the copies, this should result
-  // in just one memory allocation;
-  event[0].data.payload.length (this->payload_size_);
+      // We use replace to minimize the copies, this should result
+      // in just one memory allocation;
+      event[0].data.payload.length (this->payload_size_);
 
-  for (int i = 0; i < this->burst_count_; ++i)
-    {
-      for (int j = 0; j < this->burst_size_; ++j)
+      for (int i = 0; i < this->burst_count_; ++i)
         {
-          ACE_TRY
+          for (int j = 0; j < this->burst_size_; ++j)
             {
               this->supplier_->event_type (j, event[0]);
 
@@ -253,29 +242,17 @@ EC_Supplier_Task::svc (void)
 
               ACE_TRY_CHECK;
             }
-          ACE_CATCH (CORBA::SystemException, sys_ex)
-            {
-              ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
-            }
-          ACE_CATCHANY
-            {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
-            }
-          ACE_ENDTRY;
 
           ACE_OS::sleep (tv);
         }
-    }
 
-  ACE_TRY_EX(SHUTDOWN)
-    {
       // Send one event shutdown from each supplier
       event[0].header.type = this->shutdown_event_type_;
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
       this->supplier_->send_event (event, ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (SHUTDOWN);
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
     {
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index b2d5dcc1bfa..09e0e423134 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -86,9 +86,6 @@ public:
   void disconnect (CORBA::Environment &ACE_TRY_ENV);
   // Disconnect from the EC, also deactivates the object
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
-  // Disconnect from the EC, also deactivates the object
-
   virtual void dump_results (const char* name);
   // Dump the results...
 
@@ -132,9 +129,6 @@ private:
 
   RtecEventChannelAdmin::SupplierQOS qos_;
   // The publications, used to select the events.
-
-  int is_active_;
-  // Is the supplier active in the POA?
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index f80af44e9a0..fdee769899f 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -10,9 +10,9 @@
 
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Basic_Factory.h"
 #include "Event_Latency.h"
@@ -93,11 +93,29 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                                  const char *my_name)
 {
   entry_point (my_name);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      // No scheduling for this test...
-      this->rt_info_ = 0;
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
+
+      rt_info_ =
+        server->create (my_name, TAO_TRY_ENV);
+
+      const ACE_hrtime_t wcet_ns = ACE_UINT64_LITERAL (10000000); // 1 ms
+      RtecScheduler::Time wcet;
+      ORBSVCS_Time::hrtime_to_TimeT (wcet, wcet_ns);
+
+      server->set (rt_info_,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   wcet,
+                   wcet,
+                   ORBSVCS_Time::zero (),
+                   0,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   ORBSVCS_Time::zero (),
+                   1,
+                   RtecScheduler::OPERATION,
+                   TAO_TRY_ENV);
 
       // Create the event that we're registering for.
       ACE_ConsumerQOS_Factory dependencies;
@@ -110,35 +128,35 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       // = Connect as a consumer.
       this->consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        channel_admin_->for_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->suppliers_->connect_push_consumer (objref.in (),
                                                dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
+  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Latency_Consumer::open: "
                          "subscribe failed.\n"), -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Latency_Consumer::open: "
                          "unexpected exception.\n"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -258,20 +276,19 @@ Latency_Consumer::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) %s shutting down.\n", entry_point ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Disconnect from the push supplier.
-      this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR,
                  "(%t) %s Latency_Consumer::shutdown: unexpected exception.\n",
                   entry_point ()));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -343,10 +360,10 @@ Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
 
 void
 Latency_Supplier::Supplier::disconnect_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->impl_->disconnect_push_supplier (TAO_IN_ENV);
 }
 
 Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
@@ -356,19 +373,19 @@ Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
 
 void
 Latency_Supplier::Consumer::disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->impl_->disconnect_push_consumer (TAO_IN_ENV);
 }
 
 void
 Latency_Supplier::Consumer::push (
     const RtecEventComm::EventSet &events,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &TAO_IN_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->push (events, ACE_TRY_ENV);
+  this->impl_->push (events, TAO_IN_ENV);
 }
 
 // ************************************************************
@@ -392,13 +409,31 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 {
   this->entry_point (name);
   master_ = master;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->channel_admin_ =
         RtecEventChannelAdmin::EventChannel::_duplicate (ec);
 
-      this->rt_info_ = 0;
+      RtecScheduler::Scheduler_ptr server =
+        ACE_Scheduler_Factory::server ();
+
+      this->rt_info_ =
+        server->create (name, TAO_TRY_ENV);
+
+      RtecScheduler::Period_t period = timeout_interval * 20000;
+
+      server->set (rt_info_,
+                   RtecScheduler::VERY_HIGH_CRITICALITY,
+                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero (),
+                   period,
+                   RtecScheduler::VERY_LOW_IMPORTANCE,
+                   ORBSVCS_Time::zero (),
+                   1,
+                   RtecScheduler::OPERATION,
+                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_SupplierQOS_Factory publications;
       publications.insert (supplier_id_,
@@ -410,28 +445,28 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       // = Connect as a supplier.
       this->supplier_admin_ =
-        channel_admin_->for_suppliers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        channel_admin_->for_suppliers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->consumers_ =
-        supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        supplier_admin_->obtain_push_consumer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventComm::PushSupplier_var objref =
-        this->supplier_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->supplier_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       consumers_->connect_push_supplier (objref.in (),
                                          publications.get_SupplierQOS (),
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Latency_Supplier::open");
+      TAO_TRY_ENV.print_exception ("Latency_Supplier::open");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -458,8 +493,7 @@ Latency_Supplier::start_generating_events (void)
                                          ACE_CU64_TO_CU32 (now) % 1000000000 /
                                            1000));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       ACE_Time_Value tv_timeout (0, timeout_interval * 1000);
       TimeBase::TimeT timeout;
@@ -484,37 +518,38 @@ Latency_Supplier::start_generating_events (void)
 
       // = Connect as a consumer.
       consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        channel_admin_->for_consumers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventComm::PushConsumer_var objref =
-        this->consumer_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->consumer_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->suppliers_->connect_push_consumer (objref.in (),
                                                dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Latency_Supplier::generate_events:"
                          " unexpected exception.\n"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
 
 void
 Latency_Supplier::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment & TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - "));
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
   // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
   if (events.length () == 0)
@@ -548,7 +583,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
           // @@ ACE_TIMEPROBE_RESET;
           // @@ ACE_TIMEPROBE (EVENT_LATENCY_START_WITH_NEW_EVENT_IN_SUPPLIER);
 
-          ACE_TRY
+          TAO_TRY
             {
               if (short_circuit_EC)
                 {
@@ -556,7 +591,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
                     {
                       // This constructor is fast.
                       const RtecEventComm::EventSet es (1, 1, &event);
-                      consumer [cons]->push (es, ACE_TRY_ENV);
+                      consumer [cons]->push (es, TAO_TRY_ENV);
                     }
                 }
               else
@@ -575,19 +610,19 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
                   RtecEventComm::EventSet events (1);
                   events.length (1);
                   events[0] = event;
-                  consumers_->push (events, ACE_TRY_ENV);
+                  consumers_->push (events, TAO_TRY_ENV);
 
                   ACE_TIMEPROBE (EVENT_LATENCY_SUPPLIER_ENDS_PUSHING_EVENT);
                 }
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
             }
-          ACE_CATCHANY
+          TAO_CATCHANY
             {
               ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::push:"
                           " unexpected exception.\n",
                           entry_point ()));
             }
-          ACE_ENDTRY;
+          TAO_ENDTRY;
 
           // Check if we're done.
           if (master_ && (total_sent_ >= total_messages_))
@@ -631,8 +666,7 @@ Latency_Supplier::shutdown (void)
       return;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       if (master_)
         {
@@ -645,27 +679,31 @@ Latency_Supplier::shutdown (void)
           RtecEventComm::EventSet events (1);
           events.length (1);
           events[0] = event;
-          consumers_->push (events, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          consumers_->push (events, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       // Disconnect from the channel.
-      consumers_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      consumers_->disconnect_push_consumer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (master_)
+        {
+          TAO_ORB_Core_instance ()->orb ()->shutdown ();
+        }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::shutdown:"
                   " unexpected exception.\n",
                   entry_point ()));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Latency_Supplier::shutdown");
+      TAO_TRY_ENV.print_exception ("Latency_Supplier::shutdown");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
@@ -814,13 +852,12 @@ main (int argc, char *argv [])
 
   u_int i;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -830,15 +867,12 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService");
@@ -848,8 +882,10 @@ main (int argc, char *argv [])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_Scheduler_Factory::use_config (naming_context.in ());
 
       if (get_options (argc, argv))
         ACE_OS::exit (-1);
@@ -864,23 +900,23 @@ main (int argc, char *argv [])
       channel_name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        naming_context->resolve (channel_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var ec =
         RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 #else
       TAO_EC_Event_Channel_Attributes attr(root_poa.in (),
                                            root_poa.in ());
       TAO_EC_Event_Channel ec_impl  (attr);
-      ec_impl.activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ec_impl.activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 #endif /* 0 */
 
       // Create supplier(s).
@@ -932,14 +968,13 @@ main (int argc, char *argv [])
             ACE_ERROR_RETURN ((LM_ERROR, "generate_events failed.\n"), -1);
         }
 
-      while (!shutting_down)
-        orb->perform_work ();
+      orb->run ();
 
       for (i = 0; i < suppliers; ++i)
         {
           supplier [i]->print_stats ();
           delete supplier[i];
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
       delete [] supplier;
 
@@ -947,20 +982,20 @@ main (int argc, char *argv [])
         {
           consumer [i]->print_stats ();
           delete consumer [i];
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
       delete [] consumer;
 
-      ec->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ec->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_TIMEPROBE_PRINT;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
index 479c87d0b52..b9ecd48409b 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "Event_Latency - Win32 Debug"

 

diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index a50a5280f97..7f4baebc617 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -10,7 +10,7 @@ BIN2 = Event_Latency
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Event
@@ -169,25 +169,16 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -235,9 +226,13 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -329,8 +324,10 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 0c2eade7460..d1a48c5cc98 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -7,53 +7,26 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 unshift @INC, '../../../../bin';
 require Process;
-require ACEutils;
 
 $NS_ior = "NameService.ior";
 $sleeptime = 3;
-$status = 0;
 
-$NS = Process::Create ("..".$DIR_SEPARATOR
-		       ."..".$DIR_SEPARATOR
-		       ."Naming_Service".$DIR_SEPARATOR
-		       ."Naming_Service".$EXE_EXT,
+$NS = Process::Create ("../../Naming_Service/Naming_Service".$EXE_EXT,
 		       " -o $NS_ior ");
 
-if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
-  print STDERR "ERROR: waiting for naming service IOR file\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-
-$ES = Process::Create ("..".$DIR_SEPARATOR
-		       ."..".$DIR_SEPARATOR
-		       ."Event_Service".$DIR_SEPARATOR
-		       ."Event_Service".$EXE_EXT,
-		       "-ORBNameServiceIOR file://$NS_ior -t new");
-
 sleep $sleeptime;
 
-$TEST = Process::Create (".".$DIR_SEPARATOR."Event_Latency".$EXE_EXT,
-			 "-ORBNameServiceIOR file://$NS_ior"
-			 ." -j -m 100");
+$ES = Process::Create ("../../Event_Service/Event_Service".$EXE_EXT);
 
-if ($TEST->TimedWait (60) == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $status = 1;
-  $TEST->Kill (); $TEST->TimedWait (1);
-}
+sleep $sleeptime;
 
+$status = system ($EXEPREFIX."Event_Latency".$EXE_EXT.
+                  " -j -m 100");
 
-$NS->Terminate();
-$ES->Terminate();
-if ($NS->TimedWait (5) == -1 || $ES->TimedWait (5) == -1) {
-  print STDERR "ERROR: couldn't terminate the services nicely\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  $ES->Kill (); $ES->TimedWait (1);
-  $status = 1;
-}
+$NS->Kill ();
+$ES->Kill ();
 
-unlink $NS_ior;
+unlink ($NS_ior);
 
 # @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
new file mode 100644
index 00000000000..63d18e6443c
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
@@ -0,0 +1,253 @@
+// $Id$
+
+#include "IR_Helper.h"
+#include "orbsvcs/PingS.h"
+#include "tao/IIOP_Profile.h"
+#include "tao/IIOP_Acceptor.h"
+#include "tao/Acceptor_Registry.h"
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+
+class Ping_i: public POA_Ping_Object
+  // = TITLE
+  //    Ping Object Implementation
+  //
+  // = DESCRIPTION
+  //    Implementation Repository uses this to check to see if the server
+  //    is still running.
+{
+public:
+  Ping_i (int debug = 0) : debug_ (debug) {}
+
+  virtual void ping (CORBA::Environment &)
+    ACE_THROW_SPEC (())
+    {
+      if (this->debug_)
+        ACE_DEBUG ((LM_DEBUG, "Pong!\n"));
+    }
+private:
+  int debug_;
+};
+
+IR_Helper::IR_Helper (char *server_name,
+                      PortableServer::POA_ptr poa,
+                      CORBA::ORB_ptr orb,
+                      int debug)
+  : name_ (ACE::strnew (server_name)),
+    ir_key_ (0),
+    ir_addr_ (0),
+    ping_ (new Ping_i (debug)),
+    implrepo_ (0),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    orb_ (CORBA::ORB::_duplicate (orb)),
+    debug_ (debug)
+{
+  const char *exception_message = "Null Message";
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      exception_message = "While read_ir_ior";
+      this->read_ir_ior (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Resolve the IR.
+      exception_message = "While string_to_object of ImplRepo";
+      CORBA::Object_var implrepo_object =
+        this->orb_->string_to_object (this->ir_key_, ACE_TRY_ENV);
+      ACE_TRY_CHECK;;
+
+      if (CORBA::is_nil (implrepo_object.in ()))
+        ACE_ERROR ((LM_ERROR,
+                    "invalid implrepo key <%s>\n",
+                    this->ir_key_));
+
+      exception_message = "While narrowing ImplRepo";
+      this->implrepo_ =
+        Implementation_Repository::_narrow (implrepo_object.in(), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Now register the Ping Object
+       PortableServer::ObjectId_var ping_id =
+      PortableServer::string_to_ObjectId ("ping");
+
+      exception_message = "While activating ping object";
+      this->poa_->activate_object_with_id (ping_id.in (),
+                                           this->ping_,
+                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      exception_message = "While creating reference to ping object";
+      this->ping_ptr_ =
+        this->poa_->id_to_reference (ping_id.in (),
+                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_ERROR ((LM_ERROR, "IR_Helper::IR_Helper - %s\n", exception_message));
+      ACE_TRY_ENV.print_exception ("SYS_EX");
+      return;
+    }
+  ACE_ENDTRY;
+}
+
+IR_Helper::~IR_Helper ()
+{
+  delete this->name_;
+  delete this->ir_key_;
+
+  // @@ Delete the two objects
+}
+
+int
+IR_Helper::register_server (const char *comm_line,
+                            const char *environment,
+                            const char *working_dir,
+                            CORBA_Environment &ACE_TRY_ENV)
+{
+  ACE_TRY
+    {
+      CORBA::Object_var implrepo_object =
+        this->orb_->string_to_object (this->ir_key_, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Implementation_Repository *ImplRepo =
+        Implementation_Repository::_narrow (implrepo_object.in(), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (implrepo_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid implrepo key <%s>\n",
+                           this->ir_key_),
+                          -1);
+
+      Implementation_Repository::Process_Options proc_opts;
+
+      proc_opts.command_line_ = CORBA::string_dup (comm_line);
+      proc_opts.environment_ = CORBA::string_dup (environment);
+      proc_opts.working_directory_ = CORBA::string_dup (working_dir);
+
+      ImplRepo->reregister_server (this->name_, proc_opts, ACE_TRY_ENV);
+    }
+  ACE_CATCHANY
+    {
+      ACE_TRY_ENV.print_exception ("IR_Helper::register_server");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+int
+IR_Helper::read_ir_ior (CORBA_Environment &ACE_TRY_ENV)
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+
+  // Open the file for reading.
+  // @@ Hard-coded name is bad.  Need to fix.
+  ACE_HANDLE f_handle_ = ACE_OS::open ("implrepo.ior", 0);
+
+  if (f_handle_ == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: implrepo.ior\n"),
+                      -1);
+
+  ACE_Read_Buffer ior_buffer (f_handle_);
+  this->ir_key_ = ior_buffer.read ();
+
+  if (this->ir_key_ == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
+
+  ACE_OS::close (f_handle_);
+  return 0;
+}
+
+
+void
+IR_Helper::notify_startup (CORBA_Environment &ACE_TRY_ENV)
+{
+  // @@ Don't use the ORB_Core_instance() keep a pointer to the ORB
+  //    and use the orb_core() accessor
+  TAO_Acceptor_Registry* registry =
+    TAO_ORB_Core_instance ()->acceptor_registry ();
+
+  TAO_Acceptor *acceptor = 0;
+  TAO_AcceptorSetItor end = registry->end ();
+  for (TAO_AcceptorSetItor i = registry->begin (); i != end; ++i)
+    {
+      if ((*i)->tag () == TAO_IOP_TAG_INTERNET_IOP)
+        {
+          acceptor = (*i);
+          break;
+        }
+    }
+  if (acceptor == 0)
+    ACE_THROW (CORBA::NO_IMPLEMENT());
+
+  TAO_IIOP_Acceptor* iiop_acceptor =
+    ACE_dynamic_cast (TAO_IIOP_Acceptor*,acceptor);
+
+  // Get our host and port and convert it to something we can use.
+  const ACE_INET_Addr& my_addr  = iiop_acceptor->address ();
+
+  Implementation_Repository::INET_Addr my_ir_addr;
+  my_ir_addr.port_ = my_addr.get_port_number ();
+  my_ir_addr.host_ = CORBA::string_dup (my_addr.get_host_name ());
+
+  ACE_TRY
+    {
+      delete this->ir_addr_;
+      this->ir_addr_ = this->implrepo_->server_is_running (this->name_,
+                                                           my_ir_addr,
+                                                           this->ping_ptr_,
+                                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+}
+
+
+// Notify the IR that the server has been shut down.
+void
+IR_Helper::notify_shutdown (CORBA_Environment &ACE_TRY_ENV)
+{
+  ACE_TRY
+    {
+      this->implrepo_->server_is_shutting_down (this->name_, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+}
+
+void
+IR_Helper::change_object (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV)
+{
+  if ( obj
+    && obj->_stubobj ()
+    && obj->_stubobj ()->profile_in_use ()
+    && this->implrepo_
+    && this->implrepo_->_stubobj ()
+    && this->implrepo_->_stubobj ()->profile_in_use ()  )
+    {
+      TAO_IIOP_Profile *implrepo_pfile =
+          ACE_dynamic_cast (TAO_IIOP_Profile *,
+                            this->implrepo_->_stubobj ()->profile_in_use ());
+      TAO_IIOP_Profile *iiop_pfile =
+          ACE_dynamic_cast (TAO_IIOP_Profile *,
+                            obj->_stubobj ()->profile_in_use ());
+
+      // @@ Only same host for now
+      iiop_pfile->port (implrepo_pfile->port ());
+    }
+}
diff --git a/TAO/orbsvcs/orbsvcs/IR_Helper.h b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h
index 849b7a8d600..fa674bc7a41 100644
--- a/TAO/orbsvcs/orbsvcs/IR_Helper.h
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h
@@ -4,7 +4,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/orbsvcs/orbsvcs
+//    TAO/orbsvcs/tests/ImplRepo
 //
 // = FILENAME
 //    IR_Helper.h
@@ -22,9 +22,10 @@
 
 #include "tao/TAO.h"
 #include "orbsvcs/ImplRepoC.h"
-#include "orbsvcs/ImplRepoS.h"
 
-class TAO_ORBSVCS_Export IR_Helper
+class POA_Ping_Object;
+
+class IR_Helper
   // = TITLE
   //   Implementation Repository Helper Class
   //
@@ -33,7 +34,7 @@ class TAO_ORBSVCS_Export IR_Helper
   //   
 {
 public:
-  IR_Helper (const char *server_name, PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, int debug = 0);
+  IR_Helper (char *server_name, PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, int debug = 0);
   // Constructor
   ~IR_Helper ();
   // Destructor
@@ -54,19 +55,19 @@ public:
                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
   // Convert an object into a IR controlled object.
 private:
+  int read_ir_ior (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+
   char *name_;
-  
-  ImplementationRepository::Address *ir_addr_;
-  
-  POA_ImplementationRepository::ServerObject *server_object_;  
-  // Pointer to our implementation of the server object
+  char *ir_key_;
 
-  ImplementationRepository::ServerObject_ptr server_object_ptr_;
-  // Object pointer to <server_object>
+  Implementation_Repository::INET_Addr *ir_addr_;
   
-  ImplementationRepository::Administration *implrepo_;
-  CORBA::ORB_var orb_;
+  POA_Ping_Object *ping_;  
+  CORBA::Object_ptr ping_ptr_;
+  
+  Implementation_Repository *implrepo_;
   PortableServer::POA_var poa_;
+  CORBA::ORB_var orb_;
   int debug_; 
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
index e7ce084a55c..c60198ae4fd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
@@ -63,6 +63,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Repository_Test"=.\Repository_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index 7982b4862eb..1e1e8b5a296 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -18,6 +18,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
 
 IDL_SRC = AirplaneS.cpp AirplaneC.cpp NesteaS.cpp NesteaC.cpp
 PROG_SRCS = \
+            Repository_Test.cpp \
             airplane_client.cpp \
             airplane_server.cpp \
             airplane_client_i.cpp \
@@ -27,7 +28,8 @@ PROG_SRCS = \
             nestea_server.cpp \
             nestea_client_i.cpp \
             nestea_server_i.cpp \
-            nestea_i.cpp
+            nestea_i.cpp \
+            IR_Helper.cpp
 
 SRC=$(IDL_SRC) $(PROG_SRCS)
 
@@ -40,7 +42,8 @@ AIRPLANE_SERVER_OBJS =  AirplaneC.o \
                         AirplaneS.o \
                         airplane_server.o \
                         airplane_server_i.o \
-                        airplane_i.o
+                        airplane_i.o \
+                        IR_Helper.o
 
 NESTEA_CLIENT_OBJS =  NesteaC.o \
                       NesteaS.o \
@@ -51,24 +54,28 @@ NESTEA_SERVER_OBJS =  NesteaC.o \
                       NesteaS.o \
                       nestea_server.o \
                       nestea_server_i.o \
-                      nestea_i.o
+                      nestea_i.o \
+                      IR_Helper.o
+
+REPOSITORY_TEST_OBJS =  Repository_Test.o \
+                        Repository.o \
+                        Options.o
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = airplane_server \
        airplane_client \
        nestea_server \
-       nestea_client 
+       nestea_client \
+       Repository_Test
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # ImplRepo
 
-TAO_IDLFLAGS += -Ge 1
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -102,10 +109,22 @@ nestea_server: $(addprefix $(VDIR),$(NESTEA_SERVER_OBJS))
 nestea_client: $(addprefix $(VDIR),$(NESTEA_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+Repository_Test: $(addprefix $(VDIR),$(REPOSITORY_TEST_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), Airplane$(ext)) \
                $(foreach ext, $(IDL_EXT), Nestea$(ext))
 
+$(VDIR)Repository.$(OBJEXT): ../../ImplRepo_Service/Repository.cpp
+	$(COMPILE.cc) -o $@ $<
+	${MVCMD}
+
+$(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
+	$(COMPILE.cc) -o $@ $<
+	${MVCMD}
+
+
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -218,25 +237,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -284,9 +294,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -476,25 +490,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -542,9 +547,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -624,7 +633,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- AirplaneC.i
+ AirplaneC.i AirplaneS.h AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp \
+ AirplaneS.i
 .obj/NesteaS.o .obj/NesteaS.so .shobj/NesteaS.o .shobj/NesteaS.so: NesteaS.cpp NesteaS.h NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -734,25 +744,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -800,9 +801,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -992,25 +997,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1058,9 +1054,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1140,7 +1140,89 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- NesteaC.i
+ NesteaC.i NesteaS.h NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i
+.obj/Repository_Test.o .obj/Repository_Test.so .shobj/Repository_Test.o .shobj/Repository_Test.so: Repository_Test.cpp \
+ ../../ImplRepo_Service/Repository.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 .obj/airplane_client.o .obj/airplane_client.so .shobj/airplane_client.o .shobj/airplane_client.so: airplane_client.cpp airplane_client_i.h AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1250,25 +1332,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1316,9 +1389,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1520,13 +1597,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  airplane_i.h AirplaneS.h AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1579,6 +1649,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1659,15 +1731,12 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
 .obj/airplane_client_i.o .obj/airplane_client_i.so .shobj/airplane_client_i.o .shobj/airplane_client_i.so: airplane_client_i.cpp airplane_client_i.h \
  AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1778,25 +1847,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1844,9 +1904,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2052,13 +2116,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  airplane_i.h AirplaneS.h AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2111,6 +2168,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2191,15 +2250,12 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -2313,25 +2369,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2379,9 +2426,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2571,25 +2622,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2637,9 +2679,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2841,13 +2887,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  nestea_i.h NesteaS.h NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2900,6 +2939,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2979,16 +3020,12 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
 .obj/nestea_client_i.o .obj/nestea_client_i.so .shobj/nestea_client_i.o .shobj/nestea_client_i.so: nestea_client_i.cpp nestea_client_i.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -3098,25 +3135,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3164,9 +3192,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3372,13 +3404,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  nestea_i.h NesteaS.h NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -3431,6 +3456,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3510,16 +3537,12 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IR_Helper.h \
+ NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -3633,25 +3656,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3699,9 +3713,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3794,5 +3812,321 @@ realclean: clean
  $(ACE_ROOT)/ace/FILE.i \
  $(ACE_ROOT)/ace/FILE_IO.i \
  $(ACE_ROOT)/ace/FILE_Connector.i
+.obj/IR_Helper.o .obj/IR_Helper.so .shobj/IR_Helper.o .shobj/IR_Helper.so: IR_Helper.cpp IR_Helper.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.h \
+ $(TAO_ROOT)/tao/Acceptor_Impl.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.i \
+ $(TAO_ROOT)/tao/Acceptor_Registry.h \
+ $(TAO_ROOT)/tao/Acceptor_Registry.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp
new file mode 100644
index 00000000000..ecf7ec436e8
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp
@@ -0,0 +1,166 @@
+/* -*- C++ -*- */
+// $Id$
+
+#include "../../ImplRepo_Service/Repository.h"
+
+ASYS_TCHAR *NAME_VALUE = ASYS_TEXT ("server");
+ASYS_TCHAR *NAME_VALUE2 = ASYS_TEXT ("server");
+ASYS_TCHAR *COMM_LINE_VALUE = ASYS_TEXT ("server -i");
+ASYS_TCHAR *ENV_VALUE = ASYS_TEXT ("null environment");
+ASYS_TCHAR *HOST_VALUE = ASYS_TEXT ("maxixe.cs.wustl.edu");
+const int PORT_VALUE = 20000;
+ASYS_TCHAR *PING_IOR_VALUE = ASYS_TEXT ("iiop://maxixe/ping");
+ASYS_TCHAR *WDIR_VALUE = ASYS_TEXT (".");
+
+// Just tests the functionality of the Repository
+
+int main (int argc, char *argv[])
+{
+  int test_success = 1;
+  Repository rep;
+  Repository_Record new_rec, rec;
+
+  new_rec.comm_line = ACE::strnew (COMM_LINE_VALUE);
+  new_rec.env = ACE::strnew (ENV_VALUE);
+  new_rec.host = ACE::strnew (HOST_VALUE);
+  new_rec.port = PORT_VALUE;
+  new_rec.ping_ior = ACE::strnew (PING_IOR_VALUE);
+  new_rec.wdir = ACE::strnew (WDIR_VALUE);
+
+  ACE_DEBUG ((LM_DEBUG, "=Adding Record to Repository\n"));
+
+  // Add our one record
+  int result = rep.add (NAME_VALUE, new_rec);
+
+  if (result == 1) // We need to get rid of it
+    {
+      ACE_DEBUG ((LM_DEBUG, "New Record already registered, updating\n"));
+      rep.update (NAME_VALUE, new_rec);
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "=Performing Resolve Test\n"));
+
+  // Bring it back!
+  if (rep.resolve (NAME_VALUE, rec) == 0)
+    {
+      if (ACE_OS::strcmp (rec.comm_line, COMM_LINE_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: comm_line compare failed: \"%s\" \"%s\"\n",
+                     rec.comm_line,
+                     COMM_LINE_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (rec.env, ENV_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: env compare failed: \"%s\" \"%s\"\n",
+                     rec.env,
+                     ENV_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (rec.wdir, WDIR_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: wdir compare failed: \"%s\" \"%s\"\n",
+                     rec.wdir,
+                     WDIR_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (rec.host, HOST_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: host compare failed: \"%s\" \"%s\"\n",
+                     rec.host,
+                     HOST_VALUE));
+          test_success = 0;
+        }
+
+      if (rec.port != PORT_VALUE)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: port compare failed: \"%hu\" \"%hu\"\n",
+                     rec.port,
+                     PORT_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (rec.ping_ior, PING_IOR_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                     "Error: ping_ior compare failed: \"%s\" \"%s\"\n",
+                     rec.ping_ior,
+                     PING_IOR_VALUE));
+          test_success = 0;
+        }
+    }
+
+  // Try some of the single accessors
+
+  ASYS_TCHAR *cl, *env, *ping_ior;
+
+  ACE_DEBUG ((LM_DEBUG, "=Performing Single Accessor Test\n"));
+
+  if (rep.get_comm_line (NAME_VALUE, cl) == 0
+      && rep.get_env (NAME_VALUE, env) == 0
+      && rep.get_ping_ior (NAME_VALUE, ping_ior) == 0)
+    {
+      if (ACE_OS::strcmp (cl, COMM_LINE_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Error: comm_line compare failed: \"%s\" \"%s\"\n",
+                      cl,
+                      COMM_LINE_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (env, ENV_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Error: env compare failed: \"%s\" \"%s\"\n",
+                      env,
+                      ENV_VALUE));
+          test_success = 0;
+        }
+
+      if (ACE_OS::strcmp (ping_ior, PING_IOR_VALUE) != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Error: ping_ior compare failed: \"%s\" \"%s\"\n",
+                      ping_ior,
+                      PING_IOR_VALUE));
+          test_success = 0;
+        }
+
+      delete [] cl;
+      delete [] env;
+      delete [] ping_ior;
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "=Performing Reregister Test\n"));
+
+  if (rep.add (NAME_VALUE, new_rec) != 1)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Error: Reregistration not detected\n"));
+      test_success = 0;
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "=Cleaning up\n"));
+
+  if (rep.remove (NAME_VALUE) != 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Error: Could not remove record\n"));
+      test_success = 0;
+    }
+
+  if (test_success == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Tests were successful\n"));
+      return 0;
+    }
+  else
+    return -1;
+}
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_ir.dsp b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp
index 5f86793005a..c0db7558226 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_ir.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp
@@ -1,38 +1,39 @@
-# Microsoft Developer Studio Project File - Name="tao_ir" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Repository_Test" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=tao_ir - Win32 Debug

+CFG=Repository_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "tao_ir.mak".

+!MESSAGE NMAKE /f "Repository_Test.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "tao_ir.mak" CFG="tao_ir - Win32 Debug"

+!MESSAGE NMAKE /f "Repository_Test.mak" CFG="Repository_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "tao_ir - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "tao_ir - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Repository_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Repository_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "tao_ir - Win32 Release"

+!IF  "$(CFG)" == "Repository_Test - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "tao_ir___Win32_Release"

-# PROP BASE Intermediate_Dir "tao_ir___Win32_Release"

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

@@ -41,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -50,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "tao_ir - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Repository_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "tao_ir___Win32_Debug"

-# PROP BASE Intermediate_Dir "tao_ir___Win32_Debug"

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -66,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -75,24 +76,28 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "tao_ir - Win32 Release"

-# Name "tao_ir - Win32 Debug"

+# Name "Repository_Test - Win32 Release"

+# Name "Repository_Test - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\tao_ir.cpp

+SOURCE=..\..\ImplRepo_Service\Options.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\tao_ir_i.cpp

+SOURCE=..\..\ImplRepo_Service\Repository.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Repository_Test.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -100,7 +105,11 @@ SOURCE=.\tao_ir_i.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\tao_ir_i.h

+SOURCE=..\..\ImplRepo_Service\Options.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\ImplRepo_Service\Repository.h

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
index a46211f7459..3dd4f596208 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
@@ -17,13 +17,12 @@ CFG=Airplane Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Airplane Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Airplane Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Airplane Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Airplane Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -132,7 +131,7 @@ InputPath=.\Airplane.idl
 InputName=Airplane

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,7 +170,7 @@ InputPath=.\Airplane.idl
 InputName=Airplane

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 4223ea6911d..671c672fbfc 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -85,9 +85,11 @@ Airplane_Client_i::get_planes (size_t count)
       ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
+          ACE_TRY_ENV.clear ();
           CORBA::String_var response =
             this->server_->get_plane (ACE_TRY_ENV);
           ACE_TRY_CHECK;
+          ACE_OS::sleep (1);
 
           ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
         }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index c37e88f3ea8..c10222a91a0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -7,7 +7,8 @@ ACE_RCSID(ImplRepo, airplane_i, "$Id$")
 
 // Constructor
 
-  Airplane_i::Airplane_i (int /*shutdown*/)
+Airplane_i::Airplane_i (int shutdown)
+: shutdown_ (shutdown)
 {
   // Seed the random number generator
   // Note: This server should not be run with thread-per-request since the seeding
@@ -35,6 +36,9 @@ Airplane_i::get_plane (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
   
+  if (this->shutdown_ != 0)
+    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   switch (ACE_OS::rand () % 24)
     {
     case 0:
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 14893908c6d..c740b5039ea 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -53,6 +53,10 @@ public:
   virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a random plane.
+
+private:
+  int shutdown_;
+  // Shutdown flag
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 5a22f6d9285..164daf342b9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -33,7 +33,5 @@ main (int argc, char *argv[])
       return -1;
     }
   ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
index 29beb825b37..a5068a8b5d4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
@@ -17,13 +17,12 @@ CFG=Airplane Server - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Airplane Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Airplane Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Airplane Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Airplane Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -100,6 +99,10 @@ SOURCE=.\airplane_server.cpp
 

 SOURCE=.\airplane_server_i.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\IR_Helper.cpp

+# End Source File

 # End Group

 # Begin Group "Generated Source Files"

 

@@ -124,6 +127,10 @@ SOURCE=.\airplane_i.h
 

 SOURCE=.\airplane_server_i.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\IR_Helper.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

@@ -140,7 +147,7 @@ InputPath=.\Airplane.idl
 InputName=Airplane

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -179,7 +186,7 @@ InputPath=.\Airplane.idl
 InputName=Airplane

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 4bcee722ff3..9eb000f47f9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -10,6 +10,7 @@ Airplane_Server_i::Airplane_Server_i (void)
   : server_impl_ (0),
     ior_output_file_ (0),
     ir_helper_ (0),
+    register_with_ir_ (0),
     use_ir_ (0)
 {
   // Nothing
@@ -18,7 +19,7 @@ Airplane_Server_i::Airplane_Server_i (void)
 int
 Airplane_Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:i");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ir");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -27,6 +28,9 @@ Airplane_Server_i::parse_args (void)
       case 'd':  // debug flag.
         TAO_debug_level++;
         break;
+      case 'r':  // Register restart information with the IR.
+        this->register_with_ir_ = 1;
+        break;
       case 'i':  // Use the IR
         this->use_ir_ = 1;
         break;
@@ -43,6 +47,7 @@ Airplane_Server_i::parse_args (void)
                            "usage:  %s"
                            " [-d]"
                            " [-i]"
+                           " [-r]"
                            " [-o] <ior_output_file>"
                            "\n",
                            argv_ [0]),
@@ -87,11 +92,16 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       CORBA::ORB_var orb = this->orb_manager_.orb ();
 
       if (this->use_ir_ == 1)
-        ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name,
-                                                     child_poa.in (),
-                                                     orb.in (),
-                                                     TAO_debug_level),
-                        -1);
+        {
+          ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name,
+                                                       child_poa.in (),
+                                                       orb.in (),
+                                                       TAO_debug_level),
+                          -1);
+
+          if (this->register_with_ir_ == 1)
+            this->ir_helper_->register_server ("airplane_server -i");
+        }
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 6dbf961bf31..28e36c7a7a4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -23,7 +23,7 @@
 
 #include "tao/TAO.h"
 #include "airplane_i.h"
-#include "orbsvcs/IR_Helper.h"
+#include "IR_Helper.h"
 
 class Airplane_Server_i
 {
@@ -70,6 +70,9 @@ private:
   IR_Helper *ir_helper_;
   // Helper class for using the IR.
 
+  int register_with_ir_;
+  // Flag for whether or not to register startup with the IR.
+
   int use_ir_;
   // Flag for whether or not to use the IR.
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
index 3fe446dd698..88780a43145 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
@@ -17,13 +17,12 @@ CFG=Nestea Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Nestea Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Nestea Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Nestea Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nestea Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -126,13 +125,13 @@ SOURCE=.\Nestea.idl
 

 !IF  "$(CFG)" == "Nestea Client - Win32 Release"

 

-USERDEP__NESTE="..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__AIRPL="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Nestea.idl

 InputName=Nestea

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,13 +164,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Nestea Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__NESTE="..\..\..\..\bin\tao_idl.exe"	

+USERDEP__AIRPL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Nestea.idl

 InputName=Nestea

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Gi $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 1c0edc50242..4ed1a895e0e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -123,7 +123,7 @@ Nestea_Client_i::init (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_Client_i::init");
+      ACE_TRY_ENV.print_exception ("Nestea_Client_i::init");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 7051ead5722..527111ef28b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -10,8 +10,9 @@ ACE_RCSID(ImplRepo, nestea_i, "$Id$")
 
 // Constructor
 
-  Nestea_i::Nestea_i (const char *filename, int /*shutdown*/)
-: cans_ (0)
+Nestea_i::Nestea_i (const char *filename, int shutdown)
+: shutdown_ (shutdown),
+  cans_ (0)
 {
   this->data_filename_ = ACE::strnew (filename);
   
@@ -42,6 +43,9 @@ Nestea_i::drink (CORBA::Long cans,
 
   this->cans_ += cans;
 
+  if (this->shutdown_ != 0)
+    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   this->save_data ();
 }
 
@@ -63,6 +67,9 @@ Nestea_i::crush (CORBA::Long cans,
   else
     this->cans_ -= cans;
   
+  if (this->shutdown_ != 0)
+    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   this->save_data ();
 }
 
@@ -78,6 +85,9 @@ Nestea_i::bookshelf_size (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
 
+  if (this->shutdown_ != 0)
+    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   return this->cans_;
 }
 
@@ -92,6 +102,9 @@ Nestea_i::get_praise (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
 
+  if (this->shutdown_ != 0)
+    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   if (this->cans_ > 500)
     return CORBA::string_dup ("Man, that is one excellent Nestea Collection!");
   else if (this->cans_ > 250)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index c4b37a901d6..51aa465f0ac 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -78,6 +78,9 @@ private:
   char *data_filename_;
   // The name of the file to store the data in.
 
+  int shutdown_;
+  // Shutdown flag.
+
   ACE_UINT32 cans_;
   // Number of cans in the bookshelf.
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 5b3ecd937ab..e5673015ac2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -33,8 +33,5 @@ main (int argc, char *argv[])
       return -1;
     }
   ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, "Nestea Bookshelf Server says goodnight\n"));
-
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
index bb7940ec57e..72be10ec8c5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
@@ -17,13 +17,12 @@ CFG=Nestea Server - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Nestea Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Nestea Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Nestea Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nestea Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -100,6 +99,10 @@ SOURCE=.\nestea_server.cpp
 

 SOURCE=.\nestea_server_i.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\IR_Helper.cpp

+# End Source File

 # End Group

 # Begin Group "Generated Source Files"

 

@@ -124,6 +127,10 @@ SOURCE=.\nestea_i.h
 

 SOURCE=.\nestea_server_i.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\IR_Helper.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

@@ -134,13 +141,13 @@ SOURCE=.\Nestea.idl
 

 !IF  "$(CFG)" == "Nestea Server - Win32 Release"

 

-USERDEP__NESTE="..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__AIRPL="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Nestea.idl

 InputName=Nestea

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -173,13 +180,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Nestea Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__NESTE="..\..\..\..\bin\tao_idl.exe"	

+USERDEP__AIRPL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Nestea.idl

 InputName=Nestea

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Gi  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 5ed6b235838..330ba2e4587 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -8,10 +8,11 @@ ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
 
 const char *NESTEA_DATA_FILENAME = "nestea.dat";
 
-Nestea_Server_i::Nestea_Server_i (const char */*filename*/)
+Nestea_Server_i::Nestea_Server_i (const char *filename)
   : server_impl_ (0),
     ior_output_file_ (0),
     ir_helper_ (0),
+    register_with_ir_ (0),
     use_ir_ (0)
 {
   // Nothing
@@ -26,7 +27,7 @@ Nestea_Server_i::~Nestea_Server_i (void)
 int
 Nestea_Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:i");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ir");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,6 +36,9 @@ Nestea_Server_i::parse_args (void)
       case 'd':  // debug flag.
         TAO_debug_level++;
         break;
+      case 'r':  // Register restart information with the IR.
+        this->register_with_ir_ = 1;
+        break;
       case 'i':  // Use the IR
         this->use_ir_ = 1;
         break;
@@ -93,12 +97,16 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       ACE_TRY_CHECK;
 
       if (this->use_ir_ == 1)
-        ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name,
-                                                     this->orb_manager_.child_poa (),
-                                                     this->orb_manager_.orb (),
-                                                     TAO_debug_level),
-                        -1);
-
+        {
+          ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name,
+                                                       this->orb_manager_.child_poa (),
+                                                       this->orb_manager_.orb (),
+                                                       TAO_debug_level),
+                          -1);
+
+          if (this->register_with_ir_ == 1)
+            this->ir_helper_->register_server ("nestea_server -i");
+        }
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
@@ -107,7 +115,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         this->orb_manager_.child_poa ()->id_to_reference (id.in (),
                                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
- 
+
       if (this->use_ir_ == 1)
         {
           this->ir_helper_->change_object (server_obj.inout (), ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index 04c2c4a7dcd..f6b1280f190 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -23,7 +23,7 @@
 
 #include "tao/TAO.h"
 #include "nestea_i.h"
-#include "orbsvcs/IR_Helper.h"
+#include "IR_Helper.h"
 
 class Nestea_Server_i
 {
@@ -70,6 +70,9 @@ private:
   IR_Helper *ir_helper_;
   // Helper class for using the IR.
 
+  int register_with_ir_;
+  // Flag for whether or not to register startup with the IR.
+
   int use_ir_;
   // Flag for whether or not to use the IR.
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index 5cbbb6207fc..41cb3f46991 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -13,15 +13,6 @@ $airplane_ior = "airplane.ior";
 $nestea_ior = "nestea.ior";
 $implrepo_ior = "implrepo.ior";
 
-$implrepo_server = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".
-                   $DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT;
-$tao_ir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".
-                   $DIR_SEPARATOR."tao_ir".$EXE_EXT;
-$airplane_server = $EXEPREFIX."airplane_server".$EXE_EXT;
-$airplane_client = $EXEPREFIX."airplane_client".$EXE_EXT;
-$nestea_server = $EXEPREFIX."nestea_server".$EXE_EXT;
-$nestea_client = $EXEPREFIX."nestea_client".$EXE_EXT;
-
 # Make sure the files are gone, so we can wait on them.
 unlink $airplane_ior;
 unlink $nestea_ior;
@@ -31,105 +22,93 @@ unlink $implrepo_ior;
 
 sub airplane_test
 {
-  $SV = Process::Create ($airplane_server,
+  $SV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT,
                          "-o $airplane_ior");
 
   ACE::waitforfile ($airplane_ior);
 
-  $status = system ($airplane_client.
+  $status = system ($EXEPREFIX."airplane_client".$EXE_EXT.
                     " -k file://$airplane_ior");
 
   $SV->Kill (); $SV->Wait ();
+  unlink $airplane_ior;
 }
 
 sub airplane_ir_test
 {
-  $IR = Process::Create ($implrepo_server, 
-                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT,
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add plane -c \"airplane_server -i -ORBImplRepoIOR file://$implrepo_ior\"");
-
-  $SV = Process::Create ($airplane_server,
-                         "-o $airplane_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior");
+  $SV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT,
+                         "-o $airplane_ior -i -r");
 
   ACE::waitforfile ($airplane_ior);
 
-  system($airplane_client." -k file://$airplane_ior");
-
-  system($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown plane");
+  system($EXEPREFIX."airplane_client.$EXE_EXT -k file://$airplane_ior");
 
-  system($airplane_client." -k file://$airplane_ior");
-
-  $SV->Kill (); $SV->Wait ();
   $IR->Kill (); $IR->Wait ();
 }
 
 sub nestea_test
 {
-  $SV = Process::Create ($nestea_server,
+  $SV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT,
                          "-o $nestea_ior");
 
   ACE::waitforfile ($nestea_ior);
 
-  $status = system ($nestea_client.
+  $status = system ($EXEPREFIX."nestea_client".$EXE_EXT.
                     " -k file://$nestea_ior");
 
   $SV->Kill (); $SV->Wait ();
+
+  unlink $nestea_ior;
 }
 
 sub nestea_ir_test
 {
-  $IR = Process::Create ($implrepo_server, 
-                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT,
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add nestea_server -c \"nestea_server -i -ORBImplRepoIOR file://$implrepo_ior\"");
-
-  $SV = Process::Create ($nestea_server,
-                         "-o $nestea_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior");
+  $SV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT,
+                         "-o $nestea_ior -i -r");
 
   ACE::waitforfile ($nestea_ior);
 
-  system ($nestea_client." -k file://$nestea_ior");
-
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown nestea_server");
+  system($EXEPREFIX."nestea_client.$EXE_EXT -k file://$nestea_ior");
 
-  system ($nestea_client." -k file://$nestea_ior");
-
-  $SV->Kill (); $SV->Wait ();
   $IR->Kill (); $IR->Wait ();
 }
 
 sub both_ir_test
 {
-  $IR = Process::Create ($implrepo_server, 
-                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT,
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add plane -c \"airplane_server -i -ORBImplRepoIOR file://$implrepo_ior\"");
-  system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add nestea -c \"nestea_server -i -ORBImplRepoIOR file://$implrepo_ior\"");
+  $NSV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT,
+                         "-o $nestea_ior -i -r");
 
-  $ASV = Process::Create ($nestea_server,
-                         "-o $nestea_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior");
-  $NSV = Process::Create ($airplane_server,
-                         "-o $airplane_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior");
+  $ASV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT,
+                         "-o $airplane_ior -i -r");
 
   ACE::waitforfile ($nestea_ior);
 
-  $NCL = Process::Create ($nestea_client, "-k file://$nestea_ior");
+  $NCL = Process::Create ($EXEPREFIX."nestea_client".$EXE_EXT,
+                          "-k file://$nestea_ior");
 
   ACE::waitforfile ($airplane_ior);
 
-  system($airplane_client." -k file://$airplane_ior");
+  system($EXEPREFIX."airplane_client.$EXE_EXT -k file://$airplane_ior");
 
-  $ASV->Kill (); $ASV->Wait ();
-  $NSV->Kill (); $NSV->Wait ();
   $NCL->Kill (); $NCL->Wait ();
   $IR->Kill (); $IR->Wait ();
+  $NSV->Wait ();
+  $ASV->Wait ();
 }
 
 
@@ -144,7 +123,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "run_test test\n";
       print "\n";
       print "test               -- Runs a specific test\n";
-      print "                      airplane, airplane_ir, nestea, nestea_ir, both_ir\n";
+      print "                      airplane, simple, or implrepo\n";
       exit;
     }
     if ($ARGV[$i] eq "airplane")
diff --git a/TAO/orbsvcs/tests/ImplRepo/svc.conf b/TAO/orbsvcs/tests/ImplRepo/svc.conf
new file mode 100644
index 00000000000..5689abf761e
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/svc.conf
@@ -0,0 +1,5 @@
+
+# $Id$
+
+static Server_Strategy_Factory "-ORBtablesize 128"
+
diff --git a/TAO/tests/MT_Server/MT_Server.dsw b/TAO/orbsvcs/tests/Logger/Logger.dsw
index d17cf7c9604..d17cf7c9604 100644
--- a/TAO/tests/MT_Server/MT_Server.dsw
+++ b/TAO/orbsvcs/tests/Logger/Logger.dsw
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/orbsvcs/tests/Logger/Logging_Test.cpp
index f309e54d9e6..35fb4dc27a1 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test.cpp
@@ -18,5 +18,4 @@ main (int argc, char **argv)
     return 1;
 
   return logger_client.run ();
-
 }
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
index fecc05cbd9a..bf084d19dd3 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
@@ -4,7 +4,7 @@
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/OS.h"
 #include "orbsvcs/CosNamingC.h"
-#include "LoggerC.h"
+#include "orbsvcs/LoggerC.h"
 #include "Logging_Test_i.h"
 
 ACE_RCSID(Logger, Logging_Test_i, "$Id$")
@@ -27,19 +27,18 @@ Logger_Client::init (int argc, char *argv[])
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               "internet",
-                              ACE_TRY_ENV);
+                              TAO_TRY_ENV);
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "\nTrying to initialize orb\n"));
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "\nOrb initialized successfully\n"));
@@ -49,31 +48,31 @@ Logger_Client::init (int argc, char *argv[])
         return -1;
 
       // Initialize the naming service
-      if (this->init_naming_service (ACE_TRY_ENV) != 0)
+      if (this->init_naming_service (TAO_TRY_ENV) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize naming"
                            "services.\n"),
                           -1);
       // Create the logger instances
-      if (this->init_loggers (ACE_TRY_ENV) != 0)
+      if (this->init_loggers (TAO_TRY_ENV) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize logger"
                            "instances.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      TAO_TRY_ENV.print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 
 }
 
 int
-Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Logger_Client::init_naming_service (CORBA::Environment &env)
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -89,7 +88,7 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var factory_ref =
     my_name_client_->resolve (factory_name,
-                              ACE_TRY_ENV);
+                              env);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "\nFactory_ref resolved\n"));
@@ -105,7 +104,7 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   // Narrow the factory and check the success
   factory_ =
     Logger_Factory::_narrow (factory_ref.in (),
-                             ACE_TRY_ENV);
+                             env);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -121,7 +120,7 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   // If debugging, get the factory's IOR
   CORBA::String_var str =
     orb_->object_to_string (factory_.in (),
-                            ACE_TRY_ENV);
+                            env);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The factory IOR is <%s>\n",
@@ -130,56 +129,48 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Logger_Client::init_loggers (CORBA::Environment &ACE_TRY_ENV)
-{ 
+Logger_Client::init_loggers (CORBA::Environment &env)
+{
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
-  ACE_TRY
+  this->logger_1_ = factory_->make_logger ("key1",
+                                           env);
+  if (env.exception () != 0)
+    return -1;
+
+  this->logger_2_ = factory_->make_logger ("key2",
+                                           env);
+  if (env.exception () != 0)
+    return -1;
+
+  if (CORBA::is_nil (this->logger_1_.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "nil logger1"),
+                      -1);
+
+  if (CORBA::is_nil (this->logger_2_.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "nil logger2"),
+                      -1);
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "Created two loggers\n"));
+
+  if (TAO_debug_level > 0)
     {
-      this->logger_1_ = factory_->make_logger ("key1",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      this->logger_2_ = factory_->make_logger ("key2",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->logger_1_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "nil logger1"),
-                          -1);
-      
-      if (CORBA::is_nil (this->logger_2_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "nil logger2"),
-                          -1);
-      
-      if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG,
+                  "\nTrying to resolve already created logger..."));
+      Logger_var logger_3 = factory_->make_logger ("key1",
+                                                   env);
+      if (CORBA::is_nil (logger_3.in ()))
         ACE_DEBUG ((LM_DEBUG,
-                    "Created two loggers\n"));
-      
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nTrying to resolve already created logger..."));
-          Logger_var logger_3 = factory_->make_logger ("key1",
-                                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-      
-          if (CORBA::is_nil (logger_3.in ()))
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nResolution failed."));
-          else
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nResolution succeeded."));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init_loggers");
-      return -1;
+                    "\nResolution failed."));
+      else
+        ACE_DEBUG ((LM_DEBUG,
+                    "\nResolution succeeded."));
     }
-  ACE_ENDTRY;
+
   return 0;
 }
 
@@ -189,15 +180,14 @@ Logger_Client::init_loggers (CORBA::Environment &ACE_TRY_ENV)
 int
 Logger_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Create 3 Log_Records for the test
       Logger::Log_Record rec1;
       Logger::Log_Record rec2;
       Logger::Log_Record rec3;
       Logger::Log_Record rec4;
-      ;
+        ;
       // Setup the first log record
       this->init_record (rec1,
                          Logger::LM_DEBUG,
@@ -239,44 +229,44 @@ Logger_Client::run (void)
         }
 
       // Change the verbosity.
-      this->logger_1_->verbosity (Logger::VERBOSE_LITE, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_1_->verbosity (Logger::VERBOSE_LITE, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Log the first Log_Record (VERBOSE_LITE)
-      this->logger_1_->log (rec1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_1_->log (rec1, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Change the verbosity again.
-      this->logger_2_->verbosity (Logger::VERBOSE, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::VERBOSE, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Log the second Log_Record (VERBOSE)
-      this->logger_2_->log (rec2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_2_->log (rec2, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Change the verbosity again
-      this->logger_2_->verbosity (Logger::SILENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::SILENT, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Log the third log record using logv() (this shows if the
       // verbosity level overrides the logger's verbosity level)
-      this->logger_2_->logv (rec3, Logger::VERBOSE, ACE_TRY_ENV);
+      this->logger_2_->logv (rec3, Logger::VERBOSE, TAO_TRY_ENV);
 
       // Change the verbosity again (so that regular log msgs can be
       // seen again)
-      this->logger_2_->verbosity (Logger::VERBOSE, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::VERBOSE, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Log the fourth record using log2()
-      this->logger_2_->log2 (rec4, ACE_TRY_ENV);
+      this->logger_2_->log2 (rec4, TAO_TRY_ENV);
     }
 
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "run");
+      TAO_TRY_ENV.print_exception ("run");
+      return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/orbsvcs/tests/Logger/Logging_Test_i.h
index aac66ba4c31..748473ea51b 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test_i.h
@@ -30,7 +30,7 @@
 
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
-#include "LoggerC.h"
+#include "orbsvcs/LoggerC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 
 class Logger_Client
@@ -69,22 +69,22 @@ private:
                     const char *msg);
   // Prepares the <Log_Record> for logging.
 
-  int init_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  int init_naming_service (CORBA::Environment &env);
   // Initialises the name server and resolves the logger_factory
 
-  int init_loggers (CORBA::Environment &ACE_TRY_ENV);
+  int init_loggers (CORBA::Environment &env);
   // Instantiates the 2 logger member variables
 
   void show_record (Logger::Log_Record &newrec);
   // Shows contents of the record (for debugging purposes).
 
-  CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB for easy access
-
   TAO_Naming_Client my_name_client_;
   // An instance of the name client used for resolving the factory
   // objects.
 
+  CORBA::ORB_var orb_;
+  // Keep a pointer to the ORB for easy access
+
   int argc_;
   // # of arguments on the command line.
 
diff --git a/TAO/tests/POA/Destruction/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index 842113c2e06..7757179f682 100644
--- a/TAO/tests/POA/Destruction/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -1,34 +1,38 @@
 #----------------------------------------------------------------------------
+#       $Id$
 #
-#	$Id$
+#       Top-level Makefile for the Logging Service test
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO
+LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC	= testC.cpp testS.cpp
-PROG_SRCS =	$(IDL_SRC) Destruction.cpp
+SRC = Logging_Test.cpp \
+      Logging_Test_i.cpp
 
-LSRC = $(PROG_SRCS)
+LOGGING_TEST_OBJS = Logging_Test_i.o Logging_Test.o
 
-SVR_OBJS = testC.o testS.o Destruction.o
-
-BIN = Destruction
-BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
+BIN2 = Logging_Test
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Log,$(findstring Log,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Log
+
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -38,22 +42,24 @@ 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
-include $(TAO_ROOT)/taoconfig.mk
 
+TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
 
-.PRECIOUS: testC.h testC.i testC.cpp testS.h testS.i testS.cpp testS_T.h testS_T.i testS_T.cpp
-
-Destruction:	$(addprefix $(VDIR),$(SVR_OBJS))
+Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Logging_Test.o .obj/Logging_Test.so .shobj/Logging_Test.o .shobj/Logging_Test.so: Logging_Test.cpp Logging_Test_i.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -63,10 +69,11 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -161,283 +168,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -485,9 +225,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -567,9 +311,34 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/Destruction.o .obj/Destruction.so .shobj/Destruction.o .shobj/Destruction.so: Destruction.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
+.obj/Logging_Test_i.o .obj/Logging_Test_i.so .shobj/Logging_Test_i.o .shobj/Logging_Test_i.so: Logging_Test_i.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -579,10 +348,22 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -677,25 +458,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -743,9 +515,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -825,6 +601,20 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ Logging_Test_i.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Logging/README b/TAO/orbsvcs/tests/Logger/README
index 685d2d9d7ae..64a11da2ede 100644
--- a/TAO/examples/Logging/README
+++ b/TAO/orbsvcs/tests/Logger/README
@@ -1,25 +1,21 @@
 $ID$
 
-This example implements and tests runs a simple logging service using
-TAO.  You can either run the client and server as seperate processes
-in the same, or different windows (or machines), or you may run the
-"runtests.pl" script which will start both executables.
-
-By default, the client and server use the Naming Service.  The
-Logging_Service has its own NamingServer implementation, so it doesn't
+This example tests the TAO logging service. It generates SII stubs and
+skeletons using the TAO IDL compiler.  You can either run the client
+and server as seperate processes in the same, or different windows (or
+machines), or you may run the "runtests.pl" script which will start
+both executables.
+
+By default, the client and server use the Naming Service. The
+log_server has its own NamingServer implementation, so it doesn't
 require you to start the NamingService before starting the client and
 server.
 
-Ignore the multicast timeout error. It is a result of probing for the
-nameservice and not finding it (and thus being forced to create its
-own).
-
-If you encounter problems with the test, try increasing the sleeptime
-in the run_test.pl script.
-
-The client program will generate 4 logging messages which will be
-logged to the screen. The first message will be in the "verbose_lite"
+The test demonstrates the functionality of the logging service. The
+client program will generate 4 logging messages which will be logged
+to the screen. The first message will be in the "verbose_lite"
 format. The rest will be fully verbose messages. Successful output is:
+
 LM_DEBUG@::log() test (1) 
 Mar  8 16:31:06.000 1999@128.252.165.142@822@LM_EMERGENCY@::log() test (2) 
 Mar  8 16:31:06.000 1999@128.252.165.142@822@LM_INFO@::logv() test (3) 
@@ -45,3 +41,5 @@ That's all there is to it. If you desire, feel free to change the
 logging priorities, verbosity levels and messages in the client
 program but note that the maximum length of the message is 1023
 characters.
+
+-Matt Braun mjb2@cs.wustl.edu Thursday, Nov 12'th, 1998
diff --git a/TAO/orbsvcs/tests/Logger/client.cpp b/TAO/orbsvcs/tests/Logger/client.cpp
new file mode 100644
index 00000000000..b2f1fd63640
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/client.cpp
@@ -0,0 +1,21 @@
+// $Id$
+
+#include "client_i.h"
+
+ACE_RCSID(Logger, client, "$Id$")
+
+// This function runs the Logging service test.
+
+int
+main (int argc, char **argv)
+{
+  Logger_Client logger_client;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n \t IDL_Logger: client \n\n"));
+
+  if (logger_client.init (argc, argv) == -1)
+    return 1;
+
+  return logger_client.run ();
+}
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.dsp b/TAO/orbsvcs/tests/Logger/client.dsp
index afdc2cdb114..48cf02669c5 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.dsp
+++ b/TAO/orbsvcs/tests/Logger/client.dsp
@@ -1,26 +1,25 @@
-# Microsoft Developer Studio Project File - Name="EC_Simple_Consumer" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Logger Test Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=EC_Simple_Consumer - Win32 Debug

+CFG=Logger Test Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Consumer.mak".

+!MESSAGE NMAKE /f "client.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Consumer.mak"\

- CFG="EC_Simple_Consumer - Win32 Debug"

+!MESSAGE NMAKE /f "client.mak" CFG="Logger Test Client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "EC_Simple_Consumer - Win32 Release" (based on\

+!MESSAGE "Logger Test Client - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "EC_Simple_Consumer - Win32 Debug" (based on\

+!MESSAGE "Logger Test Client - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -30,7 +29,7 @@ CFG=EC_Simple_Consumer - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "EC_Simple_Consumer - Win32 Release"

+!IF  "$(CFG)" == "Logger Test Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -39,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -52,9 +51,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release\Consumer.exe" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "EC_Simple_Consumer - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Logger Test Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -68,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,29 +76,29 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "EC_Simple_Consumer - Win32 Release"

-# Name "EC_Simple_Consumer - Win32 Debug"

-# Begin Group "Source Files"

+# Name "Logger Test Client - Win32 Release"

+# Name "Logger Test Client - Win32 Debug"

+# Begin Source File

 

-# PROP Default_Filter ".cpp"

+SOURCE=.\client.cpp

+# End Source File

 # Begin Source File

 

-SOURCE=.\Consumer.cpp

+SOURCE=.\client.h

 # End Source File

-# End Group

-# Begin Group "Header Files"

+# Begin Source File

 

-# PROP Default_Filter ".h"

+SOURCE=.\client_i.cpp

+# End Source File

 # Begin Source File

 

-SOURCE=.\Consumer.h

+SOURCE=.\client_i.h

 # End Source File

-# End Group

 # End Target

 # End Project

diff --git a/TAO/orbsvcs/tests/Logger/client.h b/TAO/orbsvcs/tests/Logger/client.h
new file mode 100644
index 00000000000..8a6e1978466
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/client.h
@@ -0,0 +1,104 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/orbsvcs/tests/Logger
+//
+// = FILENAME
+//    client.h
+//
+// = DESCRIPTION
+//    This program tests an implementation of a logger service.  It uses the
+//    <Logger_Factory> server to create a number of logger objects.
+//    It then uses their object references to test functions supported
+//    by the logger server.
+//
+// = AUTHORS
+//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+//      Matt Braun <mjb2@cec.wustl.edu>
+//
+// ============================================================================
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corba.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/LoggerC.h"
+
+class Logger_Client
+{
+  // = TITLE
+  //    Defines a class that encapsulates behaviour of the Logger
+  //    client example.  Provides a better understanding of the logic
+  //    in an object oriented way.
+  //
+  // = DESCRIPTION
+  //    This class declares an interface to run the example client for
+  //    Logger CORBA server.  All the complexity for initializing the
+  //    server is hidden in the class.  Just the <run> interface is
+  //    needed.
+public:
+  // = Constructor and destructor.
+  Logger_Client (void);
+  ~Logger_Client (void);
+
+  int run (void);
+  // Execute client example code.
+
+  int init (int argc, char **argv);
+  // Initialize the client communication endpoint with server.
+
+private:
+  int parse_args (void);
+  // Parses the arguments passed on the command line.
+
+  void init_record (Logger::Log_Record &newrec,
+                    Logger::Log_Priority lp,
+                    const char *msg);
+  // Prepares the <Log_Record> for logging.
+
+   void show_record (Logger::Log_Record &newrec);
+  // Shows contents of the record (for debugging purposes)
+
+  CORBA::Object_var
+  resolve_name (CosNaming::Name &name, char* namestring,
+                CosNaming::NamingContext_var context,
+                CORBA::Environment &env);
+  // Take the Name, give it the proper string name, and
+  // resolve it
+  int
+  nesting_test (CosNaming::Name &name, char* namestring,
+                CosNaming::NamingContext_var context,
+                CORBA::Environment &env);
+  // Test the nesting context
+
+  int argc_;
+  // # of arguments on the command line.
+
+  char **argv_;
+  // arguments from command line.
+
+  int test_nesting_;
+  // Test nested naming context or not.
+
+  CORBA::ORB_var orb_;
+  // Keep a pointer to the orb, to avoid accidental deletes.
+
+  Logger_var logger_1_;
+  // Logger obj ref.
+
+  Logger_var logger_2_;
+  // Logger obj ref.
+
+  // @@ Matt, I recommend that once you finish implementing the
+  // TAO_Naming_Client class that you include an instance of it in
+  // this class, which can then do the (simplified) initialization of
+  // the Naming Service CLIENT.
+};
+
diff --git a/TAO/orbsvcs/tests/Logger/client_i.cpp b/TAO/orbsvcs/tests/Logger/client_i.cpp
new file mode 100644
index 00000000000..d5d275ef890
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/client_i.cpp
@@ -0,0 +1,291 @@
+// $Id$
+
+#include "ace/INET_Addr.h"
+#include "ace/SOCK_Dgram_Mcast.h"
+#include "ace/OS.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/LoggerC.h"
+#include "client_i.h"
+
+ACE_RCSID(Logger, client_i, "$Id$")
+
+// Constructor
+Logger_Client::Logger_Client (void)
+{
+  // Do nothing
+}
+
+// Destructor
+Logger_Client::~Logger_Client (void)
+{
+  // Do nothing
+}
+
+int
+Logger_Client::init (int argc, char *argv[])
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  TAO_TRY
+    {
+      // Initialize the ORB
+      orb_ = CORBA::ORB_init (argc,
+                              argv,
+                              "internet",
+                              TAO_TRY_ENV);
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "\nTrying to initialize orb\n"));
+
+      TAO_CHECK_ENV;
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "\nOrb initialized successfully\n"));
+
+      // Parse command line and verify parameters.
+      if (this->parse_args () == -1)
+        return -1;
+
+      // Initialize the naming service
+      if (this->init_naming_service (TAO_TRY_ENV) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize naming"
+                           "services.\n"),
+                          -1);
+      // Create the logger instances
+      if (this->init_loggers (TAO_TRY_ENV) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize logger"
+                           "instances.\n"),
+                          -1);
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("init");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+
+}
+
+int
+Logger_Client::init_naming_service (CORBA::Environment &env)
+{
+  // Initialize the naming services
+  if (my_name_client_.init (orb_) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
+
+  // Resolve an instance of the Logger_Factory
+  CosNaming::Name factory_name (1);
+  factory_name.length (1);
+  factory_name[0].id = CORBA::string_dup ("logger_factory");
+
+  CORBA::Object_var factory_ref =
+    my_name_client_->resolve (factory_name,
+                              env);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "\nFactory_ref resolved\n"));
+
+  if (CORBA::is_nil (factory_ref.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "resolved to nil object"),
+                      -1);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "\nLogger_Factory resolved\n"));
+
+  // Narrow the factory and check the success
+  factory_ =
+    Logger_Factory::_narrow (factory_ref.in (),
+                             env);
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "\nFactory narrowed\n"));
+  if (CORBA::is_nil (factory_.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "narrow returned nil"),
+                      -1);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "\nLogger_Factory narrowed\n"));
+
+  // If debugging, get the factory's IOR
+  CORBA::String_var str =
+    orb_->object_to_string (factory_.in (),
+                            env);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "The factory IOR is <%s>\n",
+                str.in ()));
+  return 0;
+}
+
+int
+Logger_Client::init_loggers (CORBA::Environment &env)
+{
+  // Retrieve the Logger obj ref corresponding to key1 and
+  // key2.
+  this->logger_1_ = factory_->make_logger ("key1",
+                                           env);
+  this->logger_2_ = factory_->make_logger ("key2",
+                                           env);
+
+  if (CORBA::is_nil (this->logger_1_.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "nil logger1"),
+                      -1);
+
+  if (CORBA::is_nil (this->logger_2_.in ()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "nil logger2"),
+                      -1);
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "Created two loggers\n"));
+  return 0;
+}
+
+
+// Execute client example code.
+
+int
+Logger_Client::run (void)
+{
+  TAO_TRY
+    {
+      // Create 2 Log_Records for the test
+      Logger::Log_Record rec1;
+      Logger::Log_Record rec2;
+
+      // Setup the first log record
+      this->init_record (rec1,
+                         Logger::LM_DEBUG,
+                         "Praise Bob! (1)\n");
+
+      // Setup the second log record
+      this->init_record (rec2,
+                         Logger::LM_ERROR,
+                         "Beware The Stark Fist of Removal. (2)\n");
+
+      // If debugging, output the new log records
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "First Log_Record created. Contents:\n"));
+          this->show_record (rec1);
+
+          ACE_DEBUG ((LM_DEBUG,
+                      "Second Log_Record created. Contents:\n"));
+          this->show_record (rec2);
+        }
+
+      // Change the verbosity.
+      this->logger_1_->verbosity (Logger::VERBOSE_LITE, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Log the first Log_Record
+      this->logger_1_->log (rec1, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Change the verbosity again.
+      this->logger_2_->verbosity (Logger::VERBOSE, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Log the second Log_Record.
+      this->logger_2_->log (rec2, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("run");
+      return -1;
+    }
+  TAO_ENDTRY;
+  return 0;
+}
+
+// Parses the command line arguments and returns an error status.
+
+int
+Logger_Client::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "d");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           "\n"
+                           "    -d: increase debug level\n",
+                           this->argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+
+void
+Logger_Client::init_record (Logger::Log_Record &newrec,
+                            Logger::Log_Priority lp,
+                            const char *msg)
+{
+  // Copy the message data into newrec.
+  newrec.msg_data = CORBA::string_dup (msg);
+
+  // Assign the log priority.
+  newrec.type = lp;
+
+  // Create and assign the timestamp.
+  ACE_Time_Value time (ACE_OS::gettimeofday ());
+  newrec.time = time.sec ();
+
+  // Get and store the PID of the calling process.
+  pid_t pid = ACE_OS::getpid ();
+  newrec.app_id = pid;
+
+  // Get and store the IP of the local host .
+  char name[MAXHOSTNAMELEN];
+  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);
+}
+
+void
+Logger_Client::show_record (Logger::Log_Record &newrec)
+{
+  in_addr address;
+  address.s_addr = newrec.host_addr;
+
+  ACE_DEBUG ((LM_DEBUG,
+              " Log Priority: %d\n"
+              "         Time: %d\n"
+              "          PID: %d\n"
+              " Host Address: %s\n"
+              "      Message: %s\n",
+              newrec.type,
+              newrec.time,
+              newrec.app_id,
+              inet_ntoa (address),
+              newrec.msg_data.in ()));
+}
diff --git a/TAO/orbsvcs/tests/Logger/client_i.h b/TAO/orbsvcs/tests/Logger/client_i.h
new file mode 100644
index 00000000000..0ce8873035d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/client_i.h
@@ -0,0 +1,102 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/orbsvcs/tests/Logger
+//
+// = FILENAME
+//    client_i.h
+//
+// = DESCRIPTION
+//    This class implements a simple logger CORBA client for the Logger
+//    example using stubs generated by the TAO ORB IDL compiler
+//
+// = AUTHORS
+//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+//      Matt Braun <mjb2@cec.wustl.edu>
+//
+// ============================================================================
+
+// @@ Add the guard against multiple inclusions.
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corba.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/LoggerC.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
+
+class Logger_Client
+{
+  // = TITLE
+  //    Defines a class that encapsulates behaviour of the Logger
+  //    client example.  Provides a better understanding of the logic
+  //    in an object oriented way.
+  //
+  // = DESCRIPTION
+  //    This class declares an interface to run the example client for
+  //    Logger CORBA server.  All the complexity for initializing the
+  //    server is hidden in the class.  Just the <run> interface is
+  //    needed.
+public:
+  // = Initialization and termination methods.
+
+  Logger_Client (void);
+  // Constructor.
+
+  ~Logger_Client (void);
+  // Destructor.
+
+  int init (int argc, char **argv);
+  // Initialize the client communication endpoint with server.
+
+  int run (void);
+  // Execute client example code.
+
+private:
+  int parse_args (void);
+  // Parses the arguments passed on the command line.
+
+  void init_record (Logger::Log_Record &newrec,
+                    Logger::Log_Priority lp,
+                    const char *msg);
+  // Prepares the <Log_Record> for logging.
+
+  int init_naming_service (CORBA::Environment &env);
+  // Initialises the name server and resolves the logger_factory
+
+  int init_loggers (CORBA::Environment &env);
+  // Instantiates the 2 logger member variables
+
+  void show_record (Logger::Log_Record &newrec);
+  // Shows contents of the record (for debugging purposes).
+
+  TAO_Naming_Client my_name_client_;
+  // An instance of the name client used for resolving the factory
+  // objects.
+
+  CORBA::ORB_var orb_;
+  // Keep a pointer to the ORB for easy access
+
+  int argc_;
+  // # of arguments on the command line.
+
+  char **argv_;
+  // arguments from command line.
+
+  Logger_Factory_var factory_;
+  // A pointer to the Logger_Factory; used in init_loggers
+
+  Logger_var logger_1_;
+  // Logger obj ref.
+
+  Logger_var logger_2_;
+  // Logger obj ref.
+};
+
diff --git a/TAO/examples/Logging/run_test.pl b/TAO/orbsvcs/tests/Logger/run_test.pl
index 891abc3421f..c54cfb2facf 100755
--- a/TAO/examples/Logging/run_test.pl
+++ b/TAO/orbsvcs/tests/Logger/run_test.pl
@@ -5,19 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
+$tao_root = $ENV{TAO_ROOT};
 # This is a Perl script that runs the Logger client and server
 
-unshift @INC, '../../../bin';
+unshift @INC, '../../../../bin';
 require Process;
 
 # amount of delay between running the servers
-$sleeptime = 7;
+$sleeptime = 3;
 
 # Starts the Logging Service
 sub service
 {
   my $args = "";
-  my $prog = $EXEPREFIX."Logging_Service"
+  my $prog = $EXEPREFIX."$tao_root/orbsvcs/Logging_Service/Logging_Service"
       .$EXE_EXT;
   $SV = Process::Create ($prog, $args);
 }
diff --git a/TAO/orbsvcs/tests/Logger/server.cpp b/TAO/orbsvcs/tests/Logger/server.cpp
new file mode 100644
index 00000000000..1d8db63fdf8
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/server.cpp
@@ -0,0 +1,42 @@
+// $Id$
+
+#include "server_i.h"
+
+ACE_RCSID(Logger, server, "$Id$")
+
+int
+main (int argc, char *argv[])
+{
+  Logger_Server log_server;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\tIDL_Logger:SERVER\n\n"));
+
+   TAO_TRY
+    {
+      if (log_server.init (argc, argv, TAO_TRY_ENV) == -1)
+        return 1;
+      else
+        {
+          log_server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.dsp b/TAO/orbsvcs/tests/Logger/server.dsp
index 120b1306bd6..964fb378a74 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.dsp
+++ b/TAO/orbsvcs/tests/Logger/server.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="EC_Simple_Service" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Logger Test Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=EC_Simple_Service - Win32 Debug

+CFG=Logger Test Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Service.mak".

+!MESSAGE NMAKE /f "server.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "EC_Simple_Service.mak" CFG="EC_Simple_Service - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="Logger Test Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "EC_Simple_Service - Win32 Release" (based on\

+!MESSAGE "Logger Test Server - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "EC_Simple_Service - Win32 Debug" (based on\

+!MESSAGE "Logger Test Server - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +29,7 @@ CFG=EC_Simple_Service - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "EC_Simple_Service - Win32 Release"

+!IF  "$(CFG)" == "Logger Test Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,9 +51,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Service.exe" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "EC_Simple_Service - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Logger Test Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -75,21 +76,25 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Service.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "EC_Simple_Service - Win32 Release"

-# Name "EC_Simple_Service - Win32 Debug"

-# Begin Group "Source Files"

+# Name "Logger Test Server - Win32 Release"

+# Name "Logger Test Server - Win32 Debug"

+# Begin Source File

+

+SOURCE=.\server.cpp

+# End Source File

+# Begin Source File

 

-# PROP Default_Filter ".cpp"

+SOURCE=.\server_i.cpp

+# End Source File

 # Begin Source File

 

-SOURCE=.\Service.cpp

+SOURCE=.\server_i.h

 # End Source File

-# End Group

 # End Target

 # End Project

diff --git a/TAO/orbsvcs/tests/Logger/server_i.cpp b/TAO/orbsvcs/tests/Logger/server_i.cpp
new file mode 100644
index 00000000000..a995334e1cc
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/server_i.cpp
@@ -0,0 +1,131 @@
+// $Id$
+
+#include "server_i.h"
+
+ACE_RCSID(Logger, server_i, "$Id$")
+
+Logger_Server::Logger_Server (void)
+{
+  // Do nothing 
+}
+
+int
+Logger_Server::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "d");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           "\n",
+                           argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+Logger_Server::init (int argc,
+		     char *argv[],
+		     CORBA::Environment &env)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  // Call the init of <TAO_ORB_Manager> to initialize the ORB and
+  // create a child POA under the root POA.
+  if (this->orb_manager_.init_child_poa (argc,
+					 argv,
+					 "child_poa",
+					 env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+		       "%p\n",
+		       "init_child_poa"),
+		      -1);
+  
+  TAO_CHECK_ENV_RETURN (env,-1);
+  
+  // Parse the command line arguments.
+  if (this->parse_args () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+		       "%p\n",
+		       "parse_args"),
+		      -1);
+
+  // Activate the logger_factory.
+  CORBA::String_var str =
+    this->orb_manager_.activate_under_child_poa ("logger_factory",
+						 &this->factory_impl_,
+						 env);
+    if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+		"The IOR is: <%s>\n",
+		str.in ()));
+
+    // Initialize the naming service
+  if (this->init_naming_service (env) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+		       "%p\n",
+		       "init_naming_service"),
+		      -1);
+  else
+    return 0;
+}
+
+
+// Initialisation of Naming Service and register IDL_Logger Context
+// and logger_factory object.
+
+int
+Logger_Server::init_naming_service (CORBA::Environment& env)
+{
+  // Get pointers to the ORB and child POA
+  CORBA::ORB_var orb = this->orb_manager_.orb ();
+  PortableServer::POA_var child_poa = this->orb_manager_.child_poa ();
+
+  // Initialize the naming service
+  if (this->my_name_server_.init (orb.in (),
+				  child_poa.in ()) == -1)
+    return -1;
+
+  // Create an instance of the Logger_Factory
+  Logger_Factory_var factory = this->factory_impl_._this (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  //Register the logger_factory
+  CosNaming::Name factory_name (1);
+  factory_name.length (1);
+  factory_name[0].id = CORBA::string_dup ("logger_factory");
+  this->my_name_server_->bind (factory_name,
+			       factory.in (),
+			       env);
+  TAO_CHECK_ENV_RETURN (env,-1);
+  
+  return 0;
+}
+
+int
+Logger_Server::run (CORBA::Environment& env)
+{
+  if (this->orb_manager_.run (env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Logger_Server::run"),
+                      -1);
+  return 0;
+}
+
+Logger_Server::~Logger_Server (void)
+{
+  // Do nothing
+}
diff --git a/TAO/orbsvcs/tests/Logger/server_i.h b/TAO/orbsvcs/tests/Logger/server_i.h
new file mode 100644
index 00000000000..0a8736a8ab0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/server_i.h
@@ -0,0 +1,92 @@
+// -*- c++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/orbsvcs/tests/Logger
+//
+// = FILENAME
+//    server_i.h
+//
+// = DESCRIPTION
+//      This class implements a simple "logger" CORBA server for the Logger
+//      example using skeletons generated by the TAO ORB IDL compiler.
+//
+// = AUTHORS
+//    Nagarajan Surendran <naga@cs.wustl.edu>
+//    Matthew Braun <mjb2@cec.wustl.edu>
+//
+// ============================================================================
+
+#ifndef _C_SERVER_H
+#define _C_SERVER_H
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Log_Msg.h"
+#include "tao/TAO.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Log/Logger_i.h"
+#include "orbsvcs/LoggerS.h"
+
+class Logger_Server
+{
+  // = TITLE
+  //   Defines a Logger_Server class that implements the functionality
+  //   of a server process as an object.
+  //
+  // = DESCRIPTION
+  //   The interface is quite simple. A server program has to call
+  //   init to initialize the logger_server's state and then call run
+  //   to run the orb.
+public:
+  // = Initialization and termination methods.
+  Logger_Server (void);
+  // Constructor.
+
+  ~Logger_Server (void);
+  // Destructor.
+
+  int init (int argc,
+            char **argv,
+            CORBA::Environment& env);
+  // Initialize the Logger_Server state - parsing arguments and ...
+
+  int run (CORBA::Environment& env);
+  // Run the ORB.
+
+private:
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  int init_naming_service (CORBA::Environment &env);
+  // Initialises the name server and registers logger_factory with the
+  // name server.
+
+  TAO_ORB_Manager orb_manager_;
+  // The ORB manager.
+
+  TAO_Naming_Server my_name_server_;
+  // An instance of the name server used for registering the factory
+  // objects.
+
+  Logger_Factory_i factory_impl_;
+  // Implementation object of the Logger_Factory.
+
+  Logger_Factory_var factory_;
+  // Factory_var to register with NamingService.
+
+  int argc_;
+  // Number of commandline arguments.
+
+  char **argv_;
+  // commandline arguments.
+};
+
+#endif /* _C_SERVER_H */
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index 8b3279ac018..cb6c4e9d3a3 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -9,12 +9,14 @@
 #----------------------------------------------------------------------------
 
 DIRS  =	Simple_Naming \
+	Logger \
 	Event_Latency \
 	EC_Multiple \
 	EC_Throughput \
 	EC_Mcast \
 	EC_Custom_Marshal \
 	EC_Basic \
+	Concurrency \
 	Trading \
 	Property \
 	CosEC_Basic \
@@ -22,11 +24,7 @@ DIRS  =	Simple_Naming \
 	ImplRepo \
 	Sched_Conf \
 	Time \
-	Event \
-	AVStreams
-
-# Not compiled by default
-#	Concurrency \
+	Event
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -37,3 +35,4 @@ include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 52979c1b173..6ec890dee4a 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -21,7 +21,7 @@ BIN2 = server client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Property,$(findstring Property,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Property
@@ -177,13 +177,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -239,6 +232,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -500,13 +495,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -562,6 +550,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index e571fdbb18c..ce7569202e1 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -1,4 +1,4 @@
-// $Id$
+ // $Id$
 
 // ============================================================================
 //
@@ -17,7 +17,6 @@
 // ============================================================================
 
 #include "client.h"
-#include "tao/debug.h"
 
 ACE_RCSID(CosPropertyService, client, "$Id$")
 
@@ -53,7 +52,9 @@ Client::init (int argc,
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
   CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name,
                                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK_RETURN (1);
+
+  ACE_DEBUG ((LM_DEBUG, "Naming resolve done\n"));
 
   this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in (),
                                                                    ACE_TRY_ENV);
@@ -136,6 +137,9 @@ Client::property_tester (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nChecking define_property\n"));
+
   CORBA::Any anyval;
 
   // Prepare a char and "define" that in the PropertySet.
@@ -144,10 +148,20 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   ch = '*';
   anyval >>= CORBA::Any::to_char (ch);
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Char ch = %c\n",
+              ch));
   this->propsetdef_->define_property ("char_property",
                                       anyval,
                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      ACE_TRY_ENV.clear ();
+    }
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -155,44 +169,84 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   s = 7;
   anyval >>= s;
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Short s = %d\n",
+              s));
   propsetdef_->define_property ("short_property",
                                 anyval,
                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      ACE_TRY_ENV.clear ();
+    }
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
   anyval <<= l;
   l = 931233;
   anyval >>= l;
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Long l = %d\n",
+              l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
                                 anyval,
                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  
+
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      ACE_TRY_ENV.clear ();
+    }
+
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14F;
   anyval <<= f;
   f = 4.14F;
   anyval >>= f;
-
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Float f = %f\n",
+              f));
   propsetdef_->define_property ("float_property",
                                 anyval,
                                 ACE_TRY_ENV);
 
-  ACE_CHECK_RETURN (-1);
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      ACE_TRY_ENV.clear ();
+    }
 
   // Prepare a String and "define" that in the PropertySet.
+  ACE_DEBUG ((LM_DEBUG,
+              "Main: Any holding String\n"));
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
   anyval <<= strvar.in ();
   CORBA::String newstr;
   anyval >>= newstr;
+  ACE_DEBUG ((LM_DEBUG,
+              "Main: String :  %s, From any :  %s\n",
+              strvar.in (),
+              newstr));
   propsetdef_->define_property ("string_property",
                                 anyval,
                                 ACE_TRY_ENV);
 
-  ACE_CHECK_RETURN (-1);
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("string_property");
+      ACE_TRY_ENV.clear ();
+    }
 
   return 0;
 }
@@ -202,6 +256,9 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nTesting get_all_property_names ()\n"));
+
   // Get the size.
   CORBA::ULong num_of_properties =
     propsetdef_->get_number_of_properties (ACE_TRY_ENV);
@@ -231,47 +288,45 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
   iterator_var = iterator_out.ptr ();
 
   // Print out the names in the names-sequence.
-  if (TAO_debug_level > 0)
+  if (names_var.ptr () != 0)
     {
-      if (names_var.ptr () != 0)
-        {
-          CORBA::ULong len = names_var->length ();
-          
-          for (CORBA::ULong ni = 0; ni < len; ni++)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s\n",
-                        (const char *) names_var [ni]));
-        }
-      
-      // Iterate thru and print out the names in the iterator, if any.
-      if (iterator_var.ptr () != 0)
+      CORBA::ULong len = names_var->length ();
+
+      for (CORBA::ULong ni = 0; ni < len; ni++)
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s\n",
+                    (const char *) names_var [ni]));
+    }
+
+  // Iterate thru and print out the names in the iterator, if any.
+  if (iterator_var.ptr () != 0)
+    {
+      // Helper variables to stop the SunCC warnings on on foo.out
+      // ().
+      CosPropertyService::PropertyName  name_ptr = 0;
+      CosPropertyService::PropertyName_out name_out (name_ptr);
+
+      // Call the function.
+      CORBA::Boolean next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
+
+      // Get the values back on a _var variable.
+      CosPropertyService::PropertyName_var name_var = name_out.ptr ();
+
+      while (next_one_result == 1)
         {
-          // Helper variables to stop the SunCC warnings on on foo.out
-          // ().
-          CosPropertyService::PropertyName  name_ptr = 0;
-          CosPropertyService::PropertyName_out name_out (name_ptr);
-          
-          // Call the function.
-          CORBA::Boolean next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
-          
-          // Get the values back on a _var variable.
-          CosPropertyService::PropertyName_var name_var = name_out.ptr ();
-          
-          while (next_one_result == 1)
-            {
-              ACE_CHECK_RETURN (-1);
-              ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
-              
-              // Call the function to iterate again.
-              next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
-              
-              // Get the values back on a _var variable.
-              name_var = name_out.ptr ();
-            }
-          
           ACE_CHECK_RETURN (-1);
+          ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
+
+          // Call the function to iterate again.
+          next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
+
+          // Get the values back on a _var variable.
+          name_var = name_out.ptr ();
         }
+
+      ACE_CHECK_RETURN (-1);
     }
+
   return 0;
 }
 
@@ -284,6 +339,7 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
   // the PropertySet.
+  ACE_DEBUG ((LM_DEBUG, "\nTesting get_properties\n"));
   CosPropertyService::PropertyNames_var names;
   CosPropertyService::PropertyNames_ptr names_ptr;
 
@@ -310,28 +366,24 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
   ACE_UNUSED_ARG (return_val);
   ACE_CHECK_RETURN (-1);
 
-  
-  if (TAO_debug_level > 0)
+  // Get the value to the _var.
+  CosPropertyService::Properties_var properties = properties_out.ptr ();
+
+  if (properties.ptr () != 0)
     {
-      // Get the value to the _var.
-      CosPropertyService::Properties_var properties = properties_out.ptr ();
-      
-      if (properties.ptr () != 0)
+      // Go thru the properties and print them out, if they are not
+      // _tc_void typed values.
+      CORBA::ULong len = properties->length ();
+
+      for (CORBA::ULong pi = 0; pi < len; pi++)
         {
-          // Go thru the properties and print them out, if they are not
-          // _tc_void typed values.
-          CORBA::ULong len = properties->length ();
-          
-          for (CORBA::ULong pi = 0; pi < len; pi++)
-            {
-              // Print the name.
-              ACE_DEBUG ((LM_DEBUG,
-                          "%s : ",
-                          (const char *) properties [pi].property_name.in ()));
-              
-              // Print the value.
-              CORBA::Any::dump (properties [pi].property_value);
-            }
+          // Print the name.
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s : ",
+                      (const char *) properties [pi].property_name.in ()));
+
+          // Print the value.
+          CORBA::Any::dump (properties [pi].property_value);
         }
     }
   return 0;
@@ -342,15 +394,11 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_TRY_ENV);
+  ACE_DEBUG ((LM_DEBUG,
+              "\nNumber of props : %d\n",
+              this->propsetdef_->get_number_of_properties (ACE_TRY_ENV)));
   ACE_CHECK_RETURN (-1);
-  
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nNumber of props : %d\n",
-                  nproperties));
-    }
+
   return 0;
 }
 
@@ -362,6 +410,8 @@ Client::test_delete_property (const char *property_name,
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 
+  ACE_DEBUG ((LM_DEBUG, "\nDeleting %s\n",property_name));
+
   ACE_TRY
     {
       CORBA::String_var property_name_var (property_name);
@@ -372,8 +422,8 @@ Client::test_delete_property (const char *property_name,
     }
   ACE_CATCH (CORBA::UserException, ex)
     {
-      // For no property, it is ok to get the user exception.  
-      return 0;
+      ACE_PRINT_EXCEPTION (ex, "User exception");
+      return -1;
     }
   ACE_CATCHANY
     {
@@ -393,12 +443,18 @@ Client::test_delete_property (const char *property_name,
 int
 Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nChecking delete_properties\n"));
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
   prop_names [0] = CORBA::string_dup ("char_property");
   prop_names [1] = CORBA::string_dup ("short_property");
   prop_names [2] = CORBA::string_dup ("long_property");
   // prop_names [3] = CORBA::string_dup ("no_property");
+  ACE_DEBUG ((LM_DEBUG,
+              "Length of sequence %d, Maxlength : %d\n",
+              prop_names.length (),
+              prop_names.maximum ()));
   this->propsetdef_->delete_properties (prop_names,
                                         ACE_TRY_ENV);
   ACE_CHECK_RETURN ( 0);
@@ -412,6 +468,8 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nChecking define_properties\n"));
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
   CORBA::Any anyval;
@@ -459,6 +517,8 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nTesting get_all_properties\n"));
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
     this->propsetdef_->get_number_of_properties (ACE_TRY_ENV);
@@ -485,112 +545,110 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
   CosPropertyService::PropertiesIterator_var iterator = iterator_out.ptr ();
 
   // Print out the properties now.
-  if (TAO_debug_level > 0)
+  if (properties.ptr () != 0)
     {
-      if (properties.ptr () != 0)
+      CORBA::ULong len = properties->length ();
+
+      for (CORBA::ULong pi = 0; pi < len; pi++)
         {
-          CORBA::ULong len = properties->length ();
-          
-          for (CORBA::ULong pi = 0; pi < len; pi++)
+          // Print the property_name.
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s : ",
+                      properties [pi].property_name.in ()));
+
+          // Print the value if type is not tk_void.
+          if (properties [pi].property_value.type () == CORBA::_tc_void)
+            ACE_DEBUG ((LM_DEBUG,"Void\n"));
+
+          if (properties [pi].property_value.type () == CORBA::_tc_float)
             {
-              // Print the property_name.
-              ACE_DEBUG ((LM_DEBUG,
-                          "%s : ",
-                          properties [pi].property_name.in ()));
-              
-              // Print the value if type is not tk_void.
-              if (properties [pi].property_value.type () == CORBA::_tc_void)
-                ACE_DEBUG ((LM_DEBUG,"Void\n"));
-              
-              if (properties [pi].property_value.type () == CORBA::_tc_float)
-                {
-                  CORBA::Float f;
-                  properties [pi].property_value >>= f;
-                  ACE_DEBUG ((LM_DEBUG,"%f\n", f));
-                }
-              
-              if (properties [pi].property_value.type () == CORBA::_tc_string)
-                {
-                  CORBA::String str;
-                  properties [pi].property_value >>= str;
-                  ACE_DEBUG ((LM_DEBUG,"%s\n", str));
-                }
-              
-              if (properties [pi].property_value.type () == CORBA::_tc_long)
-                {
-                  CORBA::Long l;
-                  properties [pi].property_value >>= l;
-                  ACE_DEBUG ((LM_DEBUG,"%d\n", l));
-                }
+              CORBA::Float f;
+              properties [pi].property_value >>= f;
+              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
+            }
+
+          if (properties [pi].property_value.type () == CORBA::_tc_string)
+            {
+              CORBA::String str;
+              properties [pi].property_value >>= str;
+              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
+            }
+
+          if (properties [pi].property_value.type () == CORBA::_tc_long)
+            {
+              CORBA::Long l;
+              properties [pi].property_value >>= l;
+              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
             }
         }
-      
-      // Pass thru the iterator.
-      if (iterator.ptr () != 0)
+    }
+
+  // Pass thru the iterator.
+  if (iterator.ptr () != 0)
+    {
+      // Helper variables to avoid warnings with .out () in SunCC.
+      CosPropertyService::Property* property_ptr = 0;
+      CosPropertyService::Property_out property_out (property_ptr);
+
+      // Call the funtion.
+      CORBA::Boolean next_one_result = iterator->next_one (property_out,
+                                                           ACE_TRY_ENV);
+
+      // Get the value to the _var variable.
+      CosPropertyService::Property_var property = property_out.ptr ();
+
+      while (next_one_result != 0)
         {
-          // Helper variables to avoid warnings with .out () in SunCC.
-          CosPropertyService::Property* property_ptr = 0;
-          CosPropertyService::Property_out property_out (property_ptr);
-          
-          // Call the funtion.
-          CORBA::Boolean next_one_result = iterator->next_one (property_out,
-                                                               ACE_TRY_ENV);
-          
-          // Get the value to the _var variable.
-          CosPropertyService::Property_var property = property_out.ptr ();
-          
-          while (next_one_result != 0)
+          ACE_DEBUG ((LM_DEBUG, "Iteration over PropertyIterartor"));
+          ACE_CHECK_RETURN ( -1);
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s : ",
+                      property->property_name.in ()));
+
+          // Print the property_value.
+          if (property->property_value.type () == CORBA::_tc_char)
             {
-              ACE_CHECK_RETURN ( -1);
-              ACE_DEBUG ((LM_DEBUG,
-                          "%s : ",
-                          property->property_name.in ()));
-              
-              // Print the property_value.
-              if (property->property_value.type () == CORBA::_tc_char)
-                {
-                  CORBA::Char c;
-                  property->property_value >>= CORBA::Any::to_char (c);
-                  ACE_DEBUG ((LM_DEBUG,"%c\n", c));
-                }
-              
-              if (property->property_value.type () == CORBA::_tc_short)
-                {
-                  CORBA::Short s;
-                  property->property_value >>= s;
-                  ACE_DEBUG ((LM_DEBUG,"%d\n", s));
-                }
-              
-              if (property->property_value.type () == CORBA::_tc_float)
-                {
-                  CORBA::Float f;
-                  property->property_value >>= f;
-                  ACE_DEBUG ((LM_DEBUG,"%f\n", f));
-                }
-              
-              if (property->property_value.type () == CORBA::_tc_string)
-                {
-                  CORBA::String str;
-                  property->property_value >>= str;
-                  ACE_DEBUG ((LM_DEBUG,"%s\n", str));
-                }
-              
-              if (property->property_value.type () == CORBA::_tc_long)
-                {
-                  CORBA::Long l;
-                  property->property_value >>= l;
-                  ACE_DEBUG ((LM_DEBUG,"%d\n", l));
-                }
-              
-              // Call the function for the next iteraton.
-              next_one_result = iterator->next_one (property_out,
-                                                    ACE_TRY_ENV);
-          
-              // Get the value to the _var variable.
-              property = property_out.ptr ();
+              CORBA::Char c;
+              property->property_value >>= CORBA::Any::to_char (c);
+              ACE_DEBUG ((LM_DEBUG,"%c\n", c));
             }
-          ACE_CHECK_RETURN ( -1);
+
+          if (property->property_value.type () == CORBA::_tc_short)
+            {
+              CORBA::Short s;
+              property->property_value >>= s;
+              ACE_DEBUG ((LM_DEBUG,"%d\n", s));
+            }
+
+          if (property->property_value.type () == CORBA::_tc_float)
+            {
+              CORBA::Float f;
+              property->property_value >>= f;
+              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
+            }
+
+          if (property->property_value.type () == CORBA::_tc_string)
+            {
+              CORBA::String str;
+              property->property_value >>= str;
+              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
+            }
+
+          if (property->property_value.type () == CORBA::_tc_long)
+            {
+              CORBA::Long l;
+              property->property_value >>= l;
+              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
+            }
+
+          // Call the function for the next iteraton.
+          next_one_result = iterator->next_one (property_out,
+                                                ACE_TRY_ENV);
+
+          // Get the value to the _var variable.
+          property = property_out.ptr ();
         }
+      ACE_CHECK_RETURN ( -1);
     }
   return 0;
 }
@@ -600,6 +658,9 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
 int
 Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "\nChecking define_property_with_mode\n"));
+
   CORBA::Any anyval;
 
   // Prepare a char and "define" that in the PropertySet.
@@ -608,11 +669,20 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   ch = '*';
   anyval >>= CORBA::Any::to_char (ch);
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Char ch = %c\n",
+              ch));
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
                                                 CosPropertyService::normal,
                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  // Check if that is an user exception, if so, print it out.
+  if ((ACE_TRY_ENV.exception () != 0) &&
+      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      ACE_TRY_ENV.clear ();
+    }
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -620,17 +690,32 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   s = 7;
   anyval >>= s;
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Short s = %d\n",
+              s));
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
                                           CosPropertyService::read_only,
                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  // Check if that is an user exception, if so, print it out.
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("char_property");
+      if (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0)
+        ACE_TRY_ENV.clear ();
+      else
+        return -1;
+    }
+
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
   anyval <<= l;
   l = 931233;
   anyval >>= l;
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Long l = %d\n",
+              l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
                                           anyval,
@@ -644,6 +729,9 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   anyval <<= f;
   f = 4.14F;
   anyval >>= f;
+  ACE_DEBUG ((LM_DEBUG,
+              "Main : Float f = %f\n",
+              f));
   propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
                                           CosPropertyService::fixed_readonly,
@@ -651,11 +739,17 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN ( -1);
 
   // Prepare a String and "define" that in the PropertySet.
+  ACE_DEBUG ((LM_DEBUG,
+              "Main: Any holding String\n"));
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
   anyval <<= strvar.in ();
   CORBA::String newstr;
   anyval >>= newstr;
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Main: String :  %s, From any :  %s\n",
+              strvar.in (),
+              newstr));
   propsetdef_->define_property  ("string_property",
                                  anyval,
                                  ACE_TRY_ENV);
@@ -669,6 +763,8 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 
+  ACE_DEBUG ((LM_DEBUG, "Testing get_property_value\n"));
+
   ACE_TRY
     {
       // Get the ior property.
@@ -676,6 +772,8 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
                                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_DEBUG ((LM_DEBUG, "Property value received successfully\n"));
+
       // Check whether the IOR is fine.
       CORBA::Object_var propsetdef_object;
       (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ());
@@ -689,6 +787,8 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid object reference\n"),
                           -1);
+
+      ACE_DEBUG ((LM_DEBUG, "IOR retrieved\n"));
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index 23fbe876458..474faed8f27 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -5,77 +5,54 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
+$tao_root = $ENV{TAO_ROOT};
+# This is a Perl script that runs the Naming Service, client and servers
+
 unshift @INC, '../../../../bin';
 require Process;
-require ACEutils;
+require Uniqueid;
 
 # amount of delay between running the servers
 
 $sleeptime = 6;
-$status = 0;
 
 # variables for parameters
 
-$nsior = "ns.ior";
-
+$nsport = 20000 + uniqueid ();
 sub name_server
 {
-    my $args = " -o $nsior";
-    my $prog = 
-      print ("\nNaming_Service: $args\n");
-
-    unlink $nsior;
-    $NS = Process::Create ("..".$DIR_SEPARATOR
-			   ."..".$DIR_SEPARATOR
-			   ."Naming_Service".$DIR_SEPARATOR
-			   ."Naming_Service".$EXE_EXT, $args);
-    if (ACE::waitforfile_timed ($nsior, 5) == -1) {
-      print STDERR "ERROR: cannot find naming service IOR file\n";
-      $NS->Kill (); $NS->TimedWait (1);
-      exit 1;
-    }
+    my $args = "-ORBnameserviceport $nsport";
+    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service"
+        .$EXE_EXT;
+    print ("\nNaming_Service: $prog$EXE_EXT $args\n");
+    $NS = Process::Create ($prog, $args);
 }
 
 
 sub server
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nServer $args\n");
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nServer: server$EXE_EXT $args\n");
     $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", $args);
 }
 
 
 sub client
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nclient $args\n");
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nclient: client $args\n");
     $CL = Process::Create ($EXEPREFIX."client$EXE_EXT", $args);
 }
 
 name_server ();
+sleep $sleeptime;
 
 server ();
 sleep $sleeptime;
 
 client ();
+sleep $sleeptime;
 
-if ($CL->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-  
-$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate naming service\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
+$NS->Kill ();
+$SV->Kill ();
 
-exit $status;
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index ac83993838e..f833c678ac6 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -15,7 +15,7 @@ BIN2 = DynSched_Test
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 11559c69138..1e7b5613859 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -13,7 +13,7 @@ BIN2 = Sched_Conf
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
@@ -156,25 +156,16 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -222,9 +213,13 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 1b0a9273f64..0eb5c1477ec 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -15,11 +15,11 @@ ACE_RCSID(Sched_Conf, Sched_Conf, "$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), "
-  " %d, %d, %3d, %d, %d, "
-  "ACE_static_cast (RtecScheduler::Info_Type_t, %d)}\n";
+const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, "
+                            "ACE_static_cast (RtecScheduler::Criticality_t, %d), "
+                            "ACE_static_cast (RtecScheduler::Importance_t, %d), "
+                            "%d, %d, %3d, %d, %d, "
+                            "ACE_static_cast (RtecScheduler::Info_Type_t, %d)}\n";
 
 int
 parse_args (int argc, char *argv [])
@@ -318,12 +318,12 @@ main (int argc, char *argv[])
   };
 
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -333,12 +333,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Initialize the naming services
       TAO_Naming_Client my_name_client;
@@ -359,14 +359,13 @@ main (int argc, char *argv[])
           // make second half of array depend on first half.
           for (int i = 0; i < operation_count; ++i)
           {
-            // create the RT_Info
+                // create the RT_Info
             config_infos[i].handle =
                   ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point,
-                                                            ACE_TRY_ENV);
-            ACE_TRY_CHECK;
+                                                            TAO_TRY_ENV);
 
-            // initialize the RT_Info
-            ACE_Scheduler_Factory::server ()->
+                // initialize the RT_Info
+                ACE_Scheduler_Factory::server ()->
               set (config_infos[i].handle,
                   ACE_static_cast (RtecScheduler::Criticality_t, config_infos[i].criticality),
                config_infos[i].worst_case_execution_time,
@@ -377,22 +376,20 @@ main (int argc, char *argv[])
                config_infos[i].quantum,
                config_infos[i].threads,
                ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type),
-                           ACE_TRY_ENV);
-            ACE_TRY_CHECK;
+                           TAO_TRY_ENV);
 
-            // make operations in second half dependant on
-            // operations in the first half of the array,
-            // and have each called twice as a oneway call
-            if (i >= (operation_count / 2))
-              {
-                ACE_Scheduler_Factory::server ()->
-                  add_dependency (config_infos[i].handle,
-                                  config_infos[i - (operation_count / 2)].handle,
-                                                    2,                             // number of calls
-                                                    RtecScheduler::ONE_WAY_CALL,   // type of dependency
-                                  ACE_TRY_ENV);
-                ACE_TRY_CHECK;
-              }
+        // make operations in second half dependant on
+                // operations in the first half of the array,
+                // and have each called twice as a oneway call
+                if (i >= (operation_count / 2))
+                {
+                  ACE_Scheduler_Factory::server ()->
+                add_dependency (config_infos[i].handle,
+                                        config_infos[i - (operation_count / 2)].handle,
+                                                        2,                             // number of calls
+                                                        RtecScheduler::ONE_WAY_CALL,   // type of dependency
+                                        TAO_TRY_ENV);
+                }
       }
 
       RtecScheduler::RT_Info_Set_var infos;
@@ -418,17 +415,17 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV);
+         infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV);
+         infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             configs.in (),
@@ -436,11 +433,11 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
index fc2a0e0d5d9..fa1d0de9124 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe"

 

 !ELSEIF  "$(CFG)" == "Sched_Conf - Win32 Debug"

 

diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index ba222810d7b..a41bbff05c8 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -190,12 +190,13 @@ main (int argc, char *argv[])
                   }
   };
 
-  ACE_TRY_NEW_ENV
+
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -205,12 +206,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Initialize the naming services
       TAO_Naming_Client my_name_client;
@@ -222,40 +223,37 @@ main (int argc, char *argv[])
       
       if (ACE_Scheduler_Factory::use_config (my_name_client.get_context (),
 					     service_name) < 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             " (%P|%t) Unable to bind to the scheduling service.\n"),
-                            1);
-        }
-
-      // create and initialize RT_Infos in the scheduler,
-      // make second half of array depend on first half.
-      for (int i = 0; i < operation_count; ++i)
-        {
-          // create the RT_Info
-          config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point,
-                                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // initialize the RT_Info
-          ACE_Scheduler_Factory::server ()->
-            set (config_infos[i].handle,
-                 ACE_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),
-                 config_infos[i].quantum,
-                 config_infos[i].threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t, 
-                                  config_infos[i].info_type),
-                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                          " (%P|%t) Unable to bind to the scheduling service.\n"),
+                          1);
+          }
+          // create and initialize RT_Infos in the scheduler,
+          // make second half of array depend on first half.
+          for (int i = 0; i < operation_count; ++i)
+          {
+            // create the RT_Info
+            config_infos[i].handle =
+              ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point,
+                                                        TAO_TRY_ENV);
+
+            // initialize the RT_Info
+            ACE_Scheduler_Factory::server ()->
+              set (config_infos[i].handle,
+                   ACE_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),
+                   config_infos[i].quantum,
+                   config_infos[i].threads,
+                   ACE_static_cast (RtecScheduler::Info_Type_t, 
+                                    config_infos[i].info_type),
+                   TAO_TRY_ENV);
+      }
 
 
       // register dependency of good consumer on good supplier
@@ -264,8 +262,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
 
       // register dependency of consumer that will have unresolved remote 
       // dependencies on supplier with unresolved remote dependencies
@@ -274,8 +271,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
 
 
       // register dependency of consumer that will have unresolved local
@@ -285,8 +281,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
 
 
       // register dependencies on each supplier of first consumer that will 
@@ -296,24 +291,20 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                        TAO_TRY_ENV);
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                        TAO_TRY_ENV);
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+
 
       // Register dependencies on each of the other consumers by second 
       // consumer that will have both unresolved local and unresolved remote 
@@ -323,32 +314,26 @@ main (int argc, char *argv[])
                         config_infos[1].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                        TAO_TRY_ENV);
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[3].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                        TAO_TRY_ENV);
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[5].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                        TAO_TRY_ENV);
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[6].handle,
                         1,                            // number of calls
                         RtecScheduler::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Config_Info_Set_var configs;
@@ -373,17 +358,17 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV);
+         infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV);
+         infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             configs.in (),
@@ -391,11 +376,11 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Anomalies_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 31c1fbf987f..2c0bd902827 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -20,12 +20,12 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -35,12 +35,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Store a pointer to the local run-time scheduler.
       RtecScheduler::Scheduler_ptr runtime_scheduler = 
@@ -59,20 +59,15 @@ main (int argc, char *argv[])
           // run-time scheduler's create and lookup methods.
           ACE_ASSERT (infos [i].handle == 
                       runtime_scheduler->create (infos [i].entry_point, 
-                                                 ACE_TRY_ENV));
-          ACE_TRY_CHECK;
-
+                                                 TAO_TRY_ENV));
           ACE_ASSERT (infos [i].handle == 
                       runtime_scheduler->lookup (infos [i].entry_point, 
-                                                 ACE_TRY_ENV));
-          ACE_TRY_CHECK;
+                                                 TAO_TRY_ENV));
 
           // Make sure the values in the RT_Info returned by get are OK.
           delete rt_info;
           rt_info = runtime_scheduler->get (infos [i].handle, 
-                                            ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
+                                            TAO_TRY_ENV);
           ACE_ASSERT (rt_info != 0);
           ACE_ASSERT (ACE_OS::strcmp (rt_info->entry_point,
                                       infos [i].entry_point) == 0);
@@ -118,17 +113,14 @@ main (int argc, char *argv[])
                                   infos [i].threads,
                                   ACE_static_cast (RtecScheduler::Info_Type_t,
                                                    infos [i].info_type),
-                                  ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
 
           // Make sure the correct priority values are returned.
           runtime_scheduler->priority (infos [i].handle,
                                        priority,
                                        subpriority,
                                        p_priority,
-                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
+                                       TAO_TRY_ENV);
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
           ACE_ASSERT (p_priority == infos [i].preemption_priority);
@@ -136,9 +128,7 @@ main (int argc, char *argv[])
                                                    priority,
                                                    subpriority,
                                                    p_priority,
-                                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
+                                                   TAO_TRY_ENV);
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
           ACE_ASSERT (p_priority == infos [i].preemption_priority);
@@ -154,19 +144,17 @@ main (int argc, char *argv[])
             dispatch_configuration (configs [j].preemption_priority,
                                     priority,
                                     dispatching_type,
-                                    ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
+                                    TAO_TRY_ENV);
           ACE_ASSERT (priority == configs [j].thread_priority);
           ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
 
         }
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sys_ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index bd74f226fa6..efe052fa347 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -29,11 +29,9 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BIN2 = client
 
-TAO_IDLFLAGS += -Ge 1
-
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
@@ -175,25 +173,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -241,9 +230,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -323,7 +316,8 @@ realclean:
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- test_objectC.i
+ test_objectC.i test_objectS.h test_objectS_T.h test_objectS_T.i \
+ test_objectS_T.cpp test_objectS.i
 .obj/test_objectS.o .obj/test_objectS.so .shobj/test_objectS.o .shobj/test_objectS.so: test_objectS.cpp test_objectS.h test_objectC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -433,25 +427,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -499,9 +484,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -692,25 +681,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -758,9 +738,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/README b/TAO/orbsvcs/tests/Simple_Naming/README
index 5e8c01ad0d3..2d80c03a121 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/README
+++ b/TAO/orbsvcs/tests/Simple_Naming/README
@@ -6,16 +6,11 @@ To run all tests automatically -
 	execute Perl script run_test.pl
 
 To run tests manually -
-	start the Naming Service (see
-	TAO/orbsvcs/Naming_Service/README for valid options),
-	then run ./client with one of the options below.
-
-NOTE: if running tests manually, Naming Service has to be restarted
-before each test (this is due to some tests not 'cleaning up' bindings
-after themselves).
+	start Naming Service ($TAO_ROOT/orbsvcs/Naming_Service/Naming_Service),
+	 then run ./client with one of the following options below.
 
 The following options exist:
----------------------------
+
 -s	Run the Simple test of the Naming Service.
 
 -t  	Run the Tree test of the Naming Service.
@@ -26,74 +21,25 @@ The following options exist:
 
 -y      Run the Destroy test of the Naming Service.
 
--m <n>  Run the Multi-Threaded test of the Naming Service (multiple
-        client threads).  Requires integer argument specifying number
-        of thread to spawn.  (If running this test manually, its
-        output should be redirected to some file, say, "foo".  Then,
-        "process-m-output.pl" script can be used to analyze the test
-        output and print out a diagnostic message.  Invoke the output
-        processing script like so:
-        "process-m-output.pl foo number_of_threads",
-        where <foo> is the name of the file containing test output,
-        and <number_of_threads> is the argument that was supplied with
-        "-m" option  to the client.)
-
-        Example (on a Unix system):
-        $ ../../Naming_Service &
-        $ ./client -m 10 >& foo
-        $ ./process-m-output.pl foo 10
-
-        where the steps correspond to 1)starting the Naming Service,
-        2) running the client and redirecting the output to a file,
-        and 3) running the diagnostic script.
-        Don't forget to kill the Naming Service after you are done.
-
-Persistent test consists of two parts (below).
-
--p <file_name>
-        Run the Persistent Naming Service test, part 1.  Requires an
-        argument specifying the name of the file in which to store an ior for
-        use by Persistent Naming Service test, part 2.  Note, in order
-        to test out persistent capabilities of the Naming Service, the
-        Naming Service must be started with -f and -ORBendpoint options.
-        The values for these options must be the same for both runs of
-        the Naming Service (i.e., for part 1 and part 2 of persistent test).
-
--c <ior>
-        Run the Persistent Naming Service test, part 2.  Requires an
-        argument specifying the ior, which was produced in part 1 of
-        the test.  Note, in order to test out persistent capabilities
-        of the Naming Service, the Naming Service must be started with
-        -f and -ORBendpoint options.  The values for these options
-        must remain the same for both runs of the Naming Service (i.e.,
-        for part 1 and part 2 of persistent test).
-
-        Example of testing persistence on a Unix system:
-        $ ../../Naming_Service -f log -ORBendpoint iiop://localhost:20000
-        $ ./client -p ior_file
-        kill the Naming_Service process
-        $ ../../Naming_Service -f log -ORBendpoint iiop://localhost:20000
-        $ ./client -c file://ior_file
-
-        where the steps correspond to 1)starting the Naming Service on
-        port 20000 in persistent mode, with persistent state being
-        stored in file called "log", 2) running the first part of the
-        client persistent naming test, and sending its data to file
-        called "ior_file", 3) killing the Naming Service process, 4)
-        restarting the Naming Service on the same port with the same
-        persistent state storage file, and 5) running the second part
-        of the client persistence test by specifying the ior from part
-        1 in the file format.
-
-        We kill the Naming Service process between 2 client runs to
-        make sure it can recreate its state from persistent storage.
-        It is necessary to restart the Naming Service on the same
-        host/port in order for the persistent IORs from the first
-        run to be valid for the second run.
+-m      Run the MT test of the Naming Service.  Requires integer
+        argument specifying number of thread to spawn.  (If running
+        this test manually, its output should be redirected to some
+        file, say, "foo".  Then, process-m-output.pl script can be
+        used to analyze the test output and print out a diagnostic
+        message.  Invoke the script with
+        "process-m-output.pl foo number_of_threads", where
+        <number_of_threads> is the argument that was supplied with "-m"
+        option to the client.)
 
 If no option is specified, Simple test is run.  If more than one
 option is specified, only one test runs.
 
+NOTE: if running tests manually, Naming Service has to be restarted
+before each test (this is due to some tests not 'cleaning up' bindings
+after themselves).
+
+NOTE: destroy test will not produce desired output if POA 'recreates
+servants on request'.
 
 DESCRIPTION AND EXPECTED OUTPUT FOR EACH TEST
 *******************************************
@@ -119,15 +65,6 @@ bind (), resolve (), and unbind () the object reference.
 Expected Output (produced by the output processing script):
 
 Multithreaded output is ok
-
-The output of the actual test varies from run to run, due to the
-variation in the thread scheduling.  Correct output must have the
-following properties (these are the properties that the processing
-script checks for):
-1) number of bind () calls = number of resolve () calls = number of
-unbind () calls = number of threads specified for the test
-2) number of successful bind () calls = number of successful unbind () calls.
-
 *******************************************
 
 Tree Test.
@@ -172,7 +109,7 @@ root->resolve () (with a Name of length 0) - should get InvalidName exception.
 root->bind (foo, obj) - should get AlreadyBound exception.
 root->bind (level1/foo, obj) - should get AlreadyBound exception.
 root->unbind (level1/level2/bar) - should get NotFound exception
-  with why = missing_node, rest_of_name = bar.
+  with why = not_object, rest_of_name = bar.
 root->unbind (level1/level3/foo) - should get NotFound exception
   with why = missing_node, rest_of_name = level3/foo.
 root->unbind (level1/foo/foo) -should get NotFound exception
@@ -230,33 +167,3 @@ NotEmpty exception works properly
 Destroy works properly
 
 ********************************************
-
-Persistent Test (part 1).
-
-Makes sure persistence mode of the Naming Service functions properly:
-this test sets things up for part 2
-
-Creates the Naming Context hierarchy:
-root -> level1_context -> level2_context,
-and prints out the ior of the <level1_context> to the specified file.
-
-
-Expected Output:
-
-Persistent Naming test (part 1) OK.
-
-********************************************
-Persistent Test (part 2).
-
-Makes sure persistence mode of the Naming Service functions properly.
-
-Attempts to resolve <level2_context> both through the ior obtained
-from part 1 of the test, and through the Naming Context obtained from
-<resolve_initial_references>.  Compares the results of both resolve ()
-calls.
-
-Expected Output:
-
-Persistent Naming test (part 2) OK.
-
-********************************************
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 9233d1c1b04..16015d58161 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -90,7 +90,7 @@ CosNaming_Client::CosNaming_Client (void)
 int
 CosNaming_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
+  ACE_Get_Opt get_opts (argc_, argv_, "pdstieylm:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -105,6 +105,12 @@ CosNaming_Client::parse_args (void)
                           Simple_Test,
                           -1);
         break;
+      case 'l':
+        if (this->test_ == 0)
+          ACE_NEW_RETURN (this->test_,
+                          Loop_Test,
+                          -1);
+        break;
       case 'm':
         if (this->test_ == 0)
           {
@@ -144,20 +150,9 @@ CosNaming_Client::parse_args (void)
         break;
       case 'p':
         if (this->test_ == 0)
-          {
-            FILE * ior_output_file =
-              ACE_OS::fopen (get_opts.optarg, "w");
-
-            if (ior_output_file == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Unable to open %s for writing: %p\n",
-                                 get_opts.optarg), -1);
-
-            ACE_NEW_RETURN (this->test_,
-                            Persistent_Test_Begin (this->orbmgr_.orb (),
-                                                   ior_output_file),
-                            -1);
-          }
+          ACE_NEW_RETURN (this->test_,
+                          Persistent_Test_Begin (this->orbmgr_.orb ()),
+                          -1);
         break;
       case 'c':
         if (this->test_ == 0)
@@ -285,6 +280,8 @@ MT_Test::svc (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %8.8x \n",
                   ACE_OS::thr_self ()));
+
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -323,6 +320,8 @@ MT_Test::svc (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %8.8x \n",
                   ACE_OS::thr_self ()));
+
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -347,6 +346,8 @@ MT_Test::svc (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %8.8x \n",
                   ACE_OS::thr_self ()));
+
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -416,6 +417,139 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 }
 
 int
+Loop_Test::execute (TAO_Naming_Client &root_context)
+{
+  // Create a dummy object.
+  My_Test_Object * test_obj_impl =
+    new My_Test_Object (CosNaming_Client::OBJ1_ID);
+  Test_Object_var test_ref;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY_EX (SETUP)
+    {
+      test_ref =
+        test_obj_impl->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK_EX (SETUP);
+
+      test_obj_impl->_remove_ref (ACE_TRY_ENV);
+      ACE_TRY_CHECK_EX (SETUP);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  // Create a name for dummy.
+  CosNaming::Name test_name;
+  test_name.length (1);
+  test_name[0].id = CORBA::string_dup ("Foo");
+
+  // Perform bind, resolve, and unbind operations on the dummy in a
+  // loop.  CosNaming::NamingContext::AlreadyBound and
+  // CosNaming::NamingContext::NotFound exceptions are ignored (i.e.,
+  // we move on to performing the next operation in a loop).
+  for (int i = 0; i < 200; i++)
+    {
+      // Bind the object.
+      ACE_TRY_EX (BIND)
+        {
+          root_context->bind (test_name,
+                              test_ref.in (),
+                              ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (BIND);
+          ACE_DEBUG ((LM_DEBUG,
+                      "Bound name OK in process %8.8x \n",
+                      ACE_OS::getpid ()));
+        }
+      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Unable to bind in process %8.8x \n",
+                      ACE_OS::getpid ()));
+
+          ACE_TRY_ENV.clear ();
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          return -1;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+
+      // Resolve the object from the Naming Context.
+      ACE_TRY_EX (RESOLVE)
+        {
+          CORBA::Object_var result_obj_ref =
+            root_context->resolve (test_name,
+                                   ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (RESOLVE);
+
+          Test_Object_var result_object =
+            Test_Object::_narrow (result_obj_ref.in (),
+                                  ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (RESOLVE);
+
+
+          if (!CORBA::is_nil (result_object.in ()))
+            {
+              CORBA::Short id = result_object->id (ACE_TRY_ENV);
+              ACE_TRY_CHECK_EX (RESOLVE);
+
+              if (id == CosNaming_Client::OBJ1_ID)
+                ACE_DEBUG ((LM_DEBUG,
+                            "Resolved name OK in process %8.8x \n",
+                            ACE_OS::getpid ()));
+            }
+        }
+      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Unable to resolve in process %8.8x \n",
+                      ACE_OS::getpid ()));
+          ACE_TRY_ENV.clear ();
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          return -1;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+
+      // Unbind the object from the Naming Context.
+      ACE_TRY_EX (UNBIND)
+        {
+          root_context->unbind (test_name,
+                                ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (UNBIND);
+          ACE_DEBUG ((LM_DEBUG,
+                      "Unbound name OK in process %8.8x \n",
+                      ACE_OS::getpid ()));
+        }
+      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Unable to unbind in process %8.8x \n",
+                      ACE_OS::getpid ()));
+          ACE_TRY_ENV.clear ();
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          return -1;
+        }
+
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+    }
+  return 0;
+}
+
+int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -673,6 +807,8 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_DEBUG ((LM_DEBUG, "Setup ready\n"));
+
       // Run exceptions tests.
       invalid_name_test (root_context,
                          ACE_TRY_ENV);
@@ -720,6 +856,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context,
     }
   ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
@@ -755,6 +892,7 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
@@ -792,6 +930,7 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
@@ -823,7 +962,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
-      if (ex.why == CosNaming::NamingContext::missing_node &&
+      if (ex.why == CosNaming::NamingContext::not_object &&
           ex.rest_of_name.length () == 1
           && ACE_OS::strcmp (ex.rest_of_name[0].id.in (),
                              "bar") == 0)
@@ -833,6 +972,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -874,6 +1014,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -915,6 +1056,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
+      ACE_TRY_ENV.clear ();
     }
   ACE_CATCHANY
     {
@@ -1101,6 +1243,7 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref,
 
   ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
@@ -1120,6 +1263,7 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref,
 
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
+      ACE_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
@@ -1127,10 +1271,8 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref,
   ACE_CHECK;
 }
 
-Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
-                                              FILE * ior_output_file)
-  : orb_ (orb),
-    file_ (ior_output_file)
+Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb)
+  : orb_ (orb)
 {
 }
 
@@ -1158,7 +1300,7 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name,
+        root_context->bind_new_context (test_name,
                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -1167,10 +1309,7 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
         orb_->object_to_string (level1_context.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::fprintf (this->file_,
-                       "%s",
-                       ior.in ());
-      ACE_OS::fclose (this->file_);
+      ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ()));
 
       ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
     }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
index 93ae4c0ec45..8edf12681a0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
@@ -7,21 +7,21 @@
 CFG=Simple Naming Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "client.mak" CFG="Simple Naming Client - Win32 Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "Simple Naming Client - Win32 Release" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE "Simple Naming Client - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs"

 

 !ELSEIF  "$(CFG)" == "Simple Naming Client - Win32 Debug"

 

@@ -77,7 +77,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -129,13 +129,13 @@ SOURCE=.\test_object.idl
 !IF  "$(CFG)" == "Simple Naming Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test_object.idl

 InputName=test_object

 

 BuildCmds= \

-	tao_idl -Ge 1 $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -168,13 +168,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Simple Naming Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test_object.idl

 InputName=test_object

 

 BuildCmds= \

-	tao_idl -Ge 1 $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -204,7 +204,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

@@ -230,7 +230,15 @@ SOURCE=.\test_objectS_T.i
 # Begin Source File

 

 SOURCE=.\test_objectS_T.cpp

+

+!IF  "$(CFG)" == "Simple Naming Client - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "Simple Naming Client - Win32 Debug"

+

 # PROP Exclude_From_Build 1

+

+!ENDIF

+

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 761e1766fe7..11b606076e0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -55,6 +55,22 @@ public:
   // Execute the simple test code.
 };
 
+class Loop_Test : public Naming_Test
+{
+  // = TITLE
+  //    This class implements a loop Naming Service test.
+  //
+  // = DESCRIPTION
+  //    The test binds(), resolves(), and unbinds() an object
+  //    reference in a loop, ignoring AlreadyBound and NotFound
+  //    exceptions.  This is useful for a script that spawns multiple
+  //    client processes, each executing the loop test, using the same
+  //    name for the object reference.
+public:
+  virtual int execute (TAO_Naming_Client &root_context);
+  // Execute the loop test code.
+};
+
 class MT_Test : public Naming_Test, public ACE_Task_Base
 {
   // = TITLE
@@ -224,8 +240,7 @@ class Persistent_Test_Begin : public Naming_Test
 public:
   // = Initialization and termination methods.
 
-  Persistent_Test_Begin (CORBA::ORB_ptr orb,
-                         FILE * ior_output_file);
+  Persistent_Test_Begin (CORBA::ORB_ptr orb);
   // Constructor.  Takes in an orb pointer.
 
   virtual ~Persistent_Test_Begin (void);
@@ -238,9 +253,6 @@ private:
 
   CORBA::ORB_var orb_;
   // A pointer to our ORB (needed for object/string conversion).
-
-  FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
 };
 
 class Persistent_Test_End : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 7f5167f5db5..3502343dc7b 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -5,33 +5,29 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-# This is a Perl script that runs all Naming Service tests.  It starts
-# all the servers and clients as necessary.
+# This is a Perl script that runs the client and all the other servers that
+# are needed
 
 unshift @INC, '../../../../bin';
 require Process;
 require ACEutils;
 require Uniqueid;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
+# amount of delay between running the servers
+
 $sleeptime = 8;
 
-# Variables for command-line arguments to client and server
-# executables. 
-$ns_multicast_port = 10000 + uniqueid ();  
-$ns_orb_port = 12000 + uniqueid ();
+# variables for parameters
+
+$nsmport = 10000 + uniqueid ();
 $iorfile = "ns.ior";
-$persistent_ior_file = "pns.ior";
-$persistent_log_file = "test_log";
-$data_file = "test_run.data";
 
 sub name_server
 {
-  my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
+  my $args = "-ORBnameserviceport $nsmport -o $iorfile";
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
-      "Naming_Service".$DIR_SEPARATOR.
-          "Naming_Service".$EXE_EXT;
+    "Naming_Service".$DIR_SEPARATOR.
+      "Naming_Service".$EXE_EXT;
 
   unlink $iorfile;
   $NS = Process::Create ($prog, $args);
@@ -45,54 +41,39 @@ sub name_server
 
 sub client
 {
-  my $args = "@_"." ";
+  my $args = $_[0]." "."-ORBnameserviceport $nsmport ".
+    "-ORBnameserviceior file://$iorfile";
   my $prog = $EXEPREFIX."client".$EXE_EXT;
 
   $CL = Process::Create ($prog, $args);
-
-  $client = $CL->TimedWait (60);
-  if ($client == -1) {
-      print STDERR "ERROR: client timedout\n";
-      $CL->Kill (); $CL->TimedWait (1);
-  }
 }
 
-# Options for all simple tests recognized by the 'client' program.
-@opts = ("-s -ORBnameserviceior file://$iorfile",
-         "-s -ORBnameserviceport $ns_multicast_port",
-         "-t -ORBnameserviceior file://$iorfile", 
-         "-i -ORBnameserviceior file://$iorfile", 
-         "-e -ORBnameserviceior file://$iorfile", 
-         "-y -ORBnameserviceior file://$iorfile",
-         "-p $persistent_ior_file -ORBnameserviceior file://$iorfile",
-         "-c file://$persistent_ior_file -ORBnameserviceior file://$iorfile");
-
-@server_opts = ("", "", "", "", "", "",
-                "-ORBEndpoint iiop://localhost:$ns_orb_port -f $persistent_log_file",
-                "-ORBEndpoint iiop://localhost:$ns_orb_port -f $persistent_log_file");
+# Options for all tests recognized by the 'client' program.
+@opts = ("-s", "-t", "-i", "-e", "-y");
 
 @comments = ("Simple Test: \n",
-             "Simple Test (using multicast to locate the server): \n",
              "Tree Test: \n",
              "Iterator Test: \n",
              "Exceptions Test: \n",
-             "Destroy Test: \n",
-             "Persistent Test (Part 1): \n",
-             "Persistent Test (Part 2): \n");
+             "Destroy Test: \n");
 
 $test_number = 0;
 
-unlink $persistent_ior_file, $persistent_log_file;
-
-# Run server and client for each of the tests.  Client uses ior in a
-# file to bootstrap to the server.
+# Run server and client with each option available to the client.
 foreach $o (@opts)
 {
-  name_server ($server_opts[$test_number]);
+  name_server ();
 
-  print STDERR "\n          ".$comments[$test_number];
+  print STDERR "\n";
+  print STDERR "          ".$comments[$test_number];
 
   client ($o);
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+
 
   $NS->Terminate (); $server = $NS->TimedWait (5);
   if ($server == -1) {
@@ -102,20 +83,25 @@ foreach $o (@opts)
   $test_number++;
 }
 
-unlink $persistent_ior_file, $persistent_log_file;
+print STDERR "\n";
 
-# Now run the multithreaded test, sending output to the file.
-print STDERR "\n          Multithreaded Test:\n";
-unlink $data_file;
+print STDERR "          Multithreaded Test:\n";
 
+# Now run the multithreaded test, sending output to the file.
 open (OLDOUT, ">&STDOUT");
-open (STDOUT, ">$data_file") or die "can't redirect stdout: $!";
+open (STDOUT, ">test_run.data") or die "can't redirect stdout: $!";
 open (OLDERR, ">&STDERR");
 open (STDERR, ">&STDOUT") or die "can't redirect stderror: $!";
 
 name_server ();
 
-client ("-ORBnameserviceior file://$iorfile", "-m25");
+client ("-m25");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
 close (STDERR);
 close (STDOUT);
@@ -141,4 +127,3 @@ print STDERR "\n";
 
 # @@ Capture any exit status from the processes.
 exit 0;
-
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index a2b38e041a0..39625ec11dd 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -27,22 +27,21 @@ Client_i::test_for_secure_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
  	      "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosTime::UTO_var UTO_server =
- 	   this->clerk_->secure_universal_time (ACE_TRY_ENV);
+ 	   this->clerk_->secure_universal_time (TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       ACE_DEBUG ((LM_DEBUG,
  		  "[CLIENT] Process/Thread Id : (%P/%t) test_for_secure_universal_time() successful !!\n"));
 	}
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 // The following test retrieves the current universal time as a UTO
@@ -53,70 +52,68 @@ Client_i::test_for_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
  	      "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosTime::UTO_var UTO_server =
- 	this->clerk_->universal_time (ACE_TRY_ENV);
+ 	this->clerk_->universal_time (TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
  		  "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q"
  		  "\nstruct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
- 		  UTO_server->time (ACE_TRY_ENV),
- 		  UTO_server->inaccuracy (ACE_TRY_ENV),
- 		  UTO_server->tdf (ACE_TRY_ENV),
+ 		  UTO_server->time (TAO_TRY_ENV),
+ 		  UTO_server->inaccuracy (TAO_TRY_ENV),
+ 		  UTO_server->tdf (TAO_TRY_ENV),
  		  (UTO_server->utc_time ()).time,
  		  (UTO_server->utc_time ()).inacclo,
  		  (UTO_server->utc_time ()).inacchi,
  		  (UTO_server->utc_time ()).tdf));
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error:");
+      TAO_TRY_ENV.print_exception ("Error:");
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) test_for_universal_time()\n"));
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
 Client_i::test_for_new_universal_time (void)
 {
+  // @@ Vishal, please consider replacing these numbers with consts or enums.
   TimeBase::TimeT time = 999999999;
   TimeBase::InaccuracyT inaccuracy = 9999;
   TimeBase::TdfT tdf = 99;
-  
+
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
  								      inaccuracy,
                                                                       tdf,
-                                                                      ACE_TRY_ENV);
-
-      ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == 9999);
-      ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 0);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 9999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99);
+                                                                      TAO_TRY_ENV);
+
+      ACE_ASSERT (UTO_server->time (TAO_TRY_ENV) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (TAO_TRY_ENV) == 9999);
+      ACE_ASSERT (UTO_server->tdf (TAO_TRY_ENV) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacchi == 0);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacclo == 9999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).tdf == 99);
 		  
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_universal_time () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
@@ -132,33 +129,31 @@ Client_i::test_for_uto_from_utc (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct,
-                                                                ACE_TRY_ENV);
+                                                                TAO_TRY_ENV);
       
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
       inaccuracy |= utc_struct.inacclo;
       
-      ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == inaccuracy);
-      ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99);
+      ACE_ASSERT (UTO_server->time (TAO_TRY_ENV) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (TAO_TRY_ENV) == inaccuracy);
+      ACE_ASSERT (UTO_server->tdf (TAO_TRY_ENV) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacclo == 50);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacchi == 50);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).tdf == 99);
       
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test uto_from_utc () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
@@ -170,25 +165,23 @@ Client_i::test_for_new_interval (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
  								upper,
-                                                                ACE_TRY_ENV);
+                                                                TAO_TRY_ENV);
 
-      ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).lower_bound == 666666666);
-      ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).upper_bound == 999999999);
+      ACE_ASSERT ((TIO_server->time_interval (TAO_TRY_ENV)).lower_bound == 666666666);
+      ACE_ASSERT ((TIO_server->time_interval (TAO_TRY_ENV)).upper_bound == 999999999);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_interval () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   
   return;
 }
@@ -308,9 +301,7 @@ Client_i::~Client_i (void)
 int
 Client_i::obtain_initial_references (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize the naming services.
       if (my_name_client_.init (orb_.in ()) != 0)
@@ -340,12 +331,12 @@ Client_i::obtain_initial_references (void)
 
       CORBA::Object_var temp_object =
         my_name_client_->resolve (clerk_name,
-				  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+				  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       clerk_ = CosTime::TimeService::_narrow (temp_object.in (),
-					      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+					      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (clerk_.in ()))
 	ACE_ERROR_RETURN ((LM_ERROR,
@@ -353,12 +344,12 @@ Client_i::obtain_initial_references (void)
 			   "Clerk Reference\n"),
 			   -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client :: obtain_initial_references\n");
+      TAO_TRY_ENV.print_exception ("Client :: obtain_initial_references");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -371,17 +362,15 @@ Client_i::init (int argc, char **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  TAO_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -394,9 +383,9 @@ Client_i::init (int argc, char **argv)
 
 	  CORBA::Object_var server_object =
 	  this->orb_->string_to_object (this->ior_,
-					ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-          
+					TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+
 	  if (CORBA::is_nil (server_object.in ()))
 	    ACE_ERROR_RETURN ((LM_ERROR,
 			       "invalid ior <%s>\n",
@@ -404,11 +393,11 @@ Client_i::init (int argc, char **argv)
 			      -1);
 	  this->clerk_ =
 	    CosTime::TimeService::_narrow (server_object.in (),
-                                           ACE_TRY_ENV);
+					    TAO_TRY_ENV);
 
 	  ACE_DEBUG ((LM_DEBUG,
 		      "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
-	  ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
 	}
       else
 	{ // No IOR specified. Use the Naming Service
@@ -418,15 +407,15 @@ Client_i::init (int argc, char **argv)
 	  if (this->obtain_initial_references () == -1)
 	    return -1;
 
-	  ACE_TRY_CHECK;
+	  TAO_CHECK_ENV;
 	}
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init\n");
+      TAO_TRY_ENV.print_exception ("Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index 044c0eaa776..5c9abf76af7 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -29,7 +29,7 @@ BIN2 = client
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Time
@@ -177,25 +177,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -243,9 +234,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -466,25 +461,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -532,9 +518,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Time/implrepo.conf b/TAO/orbsvcs/tests/Time/implrepo.conf
new file mode 100644
index 00000000000..4c30fa8cb6a
--- /dev/null
+++ b/TAO/orbsvcs/tests/Time/implrepo.conf
@@ -0,0 +1,5 @@
+# $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 thread-per-connection  -ORBpoalock null "
diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl
index 822a83e9c31..a0236d03047 100755
--- a/TAO/orbsvcs/tests/Time/run_test.pl
+++ b/TAO/orbsvcs/tests/Time/run_test.pl
@@ -12,7 +12,6 @@ require ACEutils;
 $server_ior = "server_ior";
 $clerk_ior = "clerk_ior";
 $implrepo_ior = "implrepo.ior";
-$status = 0;
 
 # Make sure the files are gone, so we can wait on them.
 
@@ -20,156 +19,82 @@ unlink $server_ior;
 unlink $clerk_ior;
 unlink $implrepo_ior;
 
-$implrepo_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT;
-$tao_ir_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."ImplRepo_Service".$DIR_SEPARATOR."tao_ir".$EXE_EXT;
-$server_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Server".$EXE_EXT;
-$clerk_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Clerk".$EXE_EXT;
-$client_program = $EXEPREFIX."client".$EXE_EXT;
+$time_dir = "..$DIR_SEPARATOR..".$DIR_SEPARATOR."Time_Service".$DIR_SEPARATOR;
 
 sub time_service_test_using_naming_service
 {
-    $SV1 = Process::Create ($server_program,"");
+    $SV1 = Process::Create ($time_dir."server".$EXE_EXT,"");
 
     sleep 5;
 
-    $SV2 = Process::Create ($clerk_program,"-t 2");
+    $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT,"-t 2");
 
     sleep 10;
 
-    $CL = Process::Create ($client_program, "");
-    
-    if ($CL->TimedWait (60) == -1) {
-      print STDERR "ERROR: client timedout\n";
-      $status = 1;
-      $CL->Kill (); $CL->TimedWait (1);
-    }
+    $status = system ($EXEPREFIX."client".$EXE_EXT.
+                      "");
 
-    $SV1->Terminate ();
-    $SV2->Terminate ();
-    if ($SV1->TimedWait (5) == -1 ||
-        $SV2->TimedWait (5) == -1) {
-      print STDERR "ERROR: couldn't shutdown the servers nicely\n";
-      $status = 1;
-      $SV1->Kill (); $SV2->Kill ();
-      $SV1->TimedWait (1); $SV2->TimedWait (1);
-    }
+    $SV1->Kill ();
+    $SV2->Kill ();
+    $SV1->Wait ();
+    $SV2->Wait ();
 }
 
 sub time_service_test_using_files
 {
-    $SV1 = Process::Create ($server_program,
+    $SV1 = Process::Create ($time_dir."server".$EXE_EXT,
                             "-o $server_ior");
 
-    if (ACE::waitforfile_timed ($server_ior, 5) == -1) {
-      print STDERR "ERROR: timedout waiting for file <$server_ior>\n";
-      $status = 1;
-      $SV1->Kill (); $SV1->TimedWait (1);
-    }
-    else {
-      
-      sleep 5;
-      
-      $SV2 = Process::Create ($clerk_program,
-                              "-f $server_ior -o $clerk_ior -t 2");
-      
-      if (ACE::waitforfile_timed ($clerk_ior, 5) == -1) {
-        print STDERR "ERROR: timedout waiting for file <$clerk_ior>\n";
-        $status = 1;
-        $SV2->Kill (); $SV2->TimedWait (1);
-      }
-      else {
-        
-        sleep 10;
-        
-        $CL = Process::Create ($client_program,
-                          " -f $clerk_ior");
-        if ($CL->TimedWait (60) == -1) {
-          print STDERR "ERROR: client timedout\n";
-          $status = 1;
-          $CL->Kill (); $CL->TimedWait (1);
-        }
-      
-        $SV1->Terminate ();
-        $SV2->Terminate ();
-        if ($SV1->TimedWait (5) == -1 ||
-            $SV2->TimedWait (5) == -1) {
-          print STDERR "ERROR: couldn't shutdown the servers nicely\n";
-          $status = 1;
-          $SV1->Kill (); $SV2->Kill ();
-          $SV1->TimedWait (1); $SV2->TimedWait (1);
-        }
-      }
-    }
+    ACE::waitforfile ($server_ior);
+    sleep 5;
+
+    $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT,
+                            "-f $server_ior -o clerk_ior -t 2");
+
+    ACE::waitforfile ($clerk_ior);
+
+    sleep 10;
+
+    $status = system ($EXEPREFIX."client".$EXE_EXT.
+                      " -f clerk_ior");
+
+    $SV1->Kill ();
+    $SV2->Kill ();
+    $SV1->Wait ();
+    $SV2->Wait ();
+
     unlink $clerk_ior;
     unlink $server_ior;
 }
 
 sub time_service_test_using_ir
 {
-  $IR = Process::Create ($implrepo_program,
-                         "-o $implrepo_ior -d 1");
-
-  if (ACE::waitforfile_timed ($implrepo_ior, 5) == -1) {
-    print STDERR "ERROR: timedout waiting for file <$implrepo_ior>\n";
-    $IR->Kill (); $IR->TimedWait (1);
-    exit 1;
-  } 
-
-  $TIR = Process::Create ($tao_ir_program, 
-                          "-ORBImplRepoIOR file://$implrepo_ior add ".
-                          "time_server -c \"$server_program ".
-                          "-ORBImplRepoIOR file://$implrepo_ior -i\"");
-
-  sleep 5;
-
-  $SV1 = Process::Create ($server_program,
-                         "-ORBImplRepoIOR file://$implrepo_ior -o $server_ior -i");
-
-  if (ACE::waitforfile_timed ($server_ior, 5) == -1) {
-    print STDERR "ERROR: timedout waiting for file <$implerepo_ior>\n";
-    $IR->Kill (); $IR->TimedWait (1);
-    $SV1->Kill (); $SV1->TimedWait (1);
-    exit 1;
-  }
+  $ir_dir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR;
+  $IR = Process::Create ($ir_dir."ImplRepo_Service".$EXE_EXT,
+                         "-ORBsvcconf implrepo.conf -d 1");
 
-  sleep 10;
+  ACE::waitforfile ($implrepo_ior);
 
-  $SV2 = Process::Create ($clerk_program,
-                          "-f $server_ior -o $clerk_ior");
+  $SV1 = Process::Create ($time_dir."server".$EXE_EXT,
+                         "-o $server_ior -i -r");
+
+  ACE::waitforfile ($server_ior);
 
   sleep 10;
 
-  $CL = Process::Create ($client_program, "-f $clerk_ior");
-  
-  if ($CL->TimedWait (60) == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $status = 1;
-    $CL->Kill (); $CL->TimedWait (1);
-  }
-    
-  $IR->Terminate ();
-  if ($IR->TimedWait (5) == -1) {
-    print STDERR "ERROR: couldn't shutdown repository nicely\n";
-    $status = 1;
-    $IR->Kill (); $IR->TimedWait (1);
-  }
+  $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT,
+                          "-f $server_ior -o clerk_ior");
 
-  $TIR->Terminate ();
-  if ($TIR->TimedWait (5) == -1) {
-    print STDERR "ERROR: couldn't shutdown tao_ir nicely\n";
-    $status = 1;
-    $TIR->Kill (); $TIR->TimedWait (1);
-  }
+  sleep 10;
 
-  $SV1->Terminate ();
-  $SV2->Terminate ();
-  if ($SV1->TimedWait (5) == -1 ||
-      $SV2->TimedWait (5) == -1) {
-    print STDERR "ERROR: couldn't shutdown the servers nicely\n";
-    $status = 1;
-    $SV1->Kill (); $SV2->Kill ();
-    $SV1->TimedWait (1); $SV2->TimedWait (1);
-  }
+  system($EXEPREFIX."client.$EXE_EXT -f $clerk_ior");
+
+  $IR->Kill ();
+  $IR->Wait ();
+  $SV1->Kill ();
+  $SV1->Wait ();
+  $SV2->Kill ();
+  $SV2->Wait ();
 
   unlink $clerk_ior;
   unlink $server_ior;
@@ -188,7 +113,6 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "\n";
       print "use_naming               -- Runs the test using Naming Service\n";
       print "use_files                -- Runs the test using IOR Files\n";
-      print "use_ir                   -- Runs the test with the IR\n";
       exit;
     }
 
@@ -213,5 +137,3 @@ for ($i = 0; $i <= $#ARGV; $i++)
     print "run_test: Unknown Option: ".$ARGV[$i]."\n";
   }
 }
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
index e4c31473eb5..cd02ac9321c 100644
--- a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/orbsvcs/tests/Trading/Import_Test.dsp b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
index 8669aeead50..d3fa87a6b1f 100644
--- a/TAO/orbsvcs/tests/Trading/Import_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index cd298e95f73..0aeb8cf4bcc 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -43,14 +43,13 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
   LIB = $(LIB2)
   SHLIB = $(SHLIB2)
 endif # Trader
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -194,25 +193,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -260,9 +250,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -342,7 +336,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- TTestC.i
+ TTestC.i TTestS.h TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i
 .obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -452,25 +446,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -518,9 +503,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -710,25 +699,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -776,9 +756,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -996,25 +980,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1062,9 +1037,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1265,25 +1244,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1331,9 +1301,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1557,25 +1531,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1623,9 +1588,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1857,25 +1826,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1923,9 +1883,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2147,13 +2111,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Offer_Exporter.h TT_Info.h TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2206,6 +2163,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2452,13 +2411,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Offer_Importer.h TT_Info.h TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2511,6 +2463,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2755,13 +2709,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Offer_Exporter.h TT_Info.h TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2814,6 +2761,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 3e31835682d..24bbefea8b8 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -8,18 +8,18 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                     CORBA::Boolean verbose,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
-  this->create_offers (ACE_TRY_ENV);
+  this->create_offers ();
 
   // Obtain the necessary trading service interfaces.
-  this->register_ = lookup_if->register_if (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->admin_ = lookup_if->admin_if (ACE_TRY_ENV);
-  // ACE_CHECK;
+  this->register_ = lookup_if->register_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  this->admin_ = lookup_if->admin_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
@@ -33,7 +33,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::export_offers (CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -54,13 +54,13 @@ TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV)
       this->props_fs_[i][4].value <<= "Default";
     }
 
-  this->export_to (this->register_.in (), ACE_TRY_ENV);
-  // ACE_CHECK;
+  this->export_to (this->register_.in (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
 TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -72,47 +72,38 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
                    CosTrading::MissingMandatoryProperty,
                    CosTrading::DuplicatePropertyName))
 {
-  ACE_TRY
+  TAO_TRY
     {
       for (int i = 0; i < NUM_OFFERS; i++)
         {
-          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
           CosTrading::OfferId_var offer_id =
-            reg->_cxx_export (offer_obj,
+            reg->_cxx_export (this->plotter_[i]._this (TAO_TRY_ENV),
                               TT_Info::INTERFACE_NAMES[1],
                               this->props_plotters_[i],
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->printer_[i]._this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          offer_id = reg->_cxx_export (offer_obj,
+          offer_id = reg->_cxx_export (this->printer_[i]._this (TAO_TRY_ENV),
                                        TT_Info::INTERFACE_NAMES[2],
                                        this->props_printers_[i],
-                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->fs_[i]._this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          offer_id = reg->_cxx_export (offer_obj,
+          offer_id = reg->_cxx_export (this->fs_[i]._this (TAO_TRY_ENV),
                                        TT_Info::INTERFACE_NAMES[3],
                                        this->props_fs_[i],
-                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK
+                                       TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (this->verbose_)
             {
@@ -120,17 +111,16 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::export_offers");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::export_offers");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  // ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -149,8 +139,8 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
       ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
     }
 
-  CosTrading::Link_var link_if = this->register_->link_if (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->register_->link_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   if (this->verbose_)
     {
@@ -158,8 +148,8 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
                   " linked to the root trader.\n"));
     }
 
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   if (this->verbose_)
       {
@@ -169,7 +159,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
 
   for (int i = link_name_seq->length () - 1; i >= 0; i--)
     {
-      ACE_TRY
+      TAO_TRY
         {
           if (this->verbose_)
             {
@@ -178,8 +168,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            link_if->describe_link (link_name_seq[i], TAO_IN_ENV);
 
           for (int j = 0; j < NUM_OFFERS; j++)
             {
@@ -194,20 +183,19 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in (), ACE_TRY_ENV);
-          //ACE_TRY_CHECK;
+          this->export_to (link_info->target_reg.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          // @@ IGNORE??
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
 }
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -215,33 +203,33 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ULong length;
 
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_IN_ENV);
+      TAO_CHECK_ENV;
 
       if (offer_id_seq.ptr () != 0)
         {
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              this->register_->withdraw (offer_id_seq[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_offers");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::withdraw_offers");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
-TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::describe_offers (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -249,11 +237,11 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ULong length;
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_IN_ENV);
+      TAO_CHECK_ENV;
 
       if (offer_id_seq.ptr () != 0)
         {
@@ -265,30 +253,29 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i], ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                this->register_->describe (offer_id_seq[i], TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               if (this->verbose_)
                 {
                   ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
                   ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
-                  TT_Info::dump_properties (offer_info->properties, 0, ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+                  TT_Info::dump_properties (offer_info->properties, 0);
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::describe_offers");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::describe_offers");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
-TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::modify_offers (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented,
                    CosTrading::IllegalOfferId,
@@ -304,10 +291,10 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_IN_ENV);
+      TAO_CHECK_ENV;
 
       if (offer_id_seq.ptr () != 0)
         {
@@ -328,22 +315,22 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
               this->register_->modify (offer_id_seq[i],
                                        del_list,
                                        modify_list,
-                                       ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::modify_offers");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::modify_offers");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
+withdraw_offers_using_constraints (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -358,37 +345,36 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Constraint: %s\n", constraint));
 
-  ACE_TRY
+  TAO_TRY
     {
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
                                    constraint,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
                                    constraint,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
                                    constraint,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::withdraw_using_constraint");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::withdraw_using_constraint");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::grab_offerids (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
@@ -396,7 +382,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
 
   CosTrading::OfferIdSeq_ptr offer_id_seq;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ULong length = NUM_OFFERS;
       CosTrading::OfferIdIterator_ptr offer_id_iter;
@@ -404,8 +390,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
       this->admin_->list_offers (NUM_OFFERS,
                                  CosTrading::OfferIdSeq_out (offer_id_seq),
                                  CosTrading::OfferIdIterator_out (offer_id_iter),
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
         {
@@ -418,8 +404,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
               any_left =
                 offer_id_iter->next_n (length,
                                        CosTrading::OfferIdSeq_out (id_seq),
-                                       ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               int offers = id_seq->length ();
               int old_length = offer_id_seq->length ();
@@ -432,8 +418,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
             }
           while (any_left);
 
-          offer_id_iter->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          offer_id_iter->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       if (this->verbose_)
@@ -443,21 +429,18 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
             ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *)(*offer_id_seq)[j]));
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::grab_offerids");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::grab_offerids");
+      TAO_RETHROW_RETURN (offer_id_seq);
     }
-  ACE_ENDTRY;
-  // @@ redundant.
-  //  ACE_CHECK_RETURN (offer_id_seq);
+  TAO_ENDTRY;
 
   return offer_id_seq;
 }
 
 void
-TAO_Offer_Exporter::create_offers (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Exporter::create_offers (void)
 {
   const int QUEUE_SIZE = 4;
 
@@ -468,6 +451,7 @@ TAO_Offer_Exporter::create_offers (CORBA::Environment &ACE_TRY_ENV)
   TAO_Trader_Test::StringSeq string_seq (QUEUE_SIZE);
   TAO_Trader_Test::ULongSeq ulong_seq (QUEUE_SIZE);
 
+  CORBA::Environment TAO_IN_ENV;
   CosTradingDynamic::DynamicProp* dp_user_queue;
   CosTradingDynamic::DynamicProp* dp_file_queue;
   CosTradingDynamic::DynamicProp* dp_space_left;
@@ -530,13 +514,10 @@ TAO_Offer_Exporter::create_offers (CORBA::Environment &ACE_TRY_ENV)
       this->props_plotters_[i][8].value <<= TT_Info::MODEL_NUMBERS[i];
       this->props_plotters_[i][9].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE];
       this->props_plotters_[i][9].
-        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_user_queue, 1, ACE_TRY_ENV);
-      ACE_CHECK;
-
+        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_user_queue, 1, TAO_IN_ENV);
       this->props_plotters_[i][10].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING];
       this->props_plotters_[i][10].
-        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_file_queue, 1, ACE_TRY_ENV);
-      ACE_CHECK;
+        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_file_queue, 1, TAO_IN_ENV);
     }
 
   // Initialize printers
@@ -594,12 +575,10 @@ TAO_Offer_Exporter::create_offers (CORBA::Environment &ACE_TRY_ENV)
       this->props_printers_[i][9].value <<= (CORBA::UShort) i;
       this->props_printers_[i][10].name = TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE];
       this->props_printers_[i][10].
-        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_user_queue, 1, ACE_TRY_ENV);
-      ACE_CHECK;
+        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_user_queue, 1, TAO_IN_ENV);
       this->props_printers_[i][11].name = TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING];
       this->props_printers_[i][11].
-        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_file_queue, 1, ACE_TRY_ENV);
-      ACE_CHECK;
+        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_file_queue, 1, TAO_IN_ENV);
     }
 
   // Initialize FileSystem
@@ -637,8 +616,7 @@ TAO_Offer_Exporter::create_offers (CORBA::Environment &ACE_TRY_ENV)
       this->props_fs_[i][6].value <<= (CORBA::UShort) (i + 1);
       this->props_fs_[i][7].name = TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING];
       this->props_fs_[i][7].
-        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_space_left, 1, ACE_TRY_ENV);
-      ACE_CHECK;
+        value.replace (CosTradingDynamic::_tc_DynamicProp, dp_space_left, 1, TAO_IN_ENV);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index dfe4070df25..de4e98abb00 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -25,12 +25,12 @@ public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose,
-                      CORBA::Environment& ACE_TRY_ENV)
+                      CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
 
-  void export_offers (CORBA::Environment& ACE_TRY_ENV)
+  void export_offers (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -43,7 +43,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
+  void export_offers_to_all (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -57,21 +57,21 @@ public:
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
+  void withdraw_offers (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
-  void describe_offers (CORBA::Environment& ACE_TRY_ENV)
+  void describe_offers (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (CORBA::Environment& ACE_TRY_ENV)
+  void modify_offers (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -86,7 +86,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
+  void withdraw_offers_using_constraints (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -96,15 +96,15 @@ public:
 
 private:
 
-  CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& ACE_TRY_ENV)
+  CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
-  void create_offers (CORBA::Environment &ACE_TRY_ENV);
+  void create_offers (void);
   // Fill in each of the offer structures.
 
   void export_to (CosTrading::Register_ptr reg,
-                  CORBA::Environment& ACE_TRY_ENV)
+                  CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 0f0f8127c2f..92880472e2f 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Importer::perform_queries (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -34,12 +34,12 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies, ACE_TRY_ENV);
-  // ACE_CHECK;
+  this->perform_queries_with_policies (policies, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -63,16 +63,16 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
 
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   if (this->verbose_)
     {
       ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
                   " linked to the root trader.\n"));
     }
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   if (link_name_seq->length () > 0)
     {
@@ -83,15 +83,15 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0], ACE_TRY_ENV);
-      ACE_CHECK;
+        link_if->describe_link (link_name_seq[0], TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
-      CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_TRY_ENV);
-      ACE_CHECK;
+      CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_TRY_ENV);
-      ACE_CHECK;
+      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
       if (link_name_seq2->length () > 0)
         {
@@ -117,8 +117,8 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies, ACE_TRY_ENV);
-              ACE_CHECK;
+              this->perform_queries_with_policies (policies, TAO_IN_ENV);
+              TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
             }
         }
       else
@@ -138,7 +138,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
 void
 TAO_Offer_Importer::
 perform_queries_with_policies (const TAO_Policy_Creator& policies,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -151,7 +151,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::DuplicatePolicyName))
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosTrading::Lookup::SpecifiedProps desired_props;
 
@@ -190,8 +190,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
                                 offer_seq_out,
                                 offer_iterator_out,
                                 limits_applied_out,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
           CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr);
@@ -202,8 +202,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
                                      offer_iterator_ptr,
-                                     ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               if (limits_applied_out->length () > 0)
                 ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n"));
@@ -217,21 +217,21 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Importer::perform_queries");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                                      CosTrading::OfferIterator_ptr offer_iterator,
-                                     CORBA::Environment& ACE_TRY_ENV) const
+                                     CORBA::Environment& TAO_IN_ENV) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ULong length = 0, i = 0;
       ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -242,14 +242,13 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
             TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
-                                                     ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-          remote_output->confirm (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          remote_output->confirm (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          TT_Info::dump_properties (offer_seq[i].properties);
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
 
@@ -267,8 +266,8 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 
               any_left = offer_iterator->next_n (length,
                                                  iter_offers_out,
-                                                 ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                                 TAO_TRY_ENV);
+              TAO_CHECK_ENV;
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
               for (length = iter_offers->length (), i = 0; i < length; i++)
@@ -276,27 +275,27 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
                     TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
-                                                             ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+                                                             TAO_TRY_ENV);
+                  TAO_CHECK_ENV;
 
-                  remote_output->confirm (ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+                  remote_output->confirm (TAO_TRY_ENV);
+                  TAO_CHECK_ENV;
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1, ACE_TRY_ENV);
+                  TT_Info::dump_properties (props);
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
 
             } while (any_left);
 
-          offer_iterator->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          offer_iterator->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Offer_Importer::display_results");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index a499a4b3f89..c55f8314e3a 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -32,7 +32,7 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (CORBA::Environment& ACE_TRY_ENV)
+  void perform_queries (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -46,7 +46,7 @@ public:
                      CosTrading::DuplicatePolicyName));
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
+  void perform_directed_queries (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -64,7 +64,7 @@ public:
 private:
 
   void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager,
-                                      CORBA::Environment& ACE_TRY_ENV)
+                                      CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -81,7 +81,7 @@ private:
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
                         CosTrading::OfferIterator_ptr offer_iterator,
-                        CORBA::Environment& ACE_TRY_ENV) const
+                        CORBA::Environment& _env) const
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 6e5a4744e94..e0502e4b1f3 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -7,42 +7,43 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                            CORBA::Boolean verbose,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           CORBA::Environment& TAO_IN_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
   // Obtain the Service Type Repository.
-  CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::TypeRepository_var obj = lookup_if->type_repos (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Narrow the Service Type Repository.
-  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in (),
-                                                                  ACE_TRY_ENV);
-  ACE_CHECK;
+  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // Build the service type descriptions.
   this->create_types ();
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all"
               " types from the Repository.\n"));
 
   for (int i = NUM_TYPES - 1; i >= 0; i--)
     {
-      ACE_TRY
+      TAO_TRY
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i], ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i], TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCH (CosTrading::UnknownServiceType, excp)
+      TAO_CATCH (CosTrading::UnknownServiceType, excp)
         {
           if (this->verbose_)
             {
@@ -50,19 +51,18 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV)
                 ACE_DEBUG ((LM_DEBUG, "Service type not yet registered: %s\n", excp.type.in ()));
             }
 
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::remove_all_types");
+          TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::remove_all_types");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
     }
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -76,12 +76,12 @@ TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.ptr (), ACE_TRY_ENV);
-  // ACE_CHECK;
+  this->add_all_types_to (this->repos_.ptr (), TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -96,57 +96,50 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
               "add all types to all repositories.\n"));
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
               " linked to the root trader.\n"));
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
               " traders.\n"));
   for (int i = link_name_seq->length () - 1; i >= 0; i--)
     {
-      CosTradingRepos::ServiceTypeRepository_ptr str = 0;
-      ACE_TRY
+      TAO_TRY
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            link_if->describe_link (link_name_seq[i], TAO_IN_ENV);
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos = 
-            link_info->target->type_repos (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            link_info->target->type_repos (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-          str =
-            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (),
-                                                             ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CosTradingRepos::ServiceTypeRepository_ptr str =
+            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
+          this->add_all_types_to (str, TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
-      ACE_CATCHANY 
+      TAO_CATCHANY
         {
-          // @@ Seth, Ignore all these exceptions?
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
-
-      // @@ Seth, But this one?
-      this->add_all_types_to (str, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_ENDTRY;
     }
 }
 
 void
 TAO_Service_Type_Exporter::
 add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
-                  CORBA::Environment& ACE_TRY_ENV)
+                  CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -159,54 +152,58 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
 {
   for (int i = 0; i < NUM_TYPES; i++)
     {
-      ACE_TRY
+      TAO_TRY
         {
           repos->add_type (TT_Info::INTERFACE_NAMES[i],
                            this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
                            this->type_structs_[i].super_types,
-                           ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                           TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
+      TAO_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
         {
-          ACE_PRINT_EXCEPTION (ste, "TAO_Service_Type_Exporter::add_all_types");
+          TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
 
           if (ste.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", ste.name.in ()));
+
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCH (CosTrading::IllegalPropertyName, excp)
+      TAO_CATCH (CosTrading::IllegalPropertyName, excp)
         {
-          ACE_PRINT_EXCEPTION (excp, "TAO_Service_Type_Exporter::add_all_types");
+          TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
 
           if (excp.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", excp.name.in ()));
+
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, vtr)
+      TAO_CATCH (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, vtr)
         {
-          ACE_PRINT_EXCEPTION (vtr, "TAO_Service_Type_Exporter::add_all_types");
+          TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
 
           if (vtr.type_1.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type One: %s\n", vtr.type_2.in ()));
           if (vtr.type_2.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type Two: %s\n", vtr.type_2.in ()));
+
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::add_all_types");
-          ACE_RETHROW;
+          TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
+          TAO_RETHROW;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
     }
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes sst;
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -214,8 +211,8 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
 
       sst.all_ (1);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
-        this->repos_->list_types (sst, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->repos_->list_types (sst, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       for (int i = type_names->length () - 1; i >= 0; i--)
         {
@@ -226,23 +223,21 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::list_all_types");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::list_all_types");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  // ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "describing all types in the Repository.\n"));
@@ -251,8 +246,8 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
             this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i],
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (this->verbose_)
             {
@@ -261,22 +256,21 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::describe_all_types");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::describe_all_types");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "fully describing all types in the Repository.\n"));
@@ -285,8 +279,8 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
             this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i],
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (this->verbose_)
             {
@@ -295,13 +289,12 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY
             }
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::fully_describe_all_types");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::fully_describe_all_types");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index e5645cb087b..a99ab322991 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -24,17 +24,17 @@ public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                              CORBA::Boolean verbose,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void remove_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void remove_all_types (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
   // Remove all service types from the trading service instance.
 
-  void add_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void add_all_types (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -46,7 +46,7 @@ public:
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV)
+  void add_all_types_to_all (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -59,19 +59,19 @@ public:
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void list_all_types (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void describe_all_types (CORBA::Environment& _env)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType));
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void fully_describe_all_types (CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -85,7 +85,7 @@ private:
   // Generate the service type description structures.
 
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
-                         CORBA::Environment& ACE_TRY_ENV)
+                         CORBA::Environment& _env)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index 4534fec6f2e..ba02abd1aef 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -14,10 +14,10 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
 }
 
 template <class T> CORBA::Any*
-TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
-                                        CORBA::TypeCode_ptr,
-                                        const CORBA::Any&,
-                                        CORBA::Environment&)
+TAO_Simple_Dynamic_Property<T>::evalDP (const char* name,
+                                        CORBA::TypeCode_ptr returned_type,
+                                        const CORBA::Any& extra_info,
+                                        CORBA::Environment& TAO_IN_ENV)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 0db27b21843..e3842003ad5 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -139,9 +139,9 @@ const char* TT_Info::QUERIES[][3] =
 
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
-                          CORBA::Boolean print_dynamic,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Boolean print_dynamic)
 {
+  CORBA::Environment env;
   TAO_Property_Evaluator prop_eval (prop_seq);
 
   for (int length = prop_seq.length (), k = 0; k < length; k++)
@@ -150,15 +150,15 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
       CORBA::Any* value = 0;
       CORBA::TypeCode_ptr tc = 0;
       ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
-      ACE_TRY
+      TAO_TRY
         {
           CORBA::Boolean is_dynamic = prop_eval.is_dynamic_property (k);
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
 
           if (print_dynamic || ! is_dynamic)
             {
-              value = prop_eval.property_value(k, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              value = prop_eval.property_value(k, env);
+              TAO_CHECK_ENV;
 
               tc = value->type ();
             }
@@ -167,20 +167,15 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
               ACE_DEBUG ((LM_DEBUG, "Dynamic Property\n"));
             }
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          // @@ Seth, don't pass the exceptions back?
           ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n"));
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
 
       if (tc == 0)
         continue;
-      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (check)
+      else if (tc->equal (TAO_Trader_Test::_tc_StringSeq, env))
         {
           TAO_Trader_Test::StringSeq* str_seq;
           (*value) >>= str_seq;
@@ -190,24 +185,18 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 
           ACE_DEBUG ((LM_DEBUG, "\n"));
         }
-      else
+      else if (tc->equal (TAO_Trader_Test::_tc_ULongSeq, env))
         {
-          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (check)
-            {
-              TAO_Trader_Test::ULongSeq* ulong_seq;
-              (*value) >>= ulong_seq;
+          TAO_Trader_Test::ULongSeq* ulong_seq;
+          (*value) >>= ulong_seq;
 
-              for (seq_length = ulong_seq->length (), i = 0; i < seq_length; i++)
-                ACE_DEBUG ((LM_DEBUG, "%d ", (*ulong_seq)[i]));
+          for (seq_length = ulong_seq->length (), i = 0; i < seq_length; i++)
+            ACE_DEBUG ((LM_DEBUG, "%d ", (*ulong_seq)[i]));
 
-              ACE_DEBUG ((LM_DEBUG, "\n"));
-            }
-          else
-            CORBA::Any::dump (*value);
+          ACE_DEBUG ((LM_DEBUG, "\n"));
         }
+      else
+        CORBA::Any::dump (*value);
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 2e346d7e5df..13296b61050 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -15,8 +15,7 @@ class TT_Info
 public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-                               CORBA::Boolean print_dynamic = 1,
-                               CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                               CORBA::Boolean print_dynamic = 1);
   // Dump the contents of this property sequence.
 
   enum INTERFACES
diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
index a89d4112e49..7974f093e51 100644
--- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp
+++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
@@ -22,9 +22,11 @@ CFG=TradingLib - Win32 Debug
 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "TradingLib - Win32 Release"

 

@@ -38,12 +40,11 @@ CPP=cl.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -63,12 +64,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Debug"

 # PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -160,7 +160,7 @@ InputPath=.\TTest.idl
 InputName=TTest

 

 BuildCmds= \

-	tao_idl -Ge 1 $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -198,7 +198,7 @@ InputPath=.\TTest.idl
 InputName=TTest

 

 BuildCmds= \

-	tao_idl -Ge 1 $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 989a3bbb1ea..fa078177a5c 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -29,11 +29,11 @@ parse_args (int argc, char *argv[],
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv, TAO_TRY_ENV);
+      TAO_CHECK_ENV
 
       // Command line argument interpretation.
       CORBA::Boolean verbose = 0;
@@ -49,83 +49,83 @@ main (int argc, char** argv)
       TAO_Trading_Components_i& trd_comp = trader->trading_components ();
 
       // Set the service type repository
-      sup_attr.type_repos (type_repos._this (ACE_TRY_ENV));
-      ACE_TRY_CHECK;
+      sup_attr.type_repos (type_repos._this (TAO_TRY_ENV));
+      TAO_CHECK_ENV;
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
          verbose,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.remove_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.add_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.list_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.list_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.describe_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.describe_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.fully_describe_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.fully_describe_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter
 	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
          verbose,
-	 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.modify_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.modify_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers_using_constraints (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer
 	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose);
 
-      offer_importer.perform_queries (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_importer.perform_queries (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 31d0d9c4f2c..2a1544a8afc 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -13,11 +13,11 @@ ACE_RCSID(Trading, export_test, "$Id$")
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -39,99 +39,99 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if = 
-      	CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      	CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
             
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
                                                ! parse_args.quiet (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      type_exporter.remove_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
-      type_exporter.add_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
-      type_exporter.remove_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
-      type_exporter.add_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (parse_args.federated ())
         {
-          type_exporter.add_all_types_to_all (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          type_exporter.add_all_types_to_all (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       
-      type_exporter.list_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.list_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
-      type_exporter.describe_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.describe_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
-      type_exporter.fully_describe_all_types (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      type_exporter.fully_describe_all_types (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n"));
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // = Test series.
       
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.modify_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.modify_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers_using_constraints (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;      
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;      
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;      
+      offer_exporter.withdraw_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;      
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       if (parse_args.federated ())
         {
-          offer_exporter.export_offers_to_all (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          offer_exporter.export_offers_to_all (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       
-      offer_exporter.describe_offers (ACE_TRY_ENV);
-      ACE_TRY_CHECK;      
+      offer_exporter.describe_offers (TAO_TRY_ENV);
+      TAO_CHECK_ENV;      
 
       ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n"));
       ACE_DEBUG ((LM_DEBUG, "*** Now serving dynamic properties.\n"));
 
-      orb_manager.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb_manager.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 07d2a0dbd78..aca979a0e73 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -8,11 +8,11 @@ ACE_RCSID(Trading, import_test, "$Id$")
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -34,27 +34,27 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if = 
-	CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+	CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ());
       
-      offer_importer.perform_queries (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      offer_importer.perform_queries (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (parse_args.federated ())
         {
-          offer_importer.perform_directed_queries (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          offer_importer.perform_directed_queries (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Import Tests Failed."), -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
deleted file mode 100755
index e520d88327a..00000000000
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../bin';
-require ACEutils;
-require Process;
-
-$ior = "trading.ior";
-$sleeptime = 20;
-$status = 0;
-
-$TS = Process::Create ("..".$DIR_SEPARATOR.
-                       "..".$DIR_SEPARATOR.
-                       "Trading_Service".$DIR_SEPARATOR.
-                       "Trading_Service".$EXE_EXT,
-                       " -TSdumpior $ior ");
-
-if (ACE::waitforfile_timed ($ior, $sleeptime) == -1) {
-  print STDERR "ERROR: waiting for trading service IOR file\n";
-  $TS->Kill (); $TS->TimedWait (1);
-  exit 1;
-}
-
-$E = Process::Create ($EXEPREFIX."export_test".$EXE_EXT,
-		      "-ORBTradingServiceIOR file://$ior");
-
-sleep $sleeptime;
-
-$I = Process::Create ($EXEPREFIX."import_test".$EXE_EXT,
-		      "-ORBTradingServiceIOR file://$ior");
-
-if ($I->TimedWait (60) == -1) {
-  $status = 1;
-  print STDERR "ERROR: import test timedout\n";
-  $I->Kill (); $I->TimedWait (1);
-}
-
-$E->Terminate (); 
-if ($E->TimedWait (15) == -1) {
-  $status =1;
-  print STDERR "ERROR: export test timedout\n";
-  $E->Kill (); $E->TimedWait (1);
-}
-
-$TS->Terminate();
-if ($TS->TimedWait (15) == -1) {
-  print STDERR "ERROR: couldn't terminate the trading service nicely\n";
-  $TS->Kill (); $TS->TimedWait (1);
-  $status = 1;
-}
-
-unlink $ior;
-
-exit $status;
-
-
diff --git a/TAO/orbsvcs/tests/tests.dsw b/TAO/orbsvcs/tests/tests.dsw
index b70d19c5520..b03ae5e6b85 100644
--- a/TAO/orbsvcs/tests/tests.dsw
+++ b/TAO/orbsvcs/tests/tests.dsw
@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

+Project: "CC_client"=.\Concurrency\CC_client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Colocated_Test"=.\Trading\Colocated_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -120,6 +132,30 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Logger Test Client"=.\Logger\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Logger Test Server"=.\Logger\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Sched_Conf"=.\Sched_Conf\Sched_Conf.dsp - Package Owner=<4>

 

 Package=<5>

@@ -167,3 +203,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+

diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
index 7443d01573b..df519b251bb 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
@@ -16,7 +16,6 @@ SVR_OBJS = cubit_i.o server.o cubit.o tmplinst.o
 
 CLT_OBJS = client.o cubit.o tmplinst.o
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
index 9dc8b41e2e4..cee1a38d81a 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
@@ -26,7 +26,6 @@ CLT_OBJS = Task_Client.o \
 	cubit.o \
 	Util_Thread.o
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/Makefile
index 3e8129e6517..a9713cf8083 100644
--- a/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/Hardpack/IDL_Cubit/Makefile
@@ -40,15 +40,15 @@ cubit.hh:      cubit.idl
 	       $(PREPRO) cubit.idl
 
 clean:
-	       $(RM) client server cubit.hh *_s.cc *_c.cc *.o;
-	$(RM) -r Templates.DB; $(RM) *~
+	       rm -f client server cubit.hh *_s.cc *_c.cc *.o;
+	rm -rf Templates.DB; rm -f *~
 
 .SUFFIXES: .cc
 
 .cc.a:
 	       $(CCC) -c $(CCFLAGS) $<
 	       $(AR) $(ARFLAGS) $@ $*.o
-	       $(RM) $*.o
+	       rm -f $*.o
 
 .cc:
 	       $(CCC) $(CCFLAGS) $(LDFLAGS) $< -o $@
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 76d415f9f11..c4f63b3fba1 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -28,7 +28,6 @@ CFLAGS += -I../IDL_Cubit
 BIN = client
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -185,25 +184,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -251,9 +241,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index fd9a82e7a37..ace23784b6a 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -245,8 +245,7 @@ DII_Cubit_Client::init (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DII_Cubit_Client::init");
+      ACE_TRY_ENV.print_exception ("DII_Cubit_Client::init");
       return -1;
     }
   ACE_ENDTRY;
@@ -417,8 +416,7 @@ DII_Cubit_Client::cube_short_dii (void)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_short_dii");
+      ACE_TRY_ENV.print_exception ("cube_short_dii");
       return;
     }
   ACE_ENDTRY;
@@ -462,8 +460,7 @@ DII_Cubit_Client::cube_long_dii (void)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_long_dii");
+      ACE_TRY_ENV.print_exception ("cube_long_dii");
       return;
     }
   ACE_ENDTRY;
@@ -510,8 +507,7 @@ DII_Cubit_Client::cube_octet_dii (void)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_octet_dii");
+      ACE_TRY_ENV.print_exception ("cube_octet_dii");
       return;
     }
   ACE_ENDTRY;
@@ -565,8 +561,7 @@ DII_Cubit_Client::cube_union_dii (void)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_union_dii");
+      ACE_TRY_ENV.print_exception ("cube_union_dii");
       return;
     }
   ACE_ENDTRY;
@@ -617,8 +612,7 @@ DII_Cubit_Client::cube_struct_dii (void)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_struct_dii");
+      ACE_TRY_ENV.print_exception ("cube_struct_dii");
       return;
     }
   ACE_ENDTRY;
@@ -678,8 +672,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_octet_seq_dii");
+      ACE_TRY_ENV.print_exception ("cube_octet_seq_dii");
       return;
     }
   ACE_ENDTRY;
@@ -740,8 +733,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
   ACE_CATCHANY
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_long_seq_dii");
+      ACE_TRY_ENV.print_exception ("cube_long_seq_dii");
       return;
     }
   ACE_ENDTRY;
@@ -836,8 +828,7 @@ DII_Cubit_Client::run (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DII_Cubit_Client: server shutdown");
+      ACE_TRY_ENV.print_exception ("DII_Cubit_Client: server shutdown");
       return -1;
     }
   ACE_ENDTRY;
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 659acf576bb..ccaf3b5d361 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -126,26 +126,19 @@ Cubit_Client::read_ior (const char *filename)
   this->f_handle_ = ACE_OS::open (filename,0);
 
   if (this->f_handle_ == ACE_INVALID_HANDLE)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to open <%s> for reading: %p\n",
-                         filename),
-                        -1);
-    }
-
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open <%s> for reading: %p\n",
+                       filename),
+                      -1);
   ACE_Read_Buffer ior_buffer (this->f_handle_);
-
   char *data = ior_buffer.read ();
 
   if (data == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to allocate memory to read ior: %p\n"),
-                        -1);
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
 
   this->cubit_factory_key_ = ACE_OS::strdup (data);
-
   ior_buffer.alloc ()->free (data);
 
   return 0;
@@ -173,15 +166,8 @@ Cubit_Client::parse_args (void)
         TAO_debug_level++;
         break;
       case 'n':                 // loop count
-        result = ACE_OS::atoi (get_opts.optarg);
-
-        if (result <= 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Invalid number of iterations entered: <%s>\n",
-                             get_opts.optarg),
-                            -1);
-        else
-          this->loop_count_ = (u_int) result;
+        this->loop_count_ =
+          (u_int) ACE_OS::atoi (get_opts.optarg);
         break;
       case 'f': // read the IOR from the file.
         result = this->read_ior (get_opts.optarg);
@@ -189,7 +175,7 @@ Cubit_Client::parse_args (void)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from <%s> : %p\n",
                              get_opts.optarg,
-                             ""),
+							 ""),
                             -1);
         break;
       case 'k': // read the cubit IOR from the command-line.
@@ -224,25 +210,28 @@ Cubit_Client::parse_args (void)
 void
 Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Cubit::oneof u;
+  CORBA::Environment env;
+  Cubit::oneof u;
 
-      this->call_count_++;
+  this->call_count_++;
 
-      u.l (3); // use the long union branch.
+  u.l (3); // use the long union branch.
 
-      // Cube a "union" ...
-      Cubit::oneof r;
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
+  // Cube a "union" ...
+  Cubit::oneof r;
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u, 
-                                      ACE_TRY_ENV);
-      }
-
-      ACE_TRY_CHECK;
+    r = this->cubit_->cube_union (u, ACE_TRY_ENV);
+  }
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_union");
+      this->error_count_++;
+    }
+  else
+    {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG, "cube union ..."));
       u.l (u.l () * u.l () * u.l ()) ;
@@ -253,24 +242,35 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
           this->error_count_++;
         }
 
-      this->call_count_++;
+    }
 
-      u._d (Cubit::e_3rd);
+  this->call_count_++;
 
-      u.cm ().l = 7;
-      u.cm ().s = 5;
-      u.cm ().o = 3;
+  u._d (Cubit::e_3rd);
+#if 0
+  u.cm ().l = this->func (i);
+  u.cm ().s = this->func (i);
+  u.cm ().o = this->func (i);
+#endif
 
-      // Cube another "union" which uses the default arm ... NOT tested yet
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
+  u.cm ().l = 7;
+  u.cm ().s = 5;
+  u.cm ().o = 3;
 
-        r = this->cubit_->cube_union (u, 
-                                      ACE_TRY_ENV);
-      }
+  // Cube another "union" which uses the default arm ... NOT tested yet
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-      ACE_TRY_CHECK;
+    r = this->cubit_->cube_union (u, ACE_TRY_ENV);
+  }
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_union");
+      this->error_count_++;
+    }
+  else
+    {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG, "cube union ..."));
       u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
@@ -285,14 +285,6 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_union");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube a short.
@@ -301,30 +293,30 @@ void
 Cubit_Client::cube_short (int i,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Short arg_short = this->func (i);
+  CORBA::Short arg_short = this->func (i);
 
-      // Cube a short.
-      CORBA::Short ret_short;
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
+  // Cube a short.
+  CORBA::Short ret_short;
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
 
-        ret_short = cubit_->cube_short (arg_short, 
-                                        ACE_TRY_ENV);
-      }
+    ret_short = cubit_->cube_short (arg_short, ACE_TRY_ENV);
+  }
 
-      ACE_TRY_CHECK;
-
-      this->call_count_++;
+  this->call_count_++;
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_short");
+      this->error_count_++;
+    }
+  else
+    {
       if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "cube short:  %d --> %d\n",
-                      arg_short,
-                      ret_short));
-        }
+        ACE_DEBUG ((LM_DEBUG,
+                    "cube short:  %d --> %d\n",
+                    arg_short,
+                    ret_short));
       arg_short = arg_short * arg_short * arg_short;
 
       if (arg_short != ret_short)
@@ -332,18 +324,9 @@ Cubit_Client::cube_short (int i,
           ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
                       (CORBA::Short) this->func (i),
                       ret_short));
-
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_short");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Oneway test.
@@ -352,52 +335,38 @@ void
 Cubit_Client::cube_oneway (int,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
 
-        this->cubit_->cube_oneway (ACE_TRY_ENV);
-      }
+    this->cubit_->cube_oneway (ACE_TRY_ENV);
+  }
 
-      ACE_TRY_CHECK;
+  this->call_count_++;
 
-      this->call_count_++;
-    }
-  ACE_CATCHANY
+  if (ACE_TRY_ENV.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_oneway");
+      ACE_TRY_ENV.print_exception ("from cube_oneway");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Cubit_Client::cube_void (int,
                          CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
 
-        this->cubit_->cube_void (ACE_TRY_ENV);
-      }
+    this->cubit_->cube_void (ACE_TRY_ENV);
+  }
 
-      ACE_TRY_CHECK;
+  this->call_count_++;
 
-      this->call_count_++;
-    }
-  ACE_CATCHANY
+  if (ACE_TRY_ENV.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_void");
+      ACE_TRY_ENV.print_exception ("from cube_void");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube an octet
@@ -406,50 +375,38 @@ void
 Cubit_Client::cube_octet (int i,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Octet arg_octet = this->func (i);
-
-      // Cube an octet.
-      CORBA::Octet ret_octet;
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
+  CORBA::Octet arg_octet = this->func (i);
 
-        ret_octet = this->cubit_->cube_octet (arg_octet, 
-                                              ACE_TRY_ENV);
-      }
+  // Cube an octet.
+  CORBA::Octet ret_octet;
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
 
-      ACE_TRY_CHECK;
+    ret_octet = this->cubit_->cube_octet (arg_octet, ACE_TRY_ENV);
+  }
 
-      this->call_count_++;
+  this->call_count_++;
 
-      if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "cube octet:  %d --> %d\n",
-                      arg_octet, ret_octet));
-        }
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-
-      if (arg_octet != ret_octet) 
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "** cube_octet (%d) ERROR (--> %d)\n",
-                      (CORBA::Octet) this->func (i),
-                      ret_octet));
-
-          this->error_count_++;
-        }
-    }
-  ACE_CATCHANY
+  if (ACE_TRY_ENV.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_octet");
+      ACE_TRY_ENV.print_exception ("from cube_octet");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    {
+      if (TAO_debug_level > 2)
+        ACE_DEBUG ((LM_DEBUG,
+                    "cube octet:  %d --> %d\n",
+                    arg_octet, ret_octet));
+      arg_octet = arg_octet * arg_octet * arg_octet;
+      if (arg_octet != ret_octet) {
+        ACE_DEBUG ((LM_DEBUG,
+                    "** cube_octet (%d) ERROR (--> %d)\n",
+                    (CORBA::Octet) this->func (i),
+                    ret_octet));
+        this->error_count_++;
+      }
+    }
 }
 
 // calculate the cube from a long
@@ -458,31 +415,30 @@ void
 Cubit_Client::cube_long (int i,
                          CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Long arg_long = this->func (i);
-
-      // Cube a long.
-      CORBA::Long ret_long;
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
+  CORBA::Long arg_long = this->func (i);
 
-        ret_long = this->cubit_->cube_long (arg_long, 
-                                            ACE_TRY_ENV);
-      }
+  // Cube a long.
+  CORBA::Long ret_long;
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
 
-      ACE_TRY_CHECK;
+    ret_long = this->cubit_->cube_long (arg_long, ACE_TRY_ENV);
+  }
 
-      this->call_count_++;
+  this->call_count_++;
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_long");
+      this->error_count_++;
+    }
+  else
+    {
       if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "cube long:  %d --> %d\n",
-                      arg_long,
-                      ret_long));
-        }
-
+        ACE_DEBUG ((LM_DEBUG,
+                    "cube long:  %d --> %d\n",
+                    arg_long,
+                    ret_long));
       arg_long = arg_long * arg_long * arg_long;
 
       if (arg_long != ret_long)
@@ -491,18 +447,9 @@ Cubit_Client::cube_long (int i,
                       "** cube_long (%ld) ERROR (--> %ld)\n",
                       (CORBA::Long) this->func (i),
                       ret_long));
-
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_long");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the numbers in a struct
@@ -511,33 +458,32 @@ void
 Cubit_Client::cube_struct (int i,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Cubit::Many arg_struct;
-      Cubit::Many ret_struct;
-
-      this->call_count_++;
+  Cubit::Many arg_struct;
+  Cubit::Many ret_struct;
 
-      arg_struct.l = this->func (i);
-      arg_struct.s = this->func (i);
-      arg_struct.o = this->func (i);
+  this->call_count_++;
 
-      // Cube a "struct" ...
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
+  arg_struct.l = this->func (i);
+  arg_struct.s = this->func (i);
+  arg_struct.o = this->func (i);
 
-        ret_struct = this->cubit_->cube_struct (arg_struct, 
-                                                ACE_TRY_ENV);
-      }
+  // Cube a "struct" ...
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
 
-      ACE_TRY_CHECK;
+    ret_struct = this->cubit_->cube_struct (arg_struct, ACE_TRY_ENV);
+  }
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_struct");
+      this->error_count_++;
+    }
+  else
+    {
       if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "cube struct ..."));
-        }
-
+        ACE_DEBUG ((LM_DEBUG,
+                    "cube struct ..."));
       arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
       arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
       arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
@@ -547,231 +493,239 @@ Cubit_Client::cube_struct (int i,
           || arg_struct.o != ret_struct.o)
         {
           ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_struct");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the numbers in a sequence
 
 void
-Cubit_Client::cube_long_sequence (int, 
-                                  int l,
+Cubit_Client::cube_long_sequence (int, int l,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->call_count_++;
+  this->call_count_++;
 
-      Cubit::long_seq input (l);
-      input.length (l);
+  Cubit::long_seq input (l);
+  input.length (l);
 
-      // Just set the first item, otherwise it is hard to compare the
-      // results for longer sequences, i.e. more than just marshalling
-      // gets in the way.
-      input[0] = 4;
+#if 0
+  // Fill in the input sequence...
+  for (int j = 0; j < l; ++j)
+    input[j] = j;
+#else
+  // Just set the first item, otherwise it is hard to compare the
+  // results for longer sequences, i.e. more than just marshalling
+  // gets in the way.
+  input[0] = 4;
+#endif
 
-      Cubit::long_seq_var output;
-      Cubit::long_seq_out vout (output);
+  Cubit::long_seq_var output;
+  Cubit::long_seq_out vout (output);
 
-      // Cube the sequence
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
+  // Cube the sequence
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
 
-        this->cubit_->cube_long_sequence (input, 
-                                          vout, 
-                                          ACE_TRY_ENV);
-      }
+    this->cubit_->cube_long_sequence (input, vout, ACE_TRY_ENV);
+  }
 
-      ACE_TRY_CHECK;
+  //  Cubit::long_seq& output = *vout.ptr ();
+  //  output = vout;
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_struct");
+      this->error_count_++;
+    }
+  else
+    {
       if (output->length () != input.length ())
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube sequence, wrong length\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube sequence, wrong length\n"));
           this->error_count_++;
-
           return;
         }
 
       u_int rl = output->length ();
-
       if (input.length () < rl)
+        rl = input.length ();
+#if 0
+      for (u_int j = 0; j < rl; ++j)
         {
-          rl = input.length ();
+          CORBA::Long x = input[j];
+          if (x*x*x != output[j])
+            {
+              ACE_ERROR ((LM_ERROR, "** cube_long_sequence ERROR\n"));
+              this->error_count_++;
+            }
         }
-
+#else
       CORBA::Long x = input[0];
-
       if (x * x *x != output[0])
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube_long_sequence ERROR\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube_long_sequence ERROR\n"));
           this->error_count_++;
         }
+#endif
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_long_sequence");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Cubit_Client::cube_octet_sequence (int, 
-                                   int l,
+Cubit_Client::cube_octet_sequence (int, int l,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->call_count_++;
+  this->call_count_++;
 
-      Cubit::octet_seq input (l);
-      input.length (l);
+  Cubit::octet_seq input (l);
+  input.length (l);
 
-      // Just set the first item, otherwise it is hard to compare the
-      // results for longer sequences, i.e. more than just marshalling
-      // gets in the way.
-      input[0] = 4;
+#if 0
+  // Fill in the input sequence...
+  for (int j = 0; j < l; ++j)
+    input[j] = j;
+#else
+  // Just set the first item, otherwise it is hard to compare the
+  // results for longer sequences, i.e. more than just marshalling
+  // gets in the way.
+  input[0] = 4;
+#endif
 
-      Cubit::octet_seq_var output;
-      Cubit::octet_seq_out vout (output);
+  Cubit::octet_seq_var output;
+  Cubit::octet_seq_out vout (output);
 
-      // Cube the sequence
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_SEQUENCE_START);
+  // Cube the sequence
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_SEQUENCE_START);
 
-        this->cubit_->cube_octet_sequence (input, 
-                                           vout, 
-                                           ACE_TRY_ENV);
-      }
+    this->cubit_->cube_octet_sequence (input, vout, ACE_TRY_ENV);
+  }
 
-      ACE_TRY_CHECK;
+  //  Cubit::long_seq& output = *vout.ptr ();
+  //  output = vout;
 
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_struct");
+      this->error_count_++;
+    }
+  else
+    {
       if (output->length () != input.length ())
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube octet, wrong length\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube octet, wrong length\n"));
           this->error_count_++;
-
           return;
         }
 
       u_int rl = output->length ();
-
       if (input.length () < rl)
+        rl = input.length ();
+#if 0
+      for (u_int j = 0; j < rl; ++j)
         {
-          rl = input.length ();
+          CORBA::Octet x = input[j];
+          if (x*x*x != output[j])
+            {
+              ACE_ERROR ((LM_ERROR, "** cube_octet ERROR\n"));
+              this->error_count_++;
+            }
         }
+#else
       CORBA::Octet x = input[0];
-
       if (x * x *x != output[0])
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube_octet ERROR\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube_octet ERROR\n"));
           this->error_count_++;
         }
+#endif
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_octet_sequence");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the many in a sequence
 
 void
-Cubit_Client::cube_many_sequence (int, 
-                                  int l,
+Cubit_Client::cube_many_sequence (int, int l,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->call_count_++;
-
-      Cubit::many_seq input (l);
-      input.length (l);
-
-      // Just set the first item, otherwise it is hard to compare the
-      // results for longer sequences, i.e. more than just marshalling
-      // gets in the way.
-      Cubit::Many &in = input[0];
-      in.l = 4;
-      in.s = 5;
-      in.o = 6;
-
-      Cubit::many_seq_var output;
-      Cubit::many_seq_out vout (output);
-
-      // Cube the sequence
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
-
-        this->cubit_->cube_many_sequence (input, 
-                                          vout, 
-                                          ACE_TRY_ENV);
-      }
+  this->call_count_++;
 
-      ACE_TRY_CHECK;
+  Cubit::many_seq input (l);
+  input.length (l);
 
+#if 0
+  // Fill in the input sequence...
+  for (int j = 0; j < l; ++j)
+    {
+      Cubit::Many &in = input[j];
+      in.l = j;
+      in.s = j;
+      in.o = j;
+    }
+#else
+  // Just set the first item, otherwise it is hard to compare the
+  // results for longer sequences, i.e. more than just marshalling
+  // gets in the way.
+  Cubit::Many &in = input[0];
+  in.l = 4;
+  in.s = 5;
+  in.o = 6;
+#endif
+
+  Cubit::many_seq_var output;
+  Cubit::many_seq_out vout (output);
+
+  // Cube the sequence
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
+
+    this->cubit_->cube_many_sequence (input, vout, ACE_TRY_ENV);
+  }
+
+  if (ACE_TRY_ENV.exception () != 0)
+    {
+      ACE_TRY_ENV.print_exception ("from cube_many_sequence");
+      this->error_count_++;
+    }
+  else
+    {
       if (output->length () != input.length ())
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube sequence, wrong length\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube sequence, wrong length\n"));
           this->error_count_++;
-
           return;
         }
 
       u_int rl = output->length ();
-
       if (input.length () < rl)
+        rl = input.length ();
+#if 0
+      for (u_int j = 0; j < rl; ++j)
         {
-          rl = input.length ();
-        }
+          Cubit::Many &in  = input[j];
+          Cubit::Many &out = output[j];
 
-      Cubit::Many &ret_in  = input[0];
+          if (in.l * in.l * in.l != out.l ||
+              in.s * in.s * in.s != out.s ||
+              in.o * in.o * in.o != out.o)
+            {
+              ACE_ERROR ((LM_ERROR, "** cube_long_sequence ERROR\n"));
+              this->error_count_++;
+            }
+        }
+#else
+      Cubit::Many &in  = input[0];
       Cubit::Many &out = output[0];
 
-      if (ret_in.l * ret_in.l * ret_in.l != out.l ||
-          ret_in.s * ret_in.s * ret_in.s != out.s ||
-          ret_in.o * ret_in.o * ret_in.o != out.o)
+      if (in.l * in.l * in.l != out.l ||
+          in.s * in.s * in.s != out.s ||
+          in.o * in.o * in.o != out.o)
         {
-          ACE_ERROR ((LM_ERROR, 
-                      "** cube_long_sequence ERROR\n"));
-
+          ACE_ERROR ((LM_ERROR, "** cube_long_sequence ERROR\n"));
           this->error_count_++;
         }
+#endif
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_many_sequence");
-      this->error_count_++;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -780,88 +734,66 @@ Cubit_Client::cube_rti_data (int,
                              int numAttrs,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->call_count_++;
+  this->call_count_++;
 
-      Cubit::RtiPacket input;
-      input.packetHeader.packetLength = 1; // this is probably redundant
-      input.packetHeader.federationHandle = 2;
-      input.packetHeader.channelHandle = 3;
-      input.packetHeader.packetColor = 4;
+  Cubit::RtiPacket input;
+  input.packetHeader.packetLength = 1; // this is probably redundant
+  input.packetHeader.federationHandle = 2;
+  input.packetHeader.channelHandle = 3;
+  input.packetHeader.packetColor = 4;
 
-      input.msgs.length (numUpdates);
+  input.msgs.length (numUpdates);
 
-      for (int j = 0; j < numUpdates; ++j)
-        {
-          input.msgs[j].oumh (Cubit::RtiObjectUpdateMessageHeader ());
-          Cubit::RtiObjectUpdateMessageHeader & oumh = input.msgs[j].oumh ();
-          oumh.updateLength = 2001; // redundant
-          oumh.updateTag = 2002;
-          oumh.objectHandle = 2003;
-          oumh.timestamp = 3.14159;
-          oumh.eventRetractionHandle = 2004;
-          oumh.classHandle = 2005;
-          oumh.sendingFederateHandle = 2006;
-          oumh.userTag = CORBA::string_dup ("beefcake!");
-          oumh.regionData.length(0);
-          oumh.transportationHandle = 1;
-          oumh.orderingHandle = 1;
-          oumh.messagePayload.length (numAttrs);
-
-          for (int k = 0; k < numAttrs; ++k)
-            {
-              oumh.messagePayload[k] = Cubit::HandleValuePair ();
-              Cubit::HandleValuePair &hvp = oumh.messagePayload[k];
-              hvp.handle = k * k;
-              const char *d1 = "somedata";
-              hvp.data.length (ACE_OS::strlen (d1)+1);
-              ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1);
-            }
-        }
-
-      Cubit::RtiPacket_var output;
-      Cubit::RtiPacket_out vout (output);
-
-      // Cube the sequence
-      if (TAO_debug_level > 0)
+  for (int j = 0; j < numUpdates; ++j)
+    {
+      input.msgs[j].oumh (Cubit::RtiObjectUpdateMessageHeader ());
+      Cubit::RtiObjectUpdateMessageHeader & oumh = input.msgs[j].oumh ();
+      oumh.updateLength = 2001; // redundant
+      oumh.updateTag = 2002;
+      oumh.objectHandle = 2003;
+      oumh.timestamp = 3.14159;
+      oumh.eventRetractionHandle = 2004;
+      oumh.classHandle = 2005;
+      oumh.sendingFederateHandle = 2006;
+      oumh.userTag = CORBA::string_dup ("beefcake!");
+      oumh.regionData.length(0);
+      oumh.transportationHandle = 1;
+      oumh.orderingHandle = 1;
+      oumh.messagePayload.length (numAttrs);
+
+      for (int k = 0; k < numAttrs; ++k)
         {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "Input: \n"));
-
-          print_RtiPacket (input);
+          oumh.messagePayload[k] = Cubit::HandleValuePair ();
+          Cubit::HandleValuePair &hvp = oumh.messagePayload[k];
+          hvp.handle = k * k;
+          const char *d1 = "somedata";
+          hvp.data.length (ACE_OS::strlen (d1)+1);
+          ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1);
         }
+    }
 
-      {
-        ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
-
-        this->cubit_->cube_rti_data (input, 
-                                     vout, 
-                                     ACE_TRY_ENV);
-      }
-
-      ACE_TRY_CHECK;
+  Cubit::RtiPacket_var output;
+  Cubit::RtiPacket_out vout (output);
 
-      if (TAO_debug_level > 0)
+  // Cube the sequence
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Input: \n"));
+      print_RtiPacket (input);
+    }
 
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "Output: \n"));
+  {
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
 
-          print_RtiPacket (*vout.ptr ());
+    this->cubit_->cube_rti_data (input, vout, ACE_TRY_ENV);
+  }
+  if (TAO_debug_level > 0)
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "need to check whether cubing happened\n"));
-        }
-    }
-  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_rtti_data");
-      this->error_count_++;
+      ACE_DEBUG ((LM_DEBUG, "Output: \n"));
+      print_RtiPacket (*vout.ptr ());
+      ACE_DEBUG ((LM_DEBUG,"need to check whether cubing happened\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -917,7 +849,8 @@ Cubit_Client::print_stats (const char *call_name,
 int
 Cubit_Client::run ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  // @@
+  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
 
   if (this->only_void_)
     return this->run_void (ACE_TRY_ENV);
@@ -937,265 +870,155 @@ Cubit_Client::run ()
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_void (i, 
-                       ACE_TRY_ENV);
-    }
-
+    this->cube_void (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_void", 
-                     elapsed_time);
+  this->print_stats ("cube_void", elapsed_time);
 
   // SHORT
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i, 
-                        ACE_TRY_ENV);
-    }
-
+    this->cube_short (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_short", 
-                     elapsed_time);
+  this->print_stats ("cube_short", elapsed_time);
 
   // OCTET
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_octet (i, 
-                        ACE_TRY_ENV);
-    }
-
+    this->cube_octet (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_octet", 
-                     elapsed_time);
+  this->print_stats ("cube_octet", elapsed_time);
 
   // LONG
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_long (i, 
-                       ACE_TRY_ENV);
-    }
-
+    this->cube_long (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-  this->print_stats ("cube_long", 
-                     elapsed_time);
+  this->print_stats ("cube_long", elapsed_time);
 
   // STRUCT
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct (i, 
-                         ACE_TRY_ENV);
-    }
-
+    this->cube_struct (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_struct", 
-                     elapsed_time);
+  this->print_stats ("cube_struct", elapsed_time);
 
   // UNION
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union (ACE_TRY_ENV);
-    }
-
+    this->cube_union (ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_union_stub call", 
-                     elapsed_time);
+  this->print_stats ("cube_union_stub call", elapsed_time);
 
   // SMALL LONG SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_long_sequence (this->loop_count_, 
-                                4, 
-                                ACE_TRY_ENV);
-    }
-
+    this->cube_long_sequence (this->loop_count_, 4, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_small_sequence<long>", 
-                     elapsed_time);
+  this->print_stats ("cube_small_sequence<long>", elapsed_time);
 
   // LARGE LONG SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_long_sequence (this->loop_count_, 
-                                1024, 
-                                ACE_TRY_ENV);
-    }
-
+    this->cube_long_sequence (this->loop_count_, 1024, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_large_sequence<long>", 
-                     elapsed_time);
+  this->print_stats ("cube_large_sequence<long>", elapsed_time);
 
   // SMALL OCTET SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_octet_sequence (this->loop_count_, 
-                                 16, 
-                                 ACE_TRY_ENV);
-    }
-
+    this->cube_octet_sequence (this->loop_count_, 16, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_small_sequence<octet>", 
-                     elapsed_time);
+  this->print_stats ("cube_small_sequence<octet>", elapsed_time);
 
   // LARGE OCTET SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_octet_sequence (this->loop_count_, 
-                                 4096, 
-                                 ACE_TRY_ENV);
-    }
-
+    this->cube_octet_sequence (this->loop_count_, 4096, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_large_sequence<octet>", 
-                     elapsed_time);
+  this->print_stats ("cube_large_sequence<octet>", elapsed_time);
 
   // SMALL MANY SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_many_sequence (this->loop_count_, 
-                                4, 
-                                ACE_TRY_ENV);
-    }
-
+    this->cube_many_sequence (this->loop_count_, 4, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_small_sequence<many>",
-                     elapsed_time);
+  this->print_stats ("cube_small_sequence<many>", elapsed_time);
 
   // LARGE many SEQUENCES
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_many_sequence (this->loop_count_, 
-                                1024, 
-                                ACE_TRY_ENV);
-    }
-
+    this->cube_many_sequence (this->loop_count_, 1024, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_large_sequence<many>", 
-                     elapsed_time);
+  this->print_stats ("cube_large_sequence<many>", elapsed_time);
 
   // MIXIN
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
     {
-      this->cube_short (i, 
-                        ACE_TRY_ENV);
-      this->cube_octet (i, 
-                        ACE_TRY_ENV);
-      this->cube_long (i, 
-                       ACE_TRY_ENV);
+      this->cube_short (i, ACE_TRY_ENV);
+      this->cube_octet (i, ACE_TRY_ENV);
+      this->cube_long (i, ACE_TRY_ENV);
     }
-
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-  this->print_stats ("cube mixin (short/octet/long)", 
-                     elapsed_time);
+  this->print_stats ("cube mixin (short/octet/long)", elapsed_time);
 
   // RTI
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_rti_data (this->loop_count_, 
-                           2, 
-                           5, 
-                           ACE_TRY_ENV);
-    }
-
+    this->cube_rti_data (this->loop_count_, 2, 5, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_rti_data", 
-                     elapsed_time);
+  this->print_stats ("cube_rti_data", elapsed_time);
 
   // ONEWAY
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_oneway (i, 
-                         ACE_TRY_ENV);
-    }
-
+    this->cube_oneway (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_oneway", 
-                     elapsed_time);
+  this->print_stats ("cube_oneway", elapsed_time);
 
   this->shutdown_server (this->shutdown_,
                          ACE_TRY_ENV);
@@ -1216,12 +1039,10 @@ Cubit_Client::shutdown_server (int do_shutdown,
       ACE_TRY
         {
           if (this->cubit_factory_key_ == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%s: no cubit factory key specified\n",
-                                 this->argv_[0]),
-                                -1);
-            }
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "%s: no cubit factory key specified\n",
+                               this->argv_[0]),
+                              -1);
 
           CORBA::Object_var factory_object =
             this->orb_->string_to_object (this->cubit_factory_key_,
@@ -1234,12 +1055,10 @@ Cubit_Client::shutdown_server (int do_shutdown,
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->factory_.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "invalid factory key <%s>\n",
-                                 this->cubit_factory_key_),
-                                -1);
-            }
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "invalid factory key <%s>\n",
+                               this->cubit_factory_key_),
+                              -1);
 
           this->cubit_ =
             this->factory_->make_cubit (ACE_TRY_ENV);
@@ -1248,8 +1067,7 @@ Cubit_Client::shutdown_server (int do_shutdown,
           this->cubit_->shutdown (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG, 
-                      "shutdown on shutdown object\n"));
+          ACE_DEBUG ((LM_DEBUG, "shutdown on shutdown object\n"));
         }
       ACE_CATCHANY
         {
@@ -1262,9 +1080,7 @@ Cubit_Client::shutdown_server (int do_shutdown,
     }
   else if (do_shutdown)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "shutdown on cubit object\n"));
-
+      ACE_DEBUG ((LM_DEBUG, "shutdown on cubit object\n"));
       ACE_TRY_EX(NOT_COLLOCATED)
         {
           this->cubit_->shutdown (ACE_TRY_ENV);
@@ -1295,25 +1111,17 @@ Cubit_Client::run_oneway (CORBA::Environment &ACE_TRY_ENV)
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_oneway (i, 
-                         ACE_TRY_ENV);
-    }
-
+    this->cube_oneway (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_oneway", 
-                     elapsed_time);
+  this->print_stats ("cube_oneway", elapsed_time);
 
   if (this->shutdown_)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "shutdown on cubit object\n"));
-
+      ACE_DEBUG ((LM_DEBUG, "shutdown on cubit object\n"));
       this->cubit_->shutdown (ACE_TRY_ENV);
+      ACE_TRY_ENV.print_exception ("server, please ACE_OS::exit");
     }
 
   return this->error_count_ == 0 ? 0 : 1;
@@ -1332,25 +1140,17 @@ Cubit_Client::run_void (CORBA::Environment &ACE_TRY_ENV)
   this->call_count_ = 0;
   this->error_count_ = 0;
   timer.start ();
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_void (i, 
-                       ACE_TRY_ENV);
-    }
-
+    this->cube_void (i, ACE_TRY_ENV);
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-
-  this->print_stats ("cube_void", 
-                     elapsed_time);
+  this->print_stats ("cube_void", elapsed_time);
 
   if (this->shutdown_)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "shutdown on cubit object\n"));
-
+      ACE_DEBUG ((LM_DEBUG, "shutdown on cubit object\n"));
       this->cubit_->shutdown (ACE_TRY_ENV);
+      ACE_TRY_ENV.print_exception ("server, please ACE_OS::exit");
     }
 
   return this->error_count_ == 0 ? 0 : 1;
@@ -1360,19 +1160,13 @@ Cubit_Client::~Cubit_Client (void)
 {
   // Free resources and close the IOR files.
   if (this->cubit_factory_ior_file_)
-    {
-      ACE_OS::fclose (this->cubit_factory_ior_file_);
-    }
+    ACE_OS::fclose (this->cubit_factory_ior_file_);
 
   if (this->f_handle_ != ACE_INVALID_HANDLE)
-    {
-      ACE_OS::close (this->f_handle_);
-    }
+    ACE_OS::close (this->f_handle_);
 
   if (this->cubit_factory_key_ != 0)
-    {
-      ACE_OS::free (this->cubit_factory_key_);
-    }
+    ACE_OS::free (this->cubit_factory_key_);
 
   // Release the objects, to have a clean shutdown.
   this->factory_ = Cubit_Factory::_nil ();
@@ -1397,31 +1191,22 @@ Cubit_Client::init (int argc, char **argv, const char *collocation_test_ior)
                                     "internet",
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       if (this->testing_collocation_ == 0)
-        {
-          // turn off collocation if directed to do so.
-          this->orb_->_optimize_collocation_objects (0);
-        }
+        // turn off collocation if directed to do so.
+        this->orb_->_optimize_collocation_objects (0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
-        {
-          return -1;
-        }
+        return -1;
 
       if (collocation_test_ior != 0)
-        {
-          this->read_ior (collocation_test_ior);
-        }
+        this->read_ior (collocation_test_ior);
 
       if (this->cubit_factory_key_ == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: no cubit factory key specified\n",
-                             this->argv_[0]),
-                            -1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%s: no cubit factory key specified\n",
+                           this->argv_[0]),
+                          -1);
 
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (this->cubit_factory_key_,
@@ -1434,12 +1219,10 @@ Cubit_Client::init (int argc, char **argv, const char *collocation_test_ior)
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "invalid factory key <%s>\n",
-                             this->cubit_factory_key_),
-                            -1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid factory key <%s>\n",
+                           this->cubit_factory_key_),
+                          -1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Factory received OK\n"));
@@ -1450,11 +1233,9 @@ Cubit_Client::init (int argc, char **argv, const char *collocation_test_ior)
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->cubit_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "null cubit objref returned by factory\n"),
-                            -1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "null cubit objref returned by factory\n"),
+                          -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 9315f9be064..847ba10d29e 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -6,12 +6,7 @@
 ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
 
 Cubit_Server::Cubit_Server (void)
-  : ior_output_file_ (0),
-    orb_manager_ (),
-    factory_impl_ (0),
-    factory_id_ (),
-    argc_ (0),
-    argv_ (0)
+  : ior_output_file_ (0)
 {
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 4665be24c99..2cf3acab993 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -101,7 +101,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (Cubit_i_Timeprobe_Description,
 // Constructor
 
 Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
-  : my_cubit_ (orb)
+  : my_cubit_ (orb),
+    cubit_registered_ (0)
 {
 }
 
@@ -109,12 +110,35 @@ Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
 
 Cubit_Factory_i::~Cubit_Factory_i (void)
 {
+  if (this->cubit_registered_)
+    {
+      ACE_TRY_NEW_ENV
+        {
+          PortableServer::POA_var poa = this->my_cubit_._default_POA (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          PortableServer::ObjectId_var id = poa->servant_to_id (&this->my_cubit_,
+                                                                ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          poa->deactivate_object (id.in (),
+                                  ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught and ignored");
+        }
+      ACE_ENDTRY;
+    }
 }
 
 Cubit_ptr
 Cubit_Factory_i::make_cubit (CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  this->cubit_registered_ = 1;
+
   return my_cubit_._this (env);
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 4e6b3a422b0..2b8a19390d1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -133,6 +133,8 @@ public:
 
 private:
   Cubit_i my_cubit_;
+
+  int cubit_registered_;
 };
 
 #endif /* _CUBIT_I_H */
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index 485bebfad68..0423e371c2f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -56,8 +56,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -202,25 +200,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -268,9 +257,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -350,7 +343,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- cubitC.i
+ cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -460,25 +453,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -526,9 +510,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -732,13 +720,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Cubit_Client.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
@@ -796,6 +777,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1001,13 +984,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Cubit_Client.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
@@ -1065,6 +1041,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1272,25 +1250,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1338,9 +1307,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1542,25 +1515,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1608,9 +1572,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1809,25 +1777,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1875,9 +1834,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2084,25 +2047,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2150,9 +2104,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2346,25 +2304,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2412,9 +2361,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2604,25 +2557,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2670,9 +2614,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2862,25 +2810,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2928,9 +2867,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
index 01f4422a3f6..0fa0c85e4c1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Client - Win32 static Release"

 

@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 61310d9118f..5f5bcf8ff92 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Resource_Factory "-ORBResources tss -ORBReactorType select_st"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler ST"
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null -ORBConnectorLock null"
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 1b30bd26408..419494e753c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -15,19 +15,15 @@ svr_worker (void *arg)
 {
   Cubit_Server cubit_server;
   ACE_Barrier *barrier = (ACE_Barrier *) arg;
-
-  int argc = 3;
-  CORBA::String_var argv0 = CORBA::string_dup ("server");
-  CORBA::String_var argv1 = CORBA::string_dup ("-o");
-  CORBA::String_var argv2 = CORBA::string_dup (THE_IOR_FILE);
-  //CORBA::String_var argv3 = CORBA::string_dup ("-ORBCollocationStrategy");
-  //CORBA::String_var argv4 = CORBA::string_dup ("direct");
-  char* argv[] = { argv0.inout (), argv1.inout (), argv2.inout () };
+  char *fake[] = {"server", "-o", THE_IOR_FILE};//, "-ORBcollocationstrategy", "direct" };
 
   ACE_TRY_NEW_ENV
     {
-      if (cubit_server.init (argc, argv,
-                             ACE_TRY_ENV) == -1)
+      if (cubit_server.init (3,
+                             ACE_const_cast (char **,
+                                             fake),
+                             ACE_TRY_ENV)
+          == -1)
         return (void *) 1;
       else
         {
@@ -38,12 +34,14 @@ svr_worker (void *arg)
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return (void *) 1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return (void *) 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 119fae91a0a..9ebffecc5b1 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -12,7 +12,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # Do not use environment variables here since not all platforms use ACE_ROOT
 use lib "../../../../../bin";
 
-use English;
 require Process;
 require ACEutils;
 
@@ -67,8 +66,8 @@ for ($i = 0; $i <= $#ARGV; $i++)
     }
     if ($ARGV[$i] eq "-orblite")
     {
-      $clflags .= " -ORBGIOPlite";
-      $svflags .= " -ORBGIOPlite";
+      $clflags .= " -ORBgioplite";
+      $svflags .= " -ORBgioplite";
       last SWITCH;
     }
     print "run_test: Unknown Option: ".$ARGV[$i]."\n";
@@ -83,8 +82,6 @@ unlink $iorfile;
 
 sleep 2;
 
-print stderr "\nRunning IDL_Cubit with the default ORB protocol.\n\n";
-
 $SV = Process::Create ($exepref."server".$EXE_EXT,
                        $svflags.
                        $svnsflags);
@@ -116,58 +113,4 @@ if ($server != 0 || $client != 0) {
   exit 1;
 }
 
-if ($OSNAME ne "MSWin32")
-{
-  # Only run the UIOP test on Unix platforms.
-
-  Process::Wait();
-
-  # No need to unlink the iorfile again.
-  # unlink $iorfile;
-
-  sleep 2;
-
-  print stderr "\nRunning IDL_Cubit with the UIOP protocol.\n\n";
-
-  # Save the original server flags.
-  $save_svflags = $svflags;
-
-  $svflags .= " -ORBEndpoint uiop://";
-
-  $SV = Process::Create ($exepref."server".$EXE_EXT,
-                         $svflags.
-                         $svnsflags);
-
-  if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-  }
-
-  $CL = Process::Create ($exepref . "client".$EXE_EXT,
-                         " $clflags $clnsflags -x");
-
-  $client = $CL->TimedWait (60);
-  if ($client == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $CL->Kill (); $CL->TimedWait (1);
-  }
-
-  $server = $SV->TimedWait (10);
-  if ($server == -1) {
-    print STDERR "ERROR: server timedout\n";
-    $SV->Kill (); $SV->TimedWait (1);
-  }
-
-  # Restore the original server flags
-  $svflags = $save_svflags;
-
-  unlink $iorfile;
-
-  if ($server != 0 || $client != 0) {
-    exit 1;
-  }
-}
-
-
 exit 0;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index f4d37fd467b..8fd760434c3 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
+                                                  priority);
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
@@ -39,29 +39,33 @@ main (int argc, char *argv[])
               "\n\tIDL_Cubit: server\n\n"));
   ACE_TRY_NEW_ENV
     {
-      int ret = cubit_server.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (ret == -1)
-        return -1;
-
-      cubit_server.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (cubit_server.init (argc, argv, ACE_TRY_ENV) == -1)
+        {
+          ACE_TRY_ENV.print_exception ("Initialization Exception");
+          return -1;
+        }
+      else
+        {
+          cubit_server.run (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
   ACE_TIMEPROBE_PRINT;
 
-  //  ACE_END_TEST;
+//  ACE_END_TEST;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
index fe222f5b943..fd1f08d0148 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 static Release"

 

@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 62099e50851..707a303cb04 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator tss"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
index 0b49f7c36b1..bbfeb53120f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBResources global -ORBReactorlock null -ORBInputCDRAllocator null"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBProfileLock null -ORBClientConnectionHandler RW"
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationofSystemIds 0"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources global -ORBreactorlock null -ORBinputcdrallocator tss"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 093ec0616ba..3409654e8fe 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -63,29 +63,24 @@ Cubit_Task::svc (void)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Create Servants failed.\n"),
                       -1);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       GLOBALS::instance ()->barrier_->wait ();
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
-      int r = this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
+      if (this->orb_manager_.run (TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "run"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "poa->destroy()");
+      TAO_TRY_ENV.print_exception ("poa->destroy()");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Need to clean up and do a CORBA::release on everything we've
   // created!
@@ -99,8 +94,7 @@ Cubit_Task::svc (void)
 int
 Cubit_Task::initialize_orb (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       ACE_ARGV args (this->orbargs_);
 
@@ -112,15 +106,15 @@ Cubit_Task::initialize_orb (void)
                        "ORB %d",
                        this->task_id_);
 
-      int r = this->orb_manager_.init_child_poa (argc,
-                                                 argv,
-                                                 "persistent_poa",
-                                                 orb_name,
-                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (r == -1)
+      if (this->orb_manager_.init_child_poa (argc,
+                                             argv,
+                                             "persistent_poa",
+                                             orb_name,
+                                             TAO_TRY_ENV) == -1)
         return -1;
 
+      TAO_CHECK_ENV;
+
       this->orb_ = this->orb_manager_.orb ();
 
       // Do the argument parsing.
@@ -132,18 +126,17 @@ Cubit_Task::initialize_orb (void)
           ACE_NEW_RETURN (GLOBALS::instance ()->barrier_,
                           ACE_Barrier (GLOBALS::instance ()->num_of_objs + 1),
                           -1);
-          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon,
-                                    GLOBALS::instance ()->ready_mtx_, 1));
+          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1));
           GLOBALS::instance ()->ready_ = 1;
           GLOBALS::instance ()->ready_cnd_.broadcast ();
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "orb_init");
+      TAO_TRY_ENV.print_exception ("orb_init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -160,8 +153,7 @@ Cubit_Task::get_servant_ior (u_int index)
 int
 Cubit_Task::create_servants (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::Object_var obj =
         this->orb_->resolve_initial_references ("RootPOA",
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 98968dcf637..f157064935b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -6,6 +6,7 @@ Globals::Globals (void)
   : thr_create_flags (0),
     default_priority (0),
     ior_file (0),
+    base_port (0),
     num_of_objs (2),
     thread_per_rate (0),
     use_multiple_priority (0),
@@ -13,16 +14,16 @@ Globals::Globals (void)
     ready_cnd_ (ready_mtx_),
     barrier_ (0)
 {
-  const char default_endpoint[] = "iiop://";
-  // Default to iiop
-
-  ACE_OS::strcpy (endpoint, default_endpoint);
+  if (ACE_OS::hostname (hostname, BUFSIZ) != 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "ACE_OS::hostname () returned %s\n",
+                hostname));
 }
 
 int
 Globals::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "e:t:f:rm");
+  ACE_Get_Opt opts (argc, argv, "h:p:t:f:rm");
   int c;
 
   while ((c = opts ()) != -1)
@@ -42,10 +43,13 @@ Globals::parse_args (int argc, char *argv[])
         ACE_OS::strcpy (ior_file,
                         opts.optarg);
         break;
-      case 'e':
-        ACE_OS::strcpy (endpoint,
+      case 'h':
+        ACE_OS::strcpy (hostname,
                         opts.optarg);
         break;
+      case 'p':
+        base_port = ACE_OS::atoi (opts.optarg);
+        break;
       case 't':
         num_of_objs = ACE_OS::atoi (opts.optarg);
         break;
@@ -53,7 +57,8 @@ Globals::parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s \t"
-                           "[-e <endpoint>]                // starting endpoint                  \n\t\t\t"
+                           "[-p <port_num>]                // starting port                      \n\t\t\t"
+                           "[-h <my_hostname>]             // IP address to use                  \n\t\t\t"
                            "[-t <number_of_servants>]      // # of servant threads to create     \n\t\t\t"
                            "[-f <ior_file> ]               // specify a file to output all ior's \n\t\t\t"
                            "[-m ]                          // Use multiple priorities for threads\n\t\t\t"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index de617a84679..3ced9d16a53 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 #ifndef GLOBALS_H
@@ -128,12 +127,18 @@ public:
   // Default thread priority, used for the high thread priority.
   // Must call sched_fifo_init () before accessing.
 
-  char endpoint[BUFSIZ];
-  // endpoint to be used for ORB_init.
+  char hostname[BUFSIZ];
+  // hostname to be used for ORB_init.
 
   char *ior_file;
   // file name to read/write the iors of the servants.
 
+  int base_port;
+  // The base port upon which the servants will listen.  The high
+  // priority servant will listen at the <base_port> and the
+  // low_priority servants will listen at <base_port> + i where i is
+  // the number of that low priority servant.
+
   u_int num_of_objs;
   // number of objects per servant thread.
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index e475d61ae0d..6eaa29db1b4 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -54,7 +54,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -211,25 +210,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -277,9 +267,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -359,7 +353,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- cubitC.i
+ cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -469,25 +463,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -535,9 +520,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -733,25 +722,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -799,9 +779,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1010,25 +994,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1076,9 +1051,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1336,25 +1315,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1402,9 +1372,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1584,25 +1558,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1650,9 +1615,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1905,25 +1874,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1971,9 +1931,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2143,25 +2107,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2209,9 +2164,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2456,13 +2415,6 @@ realclean: clean
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  cubit_i.h cubitS.h cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2512,6 +2464,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2766,25 +2720,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2832,9 +2777,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
index ab84888f6a3..88a629226ff 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
@@ -5,7 +5,7 @@ THE MT_CUBIT EXAMPLE
 
 This directory contains the source code for the TAO "MT_Cubit"
 benchmark, which enables us to measure the real-time performance of
-TAO.  MT_Cubit measures the latency, jitter, determinism, CPU
+TAO.  MT_Cubit measures the latency,jitter, determinism, CPU
 utilization, and degree of priority inversion incurred by TAO twoway
 operations invoked under different workloads and priorities.  For
 more information and empirical results, please see
@@ -27,17 +27,24 @@ Options are case sensitive, e.g., "-U" has a different meaning than "-u".
 
 (1) server:
 
-./server [-e <endpoint>]                // Endpoint to use (URL style endpoint)
+./server [-p <port_num>]                // starting port
+         [-h <my_hostname>]             // IP address to use
          [-t <number_of_servants>]      // # of servant threads to create
          [-f <ior_file> ]               // specify a file to output all ior's
          [-m ]                          // Use multiple priorities for threads
          [-r ]                          // Run the thread-per-rate test
 
-[-e <endpoint>] indicates the endpoint the ORB should bind to.
+[-p <port_num>] is the port number at which the server will start the
+  first (and highest priority) servant. Successive servants will be
+  created starting at (port_num+1). The -t parameter specifies the total
+  number of servants.
+
+        Default Value: ACE_DEFAULT_SERVER_PORT  /* see $ACE/ace/OS.h for actual number value */
+
+[-h <my_hostname>] indicates the IP address the ORB should bind to.
   This is useful when a machine has more than one network interface.
 
-        Default Value: Whatever the current active pluggable protocol
-                       uses as its default endpoint.
+        Default Value: Whatever ACE_OS::hostname () returns, which depends on the platform.
 
 [-t <number_of_servants>] tells the server how many servants to create.
 
@@ -63,7 +70,7 @@ by the client.
 
 (2) client:
 
-./client [<ORB OPTIONS>]        // ORB options, e.g., "-ORBObjRefStyle url"
+./client [<ORB OPTIONS>]        // ORB options, e.g., "-ORBobjrefstyle url"
          [-d <datatype>]        // what datatype to use for calls
          [-n <num_calls>]       // number of CORBA calls to make.
          [-t <num_of_clients>]  // number of client threads to create
@@ -192,18 +199,18 @@ for ALL.
 
 server:
 ------
-$rsh host_name arun path_to_server -e iiop://DOTTED_DECIMAL_ADDRESS:0
- -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options> 
+$rsh host_name arun path_to_server -h DOTTED_DECIMAL_ADDRESS
+ -f path_to_ior_file -ORBdotteddecimaladdresses 1 <server_options> 
 
 Since Chorus doesn't support DNS, you should pass
-dotted_decimal_address of the server machine to -e option.
+dotted_decimal_address of the server machine to -h option.
 
-You DONT have to use -ORBDottedDecimalAddresses 1 if you have
+You DONT have to use -ORBdotteddecimaladdresses 1 if you have
 TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file. 
 
 e.g
-$rsh tambora1 arun /MT_Cubit/server -e iiop://128.252.165.82:0 -f /ior
--ORBDottedDecimalAddresses 1 -t 10 -ORBObjRefStyle url
+$rsh tambora1 arun /MT_Cubit/server -h 128.252.165.82 -f /ior
+-ORBdotteddecimaladdresses 1 -t 10 -ORBobjrefstyle url
 
 client:
 -------
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 148c81799db..dd7230901ea 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -556,8 +556,7 @@ Client::find_frequency (void)
 int
 Client::init_orb (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "I'm thread %t\n"));
@@ -571,8 +570,8 @@ Client::init_orb (void)
                   tmp_args.buf ());
   // Add the argument.
   ACE_OS::strcat (tmp_buf,
-                  " -ORBRcvSock 32768 "
-                  " -ORBSndSock 32768 ");
+                  " -ORBrcvsock 32768 "
+                  " -ORBsndsock 32768 ");
 
   ACE_DEBUG ((LM_DEBUG,
               tmp_buf));
@@ -585,9 +584,8 @@ Client::init_orb (void)
   this->orb_ = CORBA::ORB_init (argc,
                          argv,
                          "internet",
-                         ACE_TRY_ENV);
-  ACE_TRY_CHECK;
-
+                         TAO_TRY_ENV);
+  TAO_CHECK_ENV;
   if (this->id_ == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -610,12 +608,12 @@ Client::init_orb (void)
   ACE_DEBUG ((LM_DEBUG,
               "(%t) ORB_init success\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::Orb_init ()");
+      TAO_TRY_ENV.print_exception ("Client::Orb_init ()");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -624,8 +622,7 @@ Client::get_cubit (void)
 {
   CORBA::Object_var objref (0);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       char *my_ior =
         this->ts_->use_utilization_test_ == 1
@@ -644,8 +641,8 @@ Client::get_cubit (void)
                           -1);
 
       objref = this->orb_->string_to_object (my_ior,
-                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                             TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (objref.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -655,8 +652,8 @@ Client::get_cubit (void)
       // Narrow the CORBA::Object reference to the stub object,
       // checking the type along the way using _is_a.
       this->cubit_ = Cubit::_narrow (objref.in (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->cubit_))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -668,19 +665,19 @@ Client::get_cubit (void)
 
       CORBA::String_var str =
         this->orb_->object_to_string (this->cubit_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) CUBIT OBJECT connected to <%s>\n",
                   str.in ()));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::get_cubit");
+      TAO_TRY_ENV.print_exception ("Client::get_cubit");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -729,24 +726,23 @@ Client::svc (void)
     this->ts_->semaphore_->release ();
 
   // shutdown the server if necessary.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       if (this->ts_->shutdown_)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-          this->cubit_->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->cubit_->shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR,
                   "Shutdown of the server failed!\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown() call failed.\n");
+      TAO_TRY_ENV.print_exception ("shutdown() call failed.\n");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // Delete dynamic memory
   CORBA::release (this->cubit_);
@@ -765,8 +761,7 @@ Client::svc (void)
 int
 Client::cube_octet (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->call_count_++;
       // Cube an octet.
@@ -777,13 +772,13 @@ Client::cube_octet (void)
 
       if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0)
         ret_octet = this->cubit_impl_.cube_octet (arg_octet,
-                                                  ACE_TRY_ENV);
+                                                  TAO_TRY_ENV);
       else
         ret_octet = this->cubit_->cube_octet (arg_octet,
-                                              ACE_TRY_ENV);
+                                              TAO_TRY_ENV);
 
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Perform the cube operation.
       arg_octet = arg_octet * arg_octet * arg_octet;
@@ -799,20 +794,25 @@ Client::cube_octet (void)
         }
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_octet()\n");
-      return -1;
+
+      ACE_OS::fprintf (stderr, "%s:%d, errno: %d\n", __FILE__, __LINE__, errno); // ????
+
+      TAO_TRY_ENV.print_exception ("call to cube_octet()\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%t; %D) %s: Call failed\n",
+                         TAO_TRY_ENV.exception ()),
+                        -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_short (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->call_count_++;
 
@@ -821,9 +821,9 @@ Client::cube_short (void)
 
       START_QUANTIFY;
       ret_short = this->cubit_->cube_short (arg_short,
-                                            ACE_TRY_ENV);
+                                            TAO_TRY_ENV);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
       arg_short = arg_short * arg_short * arg_short;
 
       if (arg_short != ret_short)
@@ -836,20 +836,22 @@ Client::cube_short (void)
                             -1);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_short\n");
-      return -1;
+      TAO_TRY_ENV.print_exception ("call to cube_short\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%s: Call failed\n",
+                         TAO_TRY_ENV.exception ()),
+                        -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_long (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->call_count_++;
 
@@ -858,9 +860,9 @@ Client::cube_long (void)
 
       START_QUANTIFY;
       ret_long = this->cubit_->cube_long (arg_long,
-                                          ACE_TRY_ENV);
+                                          TAO_TRY_ENV);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       arg_long = arg_long * arg_long * arg_long;
 
@@ -873,20 +875,22 @@ Client::cube_long (void)
                       ret_long));
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_long()\n");
-      return -1;
+      TAO_TRY_ENV.print_exception ("call to cube_long()\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%s: Call failed\n",
+                         TAO_TRY_ENV.exception ()),
+                        -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_struct (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       Cubit::Many arg_struct;
       Cubit::Many ret_struct;
@@ -899,9 +903,9 @@ Client::cube_struct (void)
 
       START_QUANTIFY;
       ret_struct = this->cubit_->cube_struct (arg_struct,
-                                              ACE_TRY_ENV);
+                                              TAO_TRY_ENV);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
@@ -916,12 +920,15 @@ Client::cube_struct (void)
                       "**cube_struct error!\n"));
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_struct()\n");
-      return -1;
+      TAO_TRY_ENV.print_exception
+        ("call to cube_struct()\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%s: Call failed\n", TAO_TRY_ENV.exception ()),
+                        -1);
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -959,21 +966,22 @@ Client::make_request (void)
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           this->call_count_++;
           START_QUANTIFY;
-          this->cubit_->noop (ACE_TRY_ENV);
+          this->cubit_->noop (TAO_TRY_ENV);
           STOP_QUANTIFY;
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "oneway call noop()\n");
-          return -1;
+          TAO_TRY_ENV.print_exception ("oneway call noop()\n");
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%t) noop() call failed\n"),
+                            -1);
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
   // return success.
   return 0;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index b966fd23942..4f61dc79365 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -41,14 +41,7 @@
 #include "pccTimer.h"
 #endif /* CHORUS */
 
-#if defined(ACE_HAS_EXCEPTIONS)
-// Some plaforms define an exception structure in math.h...
-#define exception _math_exception
-#include /**/ <math.h>
-#undef exception
-#else
-#include /**/ <math.h>
-#endif /* ACE_HAS_EXCEPTIONS */
+#include <math.h>
 
 // I will integrate this, together with the sqrt() function when
 // the implementation is complete.  --Sergio.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 504159349e3..8910b456ac2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -572,9 +572,16 @@ Client_i::start_servant (void)
 {
   char high_thread_args[BUFSIZ];
 
+  static char hostname[BUFSIZ];
+
+  if (ACE_OS::hostname (hostname, BUFSIZ) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "hostname"),
+                       -1);
   ACE_OS::sprintf (high_thread_args,
-                   "-ORBSndSock 32768 "
-                   "-ORBRcvSock 32768 ");
+                   "-ORBsndsock 32768 "
+                   "-ORBrcvsock 32768 ");
 
   Cubit_Task *high_priority_task;
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
index 367c7fc2d70..c142159ad90 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
@@ -27,6 +27,7 @@ CFG=MT_Cubit Client - Win32 static Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

+# PROP WCE_FormatVersion ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -103,7 +104,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # SUBTRACT BASE LINK32 /map /debug

-# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # SUBTRACT LINK32 /map /debug

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 static Debug"

@@ -129,7 +130,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

-# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
index 712f51aa94d..217a2758b22 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -5,14 +5,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-$usage = "run_tests.pl [-l suppress -ORBGIOPlite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
+$usage = "run_tests.pl [-l suppress -ORBgioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
 
 use lib "../../../../../bin";
 require ACEutils;
 
 $iorfile = "mtcubit.ior";
 $sleeptime = 3;
-$gioplite = '-ORBGIOPlite';
+$gioplite = '-ORBgioplite';
 $iterations = 1000;
 $low_priority_threads = 1;
 $thread_per_rate = '';
@@ -69,7 +69,7 @@ $CL = Process::Create ('.' . $DIR_SEPARATOR . "client" . $EXE_EXT .
                   " $gioplite $thread_per_rate " .
                   "-f $iorfile -n $iterations -t $threads");
 
-$client = $CL->TimedWait (120);
+$client = $CL->TimedWait (60);
 if ($client == -1) {
   print STDERR "ERROR: client timedout\n";
   $CL->Kill (); $CL->TimedWait (1);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 497d6dcb62f..a7d75263f9e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -82,9 +82,18 @@ Server::prelim_args_process (void)
 
   for (i = 0; i < this->argc_ ; i++)
     {
-      if (ACE_OS::strcmp (this->argv_[i], "-e") == 0 &&
-          i - 1 < this->argc_)
-        ACE_OS::strcpy (GLOBALS::instance ()->endpoint,
+      if (ACE_OS::strcmp (this->argv_[i], "-p") == 0
+          && i - 1 < this->argc_)
+        {
+          GLOBALS::instance ()->base_port =
+            ACE_OS::atoi (this->argv_[i + 1]);
+          ACE_DEBUG ((LM_DEBUG,
+                      "base_port:%d",
+                      GLOBALS::instance()->base_port));
+        }
+      else if (ACE_OS::strcmp (this->argv_[i], "-h") == 0
+               && i - 1 < this->argc_)
+        ACE_OS::strcpy (GLOBALS::instance ()->hostname,
                         this->argv_[i+1]);
     }
 }
@@ -166,13 +175,14 @@ Server::activate_high_servant (void)
   char orbendpoint[BUFSIZ];
 
   ACE_OS::sprintf (orbendpoint,
-                   "-ORBEndpoint %s ",
-                   GLOBALS::instance ()->endpoint);
+                   "-ORBendpoint iiop://%s:%d ",
+                   GLOBALS::instance ()->hostname,
+                   GLOBALS::instance ()->base_port);
 
   char *high_second_argv[] =
     {orbendpoint,
-     ACE_const_cast (char *, "-ORBSndSock 32768 "),
-     ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+     ACE_const_cast (char *, "-ORBsndsock 32768 "),
+     ACE_const_cast (char *, "-ORBrcvsock 32768 "),
      0};
   ACE_NEW_RETURN (this->high_argv_,
                   ACE_ARGV (this->argv_, high_second_argv),
@@ -228,39 +238,23 @@ Server::activate_low_servants (void)
                       -1);
     }
 
-  // Strip the provided addr from the endpoint and make the ORB
-  // choose the remaining endpoints based on the protocol used in
-  // the endpoint.
-  //
-  // e.g.: orignal endpoint:    iiop://foobar:10001 
-  //       random endpoint      iiop://
-
-  const char protocol_delimiter[] = "://";
-
-  char *addr = ACE_OS::strstr (GLOBALS::instance ()->endpoint,
-                               protocol_delimiter);
-
-  size_t random_endpoint_length =
-    ACE_OS::strlen (GLOBALS::instance ()->endpoint) -
-    ACE_OS::strlen (addr) +
-    ACE_OS::strlen (protocol_delimiter);
-
-  char random_endpoint[BUFSIZ];
-
-  ACE_OS::sprintf (random_endpoint, "-ORBEndpoint ");
-
-  ACE_OS::strncat (random_endpoint,
-                   GLOBALS::instance ()->endpoint,
-                   random_endpoint_length);
-
   for (int i = this->num_low_priority_;
        i > 0;
        i--)
     {
+      char orbendpoint[BUFSIZ];
+
+      ACE_OS::sprintf (orbendpoint,
+                       "-ORBendpoint iiop://%s:%d",
+                       GLOBALS::instance ()->hostname,
+                       GLOBALS::instance ()->base_port == 0
+                       ? (int) 0
+                       : GLOBALS::instance ()->base_port + i);
+
       char *low_second_argv[] =
-        {random_endpoint,
-         ACE_const_cast (char *, "-ORBSndSock 32768 "),
-         ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+        {orbendpoint,
+         ACE_const_cast (char *, "-ORBsndsock 32768 "),
+         ACE_const_cast (char *, "-ORBrcvsock 32768 "),
          0};
       ACE_NEW_RETURN (this->low_argv_,
                       ACE_ARGV (this->argv_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
index f787d53e2b9..3f4e8764aa3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -27,6 +27,7 @@ CFG=MT_Cubit Server - Win32 static Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

+# PROP WCE_FormatVersion ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -103,7 +104,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # SUBTRACT BASE LINK32 /map /debug

-# ADD LINK32 aces.lib TAOs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # SUBTRACT LINK32 /map /debug

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 static Debug"

@@ -129,7 +130,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

-# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index f8f49d4290c..2dcac6ab6e6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator tss"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/VisiBroker/base_server/Makefile b/TAO/performance-tests/Cubit/VisiBroker/base_server/Makefile
index 537f619e828..4b40c012e55 100644
--- a/TAO/performance-tests/Cubit/VisiBroker/base_server/Makefile
+++ b/TAO/performance-tests/Cubit/VisiBroker/base_server/Makefile
@@ -7,8 +7,8 @@ EXE = server
 all: $(EXE)
 
 clean:
-	-$(RM) core *.o cubitC.* cubitS.* $(EXE) 
-	-$(RM) -r Templates.DB
+	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
+	-rm -rf Templates.DB
 
 cubitS.cpp: cubit.idl
 	$(ORBCC) cubit.idl
diff --git a/TAO/performance-tests/Cubit/VisiBroker/client/Makefile b/TAO/performance-tests/Cubit/VisiBroker/client/Makefile
index c834d8f74ee..ac2d882a3ce 100644
--- a/TAO/performance-tests/Cubit/VisiBroker/client/Makefile
+++ b/TAO/performance-tests/Cubit/VisiBroker/client/Makefile
@@ -7,8 +7,8 @@ EXE = client
 all: $(EXE)
 
 clean:
-	-$(RM) core *.o cubitC.* cubitS.* $(EXE) 
-	-$(RM) -r Templates.DB
+	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
+	-rm -rf Templates.DB
 
 cubitS.cpp: cubit.idl
 	$(ORBCC) cubit.idl
diff --git a/TAO/performance-tests/Latency/Latency.dsw b/TAO/performance-tests/Latency/Latency.dsw
deleted file mode 100644
index c7af72671d9..00000000000
--- a/TAO/performance-tests/Latency/Latency.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=".\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=".\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile
deleted file mode 100644
index 66d39c55495..00000000000
--- a/TAO/performance-tests/Latency/Makefile
+++ /dev/null
@@ -1,1386 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
-
-CLIENT_OBJS = client.o testC.o
-SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Latency/README b/TAO/performance-tests/Latency/README
deleted file mode 100644
index e24106e9174..00000000000
--- a/TAO/performance-tests/Latency/README
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-Description:
-
-	This is a simple latency test, a server runs using a thread
-pool reactor, the client creates several threads that send requests to 
-the server and record latency and throughput statistics.
-
-	Command line options on the client and server can be used to
-control the number of threads in the server and the client, the amount
-work performed on each request, the number of requests per thread,
-etc.
-
-Expected output:
-	The server prints out the IOR of the object it serves. The
-client prints the results on a per-thread basis as well as the
-aggregated numbers.
-
-How to run:
-	You can use the run_test.pl script to run it or:
-
-$ server -ORBSvcConf server.conf -n 2
-$ client -ORBSvcConf client.conf -n 4 -i 1000
diff --git a/TAO/performance-tests/Latency/client.conf b/TAO/performance-tests/Latency/client.conf
deleted file mode 100644
index e19fbe40a3a..00000000000
--- a/TAO/performance-tests/Latency/client.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static Client_Strategy_Factory "-ORBclientconnectionhandler RW"
diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp
deleted file mode 100644
index 9190bbdaca6..00000000000
--- a/TAO/performance-tests/Latency/client.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/Stats.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "testC.h"
-
-ACE_RCSID(Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int niterations = 5;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-n <nthreads> "
-                           "-i <niterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (void);
-  // ctor
-
-  void set (Test_ptr server, int niterations);
-  // Set the test attributes.
-
-  void accumulate_into (ACE_Throughput_Stats &throughput) const;
-  // Accumulate the throughput statistics into <throughput>
-
-  void dump_stats (const char* msg, ACE_UINT32 gsf);
-  // Accumulate the throughput statistics into <throughput>
-
-  // = The ACE_Task_Base methods....
-  virtual int svc (void);
-
-private:
-  Test_var server_;
-  // The server.
-
-  int niterations_;
-  // The number of iterations on each client thread.
-
-  ACE_Throughput_Stats throughput_;
-  // Keep throughput statistics on a per-thread basis
-};
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%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"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      ACE_DEBUG ((LM_DEBUG, "High res. timer calibration...."));
-      ACE_High_Res_Timer::calibrate ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      Client* client;
-      ACE_NEW_RETURN (client, Client[nthreads], 1);
-      for (int i = 0; i != nthreads; ++i)
-        {
-          client[i].set (server.in (), niterations);
-          if (client[i].activate (THR_NEW_LWP | THR_JOINABLE) != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot activate client threads\n"),
-                              1);
-        }
-
-      ACE_Thread_Manager::instance ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
-      ACE_Throughput_Stats throughput;
-
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      for (int j = 0; j != nthreads; ++j)
-        {
-          client[j].accumulate_into (throughput);
-
-          char buf[64];
-          ACE_OS::sprintf (buf, "Thread[%d]", j);
-          client[j].dump_stats (buf, gsf);
-        }
-      throughput.dump_results ("Aggregated", gsf);
-
-      server->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Client::Client (void)
-{
-}
-
-void
-Client::set (Test_ptr server, int niterations)
-{
-  this->server_ = Test::_duplicate (server);
-  this->niterations_ = niterations;
-}
-
-int
-Client::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // @@ We should use "validate_connection" for this
-      for (int j = 0; j < 100; ++j)
-        {
-          server_->_is_a ("IDL:Test:1.0", ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_hrtime_t throughput_base = ACE_OS::gethrtime ();
-
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-          ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
-          server_->test_method (ACE_TRY_ENV);
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-
-          ACE_TRY_CHECK;
-
-          this->throughput_.sample (now - throughput_base,
-                                    now - latency_base);
-
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Latency: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client::accumulate_into (ACE_Throughput_Stats &throughput) const
-{
-  throughput.accumulate (this->throughput_);
-}
-
-void
-Client::dump_stats (const char* msg, ACE_UINT32 gsf)
-{
-  this->throughput_.dump_results (msg, gsf);
-}
diff --git a/TAO/performance-tests/Latency/server.conf b/TAO/performance-tests/Latency/server.conf
deleted file mode 100644
index 0a9c9ed5cf6..00000000000
--- a/TAO/performance-tests/Latency/server.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBReactorType tp"
diff --git a/TAO/performance-tests/Latency/server.cpp b/TAO/performance-tests/Latency/server.cpp
deleted file mode 100644
index 721930c7a9e..00000000000
--- a/TAO/performance-tests/Latency/server.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-int nthreads = 4;
-int workload = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:w:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
-
-      case 'n':
-	nthreads = ACE_OS::atoi (get_opts.optarg);
-	break;
-
-      case 'w':
-	workload = ACE_OS::atoi (get_opts.optarg);
-	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;
-}
-
-class Worker : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
-public:
-  Worker (CORBA::ORB_ptr orb);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  CORBA::ORB_var orb_;
-  // The orb
-};
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%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"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Test_i server_impl (orb.in (), workload);
-
-      Test_var server =
-        server_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      Worker worker (orb.in ());
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                          1);
-
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Worker::Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker::svc (void)
-{
-  this->orb_->run ();
-  return 0;
-}
diff --git a/TAO/performance-tests/Latency/test.idl b/TAO/performance-tests/Latency/test.idl
deleted file mode 100644
index fb5e94ff048..00000000000
--- a/TAO/performance-tests/Latency/test.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// $Id$
-//
-
-interface Test
-{
-  void test_method ();
-
-  oneway void shutdown ();
-};
diff --git a/TAO/performance-tests/Latency/test_i.cpp b/TAO/performance-tests/Latency/test_i.cpp
deleted file mode 100644
index c95525d7e0a..00000000000
--- a/TAO/performance-tests/Latency/test_i.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/ACE.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Latency, test_i, "$Id$")
-
-void
-Test_i::test_method (CORBA::Environment&) ACE_THROW_SPEC (())
-{
-  ACE_Time_Value tv (0, 0);
-  for (int i = 0; i != this->workload_; ++i)
-    {
-      const int n = 37;
-      ACE::is_prime (n, 2, n / 2);
-      ACE_OS::sleep (tv);
-    }
-}
-
-void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0, ACE_TRY_ENV);
-}
diff --git a/TAO/performance-tests/Latency/test_i.h b/TAO/performance-tests/Latency/test_i.h
deleted file mode 100644
index a98ff85285b..00000000000
--- a/TAO/performance-tests/Latency/test_i.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Latency
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_LATENCY_TEST_I_H
-#define TAO_LATENCY_TEST_I_H
-
-#include "testS.h"
-
-class Test_i : public POA_Test
-{
-  // = TITLE
-  //   An implementation for the Test interface
-  //
-  // = DESCRIPTION
-  //   Implements the Test interface in test.idl
-  //
-public:
-  Test_i (CORBA::ORB_ptr orb, int workload);
-  // ctor
-
-  // = The Test methods.
-  void test_method (CORBA::Environment&)
-    ACE_THROW_SPEC (());
-
-  void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  int workload_;
-  // How much "work" do we do on each iteration
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_LATENCY_TEST_I_H */
diff --git a/TAO/performance-tests/Latency/test_i.i b/TAO/performance-tests/Latency/test_i.i
deleted file mode 100644
index 030850cdae5..00000000000
--- a/TAO/performance-tests/Latency/test_i.i
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Test_i::Test_i (CORBA::ORB_ptr orb,
-                int workload)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     workload_ (workload)
-{
-}
diff --git a/TAO/performance-tests/Makefile b/TAO/performance-tests/Makefile
index 4922afba5b0..fafeef62824 100644
--- a/TAO/performance-tests/Makefile
+++ b/TAO/performance-tests/Makefile
@@ -13,8 +13,7 @@
 DIRS  = Cubit \
 	POA \
 	Pluggable \
-	Thruput \
-	Latency
+	Thruput
 
 # The following tests have not been updated yet
 # 	Demux
diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile
index fe6dd78f768..6364a3070ec 100644
--- a/TAO/performance-tests/POA/Demux/Makefile
+++ b/TAO/performance-tests/POA/Demux/Makefile
@@ -45,10 +45,9 @@ SRC     = $(addsuffix .cpp,$(SVR_FILES)) \
 BIN2 = server client
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
index eb017178a87..9339a325dfd 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
@@ -26,7 +26,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -160,25 +159,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -226,9 +216,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -308,7 +302,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
+ testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -418,25 +412,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -484,9 +469,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -676,25 +665,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -742,9 +722,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp
index 425aa6f8e9e..75e9affe5b6 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsp
@@ -7,22 +7,23 @@
 CFG=POA Registration - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "registration.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "registration.mak" CFG="POA Registration - Win32 Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "POA Registration - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Registration - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "POA Registration - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "POA Registration - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -76,7 +77,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -107,7 +108,7 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "POA Registration - Win32 Release"

 

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -124,7 +125,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "POA Registration - Win32 Debug"

 

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -160,7 +161,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
index 1530a12d821..df6417d0eb1 100644
--- a/TAO/performance-tests/Pluggable/Makefile
+++ b/TAO/performance-tests/Pluggable/Makefile
@@ -38,7 +38,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -180,25 +179,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -246,9 +236,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -328,7 +322,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- PP_TestC.i
+ PP_TestC.i PP_TestS.h PP_TestS_T.h PP_TestS_T.i PP_TestS_T.cpp \
+ PP_TestS.i
 .obj/PP_TestS.o .obj/PP_TestS.so .shobj/PP_TestS.o .shobj/PP_TestS.so: PP_TestS.cpp PP_TestS.h PP_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -438,25 +433,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -504,9 +490,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -710,13 +700,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  PP_Test_i.h PP_TestS.h PP_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -769,6 +752,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -973,13 +958,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  PP_Test_i.h PP_TestS.h PP_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1032,6 +1010,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1228,25 +1208,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1294,9 +1265,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1491,25 +1466,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1557,9 +1523,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1751,25 +1721,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1817,9 +1778,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 26a667bca9b..7de9ef04994 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -72,26 +72,19 @@ PP_Test_Client::read_ior (char *filename)
   this->f_handle_ = ACE_OS::open (filename,0);
 
   if (this->f_handle_ == ACE_INVALID_HANDLE)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to open %s for writing: %p\n",
-                         filename),
-                        -1);
-    }
-
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: %p\n",
+                       filename),
+                      -1);
   ACE_Read_Buffer ior_buffer (this->f_handle_);
-
   char *data = ior_buffer.read ();
 
   if (data == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to allocate memory to read ior: %p\n"),
-                        -1);
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
 
   this->factory_key_ = ACE_OS::strdup (data);
-
   ior_buffer.alloc ()->free (data);
 
   return 0;
@@ -163,30 +156,19 @@ PP_Test_Client::parse_args (void)
 void
 PP_Test_Client::send_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  {
+    ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
 
-  ACE_TRY
-    {
-      {
-        ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-
-        this->objref_->send_oneway (ACE_TRY_ENV);
-      }
-
-      ACE_TRY_CHECK;
+    this->objref_->send_oneway (this->env_);
+  }
 
-      this->call_count_++;
+  this->call_count_++;
 
-    }
-  ACE_CATCHANY
+  if (this->env_.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "from send_oneway");
-
+      this->env_.print_exception ("from send_oneway");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Twoway test.
@@ -194,30 +176,19 @@ PP_Test_Client::send_oneway (void)
 void
 PP_Test_Client::send_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  {
+    ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
 
-  ACE_TRY
-    {
-      {
-        ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
+    this->objref_->send_void (this->env_);
+  }
 
-        this->objref_->send_void (ACE_TRY_ENV);
-      }
+  this->call_count_++;
 
-      ACE_TRY_CHECK;
-
-      this->call_count_++;
-
-    }
-  ACE_CATCHANY
+  if (this->env_.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "from send_void");
-
+      this->env_.print_exception ("from send_void");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Send an octet
@@ -228,36 +199,26 @@ int
 PP_Test_Client::run ()
 {
   if (this->only_void_)
-    {
-      return this->run_void ();
-    }
+    return this->run_void ();
 
   if (this->only_oneway_)
-    {
-      return this->run_oneway ();
-    }
+    return this->run_oneway ();
 
-  CORBA::ULong i;
+  u_int i;
 
   // Show the results one type at a time.
 
   // VOID
   this->call_count_ = 0;
   this->error_count_ = 0;
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->send_void ();
-    }
+    this->send_void ();
 
   // ONEWAY
   this->call_count_ = 0;
   this->error_count_ = 0;
-
   for (i = 0; i < this->loop_count_; i++)
-    {
-      this->send_oneway ();
-    }
+    this->send_oneway ();
 
   // This causes a memPartFree on VxWorks.
   ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
@@ -269,143 +230,70 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  if (do_shutdown)
     {
-      if (do_shutdown)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "shutdown on Pluggable_Test object\n"));
-
-          this->objref_->shutdown (ACE_TRY_ENV);
-
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG, 
-                      "server, please ACE_OS::exit"));
-        }
-
-      return 0;
+      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
+      this->objref_->shutdown (this->env_);
+      this->env_.print_exception ("server, please ACE_OS::exit");
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from shutdown_server");
 
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_NOTREACHED (return 0;)
+  return 0;
 }
 
 int
 PP_Test_Client::run_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  u_int i;
 
-  ACE_TRY
+  // ONEWAY
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  for (i = 0; i < this->loop_count_; i++)
+    this->send_oneway ();
+  if (this->shutdown_)
     {
-      CORBA::ULong i;
-
-      // ONEWAY
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-
-      for (i = 0; i < this->loop_count_; i++)
-        {
-          this->send_oneway ();
-        }
-
-      if (this->shutdown_)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "shutdown on Pluggable_Test object\n"));
-
-          ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
-
-          this->objref_->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG, 
-                      "server, please ACE_OS::exit"));
-        }
-
-      return this->error_count_ == 0 ? 0 : 1;
+      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
+      ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
+      this->objref_->shutdown (this->env_);
+      this->env_.print_exception ("server, please ACE_OS::exit");
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from objref_->shutdown");
 
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_NOTREACHED (return 0;)
+  return this->error_count_ == 0 ? 0 : 1;
 }
 
 int
 PP_Test_Client::run_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  u_int i;
 
-  ACE_TRY
-    {
-      CORBA::ULong i;
-
-      // ONEWAY
-      this->call_count_ = 0;
-      this->error_count_ = 0;
-
-      for (i = 0; i < this->loop_count_; i++)
-        {
-          this->send_void ();
-        }
-
-      if (this->shutdown_)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "shutdown on Pluggable_Test object\n"));
-
-          ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
-
-          this->objref_->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG, 
-                      "server, please ACE_OS::exit"));
-        }
+  // VOID
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+  for (i = 0; i < this->loop_count_; i++)
+    this->send_void ();
 
-      return this->error_count_ == 0 ? 0 : 1;
-    }
-  ACE_CATCHANY
+  if (this->shutdown_)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from objref_->shutdown");
-
-      return -1;
+      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
+      ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
+      this->objref_->shutdown (this->env_);
+      this->env_.print_exception ("server, please ACE_OS::exit");
     }
-  ACE_ENDTRY;
-  ACE_NOTREACHED (return 0;)
+
+  return this->error_count_ == 0 ? 0 : 1;
 }
 
 PP_Test_Client::~PP_Test_Client (void)
 {
   // Free resources and close the IOR files.
   if (this->factory_ior_file_)
-    {
-      ACE_OS::fclose (this->factory_ior_file_);
-    }
+    ACE_OS::fclose (this->factory_ior_file_);
 
   if (this->f_handle_ != ACE_INVALID_HANDLE)
-    {
-      ACE_OS::close (this->f_handle_);
-    }
+    ACE_OS::close (this->f_handle_);
 
   if (this->factory_key_ != 0)
-    {
-      ACE_OS::free (this->factory_key_);
-    }
+    ACE_OS::free (this->factory_key_);
 }
 
 int
@@ -424,17 +312,13 @@ PP_Test_Client::init (int argc, char **argv)
       ACE_TRY_CHECK;
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
-        {
-          return -1;
-        }
+        return -1;
 
       if (this->factory_key_ == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: no factory key specified\n",
-                             this->argv_[0]),
-                            -1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%s: no factory key specified\n",
+                           this->argv_[0]),
+                          -1);
 
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (this->factory_key_,
@@ -447,12 +331,10 @@ PP_Test_Client::init (int argc, char **argv)
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "invalid factory key <%s>\n",
-                             this->factory_key_),
-                            -1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid factory key <%s>\n",
+                           this->factory_key_),
+                          -1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Factory received OK\n"));
@@ -467,21 +349,17 @@ PP_Test_Client::init (int argc, char **argv)
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->objref_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "null objref returned by factory\n"),
-                            -1);
-        }
-
-      return 0;
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "null objref returned by factory\n"),
+                          -1);
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Pluggable_Test::init");
+      ACE_TRY_ENV.print_exception ("Pluggable_Test::init");
       return -1;
     }
   ACE_ENDTRY;
-  ACE_NOTREACHED (return 0;)
+
+  return 0;
 }
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.h b/TAO/performance-tests/Pluggable/PP_Test_Client.h
index 51882c13277..ac817bf8db9 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.h
@@ -89,7 +89,7 @@ private:
   char *factory_key_;
   // Key of factory obj ref.
 
-  CORBA::ULong loop_count_;
+  u_int loop_count_;
   // Number of times to do the send operations.
 
   int shutdown_;
@@ -98,13 +98,16 @@ private:
   Pluggable_Test_Factory_var factory_;
   // factory pointer for cubit.
 
+  CORBA::Environment env_;
+  // Environment variable.
+
   Pluggable_Test_var objref_;
   // Pluggable_Test obj ref.
 
-  CORBA::ULong call_count_;
+  u_int call_count_;
   // # of calls made to functions.
 
-  CORBA::ULong error_count_;
+  u_int error_count_;
   // # of errors incurred in the lifetime of the application.
 
   FILE *factory_ior_file_;
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 1f6a7ed4bd7..c9fa75b0a74 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -90,7 +90,6 @@ PP_Test_Server::init (int argc,
       ACE_OS::fprintf (this->ior_output_file_,
                        "%s",
                        this->factory_id_.in ());
-
       ACE_OS::fclose (this->ior_output_file_);
     }
 
@@ -100,11 +99,7 @@ PP_Test_Server::init (int argc,
 int
 PP_Test_Server::run (CORBA::Environment& ACE_TRY_ENV)
 {
-  int result = this->orb_manager_.run (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (-1);
-
-  if (result == -1)
+  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "PP_Test_Server::run"),
                       -1);
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index e9b86f8e4bd..7885abab562 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -14,45 +14,34 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tPluggable_Test: server\n\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
-      int status = pp_test_server.init (argc, 
-                                        argv, 
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      int status = pp_test_server.init (argc, argv, ACE_TRY_ENV);
 
       if (status == -1)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Initialization Error\n"),
-                            -1);
+          ACE_TRY_ENV.print_exception ("Initialization Exception");
+          return -1;
         }
       else
         {
           pp_test_server.run (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-
-        return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex,
-                           "System Exception");
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_PRINT_EXCEPTION (userex,
-                           "User Exception");
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
   ACE_TIMEPROBE_PRINT;
-  ACE_NOTREACHED (return 0;)
+  return 0;
 }
diff --git a/TAO/performance-tests/TAO_Perf_Tests.dsw b/TAO/performance-tests/TAO_Perf_Tests.dsw
index 621bdcf153c..3604719516a 100644
--- a/TAO/performance-tests/TAO_Perf_Tests.dsw
+++ b/TAO/performance-tests/TAO_Perf_Tests.dsw
@@ -54,30 +54,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Latency Tests Client"=".\Latency\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Latency Tests Server"=".\Latency\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "MT_Cubit Client"=".\Cubit\TAO\MT_Cubit\client.dsp" - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/performance-tests/Thruput/Orbix/Makefile b/TAO/performance-tests/Thruput/Orbix/Makefile
index 0c22b7c128c..7a4cd12c24d 100644
--- a/TAO/performance-tests/Thruput/Orbix/Makefile
+++ b/TAO/performance-tests/Thruput/Orbix/Makefile
@@ -34,7 +34,7 @@ ttcp.h ttcpC.$(C++SUFFIX) ttcpS.$(C++SUFFIX):ttcp.idl
 .PHONY:	clean
 
 clean:
-	$(RM) core *.o *~ client server *C.cpp *S.cpp ttcp.h
+	rm -f core *.o *~ client server *C.cpp *S.cpp ttcp.h
 
 checkin:
 	ci ttcp.idl
@@ -44,7 +44,7 @@ checkin:
 	ci Client.cpp
 	ci ttcp_decl.h
 	ci utils.cpp
-	$(RM) core *.o *~ client server *C.cpp *S.cpp ttcp.h
+	rm -f core *.o *~ client server *C.cpp *S.cpp ttcp.h
 
 checkout:
 	co -l ttcp.idl
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index 7c9d811027f..b1c5b0cc119 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -30,7 +30,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -173,25 +172,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -239,9 +229,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -321,7 +315,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- ttcpC.i
+ ttcpC.i ttcpS.h ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
 .obj/ttcpS.o .obj/ttcpS.so .shobj/ttcpS.o .shobj/ttcpS.so: ttcpS.cpp ttcpS.h ttcpC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -431,25 +425,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -497,9 +482,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -694,25 +683,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -760,9 +740,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -958,25 +942,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1024,9 +999,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1224,25 +1203,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1290,9 +1260,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1482,25 +1456,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1548,9 +1513,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1745,25 +1714,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1811,9 +1771,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp
index a2e599fd155..2a2bc2b239c 100644
--- a/TAO/performance-tests/Thruput/TAO/client.cpp
+++ b/TAO/performance-tests/Thruput/TAO/client.cpp
@@ -4,7 +4,7 @@
 //
 // = TAO tests
 //    Throughput measurement using the TTCP benchmark adapted to work
-//    using TAO
+//    using TAO 
 //
 // = FILENAME
 //   client.cpp
@@ -47,7 +47,7 @@ CORBA::Long buflen = 8 * 1024;  // length of buffer, default 8,192 bytes
 CORBA::Char *buf;               // ptr to dynamic buffer
 CORBA::Long nbuf;               // number of buffers to send in sinkmode
 CORBA::Short port = TAO_DEFAULT_SERVER_PORT;    // TCP port number
-const char* host = "localhost";              // ptr to name of host
+CORBA::Char *host = "localhost";              // ptr to name of host
 CORBA::Long verbose = 0;        // 0=print basic info, 1=print cpu
                                 // rate, proc resource usage.
 CORBA::Char fmt = 'K';          // output
@@ -76,12 +76,16 @@ main (int argc, char *argv[])
 
   int c;
   CORBA::ORB_ptr        orb_ptr;   // underlying ORB
+  CORBA::String  objkey = "TTCP_IIOP_test"; // name of the TTCP object on the
                                             // server
   CORBA::Object_ptr     objref = CORBA::Object::_nil(); // object reference
   ttcp_sequence_ptr     ttcp_seq = 0;  // obj reference to TTCP object
+  CORBA::Environment    env;       // environment
+
+  ACE_UNUSED_ARG (objkey);
 
   // parse the arguments
-  ACE_Get_Opt get_opt (argc, argv, "d:vm:l:L:S:q:i:f:");
+  ACE_Get_Opt get_opt (argc, argv, "d:vm:l:L:S:q:i:f:"); // Command line options
   TAO_debug_level = 0;
   while ((c = get_opt ()) != -1)
     {
@@ -143,103 +147,114 @@ main (int argc, char *argv[])
         }
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  //
+  // Transmitter
+  //
+
+  // get a handle to the ORB
+  orb_ptr = CORBA::ORB_init (argc, argv, "internet", env);
+  if (env.exception () != 0)
     {
-      //
-      // Transmitter
-      //
-      
-      // get a handle to the ORB
-      orb_ptr = CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("ORB initialization", stdout);
+      return -1;
+    }
 
-      ACE_DEBUG ((LM_DEBUG, "Read IOR string as: %s\n" , ior));
+  ACE_DEBUG ((LM_DEBUG, "Read IOR string as: %s\n" , ior));
+
+  // retrieve an object reference out of the stringified IOR
+  objref = orb_ptr->string_to_object (ior, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("string_to_object", stdout);
+      return -1;
+    }
 
-      // retrieve an object reference out of the stringified IOR
-      objref = orb_ptr->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (!CORBA::is_nil (objref))
+    {
+      // if it is a valid obj ref, narrow it to a ttcp_sequence CORBA object
+      ttcp_seq = ttcp_sequence::_narrow (objref, env);
+      if (env.exception () != 0)
+        {
+          env.print_exception ("ttcp_sequence::_narrow");
+          return  -1;
+        }
 
-      if (!CORBA::is_nil (objref))
+      if (!CORBA::is_nil (ttcp_seq))
         {
-          // if it is a valid obj ref, narrow it to a ttcp_sequence
-          // CORBA object 
-          ttcp_seq = ttcp_sequence::_narrow (objref, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
 
-          if (!CORBA::is_nil (ttcp_seq))
+          // the number of iterations is based on the total data size and the
+          // individual buffer size sent
+          nbuf = srcDataSize/buflen;
+          ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n",
+                      srcDataSize, buflen, nbuf));
+
+          //
+          // Prepare the Message to be sent
+          //
+
+
+          // first allocate a buffer of the desired size and alignment
+          errno = 0;
+          if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
+            err ("malloc");
+
+          // fill the buffer with the data type to be sent
+          FillPattern (buf, buflen, dt);
+
+          //
+          // Start the timers on the client and server sides
+          //
+
+          prep_timer ();  // start our time
+          env.clear ();
+          ttcp_seq->start_timer (env); // ask the server to start its timer
+          if (env.exception () != 0)
             {
-              // the number of iterations is based on the total data size and the
-              // individual buffer size sent
-              nbuf = srcDataSize/buflen;
-              ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n",
-                          srcDataSize, buflen, nbuf));
-
-              //
-              // Prepare the Message to be sent
-              //
-
-              
-              // first allocate a buffer of the desired size and alignment
-              errno = 0;
-              if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
-                err ("malloc");
-
-              // fill the buffer with the data type to be sent
-              FillPattern (buf, buflen, dt);
-
-              //
-              // Start the timers on the client and server sides
-              //
-
-              prep_timer ();  // start our time
-              // ask the server to start its timer
-              ttcp_seq->start_timer (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              env.print_exception ("start_timer operation", stdout);
+              return -1;
+            }
 
 #if defined (ACE_HAS_QUANTIFY)
-              /* start recording quantify data from here */
-              quantify_clear_data ();
-              quantify_start_recording_data ();
+          /* start recording quantify data from here */
+          quantify_clear_data ();
+          quantify_start_recording_data ();
 #endif /* ACE_HAS_QUANTIFY */
-              // send the same buffer nbuf times
-              while (nbuf--)
+          // send the same buffer nbuf times
+          while (nbuf--)
+            {
+              switch (dt){
+              case SEND_SHORT:
+                ttcp_seq->sendShortSeq (*sseq, env);
+                nbytes += sseq->length () * sizeof (CORBA::Short);
+                break;
+              case SEND_LONG:
+                ttcp_seq->sendLongSeq (*lseq, env);
+                nbytes += lseq->length () * sizeof (CORBA::Long);
+                break;
+              case SEND_OCTET:
+                ttcp_seq->sendOctetSeq (*oseq, env);
+                nbytes += oseq->length () * sizeof (CORBA::Octet);
+                break;
+              case SEND_DOUBLE:
+                ttcp_seq->sendDoubleSeq (*dseq, env);
+                nbytes += dseq->length () * sizeof (CORBA::Double);
+                break;
+              case SEND_CHAR:
+                ttcp_seq->sendCharSeq (*cseq, env);
+                nbytes += cseq->length () * sizeof (CORBA::Char);
+                break;
+              case SEND_STRUCT:
+                ttcp_seq->sendStructSeq (*Sseq, env);
+                nbytes += Sseq->length () * sizeof (BinStruct);
+                break;
+              }
+              numCalls++; // nbytes and numCalls are used in the thruput
+                          // measurement
+              if (env.exception () != 0)
                 {
-                  switch (dt)
-                    {
-                    case SEND_SHORT:
-                      ttcp_seq->sendShortSeq (*sseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += sseq->length () * sizeof (CORBA::Short);
-                      break;
-                    case SEND_LONG:
-                      ttcp_seq->sendLongSeq (*lseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += lseq->length () * sizeof (CORBA::Long);
-                      break;
-                    case SEND_OCTET:
-                      ttcp_seq->sendOctetSeq (*oseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += oseq->length () * sizeof (CORBA::Octet);
-                      break;
-                    case SEND_DOUBLE:
-                      ttcp_seq->sendDoubleSeq (*dseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += dseq->length () * sizeof (CORBA::Double);
-                      break;
-                    case SEND_CHAR:
-                      ttcp_seq->sendCharSeq (*cseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += cseq->length () * sizeof (CORBA::Char);
-                      break;
-                    case SEND_STRUCT:
-                      ttcp_seq->sendStructSeq (*Sseq, ACE_TRY_ENV);
-                      ACE_TRY_CHECK;
-                      nbytes += Sseq->length () * sizeof (BinStruct);
-                      break;
-                  }
-                  numCalls++; // nbytes and numCalls are used in the thruput
-                  // measurement
+                  env.print_exception ("send operation", stdout);
+                  return -1;
                 }
             }
 #if defined (ACE_HAS_QUANTIFY)
@@ -249,27 +264,24 @@ main (int argc, char *argv[])
           // Stop the timer
           //
           // stop the timer on the server side
-          ttcp_seq->stop_timer (ACE_TRY_ENV);
-
+          ttcp_seq->stop_timer (env);
+          if (env.exception () != 0)
+            {
+              env.print_exception ("stop_timer operation", stdout);
+              return -1;
+            }
           // stop our timer
           (void) read_timer (stats, sizeof (stats));
 
           // print results
           PrintStats();
         }
-
-      CORBA::release (ttcp_seq);
-      CORBA::release (objref);
-      CORBA::release (orb_ptr);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-      return -1;
     }
-  ACE_ENDTRY;
 
-  return 0;
+  CORBA::release (ttcp_seq);
+  CORBA::release (objref);
+  CORBA::release (orb_ptr);
+  return (0);
 }
 
 int print_usage (void)
diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp
index 62f593b0683..d93e19dc742 100644
--- a/TAO/performance-tests/Thruput/TAO/server.cpp
+++ b/TAO/performance-tests/Thruput/TAO/server.cpp
@@ -4,7 +4,7 @@
 //
 // = TAO tests
 //    Throughput measurement using the TTCP benchmark adapted to work
-//    using TAO
+//    using TAO 
 //
 // = FILENAME
 //   server.cpp
@@ -67,141 +67,168 @@ main (int argc, char **argv)
 {
 
   int c;                      // option
+  CORBA::Environment env;     // environment
   CORBA::ORB_var     orb_var; // handle to the ORB
   PortableServer::POA_var root_poa; // Object adapter
+  CORBA::String      key = (CORBA::String) "key0"; // key assigned to our
+                                                   // target object
   CORBA::Object_var obj_var;
-  const char *oa_name = "RootPOA"; // name of our OA
-  const char *orb_name = "internet"; // name of our ORB
+  char              *oa_name = "RootPOA"; // name of our OA
+  char              *orb_name = "internet"; // name of our ORB
   CORBA::String      str; // for stringified representation of the object reference
   FILE *ior_file = 0;
 
+  ACE_UNUSED_ARG (key);
+
   // initialize the underlying ORB and get a handle to it
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  orb_var = CORBA::ORB_init (argc, argv, orb_name, env);
+  if (env.exception () != 0)
     {
-      orb_var = CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      obj_var = orb_var->resolve_initial_references(oa_name,
-                                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil(obj_var.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          -1);
-
-      root_poa = PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      PortableServer::POA_var good_poa =
-        root_poa->create_POA ("child_poa",
-                              poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // for parsing the arguments
-      ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:o:");
-
-      TAO_debug_level = 0;
-      for (; (c = get_opt ()) != EOF;)
-        {
-          switch (c)
-            {
-            case 'L':
-              // title of output file that stores result
-              title = ACE_OS::strdup (get_opt.optarg);
-              break;
-            case 'd':
-              // debugging level
-              TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
-              if (TAO_debug_level > 10)
-                TAO_debug_level = 10;
-              break;
-            case 'f':
-              // output format i.e., Mbps, Kbps, etc
-              fmt = *get_opt.optarg;
-              break;
-            case 'o':
-              ior_file = ACE_OS::fopen (get_opt.optarg,"w");
-              ACE_DEBUG ((LM_DEBUG,"ior_file is %s\n",get_opt.optarg));
-              break;
-            }
-        }
-      
-      //
-      // Receiver
-      //
-
-      // create an instance of an object implementing the "ttcp" interface
-      my_ttcp = new ttcp_sequence_i; // this is its name
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("TTCP_IIOP_test");
-      good_poa->activate_object_with_id (id.in (),
-                                         my_ttcp,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      obj_var = good_poa->id_to_reference (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // get a stringified representation of the object reference
-      // created above
-      str = orb_var->object_to_string (obj_var.in (),
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
-        }
-      
-      if (ior_file != 0)
+      env.print_exception ("ORB init");
+      return 1;
+    }
+
+  obj_var = orb_var->resolve_initial_references(oa_name);
+
+  if (CORBA::is_nil(obj_var.in()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " (%P|%t) Unable to initialize the POA.\n"),
+                      -1);
+
+  root_poa = PortableServer::POA::_narrow (obj_var.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA init");
+      return 1;
+    }
+
+  PortableServer::POAManager_var poa_manager =
+    root_poa->the_POAManager (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA manager");
+      return 1;
+    }
+
+  CORBA::PolicyList policies (2);
+  policies.length (2);
+  policies[0] =
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID,
+                                           env);
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
+                                      env);
+
+  // We use a different POA, otherwise the user would have to
+  // change the object key each time it invokes the server.
+  PortableServer::POA_var good_poa =
+    root_poa->create_POA ("child_poa",
+                          poa_manager.in (),
+                          policies,
+                          env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("create good poa");
+      return 1;
+    }
+
+  // for parsing the arguments
+  ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:o:");
+
+  TAO_debug_level = 0;
+  for (; (c = get_opt ()) != EOF;)
+    {
+      switch (c)
         {
-          // write ior to a file
-          ACE_OS::fprintf (ior_file,"%s",str);
-          ACE_OS::fclose (ior_file);
+        case 'L':
+          // title of output file that stores result
+          title = ACE_OS::strdup (get_opt.optarg);
+          break;
+        case 'd':
+          // debugging level
+          TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
+          if (TAO_debug_level > 10)
+            TAO_debug_level = 10;
+          break;
+        case 'f':
+          // output format i.e., Mbps, Kbps, etc
+          fmt = *get_opt.optarg;
+          break;
+        case 'o':
+          ior_file = ACE_OS::fopen (get_opt.optarg,"w");
+          ACE_DEBUG ((LM_DEBUG,"ior_file is %s\n",get_opt.optarg));
+          break;
         }
+    }
 
-#if defined (ACE_HAS_QUANTIFY)
-      // gather profile data
-      quantify_clear_data();
-      quantify_start_recording_data();
-#endif /* ACE_HAS_QUANTIFY */
-      
-      // Handle requests for this object until we're killed, or one of the
-      // methods asks us to exit.
-      if (orb_var->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
+  //
+  // Receiver
+  //
+
+  // create an instance of an object implementing the "ttcp" interface
+  my_ttcp = new ttcp_sequence_i; // this is its name
+
+  PortableServer::ObjectId_var id =
+    PortableServer::string_to_ObjectId ("TTCP_IIOP_test");
+  good_poa->activate_object_with_id (id.in (),
+                                     my_ttcp,
+                                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("string_to_ObjectId");
+      return 1;
+    }
+
+  obj_var = good_poa->id_to_reference (id.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("id_to_reference");
+      return 1;
     }
-  ACE_CATCHANY
+
+  poa_manager->activate (env);
+
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "server");
+      env.print_exception ("id_to_reference");
       return 1;
     }
-  ACE_ENDTRY;
+
+  // get a stringified representation of the object reference created above
+  str = orb_var->object_to_string (obj_var.in (),
+                                   env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("object_to_string");
+      return 1;
+    }
+
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
+    }
+
+  if (ior_file != 0)
+    {
+      // write ior to a file
+      ACE_OS::fprintf (ior_file,"%s",str);
+      ACE_OS::fclose (ior_file);
+    }
+
+#if defined (ACE_HAS_QUANTIFY)
+  // gather profile data
+  quantify_clear_data();
+  quantify_start_recording_data();
+#endif /* ACE_HAS_QUANTIFY */
+
+  // Handle requests for this object until we're killed, or one of the
+  // methods asks us to exit.
+  if (orb_var->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
 
   return 0;
 }
diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
index 8271e8111c7..917724f19f2 100644
--- a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
+++ b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
@@ -30,8 +30,8 @@
 /**************
 // Prototypes
 ***************/
-int err (const char *s);
-void mes (const char *s);
+int err (CORBA::Char *s);
+void mes (CORBA::Char *s);
 CORBA::String outfmt (CORBA::Double b);
 void prep_timer (void);
 CORBA::Double read_timer (CORBA::Char *str, CORBA::Long len);
@@ -50,7 +50,7 @@ extern ACE_Svc_Export CORBA::Long buflen;               /* length of buffer */
 extern ACE_Svc_Export CORBA::Char *buf;         /* ptr to dynamic buffer */
 extern ACE_Svc_Export CORBA::Long nbuf;         /* number of buffers to send in sinkmode */
 extern ACE_Svc_Export CORBA::Short port;                /* TCP port number */
-extern ACE_Svc_Export const char *host;              /* ptr to name of host */
+extern ACE_Svc_Export CORBA::Char *host;              /* ptr to name of host */
 extern ACE_Svc_Export CORBA::Long verbose;                      /* 0=print basic info, 1=prCORBA::Long cpu rate, proc
                                  * resource usage. */
 extern ACE_Svc_Export CORBA::Char fmt;          /* output format:k=kilobits,K=kilobytes,
@@ -75,3 +75,4 @@ extern ACE_Svc_Export ttcp_sequence::StructSeq          *Sseq;
 //extern ACE_Svc_Export ttcp_sequence::RtiPacketSeq *rtipacketSeq;
 
 #endif /* _TTCP_DECL_H_ */
+
diff --git a/TAO/performance-tests/Thruput/TAO/utils.cpp b/TAO/performance-tests/Thruput/TAO/utils.cpp
index ceec3f5a52c..877546b5573 100644
--- a/TAO/performance-tests/Thruput/TAO/utils.cpp
+++ b/TAO/performance-tests/Thruput/TAO/utils.cpp
@@ -25,7 +25,7 @@ ACE_RCSID(TAO, utils, "$Id$")
 
 // the error function.
 // displays the error message and exits
-int err (const char* s)
+int err (CORBA::String s)
 {
   ACE_OS::fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
   ACE_OS::perror (s);
@@ -34,7 +34,7 @@ int err (const char* s)
 }
 
 // prints a message indicating if it is a transmitter or a receiver
-void mes (const char* s)
+void mes (CORBA::String s)
 {
   ACE_OS::fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
 }
@@ -152,7 +152,7 @@ FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong
            SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
        }
        Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
-
+       
     }
     break;
   case SEND_COMPOSITE:
@@ -171,10 +171,10 @@ FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong
        SeqPtr [i].packetHeader.federationHandle = 2;
        SeqPtr [i].packetHeader.channelHandle = 3;
        SeqPtr [i].packetHeader.packetColor = 4;
-
+       
        SeqPtr [i].msgs.length (numUpdates);
-
-       for (int j = 0; j < numUpdates; ++j)
+       
+       for (int j = 0; j < numUpdates; ++j) 
 	 {
 	   SeqPtr [i].msgs[j].oumh (RtiObjectUpdateMessageHeader ());
 	   RtiObjectUpdateMessageHeader & oumh = SeqPtr [i].msgs[j].oumh ();
@@ -190,8 +190,8 @@ FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong
 	   oumh.transportationHandle = 1;
 	   oumh.orderingHandle = 1;
 	   oumh.messagePayload.length (numAttrs);
-
-	   for (int k = 0; k < numAttrs; ++k)
+  	   
+	   for (int k = 0; k < numAttrs; ++k) 
 	     {
 	       oumh.messagePayload[k] = HandleValuePair ();
 	       HandleValuePair &hvp = oumh.messagePayload[k];
@@ -208,8 +208,8 @@ FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong
      }
      rtipacketSeq = new ttcp_sequence::RtiPacketSeq (num, num, SeqPtr);
 
-   }*/
-
+   }*/ 
+ 
     break;
   case SEND_OCTET:
   default:
@@ -339,17 +339,17 @@ read_timer (CORBA::Char *str, CORBA::Long len)
 {
   char line[132];
   ACE_Profile_Timer::ACE_Elapsed_Time et;
-
+ 
   ru0.stop ();
   ru0.elapsed_time (et);
 
   prusage (line);
   (void) strncpy (str, line, len);
-
-  //Get real time
+  
+  //Get real time 
   realt = et.real_time;
-
-  //Get CPU time (user+sys)
+ 
+  //Get CPU time (user+sys) 
   cput = et.user_time + et.system_time;
   if (cput < 0.00001)
     cput = 0.00001;
@@ -361,24 +361,24 @@ void
 prusage (char *outp)
 {
   register ACE_timer_t t, ms;
-  register const char *cp;
+  register char *cp;
   register int i;
 
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   ACE_Profile_Timer::Rusage rusage;
   ru0.elapsed_time (et);
   ru0.elapsed_rusage (rusage);
-
+  
   t = et.user_time + et.system_time;
-  ms = et.real_time;
-
+  ms = et.real_time; 
+  
 #define END(x)  {while(*x) x++;}
 #if defined(SYSV)
   cp = "%Uuser %Ssys %Ereal %P";
 #else
 #if defined(sgi)                /* IRIX 3.3 will show 0 for %M,%F,%R,%C */
   cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
+#else 
   cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
 #endif
 #endif
@@ -394,7 +394,7 @@ prusage (char *outp)
             ACE_OS::sprintf (outp, "%f ", et.user_time);
             END (outp);
             break;
-
+	    
           case 'S':
 	    ACE_OS::sprintf (outp, "%f ", et.system_time);
             END (outp);
@@ -411,7 +411,7 @@ prusage (char *outp)
             break;
 
 	    /*possible thing to add in is the equivalent for case X, D, K, M, F, and R for prusage_t*/
-#if !defined(SYSV)
+#if !defined(SYSV) 
 #   if defined (ACE_HAS_PRUSAGE_T)
           case 'W':
             i = rusage.pr_nswap;;
@@ -513,7 +513,7 @@ prusage (char *outp)
             ACE_OS::sprintf (outp, "%d", rusage.ru_oublock);
             END (outp);
             break;
-
+          
 	  case 'C':
 	    ACE_OS::sprintf (outp, "%d+%d", rusage.ru_nvcsw, rusage.ru_nivcsw);
             END (outp);
@@ -588,3 +588,12 @@ read_timer (CORBA::Char *str, CORBA::Long len)
 }
 
 #endif /* ! ACE_HAS_PRUSAGE_T || ! ACE_HAS_GETRUSAGE */
+
+
+
+
+
+
+
+
+
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 6085c158beb..af188ba6a4e 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -26,6 +26,13 @@ ifeq ($(findstring g++,$(CXX)),g++)
     #### g++ < 2.8 complains about unused parameters in generated code.
     CCFLAGS += -Wno-unused
   endif # g++ < 2.8
+
+  ifneq ($(findstring egcs-2.91,$(shell $(CXX) --version)),)
+    #### egcs 2.91.57 seems to go overboard:
+    ####   DynAny_i.cpp:565: warning: `class TAO_DynAny_i * this' might be
+    ####   used uninitialized in this function
+    CCFLAGS += -Wno-uninitialized
+  endif # egcs 2.91.x
 endif # g++
 
 
@@ -38,6 +45,9 @@ IDL_EXT2=Cli.h Cli.i Cli.cpp Ser.h Ser.i Ser.cpp Ser_T.h Ser_T.i Ser_T.cpp
 .SUFFIXES: $(IDL_EXT)
 
 ifneq ($(use_flick),1)
+ifneq ($(tao_native_exception),1)
+TAO_IDLFLAGS += -Ge 1
+endif
 $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(TAO_IDL)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $<
 else
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index d1e0ff792c1..9906e5a9cc0 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -2,9 +2,11 @@
 // $Id$
 
 #include "tao/Acceptor_Registry.h"
+#include "tao/Pluggable.h"
 #include "tao/Stub.h"
 #include "tao/Environment.h"
 #include "tao/GIOP.h"
+#include "tao/Protocol_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/params.h"
 #include "tao/MProfile.h"
@@ -19,13 +21,11 @@
 ACE_RCSID(tao, Acceptor_Registry, "$Id$")
 
 TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
-  : acceptors_ ()
 {
 }
 
 TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void)
 {
-  this->close_all ();
 }
 
 size_t
@@ -57,6 +57,7 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
 int
 TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
 {
+
   TAO_AcceptorSetItor end = this->end ();
 
   for (TAO_AcceptorSetItor i = this->begin (); i != end; ++i)
@@ -73,7 +74,6 @@ TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
             return 1;
         }
     }
-
   return 0;
 }
 
@@ -92,7 +92,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
   if (first_endpoint == last_endpoint)
     {
       // No endpoints were specified, we let each protocol pick its
-      // own default.
+      // own default...
 
       // All TAO pluggable protocols are expected to have the ability
       // to create a default endpoint.
@@ -108,8 +108,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
     {
       ACE_CString iop = (*endpoint);
 
-      // IOP://address1,address2//
-      //    ^ slot
       int slot = iop.find ("://", 0);
       if (slot == iop.npos)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -119,72 +117,60 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
                           -1);
       ACE_CString prefix = iop.substring (0, slot);
 
-      // @@ We could move the protocol factory loop to the outermost
-      //    level but for now we leave it inside the endpoint loop
-      //    under the assumption that there will be more endpoints
-      //    than protocols.
+      // IOP://address1,address2//
+      //    ^ slot
+      // check for the presence of addresses.  Get length and subtract
+      // 3 for the three chars ://
+      if (slot == ACE_static_cast (int, iop.length () - 3))
+        {
+          // Protocol was specified without an endpoint.  According to
+          // the "iioploc" spec, this is valid.  As such, we extend
+          // this feature to all pluggable protocols.  All TAO
+          // pluggable protocols are expected to have the ability to
+          // create a default endpoint.
+
+          (void) this->open_default (orb_core, &prefix);
+          continue;
+        }
+
+      // increment slot past the "://" (i.e. add 3)
+      ACE_CString addrs  = iop.substring (slot + 3);
 
-      // Now get the list of available protocol factories.
-      TAO_ProtocolFactorySetItor end =
-        orb_core->protocol_factories ()->end ();
+      if (addrs [addrs.length () - 1] == '/')
+        // Get rid of trailing '/'.
+        addrs [addrs.length () - 1] = '\0';
 
-      int found = 0;
-      // If usable protocol (factory) is found then this will be
-      // set equal to 1.
+      char *last_addr=0;
+      addr_str.reset (addrs.rep ());
 
-      for (TAO_ProtocolFactorySetItor factory =
-             orb_core->protocol_factories ()->begin ();
-           factory != end;
-           ++factory)
+      for (char *astr = ACE_OS::strtok_r (addr_str.get (),
+                                          ",",
+                                          &last_addr);
+           astr != 0 ;
+           astr = ACE_OS::strtok_r (0,
+                                    ",",
+                                    &last_addr))
         {
-          if ((*factory)->factory ()->match_prefix (prefix))
-            {
-              found = 1;  // A usable protocol was found.
+          ACE_CString address (astr);
 
-              // check for the presence of addresses.  Get length and
-              // subtract  3 for the three chars `://'
-              if (slot == ACE_static_cast (int, iop.length () - 3))
-                {
-                  // Protocol was specified without an endpoint.
-                  // According to the "iioploc" spec, this is valid.
-                  // As such, we extend this feature to all pluggable
-                  // protocols.  All TAO pluggable protocols are
-                  // expected to have the ability to create a default
-                  // endpoint.
-
-                  if (this->open_default (orb_core, factory) == 0)
-                    continue;
-                  else
-                    return -1;  // Problem creating default server.
-                }
+          // Now get the list of avaliable protocol factories.
+          TAO_ProtocolFactorySetItor end =
+            orb_core->protocol_factories ()->end ();
 
-              // increment slot past the "://" (i.e. add 3)
-              ACE_CString addrs = iop.substring (slot + 3);
-
-              // @@ Should we check for something else besides '/',
-              // i.e. make it protocol dependent?  -- Ossama
-              if (addrs [addrs.length () - 1] == '/')
-                // Get rid of trailing '/'.
-                addrs [addrs.length () - 1] = '\0';
-
-              char *last_addr=0;
-              addr_str.reset (addrs.rep ());
-
-              // Iterate over the addrs specified in the endpoint.
-              for (char *astr = ACE_OS::strtok_r (addr_str.get (),
-                                                  ",",
-                                                  &last_addr);
-                   astr != 0 ;
-                   astr = ACE_OS::strtok_r (0,
-                                            ",",
-                                            &last_addr))
+          for (TAO_ProtocolFactorySetItor factory =
+                 orb_core->protocol_factories ()->begin ();
+               factory != end;
+               ++factory)
+            {
+              if ((*factory)->factory ()->match_prefix (prefix))
                 {
-                  ACE_CString address (astr);
-
                   TAO_Acceptor *acceptor =
                     (*factory)->factory ()->make_acceptor ();
                   if (acceptor != 0)
                     {
+                      // add acceptor to list.
+                      this->acceptors_.insert (acceptor);
+
                       // Check if an "N.n@" version prefix was
                       // specified.
                       // @@ For now, we just drop the version prefix.
@@ -206,54 +192,33 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
                       if (acceptor->open (orb_core,
                                           major, minor,
                                           address) == -1)
-                        {
-                          delete acceptor;
-
-                          return -1;
-                        }
-
-                      // add acceptor to list.
-                      if (this->acceptors_.insert (acceptor) == -1)
-                        {
-                          delete acceptor;
-
-                          ACE_ERROR_RETURN ((LM_ERROR,
-                                             "TAO (%P|%t) unable to add <%s> "
-                                             "to acceptor registry.\n",
-                                             address.c_str ()),
-                                            -1);
-                        }
+                        return -1;
+                      break;
                     }
                   else
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "TAO (%P|%t) unable to create "
-                                         "an acceptor for <%s>\n",
-                                         iop.c_str ()),
-                                        -1);
-                    }
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                       "(%P|%t) Unable to create an "
+                                       "acceptor for <%s>\n",
+                                       iop.c_str ()),
+                                      -1);
                 }
+              else
+                continue;
             }
-          else
-            continue;
-        }
-
-      if (found == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) no usable transport protocol "
-                             "was found\n"),
-                            -1);
         }
     }
-
   return 0;
 }
 
-// Iterate through the loaded transport protocols and create a default 
-// server for each protocol.
-int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core)
+// Used when no endpoints were specified.  Open a default server
+// for the indicated protocol.
+int
+TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
+                                     ACE_CString *protocol_prefix)
 {
+  // No endpoints were specified, we let each protocol pick its own
+  // default...
+
   TAO_ProtocolFactorySetItor end =
     orb_core->protocol_factories ()->end ();
 
@@ -263,61 +228,58 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core)
        i != end;
        ++i)
     {
-      if (this->open_default (orb_core, i) != 0)
-        return -1;
-    }
-
-  return 0;
-}
-
-// Used when no endpoints were specified.  Open a default server for
-// the indicated protocol.
-int
-TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
-                                     TAO_ProtocolFactorySetItor &factory)
-{
-  // No endpoints were specified, we let each protocol pick its own
-  // default endpoint.
-
-  // Make an acceptor
-  TAO_Acceptor *acceptor =
-    (*factory)->factory ()->make_acceptor ();
-
-  if (acceptor == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) unable to create "
-                    "an acceptor for <%s>\n",
-                    (*factory)->protocol_name ().c_str ()));
+      if (protocol_prefix != 0)
+        {
+          if (!(*i)->factory ()->match_prefix (*protocol_prefix))
+            {
+              // If we have no matching protocol then keep searching
+              // for one until the entire list of protocols has been
+              // searched.
+
+              if (TAO_debug_level > 0)
+                ACE_ERROR ((LM_ERROR,
+                            "TAO (%P|%t) Unable to match protocol prefix "
+                            "for <%s>\n",
+                            protocol_prefix->c_str ()));
+              continue;
+            }
+        }
 
-      return -1;
-    }
+      // got it, make an acceptor
+      TAO_Acceptor *acceptor =
+        (*i)->factory ()->make_acceptor ();
 
-  // Initialize the acceptor to listen on a default endpoint.
-  if (acceptor->open_default (orb_core) == -1)
-    {
-      delete acceptor;
+      if (acceptor == 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_ERROR ((LM_ERROR,
+                        "TAO (%P|%t) unable to create "
+                        "an acceptor for <%s>\n",
+                        (*i)->protocol_name ().c_str ()));
+          continue;
+        }
 
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) unable to open "
-                    "default acceptor for <%s>%p\n",
-                    (*factory)->protocol_name ().c_str (), ""));
+      // initialize the acceptor to listen on the default endpoint.  For IIOP
+      // this will just be the default interface and let the kernel pick a port for
+      // us.
+      if (acceptor->open_default (orb_core) == -1)
+        {
+          if (TAO_debug_level > 0)
+            ACE_ERROR ((LM_ERROR,
+                        "TAO (%P|%t) unable to open "
+                        "default acceptor for <%s>%p\n",
+                        (*i)->protocol_name ().c_str (), ""));
+          continue;
+        }
 
-      return -1;
+      this->acceptors_.insert (acceptor);
     }
 
-  if (this->acceptors_.insert (acceptor) == -1)
+  if (this->acceptors_.size () == 0)
     {
-      delete acceptor;
-
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                           "TAO (%P|%t) unable to add <%s> default_acceptor "
-                           "to acceptor registry.\n",
-                           (*factory)->protocol_name ().c_str ()));
-
+                    "TAO (%P%t) cannot create any default acceptor\n"));
       return -1;
     }
 
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index b8d29e1dc69..19fd16bc9d4 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -23,8 +23,6 @@
 #include "tao/Pluggable.h"
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
-#include "tao/Resource_Factory.h"
-
 #include "ace/Containers_T.h"
 
 // Forward declarations.
@@ -35,6 +33,7 @@ class TAO_ORB_Core;
 class TAO_Stub;
 class TAO_Profile;
 class TAO_MProfile;
+class TAO_Resource_Factory;
 
 typedef ACE_Unbounded_Set<TAO_Acceptor*>
         TAO_AcceptorSet;
@@ -83,12 +82,9 @@ public:
   TAO_AcceptorSetItor end (void);
 
 private:
-  int open_default (TAO_ORB_Core *orb_core);
-  // Create a default acceptor for all loaded protocols.
-
   int open_default (TAO_ORB_Core *orb_core,
-                    TAO_ProtocolFactorySetItor &factory);
-  // Create a default acceptor using the specified protocol factory.
+                    ACE_CString *protocol_prefix = 0);
+  // Create an acceptor with a default endpoint.
 
 private:
   TAO_AcceptorSet acceptors_;
diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i
index eb5e463892b..de27ebba1e0 100644
--- a/TAO/tao/Acceptor_Registry.i
+++ b/TAO/tao/Acceptor_Registry.i
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 ACE_INLINE TAO_AcceptorSetItor
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp
index 2f75e2e5e5c..985860128e1 100644
--- a/TAO/tao/Active_Object_Map.cpp
+++ b/TAO/tao/Active_Object_Map.cpp
@@ -20,7 +20,7 @@ TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
 }
 
 /* static */
-size_t TAO_Active_Object_Map::system_id_size_ = 0;
+size_t TAO_Active_Object_Map::system_id_size_ (0);
 
 void
 TAO_Active_Object_Map::set_system_id_size
@@ -289,38 +289,6 @@ TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
   delete this->user_id_map_;
 }
 
-int
-TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                                          int &deactivated)
-{
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->servant_ == 0)
-        {
-          result = 0;
-        }
-      else
-        {
-          result = 1;
-          if (entry->deactivated_)
-            {
-              deactivated = 1;
-            }
-        }
-    }
-  else
-    {
-      result = 0;
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
 {
 }
@@ -332,26 +300,12 @@ TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active
 }
 
 int
-TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
-                                           int &deactivated)
+TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      result = 1;
-      if (entry->deactivated_)
-        {
-          deactivated = 1;
-        }
-    }
+  if (this->active_object_map_->servant_map_->find (servant) == 0)
+    return 1;
   else
-    {
-      result = 0;
-    }
-
-  return result;
+    return 0;
 }
 
 int
@@ -482,8 +436,7 @@ TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant)
 ////////////////////////////////////////////////////////////////////////////////
 
 int
-TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant,
-                                             int &)
+TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant servant)
 {
   return -1;
 }
@@ -680,8 +633,8 @@ TAO_Id_Assignment_Strategy::set_active_object_map (TAO_Active_Object_Map *active
 }
 
 int
-TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant,
-                                            TAO_Active_Object_Map::Map_Entry *&)
+TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
+                                            TAO_Active_Object_Map::Map_Entry *&entry)
 {
   return -1;
 }
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index b33613a59ce..bb5a2329475 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -79,12 +79,10 @@ public:
   ~TAO_Active_Object_Map (void);
   // Destructor.
 
-  int is_servant_in_map (PortableServer::Servant servant,
-                         int &deactivated);
+  int is_servant_in_map (PortableServer::Servant servant);
   // Must be used with UNIQUE_ID policy.
 
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                         int &deactivated);
+  int is_user_id_in_map (const PortableServer::ObjectId &user_id);
   // Can be used with any policy.  With the SYSTEM_ID policy,
   // <user_id> is actually <system_id>.
 
@@ -249,8 +247,7 @@ public:
   virtual ~TAO_Id_Uniqueness_Strategy (void);
   // Virtual destructor.
 
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated) = 0;
+  virtual int is_servant_in_map (PortableServer::Servant servant) = 0;
   // Must be used with UNIQUE_ID policy.
 
   virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id) = 0;
@@ -295,8 +292,7 @@ class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy
   //     Strategy for the UNIQUE_ID policy.
 public:
 
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
+  virtual int is_servant_in_map (PortableServer::Servant servant);
   // Must be used with UNIQUE_ID policy.
 
   virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
@@ -333,8 +329,7 @@ class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy
   //     Strategy for the MULTIPLE_ID policy.
 public:
 
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
+  virtual int is_servant_in_map (PortableServer::Servant servant);
   // Must be used with UNIQUE_ID policy.
 
   virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
index bd51f904236..4dcfd2777a6 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/Active_Object_Map.i
@@ -1,11 +1,28 @@
 // $Id$
 
 ACE_INLINE int
-TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
-                                          int &deactivated)
+TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant)
 {
-  return this->id_uniqueness_strategy_->is_servant_in_map (servant,
-                                                           deactivated);
+  return this->id_uniqueness_strategy_->is_servant_in_map (servant);
+}
+
+ACE_INLINE int
+TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id)
+{
+  Map_Entry *entry = 0;
+  int result = this->user_id_map_->find (user_id,
+                                         entry);
+  if (result == 0)
+    {
+      if (entry->servant_ == 0)
+        result = 0;
+      else
+        result = 1;
+    }
+  else
+    result = 0;
+
+  return result;
 }
 
 ACE_INLINE int
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 07f9bd16a39..7cbaf651725 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -53,21 +53,15 @@ CORBA_Any::type (void) const
 
 void
 CORBA_Any::type (CORBA::TypeCode_ptr tc,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Environment &env)
 {
-  CORBA::Boolean equiv = this->type_->equivalent (tc,
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equiv)
+  if (this->type_->equivalent (tc, env))
     {
       CORBA::release (this->type_);
       this->type_ = CORBA::TypeCode::_duplicate (tc);
     }
   else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
-    }
+    env.exception (new CORBA::BAD_TYPECODE ());
 }
 
 // TAO doesn't give any guarantees if the value returned by value can
@@ -106,31 +100,20 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
     cdr_ (0),
     any_owns_data_ (any_owns_data)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  if (this->value_ != 0)
     {
-      if (this->value_ != 0)
-        {
-          TAO_OutputCDR stream;
+      CORBA::Environment env;
+      TAO_OutputCDR stream;
 
-          // Encode the value.
-          stream.encode (this->type_,
-                         this->value_,
-                         0,
-                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      // Encode the value.
+      stream.encode (this->type_,
+                     this->value_,
+                     0,
+                     env);
 
-          // Retrieve the start of the message block chain and save it.
-          this->cdr_ = stream.begin ()->clone ();
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
+      // Retrieve the start of the message block chain and save it.
+      this->cdr_ = stream.begin ()->clone ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Constructor using a message block.
@@ -157,6 +140,8 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src)
     this->type_ =
       CORBA::TypeCode::_duplicate (CORBA::_tc_null);
 
+  CORBA::Environment env;
+
   // CDR stream always contains encoded object, if any holds anything
   // at all.
   this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
@@ -169,54 +154,37 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src)
 CORBA_Any &
 CORBA_Any::operator= (const CORBA_Any &src)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
-    {
-      // check if it is a self assignment
-      if (this == &src)
-        {
-          return *this;
-        }
+  // check if it is a self assignment
+  if (this == &src)
+    return *this;
 
-      // Decrement the refcount on the Message_Block we hold, it does not
-      // matter if we own the data or not, because we always own the
-      // message block (i.e. it is always cloned or duplicated.
-      ACE_Message_Block::release ((ACE_Message_Block *) this->cdr_);
-      this->cdr_ = 0;
+  // Decrement the refcount on the Message_Block we hold, it does not
+  // matter if we own the data or not, because we always own the
+  // message block (i.e. it is always cloned or duplicated.
+  ACE_Message_Block::release ((ACE_Message_Block *) this->cdr_);
+  this->cdr_ = 0;
 
-      // If we own any previous data, deallocate it.
-      this->free_value (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // If we own any previous data, deallocate it.
+  this->free_value (env);
 
-      if (this->type_ != 0)
-        {
-          CORBA::release (this->type_);
-        }
+  if (this->type_ != 0)
+    CORBA::release (this->type_);
 
-      // Now copy the contents of the source to ourselves.
-      if (src.type_ != 0)
-        {
-          this->type_ =
-            CORBA::TypeCode::_duplicate (src.type_);
-        }
-      else
-        {
-          this->type_ =
-            CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-        }
+  // Now copy the contents of the source to ourselves.
+  if (src.type_ != 0)
+    this->type_ =
+      CORBA::TypeCode::_duplicate (src.type_);
+  else
+    this->type_ =
+      CORBA::TypeCode::_duplicate (CORBA::_tc_null);
 
-      this->any_owns_data_ = 0;
+  this->any_owns_data_ = 0;
 
-      this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
-      // Simply duplicate the cdr string here.  We can save the decode
-      // operation if there's no need to extract the object.
-    }
-  ACE_CATCHANY
-    {
-      return *this;
-    }
-  ACE_ENDTRY;
+  this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
+  // Simply duplicate the cdr string here.  We can save the decode
+  // operation if there's no need to extract the object.
 
   return *this;
 }
@@ -225,29 +193,18 @@ CORBA_Any::operator= (const CORBA_Any &src)
 
 CORBA_Any::~CORBA_Any (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // decrement the refcount on the Message_Block we hold, it does not
-      // matter if we own the data or not, because we always own the
-      // message block (i.e. it is always cloned or duplicated.
+  // decrement the refcount on the Message_Block we hold, it does not
+  // matter if we own the data or not, because we always own the
+  // message block (i.e. it is always cloned or duplicated.
 
-      ACE_Message_Block::release (this->cdr_);
-      this->cdr_ = 0;
+  ACE_Message_Block::release (this->cdr_);
+  this->cdr_ = 0;
 
-      this->free_value (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Environment env;
+  this->free_value (env);
 
-      if (this->type_)
-        CORBA::release (this->type_);
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  if (this->type_)
+    CORBA::release (this->type_);
 }
 
 // All-at-once replacement of the contents of an "Any."
@@ -264,7 +221,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
   ACE_Message_Block::release (this->cdr_);
   this->cdr_ = 0;
 
-  this->free_value (ACE_TRY_ENV);
+ this->free_value (ACE_TRY_ENV);
   ACE_CHECK;
 
   // Duplicate tc and then release this->type_, just in case tc and
@@ -296,7 +253,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
 void
 CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
                          const ACE_Message_Block *mb,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // Decrement the refcount on the Message_Block we hold, it does not
   // matter if we own the data or not, because we always own the
@@ -304,8 +261,7 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
   ACE_Message_Block::release (this->cdr_);
   this->cdr_ = 0;
 
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->free_value (env);
 
   // Duplicate tc and then release this->type_, just in case tc and
   // type_ are the same thing.
@@ -374,13 +330,12 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
 // Free internal data.
 
 void
-CORBA_Any::free_value (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Any::free_value (CORBA::Environment &env)
 {
   if (this->any_owns_data_ && this->value_ != 0)
     {
       // This is not exception safe.
-      DEEP_FREE (this->type_, this->value_, 0, ACE_TRY_ENV);
-      ACE_CHECK;
+      DEEP_FREE (this->type_, this->value_, 0, env);
       ::operator delete (this->value_);
     }
   this->value_ = 0;
@@ -391,54 +346,17 @@ CORBA_Any::free_value (CORBA::Environment &ACE_TRY_ENV)
 void
 CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::TypeCode_ptr *_tao_tc;
+  CORBA::Environment env;
+  CORBA::TypeCode_ptr *_tao_tc;
 
-      ACE_NEW (_tao_tc,
-               CORBA::TypeCode_ptr);
+  ACE_NEW (_tao_tc,
+           CORBA::TypeCode_ptr);
 
-      *_tao_tc = CORBA::TypeCode::_duplicate (tc);
-      this->replace (CORBA::_tc_TypeCode,
-                     _tao_tc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-CORBA_Any::operator<<= (const CORBA_Exception &exception)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      stream.encode (exception._type (),
-                     &exception, 0,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->_tao_replace (exception._type (),
-                          stream.begin (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  *_tao_tc = CORBA::TypeCode::_duplicate (tc);
+  this->replace (CORBA::_tc_TypeCode,
+                 _tao_tc,
+                 1,
+                 env);
 }
 
 // Insertion of CORBA object - copying.
@@ -457,28 +375,17 @@ CORBA::Any::operator<<= (const CORBA::Object_ptr obj)
 void
 CORBA::Any::operator<<= (CORBA::Object_ptr *objptr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
+  CORBA::Object_ptr *_tao_object_ptr;
 
-  ACE_TRY
-    {
-      CORBA::Object_ptr *_tao_object_ptr;
-
-      ACE_NEW (_tao_object_ptr,
-               CORBA::Object_ptr);
+  ACE_NEW (_tao_object_ptr,
+           CORBA::Object_ptr);
 
-      *_tao_object_ptr = *objptr;
-      this->replace (CORBA::_tc_Object,
-                     _tao_object_ptr,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  *_tao_object_ptr = *objptr;
+  this->replace (CORBA::_tc_Object,
+                 _tao_object_ptr,
+                 1,
+                 env);
 }
 
 // Insertion of from_string.
@@ -486,62 +393,50 @@ CORBA::Any::operator<<= (CORBA::Object_ptr *objptr)
 void
 CORBA_Any::operator<<= (from_string s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  // If the inserted string is bounded, we create a typecode.
+  static CORBA::Long _oc_string [] =
+  {
+    // CDR typecode octets
+    TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
+    0                       // ... unbounded string to start with
+  };
 
-  ACE_TRY
-    {
-      // If the inserted string is bounded, we create a typecode.
-      static CORBA::Long _oc_string [] =
-      {
-        // CDR typecode octets
-        TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
-        0                       // ... unbounded string to start with
-      };
-
-      CORBA::TypeCode_ptr tc = 0;
+  CORBA::TypeCode_ptr tc = 0;
 
-      if (s.bound_ > 0)
-        {
-          // Bounded string.
-          _oc_string [1] = s.bound_;
-          ACE_NEW (tc,
-                   CORBA::TypeCode (CORBA::tk_string,
-                                    sizeof _oc_string,
-                                    (char *) &_oc_string,
-                                    1,
-                                    sizeof (CORBA::String_var)));
-        }
-      else
-        {
-          tc = CORBA::_tc_string; // unbounded.
-        }
+  if (s.bound_ > 0)
+    {
+      // Bounded string.
+      _oc_string [1] = s.bound_;
+      ACE_NEW (tc,
+               CORBA::TypeCode (CORBA::tk_string,
+                                sizeof _oc_string,
+                                (char *) &_oc_string,
+                                1,
+                                sizeof (CORBA::String_var)));
+    }
+  else
+    tc = CORBA::_tc_string; // unbounded.
 
-      char **tmp;
-      // Non-copying.
-      if (s.nocopy_)
-        {
-          ACE_NEW(tmp,
-                  char* (s.val_));
-        }
-      // Copying.
-      else
-        {
-          ACE_NEW(tmp,
-                  char* (CORBA::string_dup (s.val_)));
-        }
+  CORBA::Environment env;
 
-      this->replace (tc,
-                     tmp,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  char **tmp;
+  // Non-copying.
+  if (s.nocopy_)
+    {
+      ACE_NEW(tmp,
+              char* (s.val_));
     }
-  ACE_CATCHANY
+  // Copying.
+  else
     {
-      // do nothing...
+      ACE_NEW(tmp,
+              char* (CORBA::string_dup (s.val_)));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+
+  this->replace (tc,
+                 tmp,
+                 1,
+                 env);
 }
 
 // Extraction: these are safe and hence we have to check that the
@@ -551,460 +446,271 @@ CORBA_Any::operator<<= (from_string s)
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Short &s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_short, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_short,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(CORBA::Short *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_short (s);
-            }
+          s = *(CORBA::Short *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_short (s);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::UShort &s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_ushort, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ushort,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(CORBA::UShort *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ushort (s);
-            }
+          s = *(CORBA::UShort *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_ushort (s);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Long &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_long, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_long,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::Long *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_long (l);
-            }
+          l = *(CORBA::Long *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_long (l);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_ulong, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::ULong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ulong (l);
-            }
+          l = *(CORBA::ULong *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_ulong (l);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::LongLong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_longlong, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longlong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::LongLong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_longlong (l);
-            }
+          l = *(CORBA::LongLong *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_longlong (l);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULongLong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_ulonglong, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulonglong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::ULongLong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ulonglong (l);
-            }
+          l = *(CORBA::ULongLong *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_ulonglong (l);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Float &f) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_float, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_float,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              f = *(CORBA::Float *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_float (f);
-            }
+          f = *(CORBA::Float *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_float (f);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Double &d) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_double, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_double,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              d = *(CORBA::Double *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_double (d);
-            }
+          d = *(CORBA::Double *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          return stream.read_double (d);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Any &a) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_any, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_any,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              a = *(CORBA::Any *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              // decode the CDR
-              CORBA::TypeCode::traverse_status retval =
-                stream.decode (CORBA::_tc_any,
-                               &a,
-                               0,
-                               ACE_TRY_ENV);
-             return (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
-            }
+          a = *(CORBA::Any *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream (this->cdr_);
+          // decode the CDR
+          return (stream.decode (CORBA::_tc_any, &a, 0, env)
+                  == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (char *&s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equal (CORBA::_tc_string, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (this->any_owns_data_ && this->value_)
+        {
+          s = *(char **) this->value_;
 
-      if (result)
+          return 1;
+        }
+      else
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(char **) this->value_;
-              return 1;
-            }
-          else
+          TAO_InputCDR stream (this->cdr_);
+          if (stream.read_string (s))
             {
-              TAO_InputCDR stream (this->cdr_);
-              if (stream.read_string (s))
-                {
-                  ACE_const_cast (CORBA_Any *,
-                                  this)->any_owns_data_ = 1;
+              ACE_const_cast (CORBA_Any *,
+                              this)->any_owns_data_ = 1;
 
-                  char **tmp;
+              char **tmp;
 
-                  ACE_NEW_RETURN (tmp,
-                                  char *,
-                                  0);
+              ACE_NEW_RETURN (tmp,
+                              char *,
+                              0);
 
-                  *tmp = s;
+              *tmp = s;
 
-                  ACE_const_cast (CORBA_Any *,
-                                  this)->value_ = tmp;
+              ACE_const_cast (CORBA_Any *,
+                              this)->value_ = tmp;
 
-                  return 1;
-                }
-              return 0;
+              return 1;
             }
-        }
-      else
-        {
+
           return 0;
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_TypeCode, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_TypeCode,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              tc = *(CORBA::TypeCode_ptr *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              CORBA::TypeCode::traverse_status retval =
-                stream.decode (CORBA::_tc_TypeCode,
-                               &tc,
-                               0,
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              return (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
-            }
+          tc = *(CORBA::TypeCode_ptr *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+          CORBA::Boolean flag =
+            (stream.decode (CORBA::_tc_TypeCode,
+                            &tc,
+                            0,
+                            env)
+             == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
+          return flag;
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 // = extraction into the special types
@@ -1012,272 +718,161 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_boolean b) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_boolean, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_boolean,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              b.ref_ = *(CORBA::Boolean *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_boolean (b.ref_);
-            }
+          b.ref_ = *(CORBA::Boolean *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+          return stream.read_boolean (b.ref_);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (to_octet o) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_octet, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_octet,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              o.ref_ = *(CORBA::Octet *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_octet (o.ref_);
-            }
+          o.ref_ = *(CORBA::Octet *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+          return stream.read_octet (o.ref_);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (to_char c) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_char, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_char,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              c.ref_ = *(CORBA::Char *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_char (c.ref_);
-            }
+          c.ref_ = *(CORBA::Char *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+          return stream.read_char (c.ref_);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (to_wchar wc) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_wchar, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wchar,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              wc.ref_ = *(CORBA::WChar *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_wchar (wc.ref_);
-            }
+          wc.ref_ = *(CORBA::WChar *) this->value_;
+          return 1;
         }
       else
         {
-          return 0;
+          TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+          return stream.read_wchar (wc.ref_);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (to_string s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_string, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      CORBA::ULong bound = this->type_->length (env);
+      if (s.bound_ == bound) // bounds are same
         {
-          CORBA::ULong bound = this->type_->length (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          if (s.bound_ == bound) // bounds are same
+          if (this->any_owns_data_ && this->value_)
             {
-              if (this->any_owns_data_ && this->value_)
-                {
-                  s.val_ = *(char **) this->value_;
-                  return 1;
-                }
-              else
-                {
-                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-                  if (stream.read_string (s.val_))
-                    {
-                      ACE_const_cast (CORBA_Any *,
-                                      this)->any_owns_data_ = 1;
-                      return 1;
-                    }
-                  else
-                    {
-                      return 0;
-                    }
-                }
+              s.val_ = *(char **) this->value_;
+              return 1;
             }
           else
             {
-              return 0;
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              if (stream.read_string (s.val_))
+                {
+                  ACE_const_cast (CORBA_Any *,
+                                  this)->any_owns_data_ = 1;
+                  return 1;
+                }
             }
         }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
     }
-  ACE_ENDTRY;
 
+  // Otherwise.
   return 0;
 }
 
 CORBA::Boolean
 CORBA_Any::operator>>= (to_object obj) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  if (this->type_->equivalent (CORBA::_tc_Object, env))
     {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_Object,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
+      if (this->any_owns_data_ && this->value_)
         {
-          if (this->any_owns_data_ && this->value_)
-            {
-              // CORBA 2.3 has changed the behavior of this operator. Caller
-              // is now responsible for release.
-              obj.ref_ =
-                CORBA::Object::_duplicate (*(CORBA::Object_ptr *) this->value_);
+          // CORBA 2.3 has changed the behavior of this operator. Caller
+          // is now responsible for release.
+          obj.ref_ = 
+            CORBA::Object::_duplicate (*(CORBA::Object_ptr *) this->value_);
 
-              return 1;
-            }
-          else
-            {
-              // @@ This uses ORB_Core instance because we need one to
-              // demarshal objects (to create the right profiles for that
-              // object), but the Any does not belong to any ORB.
-              TAO_InputCDR stream (this->cdr_,
-                                  ACE_CDR_BYTE_ORDER,
-                                  TAO_ORB_Core_instance ());
-
-              CORBA::TypeCode::traverse_status status =
-                stream.decode (CORBA::_tc_Object,
-                               &obj.ref_,
-                               0,
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Because of the CORBA 2.3 change mentioned above, there is no
-              // need to assign to this->value_.
-              return (status == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;;
-            }
+          return 1;
         }
       else
         {
-          return 0;
+          // @@ This uses ORB_Core instance because we need one to
+          // demarshal objects (to create the right profiles for that
+          // object), but the Any does not belong to any ORB.
+          TAO_InputCDR stream (this->cdr_,
+                               ACE_CDR_BYTE_ORDER,
+                               TAO_ORB_Core_instance ());
+
+          CORBA::Boolean flag = (stream.decode (CORBA::_tc_Object,
+                                                &obj.ref_, 
+                                                0, 
+                                                env)
+                                 == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
+
+          // Because of the CORBA 2.3 change mentioned above, there is no
+          // need to assing to this->value_.
+          return flag;
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  else
+    return 0;
 }
 
 // this is a copying version for unbounded strings Not inline, to
@@ -1286,27 +881,17 @@ CORBA_Any::operator>>= (to_object obj) const
 void
 CORBA_Any::operator<<= (const char* s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
-    {
-      char **tmp;
+  char **tmp;
 
-      ACE_NEW (tmp,
-               char * (CORBA::string_dup (s)));
+  ACE_NEW (tmp,
+           char * (CORBA::string_dup (s)));
 
-      this->replace (CORBA::_tc_string,
-                     tmp,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  this->replace (CORBA::_tc_string,
+                 tmp,
+                 1, 
+                 env);
 }
 
 // ----------------------------------------------------------------------
@@ -1351,114 +936,96 @@ CORBA_Any_var::operator= (const CORBA::Any_var& r)
 void
 CORBA_Any::dump (const CORBA::Any &any_value)
 {
-  // Get the typecode kind.
+  CORBA::Environment env;
+
+  // Get the type.
   CORBA::TypeCode_var type = any_value.type ();
-  CORBA::TCKind kind = type->kind ();
 
-  switch (kind)
+  if (type->equal (CORBA::_tc_null, env))
+    ACE_DEBUG ((LM_DEBUG,
+                "Null\n"));
+
+  else if (type->equal (CORBA::_tc_void, env))
+    ACE_DEBUG ((LM_DEBUG,
+                "Void\n"));
+
+  else if (type->equal (CORBA::_tc_short, env))
     {
-      case CORBA::tk_null:
-        ACE_DEBUG ((LM_DEBUG,
-                    "Null\n"));
-        break;
-      case CORBA::tk_void:
+      CORBA::Short s;
+      any_value >>= s;
+      ACE_DEBUG ((LM_DEBUG,
+                  "Short %d\n",
+                  s));
+    }
+  else if (type->equal (CORBA::_tc_long, env))
+    {
+      CORBA::Long l;
+      any_value >>= l;
+      ACE_DEBUG ((LM_DEBUG,
+                  "Long %d\n",
+                  l));
+    }
+  else if (type->equal (CORBA::_tc_ushort, env))
+    {
+      CORBA::UShort s;
+      any_value >>= s;
+      ACE_DEBUG ((LM_DEBUG,
+                  "UShort %d\n",
+                  s));
+    }
+  else if (type->equal (CORBA::_tc_ulong, env))
+    {
+      CORBA::ULong l;
+      any_value >>= l;
+      ACE_DEBUG ((LM_DEBUG,
+                  "ULong %d\n",
+                  l));
+    }
+  else if (type->equal (CORBA::_tc_float, env))
+    {
+      CORBA::Float f;
+      any_value >>= f;
+      ACE_DEBUG ((LM_DEBUG,
+                  "Float %f\n",
+                  f));
+    }
+  else if (type->equal (CORBA::_tc_double, env))
+    {
+      CORBA::Double d;
+      any_value >>= d;
+      ACE_DEBUG ((LM_DEBUG,
+                  "Double %f\n",
+                  d));
+    }
+  else if (type->equal (CORBA::_tc_boolean, env))
+    {
+      CORBA::Boolean b;
+      any_value >>= (to_boolean)b;
+      if (b == 1)
         ACE_DEBUG ((LM_DEBUG,
-                    "Void\n"));
-        break;
-      case CORBA::tk_short:
-        {
-          CORBA::Short s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Short %d\n",
-                     s));
-          break;
-        }
-      case CORBA::tk_long:
-        {
-          CORBA::Long l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Long %d\n",
-                      l));
-          break;
-        }
-      case CORBA::tk_ushort:
-        {
-          CORBA::UShort s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      "UShort %d\n",
-                      s));
-          break;
-        }
-      case CORBA::tk_ulong:
-        {
-          CORBA::ULong l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      "ULong %d\n",
-                      l));
-          break;
-        }
-      case CORBA::tk_float:
-        {
-          CORBA::Float f;
-          any_value >>= f;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Float %f\n",
-                      f));
-          break;
-        }
-      case CORBA::tk_double:
-        {
-          CORBA::Double d;
-          any_value >>= d;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Double %f\n",
-                      d));
-          break;
-        }
-      case CORBA::tk_boolean:
-        {
-          CORBA::Boolean b;
-          to_boolean tb (b);
-          any_value >>= tb;
-          if (b == 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Boolean TRUE\n"));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Boolean FALSE\n"));
-            }
-          break;
-        }
-      case CORBA::tk_char:
-        {
-          CORBA::Char ch;
-          to_char tch (ch);
-          any_value >>= tch;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Char %c\n",
-                      ch));
-          break;
-        }
-      case CORBA::tk_string:
-        {
-          CORBA::String str;
-          any_value >>= str;
-          ACE_DEBUG ((LM_DEBUG,
-                      "String %s\n",
-                      str));
-          break;
-        }
-      default:
+                    "Boolean TRUE\n"));
+      else
         ACE_DEBUG ((LM_DEBUG,
-                    "TCKind %d\n",
-                    kind));
-        break;
+                    "Boolean FALSE\n"));
+    }
+  else if (type->equal (CORBA::_tc_char, env))
+    {
+      CORBA::Char ch;
+      any_value >>= to_char (ch);
+      ACE_DEBUG ((LM_DEBUG,
+                  "Char %c\n",
+                  ch));
     }
+  else if (type->equal (CORBA::_tc_string, env))
+    {
+      CORBA::String str;
+      any_value >>= str;
+      ACE_DEBUG ((LM_DEBUG,
+                  "String %s\n",
+                  str));
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG,
+                "TCKind %d\n",
+                type->kind_));
 }
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 2dab86bf915..f99148774a4 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -202,9 +202,6 @@ public:
   void operator<<= (from_string);
   // insert a bounded string
 
-  void operator<<= (const CORBA_Exception &exception);
-  // insert an exception into the Any
-
   // = Special types.
 
   // These extract octets, chars, booleans, bounded strings, and
@@ -252,14 +249,14 @@ public:
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
                 CORBA::Boolean any_owns_data,
-                CORBA_Environment &ACE_TRY_ENV =
+                CORBA_Environment &TAO_IN_ENV =
                   TAO_default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe.
 
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
-                CORBA_Environment &ACE_TRY_ENV =
+                CORBA_Environment &TAO_IN_ENV =
                   TAO_default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe. This uses a default value for the "any_owns_data" parameter
@@ -268,7 +265,7 @@ public:
   // Return TypeCode of the element stored in the Any.
 
   void type (CORBA::TypeCode_ptr type,
-             CORBA_Environment &ACE_TRY_ENV =
+             CORBA_Environment &TAO_IN_ENV =
                TAO_default_environment ());
   // For use along with <<= of a value of aliased type when the alias must
   // be preserved.
@@ -298,7 +295,7 @@ public:
 
   void _tao_replace (CORBA::TypeCode_ptr,
                      const ACE_Message_Block *mb,
-                     CORBA::Environment &ACE_TRY_ENV =
+                     CORBA::Environment &TAO_IN_ENV =
                        TAO_default_environment ());
   // Replace via message block instead of <value_>.
 
@@ -306,14 +303,14 @@ public:
                      const ACE_Message_Block *mb,
                      CORBA::Boolean any_owns_data,
                      void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
+                     CORBA::Environment &TAO_IN_ENV =
                        TAO_default_environment ());
   // Replace all the contents of the any, used in the <<= operators.
 
   void _tao_replace (CORBA::TypeCode_ptr type,
                      CORBA::Boolean any_owns_data,
                      void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
+                     CORBA::Environment &TAO_IN_ENV =
                        TAO_default_environment ());
   // Replace the value of the Any, used in the >>= operators.
 
@@ -324,7 +321,7 @@ public:
   // Useful for template programming.
 
 protected:
-  void free_value (CORBA::Environment &ACE_TRY_ENV);
+  void free_value (CORBA::Environment &TAO_IN_ENV);
   // Release the <value_>.
 
 private:
@@ -373,7 +370,7 @@ public:
   CORBA_Any_var &operator= (const CORBA_Any_var &a);
   // assignment from an Any_var
   // This operation requires memory allocation.
-  // If the allocation fails, *this is returned
+  // If the allocation fails, *this is returned 
   // unmodified.
 
   CORBA_Any *operator-> (void);
@@ -451,79 +448,79 @@ private:
 # include "tao/Any.i"
 #else
 
-// Copying versions of insertion
+// Copying versions of insertion 
 // operators which are defined as members of the Any class
 // must also be defined for Any_var.
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Short);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::UShort);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Long);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::ULong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::LongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::ULongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Float);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Double);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     const CORBA_Any&);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     const char*);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::TypeCode_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     const CORBA::Object_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Any::from_boolean);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Any::from_char);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Any::from_wchar);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Any::from_octet);
-extern TAO_Export void operator<<= (CORBA_Any_var,
+extern TAO_Export void operator<<= (CORBA_Any_var, 
                                     CORBA::Any::from_string);
 
 // These are not required by the spec, but will make users
 // of other ORBs that are used to them more comfortable.
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Short&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::UShort&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Long&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::ULong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::LongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::ULongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Float&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Double&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA_Any&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::TypeCode_ptr&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               char*&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_boolean);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_octet);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_char);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_wchar);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_string);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
+extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
                                               CORBA::Any::to_object);
 
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index 29f52e4f9fb..ea859f47316 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -3,29 +3,26 @@
 
 // Insertion from special types.
 
-ACE_INLINE 
-void
+ACE_INLINE void
 CORBA_Any::replace (CORBA::TypeCode_ptr type,
                     const void *value,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
 {
   // Invoke the first form of the replace method and pass the default
   // value (FALSE) for the "any_owns_data" parameter
   this->replace (type,
                  value,
                  0,
-                 ACE_TRY_ENV);
+                 TAO_IN_ENV);
 }
 
-ACE_INLINE 
-CORBA::Boolean
+ACE_INLINE CORBA::Boolean
 CORBA_Any::any_owns_data (void) const
 {
   return (this->any_owns_data_ != 0 && this->value_ != 0);
 }
 
-ACE_INLINE 
-ACE_Message_Block*
+ACE_INLINE ACE_Message_Block*
 CORBA_Any::_tao_get_cdr (void) const
 {
   return this->cdr_;
@@ -33,241 +30,116 @@ CORBA_Any::_tao_get_cdr (void) const
 
 // insertion operators
 
-ACE_INLINE 
-void
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Short s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Short *ns;
-      ACE_NEW (ns,
-               CORBA::Short (s));
-      this->replace (CORBA::_tc_short,
-                     ns,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_short,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Short (s),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::UShort s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::UShort *ns;
-      ACE_NEW (ns,
-               CORBA::UShort (s));
-      this->replace (CORBA::_tc_ushort,
-                     ns,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_ushort,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::UShort (s),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Long l)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Long *nl;
-      ACE_NEW (nl,
-               CORBA::Long (l));
-      this->replace (CORBA::_tc_long,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_long,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Long (l),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::ULong l)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::ULong *nl;
-      ACE_NEW (nl,
-               CORBA::ULong (l));
-      this->replace (CORBA::_tc_ulong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_ulong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::ULong (l),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::LongLong l)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::LongLong *nl;
-      ACE_NEW (nl,
-               CORBA::LongLong (l));
-      this->replace (CORBA::_tc_longlong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_longlong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::LongLong (l),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::ULongLong l)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::ULongLong *nl;
-      ACE_NEW (nl,
-               CORBA::ULongLong (l));
-      this->replace (CORBA::_tc_ulonglong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_ulonglong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::ULongLong (l),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Float f)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Float *nf;
-      ACE_NEW (nf,
-               CORBA::Float (f));
-      this->replace (CORBA::_tc_float,
-                     nf,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_float,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Float (f),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Double d)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Double *nd;
-      ACE_NEW (nd,
-               CORBA::Double (d));
-      this->replace (CORBA::_tc_double,
-                     nd,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_double,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Double (d),
+                 1,
+                 env);
 }
 
 // insertion of Any - copying
 ACE_INLINE void
 CORBA_Any::operator<<= (const CORBA_Any& a)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA_Any_ptr na;
-      ACE_NEW (na,
-               CORBA::Any (a));
-      this->replace (CORBA::_tc_any,
-                     na,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_any,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA_Any (a),
+                 1,
+                 env);
 }
 
 // insertion of Any - non-copying
-ACE_INLINE 
-void
+ACE_INLINE void
 CORBA::Any::operator<<= (CORBA::Any_ptr anyptr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->replace (CORBA::_tc_any,
-                     anyptr,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_any,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 anyptr,
+                 1,
+                 env);
 }
 
 // implementing the special types
@@ -277,100 +149,48 @@ CORBA_Any::to_object::to_object (CORBA_Object_out obj)
 {
 }
 
-ACE_INLINE 
-void
+ACE_INLINE void
 CORBA_Any::operator<<= (from_boolean b)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Boolean *nb;
-      ACE_NEW (nb,
-               CORBA::Boolean (b.val_));
-      this->replace (CORBA::_tc_boolean,
-                     nb,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_boolean,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Boolean (b.val_),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (from_octet o)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Octet *no;
-      ACE_NEW (no,
-               CORBA::Octet (o.val_));
-      this->replace (CORBA::_tc_octet,
-                     no,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_octet,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?                 
+                 new CORBA::Octet (o.val_),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (from_char c)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Char *nc;
-      ACE_NEW (nc,
-               CORBA::Char (c.val_));
-      this->replace (CORBA::_tc_char,
-                     nc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_char,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Char (c.val_),
+                 1,
+                 env);
+}
+
+ACE_INLINE void
 CORBA_Any::operator<<= (from_wchar wc)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::WChar *nwc;
-      ACE_NEW (nwc,
-               CORBA::WChar (wc.val_));
-      this->replace (CORBA::_tc_wchar,
-                     nwc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_wchar,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::WChar (wc.val_),
+                 1,
+                 env);
 }
 
 // *************************************************************
@@ -391,11 +211,9 @@ CORBA_Any_var::CORBA_Any_var (CORBA_Any *p)
 
 ACE_INLINE
 CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r)
+  // @@ Jeff, shouldn't we be checking if "new" fails?
+  : ptr_ (new CORBA::Any (*r.ptr_))
 {
-  CORBA_Any_ptr nptr;
-  ACE_NEW (nptr,
-           CORBA::Any (*r.ptr_));
-  this->ptr_ = nptr;
 }
 
 ACE_INLINE
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
new file mode 100644
index 00000000000..204805dd43e
--- /dev/null
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -0,0 +1,129 @@
+// $Id$
+
+#include "tao/Asynch_Invocation.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
+#include "tao/Timeprobe.h"
+#include "tao/Stub.h"
+#include "tao/Principal.h"
+#include "tao/Object_KeyC.h"
+#include "tao/debug.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Asynch_Invocation.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, Asynch_Invocation, "$Id$")
+
+#if defined (ACE_ENABLE_TIMEPROBES)
+
+static const char *TAO_Asynch_Invocation_Timeprobe_Description[] =
+  {
+    "GIOP_Asynch_Invocation::invoke - start",
+    "GIOP_Asynch_Invocation::invoke - end",
+
+    "GIOP_Asynch_Invocation::start - enter",
+    "GIOP_Asynch_Invocation::start - leave",
+    "GIOP_Asynch_Invocation::start - connect",
+    "GIOP_Asynch_Invocation::start - start_msg",
+    "GIOP_Asynch_Invocation::start - request_hdr"
+  };
+
+enum
+  {
+    TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START = 1000,
+    TAO_GIOP_ASYNCH_INVOCATION_INVOKE_END,
+
+    TAO_GIOP_ASYNCH_INVOCATION_START_ENTER,
+    TAO_GIOP_ASYNCH_INVOCATION_START_LEAVE,
+    TAO_GIOP_ASYNCH_INVOCATION_START_CONNECT,
+    TAO_GIOP_ASYNCH_INVOCATION_START_START_MSG,
+    TAO_GIOP_ASYNCH_INVOCATION_START_REQUEST_HDR
+  };
+
+
+// Setup Timeprobes
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Asynch_Invocation_Timeprobe_Description,
+                                  TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
+
+#endif /* ACE_ENABLE_TIMEPROBES */
+
+void
+TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->transport_->start_request (this->orb_core_,
+                                   this->profile_,
+                                   this->opname_,
+                                   this->request_id_,
+                                   1,
+                                   this->out_stream_,
+                                   ACE_TRY_ENV);
+}
+
+int
+TAO_GIOP_Twoway_Asynch_Invocation::invoke (CORBA::ExceptionList &exceptions,
+                                           CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
+{
+  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
+  
+  int retval = this->invoke_i (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (retval);
+
+  return retval;
+}
+
+int
+TAO_GIOP_Twoway_Asynch_Invocation::invoke (TAO_Exception_Data *excepts,
+                                           CORBA::ULong except_count,
+                                           CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::Exception))
+{
+  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
+  
+  int retval = this->invoke_i (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (retval);
+
+  return retval;
+}
+
+int
+TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Register a reply dispatcher for this Asynch_Invocation. Use the
+  // heap allocated reply dispatcher.
+  
+  int retval = this->transport_->bind_reply_dispatcher (this->request_id_,
+                                                        this->rd_);
+  if (retval == -1)
+    {
+      // @@ What is the right way to handle this error?
+      this->close_connection ();
+      ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+                                         CORBA::COMPLETED_NO),
+                        TAO_INVOKE_EXCEPTION);
+    }
+
+  // Just send the request, without trying to wait for the reply.
+  retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (retval);
+
+  if (retval != TAO_INVOKE_OK)
+    return retval;
+
+  // We do not wait for the reply. Let us return. 
+
+  return TAO_INVOKE_OK;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
new file mode 100644
index 00000000000..6ec6a1f5518
--- /dev/null
+++ b/TAO/tao/Asynch_Invocation.h
@@ -0,0 +1,93 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Asynch_Invocation.h
+//
+// = DESCRIPTION
+//    Encapsulate the logic for remote Asynchronous Invocations.
+//
+// = AUTHOR
+//   Carlos O'Ryan <coryan@cs.wustl.edu> and Alexander Babu Arulanthu
+//   <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#ifndef TAO_ASYNCH_INVOCATION_H
+#define TAO_ASYNCH_INVOCATION_H
+
+#include "tao/Invocation.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+#include "tao/MessagingC.h"
+
+class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation
+{
+  // = TITLE
+  //   Sends a two-way request does not expect the reply.
+  //
+  // = DESCRIPTION
+  //   This class connects (or lookups a connection from the cache) to
+  //   the remote server, builds the CDR stream for the Request, send
+  //   the CDR stream and returns.
+  //
+public:
+  TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *data,
+                                     const char *operation,
+                                     TAO_ORB_Core* orb_core,
+                                     const TAO_Reply_Handler_Skeleton &reply_handler_skel,
+                                     Messaging::ReplyHandler_ptr reply_handler_ptr);
+  // Constructor.
+
+  void start (CORBA_Environment &TAO_IN_ENV =
+              TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Calls TAO_GIOP_Asynch_Invocation::start.
+
+  int invoke (CORBA::ExceptionList &exceptions,
+              CORBA_Environment &TAO_IN_ENV =
+                    TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
+  // Send request, block until any reply comes back, and unmarshal
+  // reply parameters as appropriate.
+
+  int invoke (TAO_Exception_Data *excepts,
+              CORBA::ULong except_count,
+              CORBA_Environment &TAO_IN_ENV =
+                    TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::Exception));
+  // Special purpose invoke method used by the interpretive stubs. This
+  // accomplishes the same task as the normal invoke except that
+  // Exceptions are allocated and decoded here. This reduces the
+  // footprint of the generated stubs.
+
+  //   TAO_InputCDR &inp_stream (void);
+  //   // Return the underlying input stream.
+  // 
+  //   void get_value (CORBA::TypeCode_ptr tc,
+  //                   void *value,
+  //                   CORBA_Environment &TAO_IN_ENV =
+  //                         TAO_default_environment ());
+  //   // No CORBA::Context support (deprecated).
+
+private:
+  int invoke_i (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Implementation of the invoke() methods, handles the basic
+  // send/reply code and the system exceptions.
+
+private:
+  TAO_Asynch_Reply_Dispatcher *rd_;
+  // Reply dispatcher for the current synchronous Asynch_Invocation.
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Asynch_Invocation.i"
+#endif /* __ACE_INLINE__ */
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+#endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
new file mode 100644
index 00000000000..800b5f14595
--- /dev/null
+++ b/TAO/tao/Asynch_Invocation.i
@@ -0,0 +1,34 @@
+// This may look like C, but it's really -*- C++ -*-
+//
+// $Id$
+//
+
+ACE_INLINE
+TAO_GIOP_Twoway_Asynch_Invocation::
+TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub,
+                                   const char *operation,
+                                   TAO_ORB_Core *orb_core,
+                                   const TAO_Reply_Handler_Skeleton &reply_handler_skel,
+                                   Messaging::ReplyHandler_ptr reply_handler_ptr)
+  : TAO_GIOP_Invocation (stub, operation, orb_core),
+    rd_ (0)
+{
+  // New Reply Dispatcher.
+  ACE_NEW (rd_,
+           TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
+                                        reply_handler_ptr));
+}
+
+// ACE_INLINE TAO_InputCDR &
+// TAO_GIOP_Twoway_Asynch_Invocation::inp_stream (void)
+// {
+//   return this->message_state_->cdr;
+// }
+// 
+// ACE_INLINE void
+// TAO_GIOP_Twoway_Asynch_Invocation::get_value (CORBA::TypeCode_ptr tc,
+//                                               void *value,
+//                                               CORBA::Environment &ACE_TRY_ENV)
+// {
+//   (void) this->inp_stream ().decode (tc, value, 0, ACE_TRY_ENV);
+// }
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 54819e1c36b..c4dcbd2476f 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -116,7 +116,7 @@ public:
                                            CORBA_Environment &ACE_TRY_ENV =
                                            TAO_default_environment ());
   // Append the contents of the CDR stream based on information
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
+  // described by <tc>; returning any errors in <TAO_IN_ENV>.
 
   // @@ TODO: do we want a special method to write an array of
   // strings and wstrings?
@@ -129,7 +129,7 @@ public:
                                            CORBA_Environment &ACE_TRY_ENV =
                                            TAO_default_environment ());
   // Marshalls the contents of <data> as described by the TypeCode in
-  // <tc>. Any errors are reported though the <ACE_TRY_ENV> parameter.
+  // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter.
 
 private:
   TAO_OutputCDR (const TAO_OutputCDR& rhs);
@@ -221,13 +221,13 @@ public:
                                            CORBA_Environment &ACE_TRY_ENV =
                                            TAO_default_environment ());
   // Demarshall the contents of the CDR stream into <data> as
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
+  // described by <tc>; returning any errors in <TAO_IN_ENV>.
 
   CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                          CORBA_Environment &ACE_TRY_ENV =
                                          TAO_default_environment ());
   // Skip the contents of the CDR stream based on information
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
+  // described by <tc>; returning any errors in <TAO_IN_ENV>.
 
   TAO_ORB_Core *orb_core (void) const;
   // Accessor
diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp
index 70e944d816b..e845d07ea92 100644
--- a/TAO/tao/CDR_Interpreter.cpp
+++ b/TAO/tao/CDR_Interpreter.cpp
@@ -93,8 +93,6 @@ TAO_CDR_Interpreter::table_[CORBA::TC_KIND_COUNT] =
 // make sure that alignment of IDL-defined data types is consistent
 // (one byte).
 
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
 enum TCKIND
 {
   tk_null               = 0,
@@ -180,7 +178,7 @@ declare_entry (CORBA::Any, tk_any);
 
 declare_entry (CORBA::TypeCode_ptr, tk_TypeCode);
 declare_entry (CORBA::Principal_ptr, tk_Principal);
-declare_entry (TAO_Object_Field_Class, tk_objref);
+declare_entry (TAO_Object_Field_T<CORBA_Object>, tk_objref);
 
 declare_entry (CORBA::String, tk_string);
 #if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
@@ -212,7 +210,7 @@ TAO_CDR_Interpreter::init (void)
   setup_entry (CORBA::TypeCode_ptr, tk_TypeCode);
   setup_entry (CORBA::Principal_ptr, tk_Principal);
   setup_entry (CORBA::Object_ptr, tk_objref);
-  setup_entry (TAO_Object_Field_Class, tk_objref);
+  setup_entry (TAO_Object_Field_T<CORBA_Object>, tk_objref);
 
   enum generic_enum {a, b, c, d};
 
@@ -275,7 +273,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
                                                        TAO_InputCDR *stream,
                                                        CORBA::TCKind kind,
                                                        size_t &alignment,
-                                                       CORBA::Environment &ACE_TRY_ENV)
+                                                       CORBA::Environment &env)
 {
   CORBA::ULong temp;
   // Just a temporary to retrieve CORBA::TCKind variables as ULong's
@@ -288,7 +286,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       || kind <= CORBA::tk_void
       || kind == CORBA::tk_except)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Use attribute calculator routine if it exists; these are needed
@@ -303,7 +302,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       // Pull encapsulation length out of the stream.
       if (stream->read_ulong (temp) == 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
 
       // Initialize the TypeCode if requested
@@ -325,13 +325,15 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
 
       if (nested.good_bit () == 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
 
       size_t size = TAO_CDR_Interpreter::table_[kind].calc_ (&nested,
                                                               alignment,
-                                                              ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+                                                              env);
+      if (env.exception () != 0)
+        return 0;
 
       // Check for garbage at end of parameter lists, or other cases
       // where parameters and the size allocated to them don't jive.
@@ -340,7 +342,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
 
       if (stream->rd_ptr () != nested.rd_ptr ())
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
       return size;
     }
@@ -367,7 +370,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
         case CORBA::tk_wstring:
           if (stream->read_ulong (len) == 0)
             {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              env.exception (new CORBA::BAD_TYPECODE ());
+              return 0;
             }
           tc->length_ = len;
           break;
@@ -377,7 +381,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
         case CORBA::tk_sequence:
           if (stream->read_ulong (len) == 0)
             {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              env.exception (new CORBA::BAD_TYPECODE ());
+              return 0;
             }
           tc->length_ = len;
 
@@ -393,7 +398,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
   else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0
            && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Return statically known values.
@@ -405,16 +411,19 @@ size_t
 TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                                      TAO_InputCDR *stream,
                                                      size_t &alignment,
-                                                     CORBA::Environment &ACE_TRY_ENV)
+                                                     CORBA::Environment &env)
 {
   // Get the "kind" ... if this is an indirection, this is a guess
   // which will soon be updated.
   CORBA::ULong temp;
   if (stream->read_ulong (temp) == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
+  env.clear ();
+
   CORBA::TCKind kind = (CORBA::TCKind) temp;
 
   if (kind != (CORBA::TCKind) ~0u)
@@ -424,7 +433,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
          stream,
          kind,
          alignment,
-         ACE_TRY_ENV);
+         env);
     }
 
   // Get indirection, sanity check it, set up new stream pointing
@@ -444,7 +453,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
       || offset >= -4
       || ((-offset) & 0x03) != 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Notice how we change the sign of the offset to estimate the
@@ -461,7 +471,8 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
   // Fetch indirected-to TCKind.
   if (!indirected_stream.read_ulong (temp))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
   kind = (CORBA::TCKind) temp;
 
@@ -469,7 +480,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                                 &indirected_stream,
                                                 kind,
                                                 alignment,
-                                                ACE_TRY_ENV);
+                                                env);
 }
 
 // Given typecode bytes for a structure (or exception), figure out its
@@ -491,7 +502,7 @@ size_t
 TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
                                                         size_t &alignment,
                                                         CORBA::Boolean is_exception,
-                                                        CORBA::Environment &ACE_TRY_ENV)
+                                                        CORBA::Environment &env)
 {
   CORBA::ULong  members;
   size_t size;
@@ -524,13 +535,14 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
       || !stream->skip_string ()
       || !stream->read_ulong (members))
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Iterate over all the members, skipping their names and looking
   // only at type data.
 
-  for ( ; members != 0; members--)
+  for ( ; members != 0; members--) 
     {
       size_t member_size;
       size_t member_alignment;
@@ -538,7 +550,8 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
       // Skip name of the member.
       if (!stream->skip_string ())
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
 
       // Get size and alignment of the member, accounting for
@@ -547,8 +560,9 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
       member_size = calc_nested_size_and_alignment (0,
                                                     stream,
                                                     member_alignment,
-                                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+                                                    env);
+      if (env.exception () != 0)
+        return 0;
 
       // Round up the struct size to handle member alignment (by
       // adding internal padding), then update the current size to
@@ -574,12 +588,12 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
                                              size_t &alignment,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             CORBA::Environment &env)
 {
   return calc_struct_and_except_attributes (stream,
                                             alignment,
                                             0,
-                                            ACE_TRY_ENV);
+                                            env);
 }
 
 // Calculate size and alignment for an exception.
@@ -587,12 +601,12 @@ TAO_CDR_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
                                                 size_t &alignment,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                CORBA::Environment &env)
 {
   return calc_struct_and_except_attributes (stream,
                                             alignment,
                                             1,
-                                            ACE_TRY_ENV);
+                                            env);
 }
 
 // Calculate and return sizes for both parts of a union, as needed by
@@ -606,7 +620,7 @@ size_t
 TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
                                                 size_t &overall_alignment,
                                                 size_t &discrim_size_with_pad,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                CORBA::Environment &env)
 {
   CORBA::ULong members;
   CORBA::ULong temp;
@@ -639,7 +653,8 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
   if (!stream->skip_string ()                   // type ID
       || !stream->skip_string ())
     {   // typedef name
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Calculate discriminant size and alignment: it's the first member
@@ -652,8 +667,9 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
     calc_nested_size_and_alignment (&discrim_tc,
                                     stream,
                                     value_alignment,
-                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                    env);
+  if (env.exception () != 0)
+    return 0;
 
   if (value_alignment > overall_alignment)
     overall_alignment = value_alignment;
@@ -664,7 +680,8 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
   if (!stream->read_ulong (temp)                 // default used
       || !stream->read_ulong (members))
     {   // member count
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // iterate over the tuples for all the members; all we care about is
@@ -694,7 +711,8 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_short (s))
             {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              env.exception (new CORBA::BAD_TYPECODE ());
+              return 0;
             }
         }
       break;
@@ -707,7 +725,8 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_long (l))
             {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              env.exception (new CORBA::BAD_TYPECODE ());
+              return 0;
             }
         }
       break;
@@ -719,20 +738,23 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_char (c))
             {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              env.exception (new CORBA::BAD_TYPECODE ());
+              return 0;
             }
         }
       break;
 
       default:
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+        env.exception (new CORBA::BAD_TYPECODE ());
+        return 0;
       }
 
     // We also don't care about any member name.
 
     if (!stream->skip_string ())
       {
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+        env.exception (new CORBA::BAD_TYPECODE ());
+        return 0;
       }
 
     // Get the member size and alignment.
@@ -744,7 +766,8 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
     TAO_InputCDR temp (*stream);
     if (calc_union_attr_is_var_sized_member (&temp, var_sized_member) == -1)
       {
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+        env.exception (new CORBA::BAD_TYPECODE ());
+        return 0;
      }
 
     if (var_sized_member)
@@ -759,8 +782,9 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
       member_size = calc_nested_size_and_alignment (0,
                                                     stream,
                                                     member_alignment,
-                                                    ACE_TRY_ENV);
-    ACE_CHECK_RETURN (0);
+                                                    env);
+    if (env.exception () != 0)
+      return 0;
 
     // Save the largest member and alignment.  They don't need to be
     // changed in sync -- e.g. "long double" size is larger than its
@@ -804,14 +828,14 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
                                             size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &env)
 {
   size_t scratch;
 
   return calc_key_union_attributes (stream,
                                     alignment,
                                     scratch,
-                                    ACE_TRY_ENV);
+                                    env);
 }
 
 // Calculate size and alignment for a typedeffed type.
@@ -819,21 +843,19 @@ TAO_CDR_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
                                             size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &env)
 {
   // Skip type ID and name in the parameter stream
 
   if (!stream->skip_string ()                   // type ID
       || !stream->skip_string ())               // typedef name
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // The typedef is identical to the type for which it stands.
-  return calc_nested_size_and_alignment (0,
-                                         stream,
-                                         alignment,
-                                         ACE_TRY_ENV);
+  return calc_nested_size_and_alignment (0, stream, alignment, env);
 }
 
 // Calculate size and alignment of an array.  (All such arrays are
@@ -844,7 +866,7 @@ TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
                                             size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &env)
 {
   size_t member_size;
   CORBA::ULong member_count;
@@ -854,15 +876,17 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
   member_size = calc_nested_size_and_alignment (0,
                                                 stream,
                                                 alignment,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                                env);
+  if (env.exception () != 0)
+    return 0;
 
   // Get and check count of members.
 
   if (stream->read_ulong (member_count) == 0
       || member_count > UINT_MAX)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   // Array size is a function only of member number and count
@@ -877,7 +901,7 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
 size_t
 TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
                                           size_t &alignment,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &env)
 {
   CORBA::TCKind kind;
 
@@ -887,7 +911,8 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
 
   if (stream->read_ulong (temp) == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   if (temp == ~0u)
@@ -897,7 +922,8 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
           || offset >= -4
           || ((-offset) & 0x03) != 0)
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
 
       // Notice how we change the sign of the offset to estimate the
@@ -915,7 +941,8 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
       // Fetch indirected-to TCKind.
       if (!indirected_stream.read_ulong (temp))
         {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return 0;
         }
     }
 
@@ -924,7 +951,8 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
   // Skip the rest of the stream because we don't use it.
   if (stream->skip_bytes (stream->length ()) == 0)
     {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
+      return 0;
     }
 
   size_t size;
@@ -938,7 +966,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
 #else
       alignment =
         (char *) &align.two
-        - (char *) &align.one
+        - (char *) &align.one 
         - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
 #endif /* TAO_HAS_FIXED_BYTE_ALIGNMENT */
     }
@@ -954,8 +982,8 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
       alignment = 1;
 #else
       alignment =
-        (char *) &align.two
-        - (char *) &align.one
+        (char *) &align.two 
+        - (char *) &align.one 
         - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
 #endif /* TAO_HAS_FIXED_BYTE_ALIGNMENT */
     }
@@ -969,7 +997,7 @@ CORBA::Boolean
 TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
                                   TAO_InputCDR *tc_stream,
                                   const void *value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   CORBA::Boolean retval = 0;
 
@@ -983,7 +1011,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ushort (discrim) != 0)
           retval = (discrim == *(CORBA::UShort *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
@@ -995,7 +1023,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ulong (discrim) != 0)
           retval = (discrim == *(CORBA::ULong *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
@@ -1006,7 +1034,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ulong (discrim) != 0)
           retval = (discrim == *(unsigned *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
@@ -1017,7 +1045,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_boolean (discrim) != 0)
           retval = (discrim == *(CORBA::Boolean *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
@@ -1028,7 +1056,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_char (discrim) != 0)
           retval = (discrim == *(CORBA::Char *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
@@ -1039,30 +1067,33 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_wchar (discrim) != 0)
           retval = (discrim == *(CORBA::WChar *)value);
         else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          env.exception (new CORBA::BAD_TYPECODE ());
       }
     break;
 
     default:
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      env.exception (new CORBA::BAD_TYPECODE ());
     }
 
   return retval;
 }
 
 int
-TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member
+TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member 
   (TAO_InputCDR *stream,
    CORBA::Boolean &flag)
 {
-    CORBA::ULong temp;
-    flag = 0;
+  CORBA::Environment env;
+  CORBA::ULong temp;
+  flag = 0;
 
-    // Get the tk_ "kind"  field
-    if (stream->read_ulong (temp) == 0)
-      // Error.
+  // Get the tk_ "kind"  field
+  if (stream->read_ulong (temp) == 0)
+    // Error.
     return -1;
 
+  env.clear ();
+
   CORBA::TCKind kind = (CORBA::TCKind) temp;
 
   switch (kind)
@@ -1123,7 +1154,7 @@ TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member
 
         //        stream->skip_bytes (encap);
         return calc_union_attr_is_var_sized_member (&nested,
-                                                flag);
+                                                    flag);
       }
       ACE_NOTREACHED (break);
     case CORBA::tk_struct:
@@ -1163,7 +1194,7 @@ TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member
 
             TAO_InputCDR member_tc (nested);
             if (calc_union_attr_is_var_sized_member (&member_tc,
-                                                 flag) == -1)
+                                                     flag) == -1)
               return -1;
 
             CORBA::TypeCode::skip_typecode (nested);
@@ -1179,7 +1210,6 @@ TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member
       // error
       return -1;
     }
-
   // cannot reach here
   ACE_NOTREACHED (return -1);
 }
diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h
index 1151e54a9f6..f1c2ec595f0 100644
--- a/TAO/tao/CDR_Interpreter.h
+++ b/TAO/tao/CDR_Interpreter.h
@@ -25,7 +25,7 @@
 // Useful typedefs.
 typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
                                          size_t &alignment,
-                                         CORBA_Environment &ACE_TRY_ENV);
+                                         CORBA_Environment &TAO_IN_ENV);
 typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *);
 
 class TAO_Export TAO_CDR_Interpreter
@@ -106,14 +106,12 @@ public:
   static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                                 TAO_InputCDR *original_stream,
                                                 size_t &alignment,
-                                                CORBA_Environment &ACE_TRY_ENV = 
-                                                  TAO_default_environment ());
+                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
                                                   TAO_InputCDR *stream,
                                                   CORBA::TCKind kind,
                                                   size_t &alignment,
-                                                  CORBA_Environment &ACE_TRY_ENV = 
-                                                    TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // For a given typecode, figure out its size and alignment needs.
   // This version is used mostly when traversing other typecodes, and
   // follows these rules:
@@ -146,8 +144,7 @@ public:
   static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream,
                                                    size_t &alignment,
                                                    CORBA::Boolean is_exception,
-                                                   CORBA_Environment &ACE_TRY_ENV = 
-                                                    TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Given typecode bytes for a structure (or exception), figure out
   // its alignment and size; return size, alignment is an 'out'
   // parameter.  Only "CORBA::tk_struct" (or "CORBA::tk_except") has
@@ -165,16 +162,14 @@ public:
 
   static size_t calc_struct_attributes (TAO_InputCDR *stream,
                                         size_t &alignment,
-                                        CORBA_Environment &ACE_TRY_ENV = 
-                                          TAO_default_environment ());
+                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment for a structure.
 
 
 #if defined (TAO_NO_COPY_OCTET_SEQUENCES)
   static size_t calc_seq_attributes (TAO_InputCDR *stream,
                                      size_t &alignment,
-                                     CORBA_Environment &ACE_TRY_ENV = 
-                                      TAO_default_environment ());
+                                     CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment for a sequence, most of them have
   // the same requirements, but for the sequences of Octets that are
   // optimized to minimize copying.
@@ -182,15 +177,13 @@ public:
 
   static size_t calc_exception_attributes (TAO_InputCDR *stream,
                                            size_t &alignment,
-                                           CORBA_Environment &ACE_TRY_ENV = 
-                                            TAO_default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment for an exception.
 
 
   static size_t calc_union_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV = 
-                                        TAO_default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment for a CORBA discriminated union.
   //
   // Note that this is really a two-element structure.  The first
@@ -202,14 +195,12 @@ public:
 
   static size_t calc_alias_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV = 
-                                        TAO_default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment for a typedeffed type.
 
   static size_t calc_array_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV = 
-                                        TAO_default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Calculate size and alignment of an array.  (All such arrays are
   // described as single dimensional, even though the IDL definition
   // may specify a multidimensional array ... such arrays are treated
@@ -218,16 +209,14 @@ public:
   static CORBA::Boolean match_value (CORBA::TCKind kind,
                                      TAO_InputCDR *tc_stream,
                                      const void *value,
-                                     CORBA_Environment &ACE_TRY_ENV = 
-                                      TAO_default_environment ());
+                                     CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Cast the discriminant values to the right type and compare them.
 
   static size_t
   calc_key_union_attributes (TAO_InputCDR *stream,
                              size_t &overall_alignment,
                              size_t &discrim_size_with_pad,
-                             CORBA_Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
 
   // = Utility routine that checks if a union member is a variable sized type
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index 7502cd20f1a..0514f80438a 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -13,13 +13,13 @@ TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
 }
 
 ACE_Lock *
-TAO_Client_Strategy_Factory::create_profile_lock (void)
+TAO_Client_Strategy_Factory::create_iiop_profile_lock (void)
 {
   return 0;
 }
 
 TAO_Transport_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy (void)
+TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *orb_core)
 {
   return 0;
 }
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index 6b1ed050876..9c4d13eb83d 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -25,6 +25,7 @@ class ACE_Lock;
 class TAO_Transport_Mux_Strategy;
 class TAO_Wait_Strategy;
 class TAO_Transport;
+class TAO_ORB_Core;
 
 class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
 {
@@ -39,12 +40,12 @@ public:
   virtual ~TAO_Client_Strategy_Factory (void);
   // Destructor
 
-  virtual ACE_Lock* create_profile_lock (void);
-  // Create the lock for the forwarding Profile used by the
+  virtual ACE_Lock* create_iiop_profile_lock (void);
+  // Create the lock for the forwarding IIOP Profile used by the
   // <TAO_GIOP_Invocation::location_forward> and the
   // <TAO_GIOP_Invocation::start>.
 
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (void);
+  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
   // Create the correct client request muxing strategy.
 
   virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 5fabc29c866..81fc65c296c 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -9,7 +9,6 @@
 #include "tao/debug.h"
 
 TAO_Connector_Registry::TAO_Connector_Registry (void)
-  : connectors_ ()
 {
 }
 
@@ -33,7 +32,6 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag)
       if ((*connector)->tag () == tag)
         return *connector;
     }
-
   return 0;
 }
 
@@ -56,27 +54,8 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
 
       if (connector)
         {
-          if (connector->open (orb_core) != 0)
-            {
-              delete connector;
-
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) unable to open connector for "
-                                 "<%s>.\n",
-                                 (*factory)->protocol_name ().c_str ()),
-                                -1);
-            }
-
-          if (connectors_.insert (connector) == -1)
-            {
-              delete connector;
-
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) unable to add a <%s> connector "
-                                 "to the connector registry.\n",
-                                 (*factory)->protocol_name ().c_str ()),
-                                -1);
-            }
+          connectors_.insert (connector);
+          connector->open (orb_core);
         }
       else
         return -1;
@@ -136,17 +115,14 @@ TAO_Connector_Registry::preconnect (TAO_EndpointSet &preconnections)
 
 int
 TAO_Connector_Registry::connect (TAO_Profile *&profile,
-                                 TAO_Transport *&transport,
-                                 ACE_Time_Value *max_wait_time)
+                                 TAO_Transport *&transport)
 {
+
   // Find the appropriate connector object
   TAO_Connector *connector =
     this->get_connector (profile->tag ());
 
-  if (connector == 0)
-    return -1;
-
-  return connector->connect (profile, transport, max_wait_time);
+  return connector->connect (profile, transport);
 }
 
 int
@@ -156,12 +132,8 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
 {
   if (!ior)
     // Failure: Null IOR string pointer
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-      CORBA_SystemException::_tao_minor_code (
-        TAO_NULL_POINTER_MINOR_CODE,
-        0),
-      CORBA::COMPLETED_NO),
-      -1);
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      -1);
 
   TAO_ConnectorSetItor first_connector =
     this->connectors_.begin ();
@@ -174,39 +146,28 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
     {
       if (*connector)
         {
-          int mp_result = (*connector)->make_mprofile (ior,
-                                                       mprofile,
-                                                       ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (mp_result);
-
-          if (mp_result == 0)
-            return 0;  // Success
+          if ((*connector)->make_mprofile (ior,
+                                           mprofile,
+                                           ACE_TRY_ENV) == 0)
+            // Success.
+            return 0;  
         }
       else
         // Failure: Null pointer to connector in connector registry.
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (
-          CORBA_SystemException::_tao_minor_code (
-            TAO_NULL_POINTER_MINOR_CODE,
-            0),
-          CORBA::COMPLETED_NO),
-          -1);
+        ACE_THROW_RETURN (CORBA::MARSHAL (),
+                          -1);
     }
 
   // Failure: None of the connectors were able to parse the URL style
   // IOR into an MProfile.
-  ACE_THROW_RETURN (CORBA::INV_OBJREF (
-   CORBA_SystemException::_tao_minor_code (
-      TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL,
-      0),
-   CORBA::COMPLETED_NO),
-   -1);
+  ACE_THROW_RETURN (CORBA::MARSHAL (),
+                    -1);
 }
 
 TAO_Profile *
 TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
 {
-  CORBA::ULong tag = 0;
+  CORBA::ULong tag;
 
   // If there is an error we abort.
   if ((cdr >> tag) == 0)
@@ -219,12 +180,13 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
     {
       if (TAO_debug_level > 0)
         {
+          // @@ TODO create a generic profile in this case...
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) unknown profile tag %d\n",
                       tag));
         }
 
-      TAO_Profile *pfile = 0;
+      TAO_Profile *pfile;
       ACE_NEW_RETURN (pfile,
                       TAO_Unknown_Profile (tag),
                       0);
@@ -233,17 +195,16 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
           pfile->_decr_refcnt ();
           pfile = 0;
         }
-
       return pfile;
     }
 
-  // OK, we've got a known profile.  It's going to be encapsulated
+  // OK, we've got known profile.  It's going to be encapsulated
   // ProfileData.  Create a new decoding stream and context for it,
   // and skip the data in the parent stream
 
   // ProfileData is encoded as a sequence of octet. So first get the
   // length of the sequence.
-  CORBA::ULong encap_len = 0;
+  CORBA::ULong encap_len;
   if ((cdr >> encap_len) == 0)
     return 0;
 
@@ -258,33 +219,6 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
   return connector->create_profile (str);
 }
 
-char
-TAO_Connector_Registry::object_key_delimiter (const char *ior)
-{
-  if (!ior)
-    return 0; // Failure: Null IOR string pointer
-
-  TAO_ConnectorSetItor first_connector =
-    this->connectors_.begin ();
-  TAO_ConnectorSetItor last_connector =
-    this->connectors_.end ();
-
-  for (TAO_ConnectorSetItor connector = first_connector;
-       connector != last_connector;
-       ++connector)
-    {
-      if (*connector)
-        {
-          if ((*connector)->check_prefix (ior) == 0)
-            return (*connector)->object_key_delimiter ();
-        }
-    }
-
-  // Failure: None of the connectors were able to match their protocol
-  // against the provided string.
-  return 0;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Node<TAO_Connector*>;
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index 12e182b8702..e90b11acc09 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -76,9 +76,7 @@ public:
   // For this list of preconnections call the connector specific
   // preconnect method for each preconnection.
 
-  int connect (TAO_Profile *&profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time = 0);
+  int connect (TAO_Profile *&profile, TAO_Transport *&transport);
   // This is where the transport protocol is selected based on some
   // policy.  This member will call the connect member of the
   // TAO_Connector class which in turn will call the concrete
@@ -93,10 +91,6 @@ public:
   TAO_Profile* create_profile (TAO_InputCDR& cdr);
   // Create a profile based on the contents of <cdr>
 
-  char object_key_delimiter (const char *ior);
-  // Obtain the object key delimiter used by the protocol specified in
-  // the provided URL style IOR.
-
 private:
   TAO_ConnectorSet connectors_;
   // list of connectors currently open.
diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp
index 72b1d3f2d81..dbd675150c6 100644
--- a/TAO/tao/Context.cpp
+++ b/TAO/tao/Context.cpp
@@ -78,7 +78,7 @@ CORBA_Context::set_one_value (const char * /* propname */,
 }
 
 void
-CORBA_Context::set_values (CORBA::NVList_ptr,
+CORBA_Context::set_values (CORBA::NVList_ptr values,
                            CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
@@ -142,6 +142,8 @@ CORBA_ContextList::item (CORBA::ULong slot,
                          CORBA::Environment &ACE_TRY_ENV)
 {
   char **ctx;
+  ACE_TRY_ENV.clear ();
+
   if (this->ctx_list_.get (ctx,
                            slot) == -1)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
@@ -153,7 +155,8 @@ void
 CORBA_ContextList::remove (CORBA::ULong,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // unimplemented
+  ACE_TRY_ENV.clear ();
 }
 
 CORBA_ContextList_ptr
@@ -172,18 +175,4 @@ CORBA_ContextList::_destroy (void)
     delete this;
 }
 
-void
-CORBA_ContextList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA_ContextList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-    if (this->ref_count_ != 0)
-      delete this;
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h
index e992f4d94fb..81334d4018b 100644
--- a/TAO/tao/Context.h
+++ b/TAO/tao/Context.h
@@ -190,9 +190,6 @@ public:
   CORBA_ContextList_ptr _duplicate (void);
   // Increment the reference count.
 
-  static CORBA_ContextList_ptr _duplicate (CORBA_ContextList *);
-  // Increment the reference count.
-
   void _destroy (void);
   // Decrement the reference count and delete if it is 0.
 
@@ -215,10 +212,6 @@ public:
                 TAO_default_environment ());
   // remove the typecode at slot i. Raises the "Bounds" exception
 
-  void _incr_refcnt (void);
-  void  _decr_refcnt (void);
-  // Increment and decrement ref counts
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA::ContextList_ptr _ptr_type;
   typedef CORBA::ContextList_var _var_type;
diff --git a/TAO/tao/Context.i b/TAO/tao/Context.i
index 63fd1441608..92ec9a59340 100644
--- a/TAO/tao/Context.i
+++ b/TAO/tao/Context.i
@@ -214,14 +214,6 @@ CORBA_ContextList::_nil (void)
   return (CORBA_ContextList_ptr)0;
 }
 
-ACE_INLINE CORBA_ContextList *
-CORBA_ContextList::_duplicate (CORBA_ContextList* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
 // *************************************************************
 // Inline operations for class CORBA_ContextList_var
 // *************************************************************
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 76e1e8aba99..806197250e0 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -31,23 +31,23 @@ CORBA_Current_ptr CORBA_Current::_duplicate (CORBA_Current_ptr obj)
 
 CORBA_Current_ptr CORBA_Current::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Current::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/Current:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:CORBA/Current:1.0", env))
     return CORBA_Current::_nil ();
   TAO_Stub *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
          || !obj->_servant()
-         || obj->_servant()->_downcast ("IDL:omg.org/CORBA/Current:1.0") == 0
+         || obj->_servant()->_downcast ("IDL:CORBA/Current:1.0") == 0
       )
   {
     return new CORBA_Current(stub);
   }
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/CORBA/Current:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:CORBA/Current:1.0");
   return new POA_CORBA::_tao_collocated_Current(
       ACE_reinterpret_cast(POA_CORBA::Current_ptr, servant),
       stub
@@ -59,19 +59,19 @@ CORBA_Current_ptr CORBA_Current::_nil (void)
   return (CORBA_Current_ptr)NULL;
 } // end of _nil
 
-CORBA::Boolean CORBA_Current::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Current::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Current:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_Current::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Current:1.0";
+  return "IDL:CORBA/Current:1.0";
 }
 
 void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem)
@@ -85,37 +85,23 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem)
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_elem)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      _tao_elem = CORBA_Current::_nil ();
-      CORBA::TypeCode_var type = _tao_any.type ();
-      CORBA::Boolean eq = type->equal (CORBA::_tc_Current,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (eq == 0)
-        return 0;
-
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      CORBA::Object_ptr *_tao_obj_ptr;
-      ACE_NEW_RETURN (_tao_obj_ptr, CORBA::Object_ptr, 0);
-      if (stream.decode (CORBA::_tc_Current, _tao_obj_ptr, 0, ACE_TRY_ENV)
-          == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          _tao_elem = CORBA_Current::_narrow (*_tao_obj_ptr, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          CORBA::release (*_tao_obj_ptr);
-          *_tao_obj_ptr = _tao_elem;
-          ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Current,
-                                              _tao_obj_ptr, 1,
-                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 1;
+  CORBA::Environment _tao_env;
+  _tao_elem = CORBA_Current::_nil ();
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (CORBA::_tc_Current, _tao_env)) return 0; // not equal
+  TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+  CORBA::Object_ptr *_tao_obj_ptr;
+  ACE_NEW_RETURN (_tao_obj_ptr, CORBA::Object_ptr, 0);
+  if (stream.decode (CORBA::_tc_Current, _tao_obj_ptr, 0, _tao_env)
+    == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  {
+    _tao_elem = CORBA_Current::_narrow (*_tao_obj_ptr, _tao_env);
+    if (_tao_env.exception ()) return 0; // narrow failed
+    CORBA::release (*_tao_obj_ptr);
+    *_tao_obj_ptr = _tao_elem;
+    ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Current, _tao_obj_ptr, 1, _tao_env);
+    if (_tao_env.exception ()) return 0; // narrow failed
+    return 1;
+  }
+  return 0; // failure
 }
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 37d8d4c123d..693c7683dbb 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -115,12 +115,12 @@ class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
   // the static operations
   static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
   static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj,
-                                    CORBA_Environment &ACE_TRY_ENV =
+                                    CORBA_Environment &TAO_IN_ENV =
                                         TAO_default_environment ());
   static CORBA_Current_ptr _nil (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Char *type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                     TAO_default_environment ()
                                 );
   virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp
index 6b31268b162..cd5907ef82a 100644
--- a/TAO/tao/CurrentS.cpp
+++ b/TAO/tao/CurrentS.cpp
@@ -27,12 +27,12 @@ POA_CORBA::Current::~Current (void)
 
 CORBA::Boolean POA_CORBA::Current::_is_a (
     const char* value,
-    CORBA::Environment &
+    CORBA::Environment &_tao_environment
   )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Current:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
@@ -42,7 +42,7 @@ void* POA_CORBA::Current::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/Current:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Current_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -51,7 +51,7 @@ void* POA_CORBA::Current::_downcast (
 
 const char* POA_CORBA::Current::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Current:1.0";
+  return "IDL:CORBA/Current:1.0";
 }
 
 POA_CORBA::_tao_collocated_Current::_tao_collocated_Current (
@@ -71,20 +71,21 @@ POA_CORBA::Current_ptr POA_CORBA::_tao_collocated_Current::_get_servant (void) c
 
 CORBA::Boolean POA_CORBA::_tao_collocated_Current::_is_a (
     const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_environment
   )
 {
   return this->servant_->_is_a (
       logical_type_id,
-      ACE_TRY_ENV
+      _tao_environment
     );
 }
 
 
 CORBA::Current*
-POA_CORBA::Current::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_CORBA::_tao_collocated_Current (this, stub);
 }
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index ac8406364a5..8dd217bdfe9 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -39,9 +39,7 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV))
     return CORBA_DomainManager::_nil ();
   return CORBA_DomainManager::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -96,6 +94,7 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -153,9 +152,7 @@ CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA::ConstructionPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ConstructionPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV))
     return CORBA::ConstructionPolicy::_nil ();
   return CORBA::ConstructionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -213,6 +210,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK;
 
@@ -346,11 +344,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_DomainManager,CORBA_DomainManager_var>;
+  template class TAO_Object_Field_T<CORBA_DomainManager>;
   template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>;
   template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Field_T<CORBA_DomainManager,CORBA_DomainManager_var>
+# pragma instantiate TAO_Object_Field_T<CORBA_DomainManager>
 # pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
 # pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
@@ -408,9 +406,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
+  template class TAO_Object_Field_T<CORBA_ConstructionPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Field_T<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
+# pragma instantiate TAO_Object_Field_T<CORBA_ConstructionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index b720bcb41ff..454cf84253c 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -82,12 +82,12 @@ public:
   static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
   static CORBA_DomainManager_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_DomainManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_DomainManager_ptr _nil (void);
@@ -99,7 +99,7 @@ public:
     );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -250,12 +250,12 @@ public:
   static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj);
   static CORBA_ConstructionPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_ConstructionPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_ConstructionPolicy_ptr _nil (void);
@@ -268,7 +268,7 @@ public:
     );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/DomainS_T.i b/TAO/tao/DomainS_T.i
index efc44a409b9..eace8fe801c 100644
--- a/TAO/tao/DomainS_T.i
+++ b/TAO/tao/DomainS_T.i
@@ -79,12 +79,12 @@ POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA::DomainManager_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->DomainManager::_default_POA (ACE_TRY_ENV);
+  return this->DomainManager::_default_POA (env);
 }
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index 85bdf7fb301..cdac0673f3e 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -813,7 +813,6 @@ CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (void)
 CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max) // uses max size
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
 #else /* AHETI */
@@ -827,7 +826,6 @@ CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max,
                                     CORBA::Boolean release)
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
 #else /* AHETI */
@@ -840,7 +838,6 @@ CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (
   ) // copy ctor
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
 #else /* AHETI */
@@ -1108,7 +1105,6 @@ CORBA_AnySeq::CORBA_AnySeq (void)
 CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max) // uses max size
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
        || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_AnySeq
 #else /* AHETI */
@@ -1122,7 +1118,6 @@ CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max,
                 CORBA::Boolean release)
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_AnySeq
 #else /* AHETI */
@@ -1133,7 +1128,6 @@ CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max,
 CORBA_AnySeq::CORBA_AnySeq (const CORBA_AnySeq &seq) // copy ctor
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_AnySeq
 #else /* AHETI */
@@ -1356,19 +1350,19 @@ CORBA::TypeCode_ptr _tc_CORBA_DynArray =
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_DynAny,CORBA_DynAny_var>;
-  template class TAO_Object_Field_T<CORBA_DynEnum,CORBA_DynEnum_var>;
-  template class TAO_Object_Field_T<CORBA_DynStruct,CORBA_DynStruct_var>;
-  template class TAO_Object_Field_T<CORBA_DynUnion,CORBA_DynUnion_var>;
-  template class TAO_Object_Field_T<CORBA_DynSequence,CORBA_DynSequence_var>;
-  template class TAO_Object_Field_T<CORBA_DynArray,CORBA_DynArray_var>;
+  template class TAO_Object_Field_T<CORBA_DynAny>;
+  template class TAO_Object_Field_T<CORBA_DynEnum>;
+  template class TAO_Object_Field_T<CORBA_DynStruct>;
+  template class TAO_Object_Field_T<CORBA_DynUnion>;
+  template class TAO_Object_Field_T<CORBA_DynSequence>;
+  template class TAO_Object_Field_T<CORBA_DynArray>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynAny,CORBA_DynAny_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynEnum,CORBA_DynEnum_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynStruct,CORBA_DynStruct_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynUnion,CORBA_DynUnion_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynSequence,CORBA_DynSequence_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynArray,CORBA_DynArray_var>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynAny>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynEnum>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynStruct>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynUnion>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynSequence>
+#  pragma instantiate TAO_Object_Field_T<CORBA_DynArray>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 0dcf8fe11d2..3e39743055e 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -224,190 +224,190 @@ public:
     static CORBA::TypeCode_ptr _tc_InvalidSeq;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
      );
   virtual void assign (
       CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
      );
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean seek (
       CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
@@ -493,21 +493,21 @@ public:
   static CORBA_DynEnum_ptr _nil (void);
 
   virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
@@ -833,7 +833,6 @@ private:
 // *************************************************************
 class TAO_Export CORBA_NameValuePairSeq : public
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
        || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
 #else /* AHETI */
@@ -923,20 +922,20 @@ public:
   static CORBA_DynStruct_ptr _nil (void);
 
   virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
       const CORBA_NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
@@ -1022,37 +1021,37 @@ public:
   static CORBA_DynUnion_ptr _nil (void);
 
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
@@ -1318,7 +1317,6 @@ private:
 
 class TAO_Export CORBA_AnySeq : public
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
        || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
   _TAO_Unbounded_Sequence_CORBA_AnySeq
 #else /* AHETI */
@@ -1409,21 +1407,21 @@ public:
   static CORBA_DynSequence_ptr _nil (void);
 
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
@@ -1509,12 +1507,12 @@ public:
   static CORBA_DynArray_ptr _nil (void);
 
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
+      CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
index e74f8a6a3a1..34c8b64e844 100644
--- a/TAO/tao/DynAnyS.cpp
+++ b/TAO/tao/DynAnyS.cpp
@@ -569,14 +569,14 @@ POA_CORBA::_tao_collocated_DynAny::rewind (
 
 
 CORBA_DynAny*
-POA_CORBA::DynAny::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynAny::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
-  return new POA_CORBA::_tao_collocated_DynAny (this, 
-                                                stub);
+  return new POA_CORBA::_tao_collocated_DynAny (this, stub);
 }
 
 // constructor
@@ -718,11 +718,12 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
 
 
 CORBA_DynEnum*
-POA_CORBA::DynEnum::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynEnum::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
   return new POA_CORBA::_tao_collocated_DynEnum (this,
                                                  stub);
@@ -861,11 +862,12 @@ POA_CORBA::_tao_collocated_DynStruct::set_members (
 
 
 CORBA_DynStruct*
-POA_CORBA::DynStruct::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynStruct::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
   return new POA_CORBA::_tao_collocated_DynStruct (this,
                                                    stub);
@@ -1043,14 +1045,15 @@ POA_CORBA::_tao_collocated_DynUnion::member_kind (
 
 
 CORBA_DynUnion*
-POA_CORBA::DynUnion::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynUnion::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
   return new POA_CORBA::_tao_collocated_DynUnion (this,
-                                                  stub);
+                                             stub);
 }
 
 // constructor
@@ -1186,11 +1189,12 @@ POA_CORBA::_tao_collocated_DynSequence::set_elements (
 
 
 CORBA_DynSequence*
-POA_CORBA::DynSequence::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynSequence::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
   return new POA_CORBA::_tao_collocated_DynSequence (this,
                                                      stub);
@@ -1306,11 +1310,12 @@ POA_CORBA::_tao_collocated_DynArray::set_elements (
 
 
 CORBA_DynArray*
-POA_CORBA::DynArray::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::DynArray::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
 
-  ACE_CHECK_RETURN (0);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
 
   return new POA_CORBA::_tao_collocated_DynArray (this,
                                                   stub);
diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
index bc1cbf0aaf9..ba08af1e6a8 100644
--- a/TAO/tao/DynAny_i.cpp
+++ b/TAO/tao/DynAny_i.cpp
@@ -23,49 +23,38 @@
 #include "tao/DynArray_i.h"
 #include "tao/DynUnion_i.h"
 #include "tao/InconsistentTypeCodeC.h"
-#include "ace/Auto_Ptr.h"
 
 // Constructor from typecode
 TAO_DynAny_i::TAO_DynAny_i (CORBA_TypeCode_ptr tc)
   : value_ (CORBA::TypeCode::_duplicate (tc))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Check to see if it's a simple type.
-      int tk = unalias (tc, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      switch (tk)
-        {
-          case CORBA::tk_null:
-          case CORBA::tk_void:
-          case CORBA::tk_short:
-          case CORBA::tk_long:
-          case CORBA::tk_ushort:
-          case CORBA::tk_ulong:
-          case CORBA::tk_float:
-          case CORBA::tk_double:
-          case CORBA::tk_longlong:
-          case CORBA::tk_ulonglong:
-          case CORBA::tk_boolean:
-          case CORBA::tk_char:
-          case CORBA::tk_wchar:
-          case CORBA::tk_octet:
-          case CORBA::tk_any:
-          case CORBA::tk_TypeCode:
-          case CORBA::tk_objref:
-          case CORBA::tk_string:
-            break;
-          default:
-            ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
+  CORBA::Environment env;
+  // Check to see if it's a simple type.
+  switch (unalias (tc, env))
     {
-      // do nothing
+      case CORBA::tk_null:
+      case CORBA::tk_void:
+      case CORBA::tk_short:
+      case CORBA::tk_long:
+      case CORBA::tk_ushort:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+      case CORBA::tk_boolean:
+      case CORBA::tk_char:
+      case CORBA::tk_wchar:
+      case CORBA::tk_octet:
+      case CORBA::tk_any:
+      case CORBA::tk_TypeCode:
+      case CORBA::tk_objref:
+      case CORBA::tk_string:
+        break;
+      default:
+        env.exception (new CORBA_ORB_InconsistentTypeCode);
+        break;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Constructor from Any
@@ -73,43 +62,32 @@ TAO_DynAny_i::TAO_DynAny_i (const CORBA_Any& any)
   : value_ (any)
 {
   // Check to see if it's a simple type.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // @@ Is the typecode duplicate in Any.type()???
-      int tk = unalias (any.type (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      switch (tk)
-        {
-          case CORBA::tk_null:
-          case CORBA::tk_void:
-          case CORBA::tk_short:
-          case CORBA::tk_long:
-          case CORBA::tk_ushort:
-          case CORBA::tk_ulong:
-          case CORBA::tk_float:
-          case CORBA::tk_double:
-          case CORBA::tk_longlong:
-          case CORBA::tk_ulonglong:
-          case CORBA::tk_boolean:
-          case CORBA::tk_char:
-          case CORBA::tk_wchar:
-          case CORBA::tk_octet:
-          case CORBA::tk_any:
-          case CORBA::tk_TypeCode:
-          case CORBA::tk_objref:
-          case CORBA::tk_string:
-            break;
-          default:
-            ACE_THROW (CORBA_DynAny::Invalid ());
-        }
-    }
-  ACE_CATCHANY
+  CORBA::Environment env;
+  switch (unalias (any.type (), env))
     {
-      // do nothing
+      case CORBA::tk_null:
+      case CORBA::tk_void:
+      case CORBA::tk_short:
+      case CORBA::tk_long:
+      case CORBA::tk_ushort:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+      case CORBA::tk_boolean:
+      case CORBA::tk_char:
+      case CORBA::tk_wchar:
+      case CORBA::tk_octet:
+      case CORBA::tk_any:
+      case CORBA::tk_TypeCode:
+      case CORBA::tk_objref:
+      case CORBA::tk_string:
+        break;
+      default:
+        env.exception (new CORBA_DynAny::Invalid);
+        break;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Destructor
@@ -127,35 +105,20 @@ TAO_DynAny_i::type (CORBA::Environment &)
 
 void
 TAO_DynAny_i::assign (CORBA_DynAny_ptr dyn_any,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
-  CORBA::TypeCode_ptr tp = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->value_.type ()->equal (tp,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      this->value_ = *dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->value_.type ()->equal (dyn_any->type (env),
+                                   env))
+    this->value_ = *dyn_any->to_any (env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynAny_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::copy (CORBA::Environment &env)
 {
   TAO_DynAny_i* tmp = new TAO_DynAny_i (this->value_);
-
-  CORBA_DynAny_ptr retval = tmp->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return retval;
+  return tmp->_this (env);
 }
 
 void
@@ -166,48 +129,34 @@ TAO_DynAny_i::destroy (CORBA::Environment &)
 
 void
 TAO_DynAny_i::from_any (const CORBA_Any& any,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
-  CORBA::Boolean equal =
-    this->value_.type ()->equal (any.type (),
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!equal || any._tao_get_cdr () == 0)
+  if (!this->value_.type ()->equal (any.type (),
+                                    env)
+      || any._tao_get_cdr () == 0)
     {
-      ACE_THROW (CORBA_DynAny::Invalid ());
+      env.exception (new CORBA_DynAny::Invalid);
     }
 
   this->value_ = any;
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::to_any (CORBA::Environment &env)
 {
   if (this->value_._tao_get_cdr ())
-    {
-      CORBA_Any_ptr retval;
-
-      ACE_NEW_RETURN (retval,
-                      CORBA::Any (this->value_),
-                      0);
-
-      return retval;
-    }
+    return new CORBA::Any (this->value_);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA_DynAny_ptr
-TAO_DynAny_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::current_component (CORBA::Environment &env)
 {
-  CORBA_DynAny_ptr retval = this->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  return this->_this (env);
 }
 
 CORBA::Boolean
@@ -220,7 +169,10 @@ CORBA::Boolean
 TAO_DynAny_i::seek (CORBA::Long slot,
                     CORBA::Environment &)
 {
-  return slot == 0 ? 1 : 0;
+  if (slot == 0)
+    return 1;
+  else
+    return 0;
 }
 
 // Nothing to rewind in this class.
@@ -233,505 +185,331 @@ TAO_DynAny_i::rewind (CORBA::Environment &)
 
 void
 TAO_DynAny_i::insert_boolean (CORBA::Boolean value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      CORBA::Any::from_boolean tmp (value);
-      this->value_ <<= tmp;
-    }
+  if (unalias (this->value_.type (), env) == CORBA::tk_boolean)
+    this->value_ <<= CORBA::Any::from_boolean (value);
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_octet (CORBA::Octet value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      CORBA::Any::from_octet tmp (value);
-      this->value_ <<= tmp;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_octet)
+    this->value_ <<= CORBA::Any::from_octet (value);
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_char (CORBA::Char value,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      CORBA::Any::from_char tmp (value);
-      this->value_ <<= tmp;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_char)
+    this->value_ <<= CORBA::Any::from_char (value);
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_short (CORBA::Short value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_short)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_ushort (CORBA::UShort value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_ushort)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_long (CORBA::Long value,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_long)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_ulong (CORBA::ULong value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_ulong)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_float (CORBA::Float value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_float)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_double (CORBA::Double value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_double)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_string (const char * value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_string)
+    this->value_ <<= CORBA::Any::from_string (CORBA::string_dup (value),
+                                              0,
+                                              1);
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_reference (CORBA::Object_ptr value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_objref)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_typecode (CORBA::TypeCode_ptr value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_TypeCode)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_longlong (CORBA::LongLong value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_longlong)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_ulonglong (CORBA::ULongLong value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind = unalias (this->value_.type (),
-                                ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_ulonglong)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_wchar (CORBA::WChar value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      CORBA::Any::from_wchar tmp (value);
-      this->value_ <<= tmp;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_wchar)
+    this->value_ <<= CORBA::Any::from_wchar (value);
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynAny_i::insert_any (const CORBA::Any& value,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      this->value_ <<= value;
-    }
+  if (this->value_.type ()->kind (env) == CORBA::tk_any)
+    this->value_ <<= value;
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 // Get functions
 
 CORBA::Boolean
-TAO_DynAny_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val;
-  CORBA::Any::to_boolean tmp (val);
 
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= CORBA_Any::to_boolean (val)))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Octet
-TAO_DynAny_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val;
-  CORBA::Any::to_octet tmp (val);
 
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= CORBA_Any::to_octet (val)))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Char
-TAO_DynAny_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val;
-  CORBA::Any::to_char tmp (val);
 
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= CORBA_Any::to_char (val)))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Short
-TAO_DynAny_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::UShort
-TAO_DynAny_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Long
-TAO_DynAny_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::ULong
-TAO_DynAny_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Float
-TAO_DynAny_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::Double
-TAO_DynAny_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 char *
-TAO_DynAny_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val;
+  CORBA::Any::to_string ts (val, 0);
 
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= ts))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
-  return val;
+  return ts.val_;
 }
 
 CORBA::Object_ptr
-TAO_DynAny_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val;
-  CORBA::Any::to_object tmp (val);
+  CORBA_Any_var a = this->to_any (env);
 
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= CORBA_Any::to_object (val)))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::TypeCode_ptr
-TAO_DynAny_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::LongLong
-TAO_DynAny_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_longlong (CORBA::Environment &env)
 {
   CORBA::LongLong val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::ULongLong
-TAO_DynAny_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val;
 
   if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
 
 CORBA::WChar
-TAO_DynAny_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val;
-  CORBA::Any::to_wchar tmp (val);
 
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
+  if (!(this->value_ >>= CORBA_Any::to_wchar (val)))
+    env.exception (new CORBA_DynAny::TypeMismatch);
 
   return val;
 }
@@ -762,11 +540,7 @@ CORBA_DynAny_ptr
 TAO_DynAny_i::create_dyn_any (const CORBA_Any &any,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  switch (kind)
+  switch (TAO_DynAny_i::unalias (any.type (), ACE_TRY_ENV))
     {
       case CORBA::tk_null:
       case CORBA::tk_void:
@@ -787,136 +561,58 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any &any,
       case CORBA::tk_objref:
       case CORBA::tk_string:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynAny_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynAny_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynAny_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       case CORBA::tk_struct:
       case CORBA::tk_except:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynStruct_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynStruct_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynStruct::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       case CORBA::tk_sequence:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynSequence_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynSequence_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynSequence::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       case CORBA::tk_union:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynUnion_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynUnion_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynUnion::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       case CORBA::tk_enum:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynEnum_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynEnum_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynEnum::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       case CORBA::tk_array:
         {
-          CORBA_DynAny_var retval;
-
           TAO_DynArray_i *dp;
-
           ACE_NEW_THROW_EX (dp,
                             TAO_DynArray_i (any),
                             CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynArray_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
+          ACE_CHECK_RETURN (CORBA_DynArray::_nil ());
+          return dp->_this (ACE_TRY_ENV);
         }
       default:
         break;
@@ -929,163 +625,79 @@ CORBA_DynAny_ptr
 TAO_DynAny_i::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
                                     CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynAny_var retval;
-
   TAO_DynAny_i *dp;
-
   ACE_NEW_THROW_EX (dp,
                     TAO_DynAny_i (tc),
                     CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynAny_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynStruct_ptr
 TAO_DynAny_i::create_dyn_struct (CORBA_TypeCode_ptr tc,
                                  CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynStruct_var retval;
-
   TAO_DynStruct_i *dp;
-
   ACE_NEW_THROW_EX (dp,
                     TAO_DynStruct_i (tc),
                     CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynStruct_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+  ACE_CHECK_RETURN (CORBA_DynStruct::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynSequence_ptr
 TAO_DynAny_i::create_dyn_sequence (CORBA_TypeCode_ptr tc,
                                    CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynSequence_var retval;
-
   TAO_DynSequence_i *dp;
-
   ACE_NEW_THROW_EX (dp,
-                    TAO_DynSequence_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynSequence_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+                        TAO_DynSequence_i (tc),
+                        CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA_DynSequence::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynArray_ptr
 TAO_DynAny_i::create_dyn_array (CORBA_TypeCode_ptr tc,
                                 CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynArray_var retval;
-
   TAO_DynArray_i *dp;
-
   ACE_NEW_THROW_EX (dp,
-                    TAO_DynArray_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynArray_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+                        TAO_DynArray_i (tc),
+                        CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA_DynArray::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynUnion_ptr
 TAO_DynAny_i::create_dyn_union (CORBA_TypeCode_ptr tc,
                                 CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynUnion_var retval;
-
   TAO_DynUnion_i *dp;
-
   ACE_NEW_THROW_EX (dp,
-                    TAO_DynUnion_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynUnion_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+                        TAO_DynUnion_i (tc),
+                        CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA_DynUnion::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynEnum_ptr
 TAO_DynAny_i::create_dyn_enum (CORBA_TypeCode_ptr tc,
                                CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_DynEnum_var retval;
-
   TAO_DynEnum_i *dp;
-
   ACE_NEW_THROW_EX (dp,
-                    TAO_DynEnum_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynEnum_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
+                        TAO_DynEnum_i (tc),
+                        CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA_DynEnum::_nil ());
+  return dp->_this (ACE_TRY_ENV);
 }
 
 CORBA_DynAny_ptr
 TAO_DynAny_i::create_dyn_any (CORBA_TypeCode_ptr tc,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::Environment& env)
 {
-  CORBA_DynAny_var retval;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  switch (kind)
+  switch (TAO_DynAny_i::unalias (tc, env))
     {
       case CORBA::tk_null:
       case CORBA::tk_void:
@@ -1105,92 +717,39 @@ TAO_DynAny_i::create_dyn_any (CORBA_TypeCode_ptr tc,
       case CORBA::tk_TypeCode:
       case CORBA::tk_objref:
       case CORBA::tk_string:
-        retval = create_basic_dyn_any (tc,
-                                       ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_basic_dyn_any (tc, env);
       case CORBA::tk_struct:
       case CORBA::tk_except:
-        retval = create_dyn_struct (tc,
-                                    ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_dyn_struct (tc, env);
       case CORBA::tk_sequence:
-        retval = create_dyn_sequence (tc,
-                                      ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_dyn_sequence (tc, env);
       case CORBA::tk_union:
-        retval = create_dyn_union (tc,
-                                   ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_dyn_union (tc, env);
       case CORBA::tk_enum:
-        retval = create_dyn_enum (tc,
-                                  ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_dyn_enum (tc, env);
       case CORBA::tk_array:
-        retval = create_dyn_array (tc,
-                                   ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
+        return create_dyn_array (tc, env);
       default:
         break;
     }
 
-  ACE_THROW_RETURN (CORBA_ORB_InconsistentTypeCode (),
-                    CORBA_DynAny::_nil ());
+  env.exception (new CORBA_ORB_InconsistentTypeCode);
+  return CORBA_DynAny::_nil ();
 }
 
 // Utility function called by all the DynAny classes
 // to extract the TCKind of possibly aliased types.
 CORBA::TCKind
 TAO_DynAny_i::unalias (CORBA_TypeCode_ptr tc,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
-  CORBA::TCKind tck = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+  CORBA::TCKind tck = tc->kind (env);
 
   while (tck == CORBA::tk_alias)
-    {
-      CORBA_TypeCode_ptr temp = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-
-      tck = TAO_DynAny_i::unalias (temp,
-                                   ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-    }
+    tck = TAO_DynAny_i::unalias (tc->content_type (env),
+                                 env);
 
   return tck;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<TAO_DynAny_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynArray_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynEnum_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynSequence_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynStruct_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynUnion_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynAny_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynArray_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynEnum_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynSequence_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynStruct_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynUnion_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
index e0305bb5898..d43d9cd01ce 100644
--- a/TAO/tao/DynAny_i.h
+++ b/TAO/tao/DynAny_i.h
@@ -44,166 +44,115 @@ public:
   // = Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument.
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // In this class, there is only one
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &);
   // Returns next component, again here there is only one
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &);
   // In this class, returns true only for slot of 0
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
   // The ORB DynAny-factory functions will call these so we don't need
   // to keep an orb pointer in each DynAny object.
 
   static CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
+                                          CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment ());
+                                                CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment ());
+                                                CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                                    CORBA::Environment &ACE_TRY_ENV =
-                                                      TAO_default_environment ());
+                                                    CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV =
-                                                TAO_default_environment ());
+                                              CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV =
-                                                TAO_default_environment ());
+                                              CORBA::Environment &ACE_TRY_ENV);
   static CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc,
-                                            CORBA::Environment &ACE_TRY_ENV =
-                                              TAO_default_environment ());
+                                            CORBA::Environment &ACE_TRY_ENV);
 
   static CORBA_DynAny_ptr create_dyn_any (CORBA_TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
+                                          CORBA::Environment &ACE_TRY_ENV);
   // And an extra generic one (not required in the spec) that calls
   // one of the above passing a typecode.  Comes in handy in
   // implementing some versions of current_component().
 
   static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+                                CORBA::Environment &ACE_TRY_ENV);
   // Utility, in case we have tk_alias.
 
 private:
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index c0ac711e0d5..0b3ce30f6c0 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -28,64 +28,46 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::Environment env;
+  CORBA::TypeCode_ptr tc = this->type_.in ();
+
+  // The type will be correct if this constructor called from a
+  // factory function, but it could also be called by the user,
+  // so.....
+  if (TAO_DynAny_i::unalias (tc, env) == CORBA::tk_array)
     {
-      CORBA::TypeCode_ptr tc = this->type_.in ();
+      CORBA::ULong numfields = this->get_arg_length (any.type (),
+                                                     env);
+      // Resize the array.
+      this->da_members_.size (numfields);
 
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // Get the CDR stream of the argument.
+      ACE_Message_Block* mb = any._tao_get_cdr ();
 
-      if (kind == CORBA::tk_array)
-        {
-          CORBA::ULong numfields = this->get_arg_length (any.type (),
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          // Get the CDR stream of the argument.
-          ACE_Message_Block* mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          CORBA::TypeCode_ptr field_tc =
-            this->get_element_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            {
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                   0,
-                                   cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
-        }
-      else
+      TAO_InputCDR cdr (mb);
+
+      CORBA::TypeCode_ptr field_tc =
+        this->get_element_type (env);
+
+      for (CORBA::ULong i = 0; i < numfields; i++)
         {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
+          // This Any constructor is a TAO extension.
+          CORBA_Any field_any (field_tc,
+                               0,
+                               cdr.start ());
+
+          // This recursive step will call the correct constructor
+          // based on the type of field_any.
+          this->da_members_[i] =
+            TAO_DynAny_i::create_dyn_any (field_any,
+                                          env);
+
+          // Move to the next field in the CDR stream.
+          cdr.skip (field_tc);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc)
@@ -93,35 +75,23 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Environment env;
 
-      if (kind == CORBA::tk_array)
-        {
-          CORBA::ULong numfields = this->get_arg_length (tc,
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            // With a typecode arg, we just create the top level.
-            this->da_members_[i] = 0;
-        }
-      else
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
+  // Need to check if called by user.
+  if (TAO_DynAny_i::unalias (tc,
+                             env) == CORBA::tk_array)
     {
-      // do nothing...
+      CORBA::ULong numfields = this->get_arg_length (tc,
+                                                     env);
+      // Resize the array.
+      this->da_members_.size (numfields);
+
+      for (CORBA::ULong i = 0; i < numfields; i++)
+        // With a typecode arg, we just create the top level.
+        this->da_members_[i] = 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynArray_i::~TAO_DynArray_i (void)
@@ -153,8 +123,6 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; i++)
     {
       CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
       (*elements)[i] = temp.in ();
     }
 
@@ -163,43 +131,37 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_DynArray_i::set_elements (const CORBA_AnySeq& value,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
   CORBA::ULong size = this->da_members_.size ();
 
   if (size != length)
     {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
+      env.exception (new CORBA_DynAny::InvalidSeq);
+      return;
     }
 
   CORBA::TypeCode_ptr element_type =
-    this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->get_element_type (env);
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
       // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type,
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (equal)
+      if (value[i].type ()->equal (element_type,
+                                   env))
         {
           if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
+            this->da_members_[i]->destroy (env);
 
           this->da_members_[i] =
             TAO_DynAny_i::create_dyn_any (value[i],
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                          env);
         }
       else
         {
-          ACE_THROW (CORBA_DynAny::InvalidSeq ());
+          env.exception (new CORBA_DynAny::InvalidSeq);
+          break;
         }
     }
 }
@@ -208,56 +170,34 @@ TAO_DynArray_i::set_elements (const CORBA_AnySeq& value,
 
 void
 TAO_DynArray_i::assign (CORBA_DynAny_ptr dyn_any,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any any = *dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (any,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_.in ()->equal (dyn_any->type (env),
+                                env))
+    this->from_any (*dyn_any->to_any (env),
+                    env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynArray_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::copy (CORBA::Environment &env)
 {
-  CORBA_Any_ptr any = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*any,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  CORBA_Any_ptr a = this->to_any (env);
+  return TAO_DynAny_i::create_dyn_any (*a,
+                                       env);
 }
 
 void
-TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::destroy (CORBA::Environment &env)
 {
   // Do a deep destroy
   for (CORBA::ULong i = 0;
        i < this->da_members_.size ();
        i++)
     if (!CORBA::is_nil (this->da_members_[i].in ()))
-      {
-        this->da_members_[i]->destroy (ACE_TRY_ENV);
-        ACE_CHECK;
-      }
+      this->da_members_[i]->destroy (env);
 
   // Free the top level
   delete this;
@@ -265,13 +205,10 @@ TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynArray_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
+  if (this->type_.in ()->equal (any.type (),
+                                env))
     {
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
@@ -279,16 +216,14 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
 
       CORBA::ULong length = this->da_members_.size ();
       CORBA::ULong arg_length = this->get_arg_length (any.type (),
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
+                                                      env);
       if (length != arg_length)
         {
-          ACE_THROW (CORBA_DynAny::Invalid ());
+          env.exception (new CORBA_DynAny::Invalid);
+          return;
         }
 
-      CORBA::TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK;
+      CORBA::TypeCode_ptr field_tc = this->get_element_type (env);
 
       for (CORBA::ULong i = 0; i < arg_length; i++)
         {
@@ -298,24 +233,18 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
+            this->da_members_[i]->destroy (env);
 
           this->da_members_[i] =
             TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                          env);
 
           // Move to the next field in the CDR stream.
           cdr.skip (field_tc);
         }
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA::Any_ptr
@@ -324,7 +253,6 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   TAO_OutputCDR out_cdr;
 
   CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0;
        i < this->da_members_.size ();
@@ -333,13 +261,13 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 0);
+          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          return 0;
         }
 
       // Recursive step
       CORBA_Any_var field_any =
         this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -348,23 +276,17 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       out_cdr.append (field_tc,
                       &field_cdr,
                       ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any *retval;
-
-  CORBA_TypeCode_ptr my_tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (my_tc,
+                    CORBA_Any (this->type (ACE_TRY_ENV),
                                0,
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-
   return retval;
 }
 
@@ -379,22 +301,15 @@ TAO_DynArray_i::type (CORBA::Environment &)
 // it.
 
 CORBA_DynAny_ptr
-TAO_DynArray_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::current_component (CORBA::Environment &env)
 {
   if (this->da_members_.size () == 0)
     return 0;
 
   if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] =
-        TAO_DynAny_i::create_dyn_any (tc,
-                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-    }
-
+    this->da_members_[this->current_index_] =
+      TAO_DynAny_i::create_dyn_any (this->get_element_type (env),
+                                    env);
   return this->da_members_[this->current_index_].in ();
 }
 
@@ -415,9 +330,7 @@ TAO_DynArray_i::seek (CORBA::Long slot,
                       CORBA::Environment &)
 {
   if (slot < 0 || slot >= (CORBA::Long) this->da_members_.size ())
-    {
-      return 0;
-    }
+    return 0;
 
   this->current_index_ = slot;
   return 1;
@@ -440,450 +353,226 @@ TAO_DynArray_i::rewind (CORBA::Environment &)
 
 void
 TAO_DynArray_i::insert_boolean (CORBA::Boolean value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_boolean (value,
+                                                     env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_octet (CORBA::Octet value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_octet)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_octet (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_char (CORBA::Char value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_char)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_char (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_short (CORBA::Short value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_short)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_short (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_ushort (CORBA::UShort value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ushort (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_long (CORBA::Long value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_long (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_ulong (CORBA::ULong value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulong (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_float (CORBA::Float value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_float)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_float (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_double (CORBA::Double value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_double)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_double (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_string (const char * value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_string)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_string (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_reference (CORBA::Object_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_objref)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_reference (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_typecode (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_longlong (CORBA::LongLong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_longlong (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_ulonglong (CORBA::ULongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulonglong (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_wchar (CORBA::WChar value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_wchar (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynArray_i::insert_any (const CORBA::Any& value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_any)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_any (value,
+                                                 env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 // Get functions
@@ -893,534 +582,357 @@ TAO_DynArray_i::insert_any (const CORBA::Any& value,
 // seems like a courteous thing to do.
 
 CORBA::Boolean
-TAO_DynArray_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_boolean)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean)
         {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_boolean (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Octet
-TAO_DynArray_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_octet)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_octet)
         {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_octet (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Char
-TAO_DynArray_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_char)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_char)
         {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_char (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Short
-TAO_DynArray_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_short)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_short)
         {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_short (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::UShort
-TAO_DynArray_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ushort)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort)
         {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ushort (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Long
-TAO_DynArray_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_long)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
         {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_long (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULong
-TAO_DynArray_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ulong)
         {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ulong (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Float
-TAO_DynArray_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_float)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_float)
         {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_float (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Double
-TAO_DynArray_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_double)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_double)
         {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_double (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 char *
-TAO_DynArray_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_string)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_string)
         {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_string (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Object_ptr
-TAO_DynArray_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_objref)
+      if (dp->type (env)->kind (env) == CORBA::tk_objref)
         {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_reference (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_TypeCode)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode)
         {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_typecode (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::LongLong
-TAO_DynArray_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_longlong (CORBA::Environment &env)
 {
 #if defined (ACE_LACKS_LONGLONG_T)
   CORBA::LongLong val = {0, 0};
 #else  /* ! ACE_LACKS_LONGLONG_T */
   CORBA::LongLong val = 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
-
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong)
         {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_longlong (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULongLong
-TAO_DynArray_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulonglong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong)
         {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ulonglong (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::WChar
-TAO_DynArray_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_wchar)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar)
         {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_wchar (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::get_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_any)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_any)
         {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_any (env);
+          this->next (env);
         }
       else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
@@ -1428,48 +940,27 @@ TAO_DynArray_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 // Private utility function.
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::get_element_type (CORBA::Environment& env)
 {
   CORBA::TypeCode_ptr element_type = this->type_.in ();
 
   // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  while (kind != CORBA::tk_array)
-    {
-      element_type = element_type->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-    }
+  while (element_type->kind (env) != CORBA::tk_array)
+    element_type = element_type->content_type (env);
 
   // Return the content type.
-  CORBA_TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  return retval;
+  return element_type->content_type (env);
 }
 
 // Get the argument length from the (aliased) typecode.
 CORBA::ULong
 TAO_DynArray_i::get_arg_length (CORBA::TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  while (tc->kind (env) == CORBA::tk_alias)
+    tc = tc->content_type (env);
 
-  while (kind == CORBA::tk_alias)
-    {
-      tc = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA::ULong retval = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return retval;
+  return tc->length (env);
 }
 
 //**********************************************************
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index cff78c0119d..967c672a4f8 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -47,150 +47,104 @@ public:
 
   // = Functions specific to DynArray
 
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
+  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV);
   // Assign/dump elements using IDL defined type AnySeq
 
   void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
 
   // = Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument.
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // Used in iterating through the contents.
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Jump to component at <slot>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &ACE_TRY_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
 private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the type of elements contained in the array.
 
   CORBA::ULong get_arg_length (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
+                               CORBA::Environment &ACE_TRY_ENV);
   // Gets the length of the array from the typecode
 
   CORBA::TypeCode_var type_;
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index 03d0a619172..2f607d6dcf8 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -26,59 +26,36 @@ TAO_DynEnum_i::TAO_DynEnum_i (const CORBA_Any &any)
   : type_ (any.type ()),
     value_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      int tk =
-        TAO_DynAny_i::unalias (this->type_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (tk == CORBA::tk_enum)
-        {
-          // Get the CDR stream of the argument.
-          ACE_Message_Block* mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          cdr.read_ulong (this->value_);
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
+  CORBA::Environment env;
+
+  // The type will be correct if this constructor called from a
+  // factory function, but it could also be called by the user,
+  // so.....
+  if (TAO_DynAny_i::unalias (this->type_.in (),
+                             env) == CORBA::tk_enum)
     {
-      // do nothing
+      // Get the CDR stream of the argument.
+      ACE_Message_Block* mb = any._tao_get_cdr ();
+
+      TAO_InputCDR cdr (mb);
+
+      cdr.read_ulong (this->value_);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynEnum_i::TAO_DynEnum_i (CORBA_TypeCode_ptr tc)
   : type_ (CORBA::TypeCode::_duplicate (tc)),
     value_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (tk != CORBA::tk_enum)
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+
+  // Need to check if called by user.
+  if (TAO_DynAny_i::unalias (tc,
+                             env)
+      != CORBA::tk_enum)
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynEnum_i::~TAO_DynEnum_i (void)
@@ -88,46 +65,30 @@ TAO_DynEnum_i::~TAO_DynEnum_i (void)
 // Functions specific to DynEnum
 
 char *
-TAO_DynEnum_i::value_as_string (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::value_as_string (CORBA::Environment& env)
 {
-  const char *retval = this->type_.in ()->member_name (this->value_,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
+  return CORBA::string_dup (this->type_.in ()->member_name (this->value_,
+                                                            env));
 }
 
 void
 TAO_DynEnum_i::value_as_string (const char *value_as_string,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::ULong count = this->type_.in ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  CORBA::ULong count = this->type_.in ()->member_count (env);
   CORBA::ULong i;
 
   for (i = 0; i < count; i++)
-    {
-      const char *temp = this->type_.in ()->member_name (i,
-                                                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (!ACE_OS::strcmp (value_as_string,
-                           temp))
-        {
-          break;
-        }
-    }
+    if (!ACE_OS::strcmp (value_as_string,
+                         this->type_.in ()->member_name (i,
+                                                         env)))
+      break;
 
   if (i < count)
-    {
-      this->value_ = i;
-    }
+    this->value_ = i;
   else
-    {
-      // *** NOT part of CORBA spec ***
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    // *** NOT part of CORBA spec ***
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 CORBA::ULong
@@ -138,62 +99,36 @@ TAO_DynEnum_i::value_as_ulong (CORBA::Environment &)
 
 void
 TAO_DynEnum_i::value_as_ulong (CORBA::ULong value_as_ulong,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& env)
 {
-  CORBA::ULong max = this->type_.in ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (value_as_ulong < max)
-    {
-      this->value_ = value_as_ulong;
-    }
+  if (value_as_ulong < this->type_.in ()->member_count (env))
+    this->value_ = value_as_ulong;
   else
-    {
-      // *** NOT part of CORBA spec ***
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    // *** NOT part of CORBA spec ***
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 // Common functions
 
 void
 TAO_DynEnum_i::assign (CORBA_DynAny_ptr dyn_any,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
   // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_.in ()->equal (dyn_any->type (env),
+                                env))
+    this->from_any (*dyn_any->to_any (env),
+                    env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynEnum_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::copy (CORBA::Environment &env)
 {
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr dp = TAO_DynAny_i::create_dyn_any (*a,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return dp;
+  CORBA_Any_ptr a = this->to_any (env);
+  return TAO_DynAny_i::create_dyn_any (*a,
+                                       env);
 }
 
 void
@@ -205,13 +140,10 @@ TAO_DynEnum_i::destroy (CORBA::Environment &)
 
 void
 TAO_DynEnum_i::from_any (const CORBA_Any& any,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_enum)
+  if (TAO_DynAny_i::unalias (any.type (),
+                             env) == CORBA::tk_enum)
     {
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
@@ -221,9 +153,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
       cdr.read_ulong (this->value_);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA::Any_ptr
@@ -250,12 +180,9 @@ TAO_DynEnum_i::type (CORBA::Environment &)
 }
 
 CORBA_DynAny_ptr
-TAO_DynEnum_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::current_component (CORBA::Environment &env)
 {
-  CORBA_DynAny_ptr retval = this->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  return this->_this (env);
 }
 
 CORBA::Boolean
@@ -288,217 +215,232 @@ TAO_DynEnum_i::rewind (CORBA::Environment &)
 
 void
 TAO_DynEnum_i::insert_boolean (CORBA::Boolean,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_octet (CORBA::Octet,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_char (CORBA::Char,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_short (CORBA::Short,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_ushort (CORBA::UShort,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_long (CORBA::Long,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_ulong (CORBA::ULong,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_float (CORBA::Float,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_double (CORBA::Double,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_string (const char *,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_reference (CORBA::Object_ptr,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_longlong (CORBA::LongLong,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_wchar (CORBA::WChar,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 void
 TAO_DynEnum_i::insert_any (const CORBA::Any&,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION ());
 }
 
 CORBA::Boolean
-TAO_DynEnum_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_boolean (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Octet
-TAO_DynEnum_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_octet (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Char
-TAO_DynEnum_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_char (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Short
-TAO_DynEnum_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_short (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::UShort
-TAO_DynEnum_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_ushort (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Long
-TAO_DynEnum_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_long (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_ulong (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Float
-TAO_DynEnum_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_float (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Double
-TAO_DynEnum_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_double (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 char *
-TAO_DynEnum_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_string (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Object_ptr
-TAO_DynEnum_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_reference (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::TypeCode_ptr
-TAO_DynEnum_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_typecode (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::LongLong
-TAO_DynEnum_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_longlong (CORBA::Environment &env)
 {
+  env.exception (new CORBA::BAD_OPERATION ());
+
 #if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong val = {0, 0};
+  CORBA::LongLong tmp = {0, 0};
+  return tmp;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong val = 0;
+  return 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
-
-  ACE_UNUSED_ARG (val);
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), val;);
 }
 
 CORBA::ULongLong
-TAO_DynEnum_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_ulonglong (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::WChar
-TAO_DynEnum_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::get_wchar (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::get_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::get_any (CORBA::Environment& env)
 {
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
+  env.exception (new CORBA::BAD_OPERATION ());
+  return 0;
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h
index 241b248edd1..e0660dad4d0 100644
--- a/TAO/tao/DynEnum_i.h
+++ b/TAO/tao/DynEnum_i.h
@@ -47,63 +47,50 @@ public:
 
   // = Functions specific to DynEnum
 
-  char *value_as_string (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  char *value_as_string (CORBA::Environment &ACE_TRY_ENV);
   // Get method for enum's string and numeric value.
 
   void value_as_string (const char *value_as_string,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   // Set method for enum's string and numeric value.
 
   CORBA::ULong value_as_ulong (CORBA::Environment&);
 
   void value_as_ulong (CORBA::ULong value_as_ulong,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument.
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly.
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument.
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any.
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the (constant) type.
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // Used in iterating through the contents.
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
   // Returns next component.
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Jump to component at <slot>.
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &ACE_TRY_ENV);
   // Makes first component the current one.
 
   // = Insert and get functions
@@ -112,85 +99,53 @@ public:
   // their presence, they will just throw an exception
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
 private:
   CORBA::TypeCode_var type_;
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 44bae63d39b..5e3cb188216 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -28,63 +28,50 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  // The type will be correct if this constructor called from a
+  // factory function, but it could also be called by the user,
+  // so.....
+  if (TAO_DynAny_i::unalias (this->type_.in (),
+                             env) == CORBA::tk_sequence)
     {
-      int tk = 
-        TAO_DynAny_i::unalias (this->type_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      if (tk == CORBA::tk_sequence)
+      // Get the CDR stream of the argument.
+      ACE_Message_Block *mb = any._tao_get_cdr ();
+
+      TAO_InputCDR cdr (mb);
+
+      CORBA::ULong length;
+
+      // If the any is a sequence, first 4 bytes of cdr hold the
+      // length.
+      cdr.read_ulong (length);
+
+      // Resize the array.
+      this->da_members_.size (length);
+
+      // Get the type of the sequence elments.
+      CORBA::TypeCode_ptr field_tc =
+        this->get_element_type (env);
+
+      for (CORBA::ULong i = 0; i < length; i++)
         {
-          // Get the CDR stream of the argument.
-          ACE_Message_Block *mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          CORBA::ULong length;
-
-          // If the any is a sequence, first 4 bytes of cdr hold the
-          // length.
-          cdr.read_ulong (length);
-
-          // Resize the array.
-          this->da_members_.size (length);
-
-          // Get the type of the sequence elments.
-          CORBA::TypeCode_ptr field_tc =
-            this->get_element_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (CORBA::ULong i = 0; i < length; i++)
-            {
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                   0,
-                                   cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
+          // This Any constructor is a TAO extension.
+          CORBA_Any field_any (field_tc,
+                               0,
+                               cdr.start ());
+
+          // This recursive step will call the correct constructor
+          // based on the type of field_any.
+          this->da_members_[i] =
+            TAO_DynAny_i::create_dyn_any (field_any,
+                                          env);
+          // Move to the next field in the CDR stream.
+          cdr.skip (field_tc);
         }
-      else
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
     }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 // Can't set the length from just the typecode, so we'll
@@ -95,21 +82,13 @@ TAO_DynSequence_i::TAO_DynSequence_i (CORBA_TypeCode_ptr tc)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (tk != CORBA::tk_sequence)
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-      // Do nothing
-    }
-  ACE_ENDTRY;
+  CORBA::Environment env;
+
+  // Need to check if called by user.
+  if (TAO_DynAny_i::unalias (tc,
+                             env)
+       != CORBA::tk_sequence)
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynSequence_i::~TAO_DynSequence_i (void)
@@ -156,9 +135,6 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
     {
       CORBA::Any_var temp =
         this->da_members_[i]->to_any (ACE_TRY_ENV);
-
-      ACE_CHECK_RETURN (0);
-
       (*elements)[i] = temp.in ();
     }
 
@@ -167,48 +143,40 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_DynSequence_i::set_elements (const CORBA_AnySeq& value,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
   CORBA::ULong size = this->da_members_.size ();
 
   if (size == 0)
-    {
-      // Resize the array, it hasn't yet been initialized.
-      this->da_members_.size (length);
-    }
+    // Resize the array, it hasn't yet been initialized.
+    this->da_members_.size (length);
   else if (size != length)
     {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
+      env.exception (new CORBA_DynAny::InvalidSeq);
+      return;
     }
 
   CORBA::TypeCode_ptr element_type =
-    this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->get_element_type (env);
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
       // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type,
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (equal)
+      if (value[i].type ()->equal (element_type,
+                                   env))
         {
           if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
+            this->da_members_[i]->destroy (env);
 
           this->da_members_[i] =
             TAO_DynAny_i::create_dyn_any (value[i],
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                          env);
         }
       else
         {
-          ACE_THROW (CORBA_DynAny::InvalidSeq ());
+          env.exception (new CORBA_DynAny::InvalidSeq);
+          break;
         }
     }
 }
@@ -217,56 +185,34 @@ TAO_DynSequence_i::set_elements (const CORBA_AnySeq& value,
 
 void
 TAO_DynSequence_i::assign (CORBA_DynAny_ptr dyn_any,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_.in ()->equal (dyn_any->type (env),
+                                env))
+    this->from_any (*dyn_any->to_any (env),
+                    env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynSequence_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::copy (CORBA::Environment &env)
 {
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*a,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  CORBA_Any_ptr a = this->to_any (env);
+  return TAO_DynAny_i::create_dyn_any (*a,
+                                       env);
 }
 
 void
-TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::destroy (CORBA::Environment &env)
 {
   // Do a deep destroy
   for (CORBA::ULong i = 0;
        i < this->da_members_.size ();
        i++)
     if (!CORBA::is_nil (this->da_members_[i].in ()))
-      {
-        this->da_members_[i]->destroy (ACE_TRY_ENV);
-        ACE_CHECK;
-      }
+      this->da_members_[i]->destroy (env);
 
   // Free the top level
   delete this;
@@ -274,17 +220,14 @@ TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynSequence_i::from_any (const CORBA_Any& any,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
+  if (this->type_.in ()->equal (any.type (),
+                                env))
     {
       // Get the CDR stream of the argument.
-      ACE_Message_Block *mb = any._tao_get_cdr ();
-
+      ACE_Message_Block *mb =
+        any._tao_get_cdr ();
       TAO_InputCDR cdr (mb);
 
       CORBA::ULong arg_length;
@@ -296,18 +239,16 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
       CORBA::ULong length = this->da_members_.size ();
 
       if (length == 0)
-        {
-          // Resize the array, it hasn't yet been initialized.
-          this->da_members_.size (arg_length);
-        }
+        // Resize the array, it hasn't yet been initialized.
+        this->da_members_.size (arg_length);
       else if (length != arg_length)
         {
-          ACE_THROW (CORBA_DynAny::Invalid ());
+          env.exception (new CORBA_DynAny::Invalid);
+          return;
         }
 
       CORBA::TypeCode_ptr field_tc =
-        this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->get_element_type (env);
 
       for (CORBA::ULong i = 0;
            i < arg_length;
@@ -319,24 +260,18 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
+            this->da_members_[i]->destroy (env);
 
           this->da_members_[i] =
             TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                          env);
 
           // Move to the next field in the CDR stream.
           cdr.skip (field_tc);
         }
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA::Any_ptr
@@ -347,21 +282,19 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   out_cdr.write_ulong (this->da_members_.size ());
 
   CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
     {
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                            0);
+          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          return 0;
         }
 
       // Recursive step
       CORBA_Any_var field_any =
         this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb =
         field_any->_tao_get_cdr ();
@@ -371,23 +304,17 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       out_cdr.append (field_tc,
                       &field_cdr,
                       ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any* retval;
-
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
+                    CORBA_Any (this->type (ACE_TRY_ENV),
                                0,
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-
   return retval;
 }
 
@@ -402,23 +329,15 @@ TAO_DynSequence_i::type (CORBA::Environment &)
 // it.
 
 CORBA_DynAny_ptr
-TAO_DynSequence_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::current_component (CORBA::Environment &env)
 {
   if (this->da_members_.size () == 0)
-    {
-      return CORBA_DynAny::_nil ();
-    }
+    return 0;
 
   if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] =
-        TAO_DynAny_i::create_dyn_any (tc,
-                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-    }
+    this->da_members_[this->current_index_] =
+      TAO_DynAny_i::create_dyn_any (this->get_element_type (env),
+                                    env);
 
   return this->da_members_[this->current_index_].in ();
 }
@@ -463,450 +382,226 @@ TAO_DynSequence_i::rewind (CORBA::Environment &)
 
 void
 TAO_DynSequence_i::insert_boolean (CORBA::Boolean value,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_boolean (value,
+                                                     env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_octet (CORBA::Octet value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_octet)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_octet (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_char (CORBA::Char value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_char)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_char (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_short (CORBA::Short value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_short)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_short (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_ushort (CORBA::UShort value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ushort (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_long (CORBA::Long value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_long (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_ulong (CORBA::ULong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulong (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_float (CORBA::Float value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_float)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_float (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_double (CORBA::Double value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_double)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_double (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_string (const char * value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_string)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_string (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_reference (CORBA::Object_ptr value,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_objref)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_reference (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_typecode (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_longlong (CORBA::LongLong value,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_longlong (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_ulonglong (CORBA::ULongLong value,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulonglong (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_wchar (CORBA::WChar value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_wchar (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynSequence_i::insert_any (const CORBA::Any& value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
+  if (this->get_element_type (env)->kind (env) == CORBA::tk_any)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_any (value,
+                                                 env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 // Get functions
@@ -916,44 +611,29 @@ TAO_DynSequence_i::insert_any (const CORBA::Any& value,
 // seems like a courteous thing to do.
 
 CORBA::Boolean
-TAO_DynSequence_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val = 0;
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_boolean)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean)
         {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_boolean (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Octet
-TAO_DynSequence_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
   CORBA_DynAny_ptr dp =
@@ -961,37 +641,22 @@ TAO_DynSequence_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_octet)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_octet)
         {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_octet (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Char
-TAO_DynSequence_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
   CORBA_DynAny_ptr dp =
@@ -999,37 +664,22 @@ TAO_DynSequence_i::get_char (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_char)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_char)
         {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_char (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Short
-TAO_DynSequence_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
   CORBA_DynAny_ptr dp =
@@ -1037,37 +687,22 @@ TAO_DynSequence_i::get_short (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_short)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_short)
         {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_short (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::UShort
-TAO_DynSequence_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
   CORBA_DynAny_ptr dp =
@@ -1075,37 +710,22 @@ TAO_DynSequence_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ushort)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort)
         {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ushort (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Long
-TAO_DynSequence_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
   CORBA_DynAny_ptr dp =
@@ -1113,37 +733,22 @@ TAO_DynSequence_i::get_long (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_long)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_long)
         {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_long (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULong
-TAO_DynSequence_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
   CORBA_DynAny_ptr dp =
@@ -1151,37 +756,22 @@ TAO_DynSequence_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ulong)
         {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ulong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Float
-TAO_DynSequence_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
   CORBA_DynAny_ptr dp =
@@ -1189,37 +779,22 @@ TAO_DynSequence_i::get_float (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_float)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_float)
         {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_float (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Double
-TAO_DynSequence_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
   CORBA_DynAny_ptr dp =
@@ -1227,37 +802,22 @@ TAO_DynSequence_i::get_double (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_double)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_double)
         {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_double (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 char *
-TAO_DynSequence_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
   CORBA_DynAny_ptr dp =
@@ -1265,37 +825,22 @@ TAO_DynSequence_i::get_string (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_string)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_string)
         {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_string (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Object_ptr
-TAO_DynSequence_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1303,37 +848,22 @@ TAO_DynSequence_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_objref)
+      if (dp->type (env)->kind (env) == CORBA::tk_objref)
         {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_reference (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1341,80 +871,49 @@ TAO_DynSequence_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_TypeCode)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode)
         {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_typecode (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::LongLong
-TAO_DynSequence_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_longlong (CORBA::Environment &env)
 {
 #if defined (ACE_LACKS_LONGLONG_T)
   CORBA::LongLong val = {0, 0};
 #else  /* ! ACE_LACKS_LONGLONG_T */
   CORBA::LongLong val = 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
-
   CORBA_DynAny_ptr dp =
     this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong)
         {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_longlong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULongLong
-TAO_DynSequence_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
   CORBA_DynAny_ptr dp =
@@ -1422,37 +921,22 @@ TAO_DynSequence_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulonglong)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong)
         {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_ulonglong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::WChar
-TAO_DynSequence_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
   CORBA_DynAny_ptr dp =
@@ -1460,37 +944,22 @@ TAO_DynSequence_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_wchar)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar)
         {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_wchar (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::get_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1498,31 +967,16 @@ TAO_DynSequence_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_any)
+      if (this->get_element_type (env)->kind (env) == CORBA::tk_any)
         {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_any (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
@@ -1530,29 +984,17 @@ TAO_DynSequence_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 // Private utility function.
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynSequence_i::get_element_type (CORBA::Environment& env)
 {
   CORBA::TypeCode_ptr element_type =
     this->type_.in ();
 
   // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  while (kind != CORBA::tk_sequence)
-    {
-      element_type = element_type->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());    
-    }
+  while (element_type->kind (env) != CORBA::tk_sequence)
+    element_type = element_type->content_type (env);
 
   // Return the content type.
-  CORBA::TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  return retval;
+  return element_type->content_type (env);
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index 8efbc72c68e..beb6a5bd183 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -47,155 +47,108 @@ public:
 
   // = Functions specific to DynSequence
 
-  CORBA::ULong length (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::ULong length (CORBA::Environment &ACE_TRY_ENV);
   // Get length of sequence.
 
   void length (CORBA::ULong length,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Set length of sequence.
 
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
+  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV);
   // Get elements using IDL defined type AnySeq.
 
   void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   // Set elements using IDL defined type AnySeq.
 
   // = Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument.
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly.
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument.
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any.
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the (constant) type.
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // Used in iterating through the contents.
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
   // Returns next component.
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Jump to component at <slot>.
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &ACE_TRY_ENV);
   // Makes first component the current one.
 
   // = Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
 private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV);
   // Utility, turns the type of elements contained in the sequence.
 
   CORBA::TypeCode_var type_;
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 03f3c94a4af..8e133933e40 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -28,64 +28,48 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (this->type_.in (),
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (kind == CORBA::tk_struct)
-        {
-          CORBA::ULong numfields =
-            this->type_.in ()->member_count (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+  CORBA::Environment env;
 
-          // Resize the array.
-          this->da_members_.size (numfields);
+  // The type will be correct if this constructor called from a
+  // factory function, but it could also be called by the user,
+  // so.....
+  if (TAO_DynAny_i::unalias (this->type_.in (),
+                             env) == CORBA::tk_struct)
+    {
+      CORBA::ULong numfields =
+        this->type_.in ()->member_count (env);
 
-          // Get the CDR stream of the argument.
-          ACE_Message_Block *mb = any._tao_get_cdr ();
+      // Resize the array.
+      this->da_members_.size (numfields);
 
-          TAO_InputCDR cdr (mb);
+      // Get the CDR stream of the argument.
+      ACE_Message_Block *mb = any._tao_get_cdr ();
 
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            {
-              CORBA::TypeCode_ptr field_tc =
-                this->type_.in ()->member_type (i,
-                                                ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                  0,
-                                  cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+      TAO_InputCDR cdr (mb);
 
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
-        }
-      else
+      for (CORBA::ULong i = 0; i < numfields; i++)
         {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
+          CORBA::TypeCode_ptr field_tc =
+            this->type_.in ()->member_type (i,
+                                            env);
+
+          // This Any constructor is a TAO extension.
+          CORBA_Any field_any (field_tc,
+                               0,
+                               cdr.start ());
+
+          // This recursive step will call the correct constructor
+          // based on the type of field_any.
+          this->da_members_[i] =
+            TAO_DynAny_i::create_dyn_any (field_any,
+                                          env);
+
+          // Move to the next field in the CDR stream.
+          cdr.skip (field_tc);
         }
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynStruct_i::TAO_DynStruct_i (CORBA_TypeCode_ptr tc)
@@ -93,34 +77,23 @@ TAO_DynStruct_i::TAO_DynStruct_i (CORBA_TypeCode_ptr tc)
     current_index_ (0),
     da_members_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::Environment env;
+
+  // Need to check if called by user.
+  if (TAO_DynAny_i::unalias (tc, env) == CORBA::tk_struct)
     {
-      // Need to check if called by user.
-      if (TAO_DynAny_i::unalias (tc, ACE_TRY_ENV) == CORBA::tk_struct)
-        {
-          CORBA::ULong numfields = tc->member_count (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      CORBA::ULong numfields = tc->member_count (env);
 
-          // Resize the array.
-          this->da_members_.size (numfields);
+      // Resize the array.
+      this->da_members_.size (numfields);
 
-          for (CORBA::ULong i = 0; i < numfields; i++)
+      for (CORBA::ULong i = 0; i < numfields; i++)
 
-            // With a typecode arg, we just create the top level.
-            this->da_members_[i] = 0;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
+        // With a typecode arg, we just create the top level.
+        this->da_members_[i] = 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynStruct_i::~TAO_DynStruct_i (void)
@@ -137,17 +110,11 @@ TAO_DynStruct_i::current_member_name (CORBA::Environment &)
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::current_member_kind (CORBA::Environment& env)
 {
-  CORBA::TypeCode_ptr tc = this->type_.in ()->member_type (this->current_index_,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
+  return TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_,
+                                                                env),
+                                env);
 }
 
 CORBA::NameValuePairSeq*
@@ -171,8 +138,6 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
         CORBA::string_dup (this->type_.in ()->member_name (i));
 
       CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
       (*members)[i].value = temp.in ();
     }
 
@@ -181,7 +146,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
 
@@ -191,35 +156,27 @@ TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
       for (CORBA::ULong i = 0; i < length; i++)
         {
           // Check for type and name match.
-          CORBA_TypeCode_ptr tc = this->type_.in ()->member_type (i,
-                                                                  ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (value[i].value.type ()->equal (tc)
+          if (value[i].value.type ()->equal (this->type_.in ()->member_type (i,
+                                                                             env))
               && !ACE_OS::strcmp (value[i].id,
                                   this->type_.in ()->member_name (i)))
             {
               if (!CORBA::is_nil (this->da_members_[i].in ()))
-                {
-                  this->da_members_[i]->destroy (ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
+                this->da_members_[i]->destroy (env);
 
               this->da_members_[i] =
                 TAO_DynAny_i::create_dyn_any (value[i].value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
+                                              env);
             }
           else
             {
-              ACE_THROW (CORBA_DynAny::InvalidSeq ());
+              env.exception (new CORBA_DynAny::InvalidSeq);
+              break;
             }
         }
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
-    }
+    env.exception (new CORBA_DynAny::InvalidSeq);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -227,56 +184,32 @@ TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
 
 void
 TAO_DynStruct_i::assign (CORBA_DynAny_ptr dyn_any,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA::TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_.in ()->equal (dyn_any->type (env),
+                                env))
+    this->from_any (*dyn_any->to_any (env),
+                    env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynStruct_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::copy (CORBA::Environment &env)
 {
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*a,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  CORBA_Any_ptr a = this->to_any (env);
+  return TAO_DynAny_i::create_dyn_any (*a,
+                                       env);
 }
 
 void
-TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::destroy (CORBA::Environment &env)
 {
   // Do a deep destroy
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
-    {
-      if (!CORBA::is_nil (this->da_members_[i].in ()))
-        {
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
+    if (!CORBA::is_nil (this->da_members_[i].in ()))
+      this->da_members_[i]->destroy (env);
 
   // Free the top level
   delete this;
@@ -284,13 +217,10 @@ TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynStruct_i::from_any (const CORBA_Any& any,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
+  if (this->type_.in ()->equal (any.type (),
+                                env))
     {
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
@@ -302,8 +232,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
         {
           CORBA::TypeCode_ptr field_tc =
             this->type_.in ()->member_type (i,
-                                            ACE_TRY_ENV);
-          ACE_CHECK;
+                                            env);
 
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
@@ -311,24 +240,18 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
+            this->da_members_[i]->destroy (env);
 
           this->da_members_[i] =
             TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                          env);
 
           // Move to the next field in the CDR stream.
           cdr.skip (field_tc);
         }
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA::Any_ptr
@@ -343,18 +266,16 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       // Each component must have been initialied.
       if (!this->da_members_[i].in ())
         {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                            0);
+          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          return 0;
         }
 
       CORBA_TypeCode_ptr field_tc =
         this->da_members_[i]->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
 
       // Recursive step
       CORBA_Any_var field_any =
         this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
 
@@ -363,23 +284,17 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       out_cdr.append (field_tc,
                       &field_cdr,
                       ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any *retval;
-
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
+                    CORBA_Any (this->type (ACE_TRY_ENV),
                                0,
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-
   return retval;
 }
 
@@ -393,21 +308,14 @@ TAO_DynStruct_i::type (CORBA::Environment &)
 // current_component will create the pointer and return it.
 
 CORBA_DynAny_ptr
-TAO_DynStruct_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::current_component (CORBA::Environment &env)
 {
   if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc =
-        this->type_.in ()->member_type (this->current_index_,
-                                        ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      CORBA_DynAny_ptr dp = TAO_DynAny_i::create_dyn_any (tc,
-                                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] = dp;
-    }
+    this->da_members_[this->current_index_] =
+      TAO_DynAny_i::create_dyn_any 
+        (this->type_.in ()->member_type (this->current_index_,
+                                         env),
+         env);
 
   return this->da_members_[this->current_index_].in ();
 }
@@ -426,7 +334,7 @@ CORBA::Boolean
 TAO_DynStruct_i::seek (CORBA::Long slot,
                        CORBA::Environment &)
 {
-  if (slot < 0
+  if (slot < 0 
       || slot >= (CORBA::Long) this->da_members_.size ())
     return 0;
 
@@ -451,434 +359,258 @@ TAO_DynStruct_i::rewind (CORBA::Environment &)
 
 void
 TAO_DynStruct_i::insert_boolean (CORBA::Boolean value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_boolean)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_boolean (value,
+                                                     env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_octet (CORBA::Octet value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_octet)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_octet (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_char (CORBA::Char value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_char)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_char (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_short (CORBA::Short value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_short)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_short (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_ushort (CORBA::UShort value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_ushort)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ushort (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_long (CORBA::Long value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_long (value,
+                                                  env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_ulong (CORBA::ULong value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_long)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulong (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_float (CORBA::Float value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_float)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_float (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_double (CORBA::Double value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_double)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_double (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_string (const char * value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_string)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_string (value,
+                                                    env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_objref)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_reference (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_TypeCode)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_typecode (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_longlong (CORBA::LongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_longlong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_longlong (value,
+                                                      env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_ulonglong)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_ulonglong (value,
+                                                       env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_wchar (CORBA::WChar value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_wchar)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_wchar (value,
+                                                   env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 void
 TAO_DynStruct_i::insert_any (const CORBA::Any& value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+                             env)
+      == CORBA::tk_any)
     {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->current_component (env)->insert_any (value,
+                                                 env);
+      this->next (env);
     }
   else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
+    env.exception (new CORBA_DynAny::InvalidValue);
 }
 
 // Get functions
@@ -888,85 +620,57 @@ TAO_DynStruct_i::insert_any (const CORBA::Any& value,
 // courteous thing to do.
 
 CORBA::Boolean
-TAO_DynStruct_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_boolean (CORBA::Environment &env)
 {
-  CORBA::Boolean val = 0;
+  CORBA::Boolean val = 0;;
   CORBA_DynAny_ptr dp =
     this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_boolean)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_boolean)
         {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_boolean (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Octet
-TAO_DynStruct_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
-  CORBA_DynAny_ptr dp =
+  CORBA_DynAny_ptr dp = 
     this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_octet)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_octet)
         {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_octet (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Char
-TAO_DynStruct_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
   CORBA_DynAny_ptr dp =
@@ -974,38 +678,24 @@ TAO_DynStruct_i::get_char (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_char)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_char)
         {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_char (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Short
-TAO_DynStruct_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
   CORBA_DynAny_ptr dp =
@@ -1013,38 +703,24 @@ TAO_DynStruct_i::get_short (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_short)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_short)
         {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_short (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::UShort
-TAO_DynStruct_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
   CORBA_DynAny_ptr dp =
@@ -1052,38 +728,24 @@ TAO_DynStruct_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ushort)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_ushort)
         {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_ushort (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Long
-TAO_DynStruct_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
   CORBA_DynAny_ptr dp =
@@ -1091,38 +753,24 @@ TAO_DynStruct_i::get_long (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_long)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_long)
         {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_long (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULong
-TAO_DynStruct_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
   CORBA_DynAny_ptr dp =
@@ -1130,38 +778,24 @@ TAO_DynStruct_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ulong)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_ulong)
         {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_ulong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Float
-TAO_DynStruct_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
   CORBA_DynAny_ptr dp =
@@ -1169,38 +803,24 @@ TAO_DynStruct_i::get_float (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_float)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_float)
         {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_float (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Double
-TAO_DynStruct_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
   CORBA_DynAny_ptr dp =
@@ -1208,38 +828,24 @@ TAO_DynStruct_i::get_double (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_double)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_double)
         {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_double (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 char *
-TAO_DynStruct_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
   CORBA_DynAny_ptr dp =
@@ -1247,38 +853,24 @@ TAO_DynStruct_i::get_string (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_string)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_string)
         {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_string (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Object_ptr
-TAO_DynStruct_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1286,38 +878,24 @@ TAO_DynStruct_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_objref)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_objref)
         {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_reference (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::TypeCode_ptr
-TAO_DynStruct_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1325,81 +903,52 @@ TAO_DynStruct_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_TypeCode)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_TypeCode)
         {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_typecode (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::LongLong
-TAO_DynStruct_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_longlong (CORBA::Environment &env)
 {
 #if defined (ACE_LACKS_LONGLONG_T)
   CORBA::LongLong val = {0, 0};
 #else  /* ! ACE_LACKS_LONGLONG_T */
   CORBA::LongLong val = 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
-
   CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+        == CORBA::tk_longlong)
         {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
+          val = dp->get_longlong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::ULongLong
-TAO_DynStruct_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
   CORBA_DynAny_ptr dp =
@@ -1407,38 +956,24 @@ TAO_DynStruct_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ulonglong)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_ulonglong)
         {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_ulonglong (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::WChar
-TAO_DynStruct_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
   CORBA_DynAny_ptr dp =
@@ -1446,38 +981,24 @@ TAO_DynStruct_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_wchar)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_wchar)
         {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_wchar (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::get_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
   CORBA_DynAny_ptr dp =
@@ -1485,32 +1006,18 @@ TAO_DynStruct_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 
   if (dp)
     {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_any)
+      if (TAO_DynAny_i::unalias (dp->type (env),
+                                 env)
+          == CORBA::tk_any)
         {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          val = dp->get_any (env);
+          this->next (env);
         }
       else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
+        env.exception (new CORBA_DynAny::TypeMismatch);
     }
   else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 
   return val;
 }
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index 4ac52eb4aae..aea79e0a4c8 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -47,149 +47,103 @@ public:
 
   // = Functions specific to DynStruct
 
-  CORBA::FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV);
   // FieldName is IDL typedef for string
 
-  CORBA::TCKind current_member_kind (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::TCKind current_member_kind (CORBA::Environment &ACE_TRY_ENV);
 
-  CORBA::NameValuePairSeq *get_members (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::NameValuePairSeq *get_members (CORBA::Environment &ACE_TRY_ENV);
   // Get elements using IDL defined type NameValuePairSeq.
 
   void set_members (const CORBA::NameValuePairSeq& value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   // Set elements using IDL defined type NameValuePairSeq.
 
   // = Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Jump to component at <slot>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &ACE_TRY_ENV);
   // Makes first component the current one
 
   // = Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
 private:
   CORBA::TypeCode_var type_;
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index c241308ca64..c157d4da09b 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -24,71 +24,43 @@
 
 TAO_DynUnion_i::TAO_DynUnion_i (const CORBA_Any& any)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int tk = TAO_DynAny_i::unalias (any.type (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (tk == CORBA::tk_union)
-        {
-          // Initialize the typecode holder
-          this->type_ = any.type ();
+  CORBA::Environment env;
 
-          this->set_from_any (any, 
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
+  if (TAO_DynAny_i::unalias (any.type (),
+                             env)
+      == CORBA::tk_union)
     {
-      // do nothing
+      // Initialize the typecode holder
+      this->type_ = any.type ();
+
+      this->set_from_any (any, env);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynUnion_i::TAO_DynUnion_i (CORBA_TypeCode_ptr tc)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Environment env;
 
-      if (tk == CORBA::tk_union)
-        {
-          // Initialize the typecode holder
-          this->type_ = CORBA::TypeCode::_duplicate (tc);
+  if (TAO_DynAny_i::unalias (tc,
+                             env)
+      == CORBA::tk_union)
+    {
+      // Initialize the typecode holder
+      this->type_ = CORBA::TypeCode::_duplicate (tc);
 
-          CORBA::TypeCode_ptr disc_tc = tc->discriminator_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      CORBA::TypeCode_ptr disc_tc = tc->discriminator_type (env);
 
-          // Get a typecode into the discriminator holder.
-          this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_tc,
-                                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      // Get a typecode into the discriminator holder.
+      this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_tc,
+                                                           env);
 
-          // To be filled in by from_any() or assign().
-          this->member_ = 0;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
+      // To be filled in by from_any() or assign().
+      this->member_ = 0;
     }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  else
+    env.exception (new CORBA_ORB_InconsistentTypeCode);
 }
 
 TAO_DynUnion_i::~TAO_DynUnion_i (void)
@@ -102,9 +74,9 @@ TAO_DynUnion_i::~TAO_DynUnion_i (void)
 // value, if one exists.
 
 CORBA::Boolean
-TAO_DynUnion_i::set_as_default (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::set_as_default (CORBA::Environment& env)
 {
-  if ((CORBA::Long) this->current_index_ == this->type_->default_index (ACE_TRY_ENV))
+  if ((CORBA::Long) this->current_index_ == this->type_->default_index (env))
     return 1;
   else
     return 0;
@@ -127,16 +99,10 @@ TAO_DynUnion_i::discriminator (CORBA::Environment &)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::discriminator_kind (CORBA::Environment& env)
 {
-  CORBA_TypeCode_ptr tc = this->type_->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
+  return TAO_DynAny_i::unalias (this->type_->discriminator_type (env),
+                                env);
 }
 
 CORBA_DynAny_ptr
@@ -146,13 +112,10 @@ TAO_DynUnion_i::member (CORBA::Environment &)
 }
 
 char*
-TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::member_name (CORBA::Environment& env)
 {
-  const char *retval = this->type_->member_name (this->current_index_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
+  return CORBA::string_dup (this->type_->member_name (this->current_index_,
+                                                      env));
 }
 
 // If a valid member name is supplied, this function creates a new
@@ -160,50 +123,33 @@ TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_DynUnion_i::member_name (const char* member_name,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             CORBA::Environment& env)
 {
   CORBA::ULong count =
-    this->type_->member_count (ACE_TRY_ENV);
+    this->type_->member_count (env);
 
   for (CORBA::ULong i = 0;
        i < count;
        i++)
     {
-      const char *temp = this->type_->member_name (i,
-                                                   ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (!ACE_OS::strcmp (member_name, 
-                           temp))
+      if (!ACE_OS::strcmp (member_name,
+                           this->type_->member_name (i,
+                                                     env)))
         {
           // No sense doing anything if we're just "resetting" to the
           // current member.
           if (i == this->current_index_)
-            {
-              return;
-            }
+            return;
           else
             {
-              CORBA_TypeCode_ptr member_type = 
-                this->type_->member_type (i,
-                                          ACE_TRY_ENV);
-              ACE_CHECK;
-
               this->member_ =
-                TAO_DynAny_i::create_dyn_any (member_type,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr disc_any = 
-                this->type_->member_label (i,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (this->type_->member_type (i,
+                                                                        env),
+                                              env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*disc_any,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
@@ -212,71 +158,42 @@ TAO_DynUnion_i::member_name (const char* member_name,
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::member_kind (CORBA::Environment& env)
 {
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
+  return TAO_DynAny_i::unalias (this->type_->member_type (this->current_index_,
+                                                          env),
+                                env);
 }
 
 // Common functions
 
 void
 TAO_DynUnion_i::assign (CORBA_DynAny_ptr dyn_any,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_->equal (tc,
-                                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_->equal (dyn_any->type (env),
+                          env))
+    this->from_any (*dyn_any->to_any (env),
+                    env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA_DynAny_ptr
-TAO_DynUnion_i::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::copy (CORBA::Environment &env)
 {
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = 
-    TAO_DynAny_i::create_dyn_any (*a,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
+  CORBA_Any_ptr a = this->to_any (env);
+  return TAO_DynAny_i::create_dyn_any (*a,
+                                       env);
 }
 
 void
-TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::destroy (CORBA::Environment &env)
 {
   // Free the two DynAnys.
-  this->member_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->discriminator_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->member_->destroy (env);
+  this->discriminator_->destroy (env);
 
   // Free the top level
   delete this;
@@ -284,33 +201,25 @@ TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynUnion_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      this->set_from_any (any,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (this->type_.in ()->equal (any.type (),
+                                env))
+    this->set_from_any (any,
+                        env);
   else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
 }
 
 CORBA::Any_ptr
 TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 {
   // Both Dynanys must have been initialied.
-  if (this->member_.in () == 0
+  if (this->member_.in () == 0 
       || this->discriminator_.in () == 0)
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 
   TAO_OutputCDR out_cdr;
@@ -319,13 +228,11 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   CORBA_TypeCode_ptr disc_tc =
     this->discriminator_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   CORBA_Any_var disc_any =
     this->discriminator_->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
-  ACE_Message_Block *disc_mb =
+  ACE_Message_Block *disc_mb = 
     disc_any->_tao_get_cdr ();
 
   TAO_InputCDR disc_cdr (disc_mb);
@@ -333,17 +240,14 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   out_cdr.append (disc_tc,
                   &disc_cdr,
                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   // Add the member to the CDR stream.
 
   CORBA_TypeCode_ptr member_tc =
     this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   CORBA_Any_var member_any =
     this->member_->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *member_mb =
     member_any->_tao_get_cdr ();
@@ -353,22 +257,17 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   out_cdr.append (member_tc,
                   &member_cdr,
                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
 
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any *retval;
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
+                    CORBA_Any (this->type (ACE_TRY_ENV),
                                0,
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-
   return retval;
 }
 
@@ -385,70 +284,45 @@ TAO_DynUnion_i::current_component (CORBA::Environment &)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::next (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::next (CORBA::Environment &env)
 {
-  CORBA::ULong count = this->type_->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (this->current_index_ + 1 == count)
-    {
-      return 0;
-    }
+  if (this->current_index_ + 1 == this->type_->member_count (env))
+    return 0;
 
   ++this->current_index_;
 
   if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+    this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+                                                            env),
+                                  env);
   return 1;
 }
 
 CORBA::Boolean
 TAO_DynUnion_i::seek (CORBA::Long slot,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
-  CORBA::ULong count = this->type_->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (slot < 0 || slot >= (CORBA::Long) count)
-    {
-      return 0;
-    }
+  if (slot < 0 
+      || slot >= (CORBA::Long) this->type_->member_count (env))
+    return 0;
 
   this->current_index_ = slot;
 
   if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+    this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+                                                            env),
+                                  env);
   return 1;
 }
 
 void
-TAO_DynUnion_i::rewind (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::rewind (CORBA::Environment &env)
 {
   if (this->current_index_ == 0)
     return;
@@ -456,19 +330,12 @@ TAO_DynUnion_i::rewind (CORBA::Environment &ACE_TRY_ENV)
   this->current_index_ = 0;
 
   if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK;
+    this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+                                                            env),
+                                  env);
 }
 
 // Insert and get functions
@@ -481,26 +348,17 @@ TAO_DynUnion_i::rewind (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynUnion_i::insert_boolean (CORBA::Boolean value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      this->member_->insert_boolean (value,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_boolean)
+    this->member_->insert_boolean (value,
+                                   env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -508,64 +366,43 @@ TAO_DynUnion_i::insert_boolean (CORBA::Boolean value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_boolean)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_boolean)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_boolean (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                             env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_octet (CORBA::Octet value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      this->member_->insert_octet (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_octet)
+    this->member_->insert_octet (value,
+                                 env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -573,64 +410,43 @@ TAO_DynUnion_i::insert_octet (CORBA::Octet value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_octet)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_octet)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_octet (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                           env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_char (CORBA::Char value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      this->member_->insert_char (value,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_char)
+    this->member_->insert_char (value,
+                                env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -638,64 +454,42 @@ TAO_DynUnion_i::insert_char (CORBA::Char value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_char)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_char)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_char (value,
-                                          ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                          env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_short (CORBA::Short value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      this->member_->insert_short (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_short)
+    this->member_->insert_short (value, env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -703,64 +497,42 @@ TAO_DynUnion_i::insert_short (CORBA::Short value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_short)
+                                      env);
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_short)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_short (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                           env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_long (CORBA::Long value,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      this->member_->insert_long (value,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_long)
+    this->member_->insert_long (value,
+                                env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -768,129 +540,86 @@ TAO_DynUnion_i::insert_long (CORBA::Long value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          if (try_kind == CORBA::tk_long)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_long)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_long (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                          env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_ushort (CORBA::UShort value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      this->member_->insert_ushort (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_ushort)
+    this->member_->insert_ushort (value,
+                                  env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
            i++)
         {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+          CORBA::TypeCode_ptr tc = this->type_->member_type (i,
+                                                             env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ushort)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_ushort)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_ushort (value,
-                                            ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                            env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_ulong (CORBA::ULong value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      this->member_->insert_ulong (value,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_ulong)
+    this->member_->insert_ulong (value,
+                                 env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -898,64 +627,43 @@ TAO_DynUnion_i::insert_ulong (CORBA::ULong value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ulong)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_ulong)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_ulong (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                           env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_float (CORBA::Float value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      this->member_->insert_float (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_float)
+    this->member_->insert_float (value,
+                                 env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -963,64 +671,43 @@ TAO_DynUnion_i::insert_float (CORBA::Float value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_float)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_float)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                               env);
               this->member_->insert_float (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                           env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_double (CORBA::Double value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      this->member_->insert_double (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_double)
+    this->member_->insert_double (value,
+                                  env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1028,64 +715,43 @@ TAO_DynUnion_i::insert_double (CORBA::Double value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_double)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_double)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_double (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                            env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_string (const char* value,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      this->member_->insert_string (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_string)
+    this->member_->insert_string (value,
+                                  env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1093,64 +759,42 @@ TAO_DynUnion_i::insert_string (const char* value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_string)
+                                      env);
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_string)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_string (value,
-                                            ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                            env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      this->member_->insert_reference (value,
-                                       ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_objref)
+    this->member_->insert_reference (value,
+                                     env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1158,64 +802,43 @@ TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          if (try_kind == CORBA::tk_objref)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_objref)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_reference (value,
-                                               ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                               env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      this->member_->insert_typecode (value,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_TypeCode)
+    this->member_->insert_typecode (value,
+                                    env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1223,64 +846,43 @@ TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          if (try_kind == CORBA::tk_TypeCode)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_TypeCode)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_typecode (value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_longlong (CORBA::LongLong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      this->member_->insert_longlong (value,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_longlong)
+    this->member_->insert_longlong (value,
+                                    env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1288,64 +890,42 @@ TAO_DynUnion_i::insert_longlong (CORBA::LongLong value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_longlong)
+                                      env);
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_longlong)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_longlong (value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      this->member_->insert_ulonglong (value,
-                                       ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_ulonglong)
+    this->member_->insert_ulonglong (value,
+                                     env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1353,64 +933,42 @@ TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ulonglong)
+                                      env);
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_ulonglong)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_ulonglong (value,
-                                               ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                               env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_wchar (CORBA::WChar value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      this->member_->insert_wchar (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_wchar)
+    this->member_->insert_wchar (value,
+                                 env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1418,64 +976,42 @@ TAO_DynUnion_i::insert_wchar (CORBA::WChar value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
+                                      env);
 
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_wchar)
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_wchar)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_wchar (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                           env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 void
 TAO_DynUnion_i::insert_any (const CORBA::Any& value,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      this->member_->insert_any (value,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  if (TAO_DynAny_i::unalias (this->member_->type (env),
+                             env)
+      == CORBA::tk_any)
+    this->member_->insert_any (value, env);
   else
     {
       CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
+        this->type_->member_count (env);
 
       for (CORBA::ULong i = 0;
            i < count;
@@ -1483,461 +1019,274 @@ TAO_DynUnion_i::insert_any (const CORBA::Any& value,
         {
           CORBA::TypeCode_ptr tc =
             this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_any)
+                                      env);
+          if (TAO_DynAny_i::unalias (tc,
+                                     env)
+              == CORBA::tk_any)
             {
               this->member_ =
                 TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                              env);
               this->member_->insert_any (value,
-                                         ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
+                                         env);
               this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
+                TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
+                                                                          env),
+                                              env);
               this->current_index_ = i;
               return;
             }
         }
 
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
+      env.exception (new CORBA_DynAny::InvalidValue);
     }
 }
 
 // Get functions
 
 CORBA::Boolean
-TAO_DynUnion_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_boolean (CORBA::Environment &env)
 {
-  CORBA::Boolean retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_boolean))
-    {
-      retval = this->member_->get_boolean (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_boolean)
+    return this->member_->get_boolean (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Octet
-TAO_DynUnion_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_octet (CORBA::Environment &env)
 {
-  CORBA::Octet retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_octet))
-    {
-      retval = this->member_->get_octet (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_octet)
+    return this->member_->get_octet (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Char
-TAO_DynUnion_i::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_char (CORBA::Environment &env)
 {
-  CORBA::Char retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_char))
-    {
-      retval = this->member_->get_char (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_char)
+    return this->member_->get_char (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Short
-TAO_DynUnion_i::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_short (CORBA::Environment &env)
 {
-  CORBA::Short retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_short))
-    {
-      retval = this->member_->get_short (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_short)
+    return this->member_->get_short (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Long
-TAO_DynUnion_i::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_long (CORBA::Environment &env)
 {
-  CORBA::Long retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_long))
-    {
-      retval = this->member_->get_long (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_long)
+    return this->member_->get_long (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::UShort
-TAO_DynUnion_i::get_ushort(CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_ushort(CORBA::Environment &env)
 {
-  CORBA::UShort retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ushort))
-    {
-      retval = this->member_->get_ushort (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_ushort)
+    return this->member_->get_ushort (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::ULong
-TAO_DynUnion_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_ulong (CORBA::Environment &env)
 {
-  CORBA::ULong retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ulong))
-    {
-      retval = this->member_->get_ulong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_ulong)
+    return this->member_->get_ulong (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Float
-TAO_DynUnion_i::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_float (CORBA::Environment &env)
 {
-  CORBA::Float retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_float))
-    {
-      retval = this->member_->get_float (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_float)
+    return this->member_->get_float (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Double
-TAO_DynUnion_i::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_double (CORBA::Environment &env)
 {
-  CORBA::Double retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_double))
-    {
-      retval = this->member_->get_double (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_double)
+    return this->member_->get_double (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::String
-TAO_DynUnion_i::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_string (CORBA::Environment &env)
 {
-  CORBA::String retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_string))
-    {
-      retval = this->member_->get_string (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_string)
+    return this->member_->get_string (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::TypeCode_ptr
-TAO_DynUnion_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_typecode (CORBA::Environment &env)
 {
-  CORBA::TypeCode_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_TypeCode))
-    {
-      retval = this->member_->get_typecode (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_TypeCode)
+    return this->member_->get_typecode (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Object_ptr
-TAO_DynUnion_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_reference (CORBA::Environment &env)
 {
-  CORBA::Object_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_objref))
-    {
-      retval = this->member_->get_reference (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_objref)
+    return this->member_->get_reference (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::LongLong
-TAO_DynUnion_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_longlong (CORBA::Environment &env)
 {
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_longlong)
+    return this->member_->get_longlong (env);
+  else
+    {
+      env.exception (new CORBA_DynAny::Invalid);
+
 #if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong retval = {0, 0};
+      CORBA::LongLong tmp = {0, 0};
+      return tmp;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong retval = 0;
+      return 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_longlong))
-    {
-      retval = this->member_->get_longlong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        retval);
     }
 }
 
 CORBA::ULongLong
-TAO_DynUnion_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_ulonglong (CORBA::Environment &env)
 {
-  CORBA::ULongLong retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ulonglong))
-    {
-      retval = this->member_->get_ulonglong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_ulonglong)
+    return this->member_->get_ulonglong (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::WChar
-TAO_DynUnion_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_wchar (CORBA::Environment &env)
 {
-  CORBA::WChar retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_wchar))
-    {
-      retval = this->member_->get_wchar (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_wchar)
+    return this->member_->get_wchar (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::get_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_any (CORBA::Environment &env)
 {
-  CORBA::Any_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_any))
-    {
-      retval = this->member_->get_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
+  if (this->member_.in () 
+      && TAO_DynAny_i::unalias (this->member_->type (env),
+                                env)
+      == CORBA::tk_any)
+    return this->member_->get_any (env);
   else
     {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
+      env.exception (new CORBA_DynAny::Invalid);
+      return 0;
     }
 }
 
@@ -2090,57 +1439,45 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
 // argument.
 void
 TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   // Get the CDR stream of the argument.
   ACE_Message_Block* mb = any._tao_get_cdr ();
 
   TAO_InputCDR cdr (mb);
 
-  CORBA_TypeCode_ptr disc_tc = 
-    any.type ()->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK;
+  CORBA_TypeCode_ptr disc_tc = any.type ()->discriminator_type (env);
 
   CORBA_Any disc_any (disc_tc,
                       0,
                       cdr.start ());
 
   if (!CORBA::is_nil (this->discriminator_.in ()))
-    {
-      this->discriminator_->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+    this->discriminator_->destroy (env);
 
   // Set the discriminator holder.
   this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_any,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
+                                                       env);
 
   cdr.skip (disc_tc);
 
-  CORBA::ULong count = any.type ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  CORBA::ULong count = any.type ()->member_count (env);
   CORBA::ULong i;
   CORBA::Long default_index = -1;
 
-  CORBA::TCKind discriminator_kind = disc_tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
+  CORBA::TCKind discriminator_kind = disc_tc->kind (env);
 
   DU_Extractor_base* functor =
     this->get_extractor (discriminator_kind,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
+                         env);
 
   // Get the index.
   for (i = 0; i < count; i++)
     {
       CORBA_Any label_any = *any.type ()->member_label (i,
-                                                        ACE_TRY_ENV);
-      ACE_CHECK;
+                                                        env);
 
-      CORBA::TCKind label_kind = label_any.type ()->kind (ACE_TRY_ENV);
-      ACE_CHECK;
+      CORBA::TCKind label_kind = label_any.type ()->kind (env);
 
       // If there is a default index, note the value but don't call
       // check_match.
@@ -2161,35 +1498,23 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
   delete functor;
 
   if (i == count && default_index == -1)
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
+    env.exception (new CORBA_DynAny::Invalid);
   else
     {
       if (i == count && default_index != -1)
-        {
-          this->current_index_ = default_index;
-        }
-
-      CORBA::TypeCode_ptr member_tc =
-        any.type ()->member_type (this->current_index_,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
+        this->current_index_ = default_index;
 
-      CORBA_Any member_any (member_tc,
+      CORBA_Any member_any (any.type ()->member_type (this->current_index_,
+                                                      env),
                             0,
                             cdr.start ());
 
       if (!CORBA::is_nil (this->member_.in ()))
-        {
-          this->member_->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
+        this->member_->destroy (env);
 
       this->member_ =
         TAO_DynAny_i::create_dyn_any (member_any,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
+                                      env);
     }
 }
 
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index a595087d7b4..66aa6b9391a 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -42,166 +42,116 @@ public:
 
   // = Functions specific to DynUnion
 
-  CORBA::Boolean set_as_default (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
+  CORBA::Boolean set_as_default (CORBA::Environment &ACE_TRY_ENV);
   // Does union have a default member?
 
   void set_as_default (CORBA::Boolean set_as_default,
-                       CORBA::Environment& ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment&);
   // Makes default member (if any) the active menber
 
-  CORBA_DynAny_ptr discriminator (CORBA::Environment& ACE_TRY_ENV =
-                                    TAO_default_environment ());
+  CORBA_DynAny_ptr discriminator (CORBA::Environment&);
   // Returns the discriminator (which is a DynAny)
 
-  CORBA::TCKind discriminator_kind (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+  CORBA::TCKind discriminator_kind (CORBA::Environment &ACE_TRY_ENV);
   // Returns TCKind of discriminator
 
-  CORBA_DynAny_ptr member (CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
+  CORBA_DynAny_ptr member (CORBA::Environment &ACE_TRY_ENV);
   // Returns active member
 
   // = Get and set for member name
 
-  char *member_name (CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+  char *member_name (CORBA::Environment &ACE_TRY_ENV);
   void member_name (const char* member_name,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
 
-  CORBA::TCKind member_kind (CORBA::Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
+  CORBA::TCKind member_kind (CORBA::Environment &ACE_TRY_ENV);
   // Returns TCKind of active member
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+               CORBA::Environment &ACE_TRY_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::Environment &ACE_TRY_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   // Jump to component at <slot>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void rewind (CORBA::Environment &ACE_TRY_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                        CORBA::Environment &ACE_TRY_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+                         CORBA::Environment &ACE_TRY_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      CORBA::Environment &ACE_TRY_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+                   CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  char *get_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
 
 private:
   CORBA_DynAny_var member_;
@@ -265,13 +215,11 @@ private:
   };
 
   DU_Extractor_base* get_extractor (CORBA::TCKind kind,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+                                    CORBA::Environment &ACE_TRY_ENV);
   // Returns a pointer to the correct extractor class.
 
   void set_from_any (const CORBA_Any& any,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   // Code common to the constructor from an Any arg and the member
   // function from_any().
 };
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index bdd144703c3..66f86728524 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -236,7 +236,7 @@ CORBA::Environment::print_exception (const char *info,
     }
   else
     ACE_DEBUG ((LM_ERROR,
-                "TAO: (%P|%t) no exception, %s\n", info));
+                "TAO: (%P|%t) no exception\n"));
 }
 
 CORBA_Environment_var &
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index d3641c158f6..86516d652c3 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -63,19 +63,15 @@ public:
   CORBA_Environment (void);
   // The default constructor, the environment will hold no exceptions.
 
-  CORBA_Environment (const CORBA_Environment &ACE_TRY_ENV);
+  CORBA_Environment (const CORBA_Environment &env);
   // Copy constructor.
 
-  CORBA_Environment &operator=(const CORBA_Environment &ACE_TRY_ENV);
+  CORBA_Environment &operator=(const CORBA_Environment &env);
   // Assingment.
 
   ~CORBA_Environment (void);
   // Destructor, release the exception.
 
-  static CORBA_Environment * _duplicate (CORBA_Environment *);
-  static CORBA_Environment * _nil (void);
-  // Some static methods that need to be defined in every pseudo object
-
   CORBA_Exception* exception (void) const;
   // Return the exception.  Caller must call <_incr_refcnf> in order
   // to keep the ptr.
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index 68b8940a38f..e57f23f3514 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -20,20 +20,6 @@ CORBA_Environment::exception (void) const
   return this->exception_;
 }
 
-ACE_INLINE CORBA_Environment *
-CORBA_Environment::_duplicate (CORBA_Environment *x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment::_nil (void)
-{
-  return (CORBA_Environment_ptr)0;
-}
-
 // Inline operations for class CORBA_Environment_var
 
 ACE_INLINE
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index e586cd5a534..043a4356b08 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -49,7 +49,7 @@ CORBA_Exception::CORBA_Exception (const CORBA_Exception &src)
 
 CORBA_Exception::CORBA_Exception (void)
   :  type_ (0),
-     refcount_ (0)
+     refcount_ (1)
 {
 }
 
@@ -95,33 +95,28 @@ CORBA_Exception::_is_a (const char* repository_id) const
 }
 
 void
-CORBA_Exception::_tao_print_exception (const char *user_provided_info,
+CORBA_Exception::_tao_print_exception (const char *info,
                                        FILE *) const
 {
+  const char *id = this->_id ();
+
   ACE_DEBUG ((LM_ERROR,
-              "(%P|%t) EXCEPTION, %s\n"
-              "%s\n",
-              user_provided_info,
-              this->_info ().c_str ()));
-}
+              "(%P|%t) EXCEPTION, %s\n",
+              info));
 
-ACE_CString
-CORBA_Exception::_info (void) const
-{
-  CORBA::SystemException *system_exception =
+  CORBA::SystemException *x2 =
     CORBA_SystemException::_narrow (ACE_const_cast (CORBA_Exception *,
                                                     this));
 
-  if (system_exception != 0)
-    return system_exception->_info ();
-
-  // @@ we can use the exception's typecode to dump all the data held
-  // within it ...
+  if (x2 != 0)
+    x2->_tao_print_system_exception ();
+  else
+    // @@ we can use the exception's typecode to dump all the data
+    // held within it ...
 
-  ACE_CString user_exception_info = "user exception, ID '";
-  user_exception_info += this->_id ();
-  user_exception_info += "'";
-  return user_exception_info;
+    ACE_DEBUG ((LM_ERROR,
+                "(%P|%t) user exception, ID '%s'\n",
+                id));
 }
 
 CORBA::ULong
@@ -192,10 +187,6 @@ CORBA_UserException::_narrow (CORBA_Exception* exception)
   return 0;
 }
 
-CORBA_SystemException::CORBA_SystemException (void)
-{
-}
-
 CORBA_SystemException::CORBA_SystemException (CORBA::TypeCode_ptr tc,
                                               CORBA::ULong code,
                                               CORBA::CompletionStatus completed)
@@ -277,21 +268,8 @@ CORBA_SystemException::_tao_errno (int errno_value)
       return TAO_EPERM_MINOR_CODE;
     case EAFNOSUPPORT:
       return TAO_EAFNOSUPPORT_MINOR_CODE;
-    case EAGAIN:
-      return TAO_EAGAIN_MINOR_CODE;
-    case ENOMEM:
-      return TAO_ENOMEM_MINOR_CODE;
-    case EACCES:
-      return TAO_EACCES_MINOR_CODE;
-    case EFAULT:
-      return TAO_EFAULT_MINOR_CODE;
-    case EBUSY:
-      return TAO_EBUSY_MINOR_CODE;
-    case EEXIST:
-      return TAO_EEXIST_MINOR_CODE;
     default:
-      // Mask off bottom 7 bits and return them.
-      return errno_value & 0x7F;
+      return TAO_UNKNOWN_MINOR_CODE;
     }
 }
 
@@ -308,23 +286,15 @@ CORBA_SystemException::_tao_minor_code (u_int location,
 void
 CORBA_SystemException::_tao_print_system_exception (FILE *) const
 {
-  ACE_DEBUG ((LM_ERROR,
-              "(%P|%t) system exception, ID '%s'\n",
-              this->_info ().c_str ()));
-}
-
-ACE_CString
-CORBA_SystemException::_info (void) const
-{
   // @@ there are a other few "user exceptions" in the CORBA scope,
   // they're not all standard/system exceptions ... really need to
   // either compare exhaustively against all those IDs (yeech) or
   // (preferably) to represent the exception type directly in the
   // exception value so it can be queried.
 
-  ACE_CString info = "system exception, ID '";
-  info += this->_id ();
-  info += "'\n";
+  ACE_DEBUG ((LM_ERROR,
+              "(%P|%t) system exception, ID '%s'\n",
+              _id ()));
 
   CORBA::ULong VMCID =
     this->minor () & 0xFFFFF000u;
@@ -332,7 +302,7 @@ CORBA_SystemException::_info (void) const
   if (VMCID == TAO_DEFAULT_MINOR_CODE)
     {
       const char *location;
-      switch (this->minor () & 0x00000F80u)
+      switch (this->minor () & 0x00000FF0u)
         {
         case TAO_INVOCATION_CONNECT_MINOR_CODE:
           location = "invocation connect failed";
@@ -355,31 +325,12 @@ CORBA_SystemException::_info (void) const
         case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE:
           location = "failed to recv request response";
           break;
-        case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL:
-          location = "all protocols failed to parse the IOR";
-          break;
-        case TAO_NULL_POINTER_MINOR_CODE:
-          location = "attempt to use null pointer";
-          break;
-        case TAO_MPROFILE_CREATION_ERROR:
-          location = "error during MProfile creation";
-          break;
-        case TAO_TIMEOUT_CONNECT_MINOR_CODE:
-          location = "timeout during connect";
-          break;
-        case TAO_TIMEOUT_SEND_MINOR_CODE:
-          location = "timeout during send";
-          break;
-        case TAO_TIMEOUT_RECV_MINOR_CODE:
-          location = "timeout during recv";
-          break;
         default:
           location = "unknown location";
         }
 
       const char *errno_indication;
-      char unknown_errno [32];
-      switch (this->minor () & 0x7FU)
+      switch (this->minor () & 0x0000000Fu)
         {
         case TAO_UNSPECIFIED_MINOR_CODE:
           errno_indication = "unspecified errno";
@@ -414,66 +365,31 @@ CORBA_SystemException::_info (void) const
         case TAO_EAFNOSUPPORT_MINOR_CODE:
           errno_indication = "EAFNOSUPPORT";
           break;
-        case TAO_EAGAIN_MINOR_CODE:
-          errno_indication = "EAGAIN";
-          break;
-        case TAO_ENOMEM_MINOR_CODE:
-          errno_indication = "ENOMEM";
-          break;
-        case TAO_EACCES_MINOR_CODE:
-          errno_indication = "EACCES";
-          break;
-        case TAO_EFAULT_MINOR_CODE:
-          errno_indication = "EFAULT";
-          break;
-        case TAO_EBUSY_MINOR_CODE:
-          errno_indication = "EBUSY";
-          break;
-        case TAO_EEXIST_MINOR_CODE:
-          errno_indication = "EEXIST";
-          break;
         default:
-          {
-            // 7 bits of some other errno.
-            ACE_OS::sprintf (unknown_errno,
-                             "low 7 bits of errno: %3u",
-                             this->minor () & 0x7FU);
-
-            errno_indication = unknown_errno;
-          }
+          errno_indication = "unknown errno";
         }
 
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "TAO exception, "
-                       "minor code = %x (%s; %s), "
-                       "completed = %s\n",
-                       this->minor (),
-                       location,
-                       errno_indication,
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
+      ACE_DEBUG ((LM_ERROR,
+                  "(%P|%t) TAO exception, "
+                  "minor code = %x (%s; %s), "
+                  "completed = %s\n",
+                  this->minor (), location, errno_indication,
+                  (completed () == CORBA::COMPLETED_YES) ? "YES" :
+                  (completed () == CORBA::COMPLETED_NO) ? "NO" :
+                  (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+                  "garbage"));
     }
   else
     {
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "non-TAO exception, "
-                       "minor code = %x, completed = %s\n",
-                       this->minor (),
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
+      ACE_DEBUG ((LM_ERROR,
+                  "(%P|%t) non-TAO exception, "
+                  "minor code = %x, completed = %s\n",
+                  this->minor (),
+                  (completed () == CORBA::COMPLETED_YES) ? "YES" :
+                  (completed () == CORBA::COMPLETED_NO) ? "NO" :
+                  (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+                  "garbage"));
     }
-
-  return info;
 }
 
 CORBA_UnknownUserException::CORBA_UnknownUserException (void)
@@ -559,17 +475,15 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
   const char *name = "UnknownUserException";
   const char *field_name = "exception";
 
-  CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-    || stream.write_string (interface_id) == 0
-    || stream.write_string (name) == 0
-    || stream.write_ulong (1L) == 0
-    || stream.write_string (field_name) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &CORBA::_tc_any, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK;
-
-  if (result)
+  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
+      || stream.write_string (interface_id) == 0
+      || stream.write_string (name) == 0
+      || stream.write_ulong (1L) == 0
+      || stream.write_string (field_name) == 0
+      || stream.encode (CORBA::_tc_TypeCode,
+                        &CORBA::_tc_any, 0,
+                        ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || ACE_TRY_ENV.exception () != 0)
     ACE_THROW (CORBA_INITIALIZE ());
 
   ACE_NEW_THROW_EX (tcp,
@@ -635,27 +549,23 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   ACE_OS::strcat (full_id, name);
   ACE_OS::strcat (full_id, suffix);
 
-  CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-    || stream.write_string (full_id) == 0
-    || stream.write_string (name) == 0
-    || stream.write_ulong (2L) != 1
-    || stream.write_string (minor) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &CORBA::_tc_ulong, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK; // @@ Maybe we should transform this exception
-
-  result = result || stream.write_string (completed) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &TC_completion_status, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK; // @@ Maybe we should transform this exception
-
-  if (result)
+  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
+      || stream.write_string (full_id) == 0
+      || stream.write_string (name) == 0
+      || stream.write_ulong (2L) != 1
+      || stream.write_string (minor) == 0
+      || stream.encode (CORBA::_tc_TypeCode,
+                        &CORBA::_tc_ulong, 0,
+                        ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || ACE_TRY_ENV.exception () != 0
+      || stream.write_string (completed) == 0
+      || stream.encode (CORBA::_tc_TypeCode,
+                        &TC_completion_status, 0,
+                        ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || ACE_TRY_ENV.exception () != 0)
     ACE_THROW (CORBA::INITIALIZE ());
-
-  // @@ It is possible to throw an exception at this point?
-  //    What if the exception typecode has not been initialized yet?
+  // @@ It is possible to throw an exception at this point?  What if
+  // the exception typecode has not been initialized yet?
 
   CORBA::string_free (full_id);
 
@@ -884,6 +794,8 @@ CORBA_ExceptionList::item (CORBA::ULong slot,
 {
   CORBA::TypeCode_ptr *tc;
 
+  //  ACE_TRY_ENV.clear ();
+
   if (this->tc_list_.get (tc,
                           slot) == -1)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
@@ -892,9 +804,10 @@ CORBA_ExceptionList::item (CORBA::ULong slot,
 }
 
 void
-CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &ACE_TRY_ENV)
+CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // unimplemented
+  env.clear ();
 }
 
 CORBA_ExceptionList_ptr
@@ -913,22 +826,6 @@ CORBA_ExceptionList::_destroy (void)
     delete this;
 }
 
-void
-CORBA_ExceptionList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA_ExceptionList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-  if (this->ref_count_ == 0)
-    delete this;
-
-}
-
-
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
 TAO_DONT_CATCH::TAO_DONT_CATCH (void)
 {}
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 93c199c070d..0cac40dc027 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -71,10 +71,6 @@ public:
   // Print the exception <ex> to output determined by <f>.  This
   // function is not CORBA compliant.
 
-  ACE_CString _info (void) const;
-  // Returns a string containing information about the exception. This
-  // function is not CORBA compliant.
-
   // = Methods required for memory management support.
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
@@ -104,7 +100,6 @@ class TAO_Export CORBA_UserException : public CORBA_Exception
   //   using OMG-IDL.
 public:
   // = Initialization and termination methods.
-
   CORBA_UserException (const CORBA_UserException &src);
   // Copy ctor.
 
@@ -128,7 +123,7 @@ public:
   virtual int _is_a (const char *interface_id) const;
   // Used for narrowing
 
-  //protected:
+protected:
   CORBA_UserException (void);
   // Default constructor.
 };
@@ -144,9 +139,6 @@ class TAO_Export CORBA_SystemException : public CORBA_Exception
 public:
   // = Initialization and termination methods.
 
-  CORBA_SystemException (void);
-  // Default Ctor
-
   CORBA_SystemException (const CORBA_SystemException &src);
   // Copy ctor.
 
@@ -183,10 +175,6 @@ public:
   // Print the system exception <ex> to output determined by f.  This
   // function is not CORBA compliant.
 
-  ACE_CString _info (void) const;
-  // Returns a string containing information about the exception. This
-  // function is not CORBA compliant.
-
   static CORBA::ULong _tao_minor_code (u_int location,
                                        int errno_value);
   // Helper to create a minor status value.
@@ -227,41 +215,40 @@ public: \
   virtual void _raise (void); \
 }
 
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
-TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
-TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
-TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
-TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
-TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
-TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
-TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
-TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policy override
+TAO_SYSTEM_EXCEPTION(UNKNOWN);
+TAO_SYSTEM_EXCEPTION(BAD_PARAM);
+TAO_SYSTEM_EXCEPTION(NO_MEMORY);
+TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
+TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
+TAO_SYSTEM_EXCEPTION(INV_OBJREF);
+TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
+TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
+TAO_SYSTEM_EXCEPTION(INTERNAL);
+TAO_SYSTEM_EXCEPTION(MARSHAL);
+TAO_SYSTEM_EXCEPTION(INITIALIZE);
+TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
+TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
+TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
+TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
+TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
+TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
+TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
+TAO_SYSTEM_EXCEPTION(TRANSIENT);
+TAO_SYSTEM_EXCEPTION(FREE_MEM);
+TAO_SYSTEM_EXCEPTION(INV_IDENT);
+TAO_SYSTEM_EXCEPTION(INV_FLAG);
+TAO_SYSTEM_EXCEPTION(INTF_REPOS);
+TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
+TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
+TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
+TAO_SYSTEM_EXCEPTION(INV_POLICY);
 TAO_SYSTEM_EXCEPTION(REBIND);
 TAO_SYSTEM_EXCEPTION(TIMEOUT);
 TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE);
 TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);   // operation needs transaction
-TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); // operation was a no-op
-TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);    // invalid TP context passed
+TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);
+TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);
+TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);
 
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -328,7 +315,7 @@ public:
   // Make the TypeCode for the CORBA::UnknownUserException standard
   // exception.
 
-  static void init (CORBA_Environment &ACE_TRY_ENV =
+  static void init (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ());
   // Runtime initialization of all standard exception typecodes.
   // Called from <CORBA::ORB_init>.
@@ -338,7 +325,7 @@ public:
 
   static CORBA_SystemException *
        create_system_exception (const char *id,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                     TAO_default_environment ());
   // Create a CORBA::SystemException given the interface repository
   // ID.
@@ -384,9 +371,6 @@ public:
   CORBA_ExceptionList_ptr _duplicate (void);
   // Increase the reference count.
 
-  static CORBA_ExceptionList_ptr _duplicate (CORBA_ExceptionList *);
-  // Increase the reference count in the spec defined manner.
-
   void _destroy (void);
 
   static CORBA_ExceptionList_ptr _nil (void);
@@ -398,19 +382,15 @@ public:
   // Add and consume a TypeCode to the list
 
   CORBA::TypeCode_ptr item (CORBA::ULong slot,
-                            CORBA_Environment &ACE_TRY_ENV =
+                            CORBA_Environment &TAO_IN_ENV =
                             TAO_default_environment ());
   // Return the typecode at slot i. Raises the "Bounds" exception.
 
   void remove (CORBA::ULong slot,
-               CORBA_Environment &ACE_TRY_ENV =
+               CORBA_Environment &TAO_IN_ENV =
                TAO_default_environment ());
   // Remove the typecode at slot i. Raises the "Bounds" exception.
 
-  void  _incr_refcnt (void);
-  void  _decr_refcnt (void);
-  // Increment and decrement ref counts
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA::ExceptionList_ptr _ptr_type;
   typedef CORBA::ExceptionList_var _var_type;
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index 21b94e09746..d9280d9f383 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -54,14 +54,6 @@ CORBA_ExceptionList::_nil (void)
   return (CORBA_ExceptionList_ptr)0;
 }
 
-ACE_INLINE CORBA_ExceptionList *
-CORBA_ExceptionList::_duplicate (CORBA_ExceptionList* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
 ACE_INLINE
 CORBA_ExceptionList_var::CORBA_ExceptionList_var (void) // default constructor
   : ptr_ (CORBA_ExceptionList::_nil ())
diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp
index bd2ae762d23..eca4db6c77e 100644
--- a/TAO/tao/Forwarding_Servant.cpp
+++ b/TAO/tao/Forwarding_Servant.cpp
@@ -38,10 +38,14 @@ TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
 }
 
 CORBA::RepositoryId
-TAO_Forwarding_Servant::_primary_interface (const PortableServer::ObjectId & /* oid */,
-                                            PortableServer::POA_ptr /* poa */,
-                                            CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_Forwarding_Servant::_primary_interface (const PortableServer::ObjectId &oid,
+                                            PortableServer::POA_ptr poa,
+                                            CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (oid);
+  ACE_UNUSED_ARG (poa);
+  ACE_UNUSED_ARG (env);
+
   return CORBA::string_dup (this->interface_repository_id_.in ());
 }
 
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h
index b093f1d28c6..81c9c551a70 100644
--- a/TAO/tao/Forwarding_Servant.h
+++ b/TAO/tao/Forwarding_Servant.h
@@ -35,7 +35,7 @@ public:
   // Constructor
 
   virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV =
+                       CORBA_Environment &TAO_IN_ENV =
                            TAO_default_environment ());
   // The <invoke> method receives requests issued to any CORBA object
   // incarnated by the DSI servant and performs the processing
@@ -43,7 +43,7 @@ public:
 
   virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                                   PortableServer::POA_ptr poa,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // The <_primary_interface> method receives an ObjectId value and a
   // POA_ptr as input parameters and returns a valid RepositoryId
   // representing the most-derived interface for that oid.
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 9b884d2a746..fe1b4191706 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -67,11 +67,8 @@ ACE_RCSID(tao, GIOP, "$Id$")
 
 static const char *TAO_GIOP_Timeprobe_Description[] =
 {
-  "GIOP::send_message - start",
-  "GIOP::send_message - end",
-
-  "GIOP::recv_message - start",
-  "GIOP::recv_message - end",
+  "GIOP::send_request - start",
+  "GIOP::send_request - end",
 
   "GIOP::read_buffer - start",
   "GIOP::read_buffer - end",
@@ -83,8 +80,8 @@ static const char *TAO_GIOP_Timeprobe_Description[] =
 enum
 {
   // Timeprobe description table start key
-  TAO_GIOP_SEND_MESSAGE_START = 100,
-  TAO_GIOP_SEND_MESSAGE_END,
+  TAO_GIOP_SEND_REQUEST_START = 100,
+  TAO_GIOP_SEND_REQUEST_END,
 
   TAO_GIOP_RECV_MESSAGE_START,
   TAO_GIOP_RECV_MESSAGE_END,
@@ -98,7 +95,7 @@ enum
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_GIOP_Timeprobe_Description,
-                                  TAO_GIOP_SEND_MESSAGE_START);
+                                  TAO_GIOP_SEND_REQUEST_START);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
@@ -233,7 +230,7 @@ TAO_GIOP::dump_msg (const char *label,
         message_name = names [slot];
       int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
       ACE_DEBUG ((LM_DEBUG,
-                  "%s GIOP v%c.%c msg, %d data bytes, %s endian, %s",
+                  "(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s",
                   label,
                   digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
                   digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
@@ -385,11 +382,10 @@ TAO_GIOP::write_locate_request_header (CORBA::ULong request_id,
 int
 TAO_GIOP::send_message (TAO_Transport *transport,
                         TAO_OutputCDR &stream,
-                        TAO_ORB_Core *orb_core,
-                        ACE_Time_Value *max_wait_time)
+                        TAO_ORB_Core *orb_core)
 {
 
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_SEND_MESSAGE_START);
+  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_SEND_REQUEST_START);
 
   // Ptr to first buffer.
   char *buf = (char *) stream.buffer ();
@@ -451,7 +447,7 @@ TAO_GIOP::send_message (TAO_Transport *transport,
                       stream.length ());
 
   // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = transport->send (stream.begin (), max_wait_time);
+  ssize_t n = transport->send (stream.begin ());
 
   if (n == -1)
     {
@@ -459,8 +455,9 @@ TAO_GIOP::send_message (TAO_Transport *transport,
         ACE_DEBUG ((LM_DEBUG,
                     "TAO: (%P|%t) closing conn %d after fault %p\n",
                     transport->handle (),
-                    "GIOP::send_message ()"));
+                    "GIOP::send_request ()"));
 
+    transport->close_connection ();
     return -1;
   }
 
@@ -469,9 +466,10 @@ TAO_GIOP::send_message (TAO_Transport *transport,
     {
       if (TAO_orbdebug)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) GIOP::send_message () "
+                    "TAO: (%P|%t) GIOP::send_request () "
                     "EOF, closing conn %d\n",
                     transport->handle()));
+      transport->close_connection ();
       return -1;
     }
 
@@ -494,9 +492,9 @@ TAO_GIOP::send_message (TAO_Transport *transport,
 // required to write robust distributed systems.)
 
 void
-TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version,
-                                 TAO_Transport *transport,
-                                 void *)
+TAO_GIOP::close_connection (const TAO_GIOP_Version& version,
+                            TAO_Transport *transport,
+                            void *)
 {
   // static CORBA::Octet
   const char close_message [TAO_GIOP_HEADER_LEN] =
@@ -520,7 +518,7 @@ TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version,
   // @@ should recv and discard queued data for portability; note
   // that this won't block (long) since we never set SO_LINGER
 
-  TAO_GIOP::dump_msg ("send_close_connection",
+  TAO_GIOP::dump_msg ("close_connection",
                       (const u_char *) close_message,
                       TAO_GIOP_HEADER_LEN);
 
@@ -529,19 +527,17 @@ TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version,
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::send_close_connection -"
+                    "TAO (%P|%t) TAO_GIOP::close_connection -"
                     " connection already closed\n"));
       return;
     }
 
   if (transport->send ((const u_char *) close_message,
                        TAO_GIOP_HEADER_LEN) == -1)
-    {
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) error closing connection %d\n",
-                    which));
-    }
+    if (TAO_orbdebug)
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) error closing connection %d\n",
+                  which));
 
   transport->close_connection ();
   ACE_DEBUG ((LM_DEBUG,
@@ -555,7 +551,7 @@ TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version,
 //
 // NOTE that IIOP will still benefit from TCP's orderly disconnect.
 
-int
+void
 TAO_GIOP::send_error (const TAO_GIOP_Version &version,
                       TAO_Transport *transport)
 {
@@ -584,28 +580,24 @@ TAO_GIOP::send_error (const TAO_GIOP_Version &version,
 
   ACE_HANDLE which = transport->handle ();
 
-  int result = transport->send ((const u_char *)error_message,
-                                TAO_GIOP_HEADER_LEN);
-  if (result == -1)
+  if (transport->send ((const u_char *)error_message,
+                       TAO_GIOP_HEADER_LEN) == -1)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) error sending error to %d\n",
                     which));
     }
-
-  return result;
 }
 
 ssize_t
 TAO_GIOP::read_buffer (TAO_Transport *transport,
                        char *buf,
-                       size_t len,
-                       ACE_Time_Value *max_wait_time)
+                       size_t len)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_READ_BUFFER_START);
 
-  ssize_t bytes_read = transport->recv (buf, len, max_wait_time);
+  ssize_t bytes_read = transport->recv (buf, len);
 
   if (bytes_read <= 0 && TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -669,8 +661,7 @@ TAO_GIOP::read_header (TAO_Transport *transport,
                        TAO_ORB_Core *orb_core,
                        TAO_GIOP_Message_State &state,
                        CORBA::ULong &header_size,
-                       TAO_InputCDR &input,
-                       ACE_Time_Value *max_wait_time)
+                       TAO_InputCDR &input)
 {
   // Default header length.
   header_size = TAO_GIOP_HEADER_LEN;
@@ -693,7 +684,7 @@ TAO_GIOP::read_header (TAO_Transport *transport,
        t != 0;
        t -= n)
     {
-      n = transport->recv (buf, t, max_wait_time);
+      n = transport->recv (buf, t);
       if (n == -1)
         return -1;
       else if (n == 0 && errno != EWOULDBLOCK)
@@ -714,8 +705,7 @@ TAO_GIOP::read_header (TAO_Transport *transport,
 int
 TAO_GIOP::handle_input (TAO_Transport *transport,
                         TAO_ORB_Core *orb_core,
-                        TAO_GIOP_Message_State &state,
-                        ACE_Time_Value *max_wait_time)
+                        TAO_GIOP_Message_State &state)
 {
   if (state.header_received () == 0)
     {
@@ -724,8 +714,7 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
                                  orb_core,
                                  state,
                                  header_size,
-                                 state.cdr,
-                                 max_wait_time) == -1)
+                                 state.cdr) == -1)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -755,8 +744,7 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
   ssize_t n =
     TAO_GIOP::read_buffer (transport,
                            state.cdr.rd_ptr () + state.current_offset,
-                           missing_data,
-                           max_wait_time);
+                           missing_data);
   if (n == -1)
     {
       if (TAO_debug_level > 0)
@@ -815,7 +803,7 @@ TAO_GIOP::parse_reply (TAO_Transport *,
       // this on the firt iteration, leave it for the nearby future...
       // ERROR too.  @@ this->reply_handler_->error ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: "
+                         "TAO (%P|%t) %N:%l handle_client_input: "
                          "request.\n"),
                         -1);
 
@@ -826,7 +814,7 @@ TAO_GIOP::parse_reply (TAO_Transport *,
       // @@ Errors for the time being.
       // @@ this->reply_handler_->error ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: "
+                         "TAO (%P|%t) %N:%l handle_client_input: "
                          "wrong message.\n"),
                         -1);
 
@@ -875,7 +863,7 @@ TAO_GIOP::parse_reply (TAO_Transport *,
   return 0;
 }
 
-int
+void
 TAO_GIOP::process_server_message (TAO_Transport *transport,
                                   TAO_ORB_Core *orb_core,
                                   TAO_InputCDR &input,
@@ -903,18 +891,20 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
     case TAO_GIOP::Request:
       // The following two routines will either raise an exception
       // or successfully write the response into <output>
-      return TAO_GIOP::process_server_request (transport,
-                                               orb_core,
-                                               input,
-                                               output,
-                                               state.giop_version);
+      TAO_GIOP::process_server_request (transport,
+                                        orb_core,
+                                        input,
+                                        output,
+                                        state.giop_version);
+      break;
 
     case TAO_GIOP::LocateRequest:
-      return TAO_GIOP::process_server_locate (transport,
-                                              orb_core,
-                                              input,
-                                              output,
-                                              state.giop_version);
+      TAO_GIOP::process_server_locate (transport,
+                                       orb_core,
+                                       input,
+                                       output,
+                                       state.giop_version);
+      break;
 
     case TAO_GIOP::MessageError:
       if (TAO_debug_level > 0)
@@ -932,15 +922,13 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) Illegal message received by server\n"));
-      return TAO_GIOP::send_error (state.giop_version, transport);
+      TAO_GIOP::send_error (state.giop_version, transport);
+      break;
     }
-
   TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
-
-  return 0;
 }
 
-int
+void
 TAO_GIOP::process_server_request (TAO_Transport *transport,
                                   TAO_ORB_Core *orb_core,
                                   TAO_InputCDR &input,
@@ -969,6 +957,7 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
 
+
 #if !defined (TAO_NO_IOR_TABLE)
       const CORBA::Octet *object_key =
         request.object_key ().get_buffer ();
@@ -1046,15 +1035,13 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
   // Only CORBA exceptions are caught here.
   ACE_CATCHANY
     {
-      int result = 0;
       if (response_required)
         {
-          result = TAO_GIOP::send_reply_exception (version,
-                                                   transport,
-                                                   orb_core,
-                                                   request_id,
-                                                   &ACE_ANY_EXCEPTION);
-          if (result == -1)
+          if (TAO_GIOP::send_reply_exception (version,
+                                              transport,
+                                              orb_core,
+                                              request_id,
+                                              &ACE_ANY_EXCEPTION) == -1)
             {
               if (TAO_debug_level > 0)
                 ACE_ERROR ((LM_ERROR,
@@ -1063,6 +1050,8 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                                    "TAO: ");
             }
+
+          return;
         }
       else if (TAO_debug_level > 0)
         {
@@ -1078,8 +1067,7 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                                "TAO: ");
         }
-
-      return result;
+      return;
     }
 #if defined (TAO_HAS_EXCEPTIONS)
   ACE_CATCHALL
@@ -1091,7 +1079,6 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
       // we have native exceptions but no support for them in the ORB
       // we should still be able to catch it.  If we don't have native
       // exceptions it couldn't have been raised in the first place!
-      int result = 0;
       if (response_required)
         {
           CORBA::UNKNOWN exception
@@ -1099,12 +1086,11 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
              (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
              CORBA::COMPLETED_MAYBE);
 
-          result = TAO_GIOP::send_reply_exception (version,
-                                                   transport,
-                                                   orb_core,
-                                                   request_id,
-                                                   &exception);
-          if (result == -1)
+          if (TAO_GIOP::send_reply_exception (version,
+                                              transport,
+                                              orb_core,
+                                              request_id,
+                                              &exception) == -1)
             {
               if (TAO_debug_level > 0)
                 ACE_ERROR ((LM_ERROR,
@@ -1114,51 +1100,41 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
             }
         }
       else if (TAO_debug_level > 0)
-        {
-          // It is unfotunate 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
-          // down, since it really isn't the client's fault.
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) exception thrown "
-                      "but client is not waiting a response\n"));
-        }
-
-      return result;
+        // It is unfotunate 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 down, since it
+        // really isn't the client's fault.
+        ACE_ERROR ((LM_ERROR,
+                    "(%P|%t) exception thrown "
+                    "but client is not waiting a response\n"));
+      return;
     }
 #endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
-  int result = 0;
-  if (response_required)
-    {
-      result = TAO_GIOP::send_message (transport,
-                                       output,
-                                       orb_core);
-      if (result == -1)
-        {
-          if (TAO_debug_level > 0)
-            {
-              // No exception but some kind of error, yet a response
-              // is required.
-              ACE_ERROR ((LM_ERROR,
-                          "TAO: (%P|%t) %p: cannot send reply\n",
-                          "TAO_GIOP::process_server_message"));
-            }
-        }
-    }
+  if (response_required
+      && TAO_GIOP::send_message (transport,
+                                 output,
+                                 orb_core) == -1
+      && TAO_debug_level > 0)
+    // No exception but some kind of error, yet a response is
+    // required.
+    ACE_ERROR ((LM_ERROR,
+                "TAO: (%P|%t) %p: cannot send reply\n",
+                "TAO_GIOP::process_server_message"));
 
-  return result;
 }
 
-int
+void
 TAO_GIOP::process_server_locate (TAO_Transport *transport,
                                  TAO_ORB_Core* orb_core,
                                  TAO_InputCDR &input,
                                  TAO_OutputCDR &output,
                                  const TAO_GIOP_Version& version)
 {
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START);
+
   // This will extract the request header, set <response_required> as
   // appropriate.
   TAO_GIOP_LocateRequestHeader locateRequestHeader;
@@ -1329,21 +1305,13 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
         }
     }
 
-  int result = TAO_GIOP::send_message (transport,
-                                       output,
-                                       orb_core);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO: (%P|%t) %p: cannot send reply\n",
-                      "TAO_GIOP::process_server_message"));
-        }
-    }
-
-  return result;
+  if (TAO_GIOP::send_message (transport,
+                              output,
+                              orb_core) == -1
+      && TAO_debug_level > 0)
+    ACE_ERROR ((LM_ERROR,
+                "TAO: (%P|%t) %p: cannot send reply\n",
+                "TAO_GIOP::process_server_message"));
 }
 
 int
@@ -1462,7 +1430,7 @@ TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
 }
 
 CORBA::Boolean
-TAO_GIOP::start_message_lite (const TAO_GIOP_Version &,
+TAO_GIOP::start_message_lite (const TAO_GIOP_Version &version,
                               TAO_GIOP::Message_Type type,
                               TAO_OutputCDR &msg)
 {
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index b77c893a44b..b15f91ead9f 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -354,7 +354,7 @@ public:
   // Constructor
 
   void init (TAO_InputCDR &msg,
-             CORBA_Environment &ACE_TRY_ENV =
+             CORBA_Environment &TAO_IN_ENV =
                  TAO_default_environment ());
   // Initialize the header from the values found in <msg>.
 
@@ -407,9 +407,9 @@ public:
     Fragment = 7                // by both.
   };
 
-  static void send_close_connection (const TAO_GIOP_Version &version,
-                                     TAO_Transport *transport,
-                                     void *ctx);
+  static void close_connection (const TAO_GIOP_Version &version,
+                                TAO_Transport *transport,
+                                void *ctx);
   // Close a connection, first sending GIOP::CloseConnection.
 
   static CORBA::Boolean start_message (const TAO_GIOP_Version &version,
@@ -434,8 +434,7 @@ public:
 
   static int send_message (TAO_Transport *transport,
                            TAO_OutputCDR &stream,
-                           TAO_ORB_Core* orb_core,
-                           ACE_Time_Value *max_wait_time = 0);
+                           TAO_ORB_Core* orb_core);
   // Send message, returns TRUE if success, else FALSE.
 
   static void dump_msg (const char *label,
@@ -443,14 +442,13 @@ public:
                         size_t len);
   // Print out a message header.
 
-  static int send_error (const TAO_GIOP_Version &version,
-                         TAO_Transport *transport);
+  static void send_error (const TAO_GIOP_Version &version,
+                          TAO_Transport *transport);
   // Send an error message back to a caller.
 
   static ssize_t read_buffer (TAO_Transport *transport,
                               char *buf,
-                              size_t len,
-                              ACE_Time_Value *max_wait_time);
+                              size_t len);
   // Loop on data read ... this is required since <recv> won't block
   // until the requested amount of data is available.
 
@@ -461,12 +459,10 @@ public:
                           TAO_ORB_Core *orb_core,
                           TAO_GIOP_Message_State &state,
                           CORBA::ULong &header_size,
-                          TAO_InputCDR &input,
-                          ACE_Time_Value *max_wait_time);
+                          TAO_InputCDR &input);
   static int handle_input (TAO_Transport *transport,
                            TAO_ORB_Core *orb_core,
-                           TAO_GIOP_Message_State &state,
-                           ACE_Time_Value *max_wait_time = 0);
+                           TAO_GIOP_Message_State &state);
 
   static int parse_reply (TAO_Transport *transport,
                           TAO_ORB_Core *orb_core,
@@ -474,16 +470,16 @@ public:
                           TAO_GIOP_ServiceContextList& reply_ctx,
                           CORBA::ULong& request_id,
                           CORBA::ULong& reply_status);
-  static int process_server_message (TAO_Transport *transport,
-                                     TAO_ORB_Core *orb_core,
-                                     TAO_InputCDR &input,
-                                     const TAO_GIOP_Message_State& state);
-
-  static int process_server_request (TAO_Transport *transport,
-                                     TAO_ORB_Core* orb_core,
-                                     TAO_InputCDR &input,
-                                     TAO_OutputCDR &output,
-                                     const TAO_GIOP_Version& version);
+  static void process_server_message (TAO_Transport *transport,
+                                      TAO_ORB_Core *orb_core,
+                                      TAO_InputCDR &input,
+                                      const TAO_GIOP_Message_State& state);
+
+  static void process_server_request (TAO_Transport *transport,
+                                      TAO_ORB_Core* orb_core,
+                                      TAO_InputCDR &input,
+                                      TAO_OutputCDR &output,
+                                      const TAO_GIOP_Version& version);
   // A request was received on the server side.
   // <transport> is the source of the message (and thus where the
   // replies should be sent).
@@ -493,11 +489,11 @@ public:
   // <request_id> and <response_required> are set as part of the
   // message processing.
 
-  static int process_server_locate (TAO_Transport *transport,
-                                    TAO_ORB_Core* orb_core,
-                                    TAO_InputCDR &input,
-                                    TAO_OutputCDR &output,
-                                    const TAO_GIOP_Version& version);
+  static void process_server_locate (TAO_Transport *transport,
+                                     TAO_ORB_Core* orb_core,
+                                     TAO_InputCDR &input,
+                                     TAO_OutputCDR &output,
+                                     const TAO_GIOP_Version& version);
   // A LocateRequest was received on the server side.
   // <transport> is the source of the message (and thus where the
   // replies should be sent).
diff --git a/TAO/tao/GIOP.i b/TAO/tao/GIOP.i
index f04f67a3295..c35b9c24676 100644
--- a/TAO/tao/GIOP.i
+++ b/TAO/tao/GIOP.i
@@ -68,7 +68,8 @@ TAO_GIOP_Message_State::reset (void)
   this->message_size = 0;
   this->current_offset = 0;
   this->more_fragments = 0;
-  this->cdr.reset_contents ();
+  // Does this involve a memory allocation? Could we eliminate it?
+  ACE_Message_Block::release (this->cdr.steal_contents ());
 }
 
 ACE_INLINE int
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index 4aec0252627..4a2a977d551 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -276,16 +276,17 @@ TAO_GIOP_ServerRequest::oa (void)
 
 void
 TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
+  env.clear ();
+
   // Save params for later use when marshaling the reply.
   this->params_ = list;
 
   // Then unmarshal each "in" and "inout" parameter.
   for (u_int i = 0; i < list->count (); i++)
     {
-      CORBA::NamedValue_ptr nv = list->item (i, ACE_TRY_ENV);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (i, env);
 
       // check if it is an in or inout parameter
       if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
@@ -303,8 +304,7 @@ TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
 
       // Skip over the next aregument.
       CORBA::TypeCode::traverse_status status =
-        this->incoming_->skip (tc.in (), ACE_TRY_ENV);
-      ACE_CHECK;
+        this->incoming_->skip (tc.in (), env);
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
@@ -335,8 +335,7 @@ TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
       // Stick it into the Any. It gets duplicated there.
       any->_tao_replace (tc.in (),
                          cdr,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
+                         env);
 
       // Now we can release the original.
       ACE_Message_Block::release (cdr);
@@ -351,7 +350,7 @@ TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
       ACE_ERROR ((LM_ERROR,
                   "TAO_GIOP_ServerRequest::arguments - "
                   "%d bytes left in buffer\n", incoming_->length ()));
-      ACE_THROW (CORBA::BAD_PARAM ());
+      env.exception (new CORBA::BAD_PARAM ());
     }
 }
 
@@ -361,24 +360,28 @@ TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
 
 void
 TAO_GIOP_ServerRequest::set_result (const CORBA::Any &value,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
+  env.clear ();
+
   // setting a result when another result already exists or if an exception
   // exists is an error
   if (this->retval_ || this->exception_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  this->retval_ = new CORBA::Any (value);
+    env.exception (new CORBA::BAD_INV_ORDER ());
+  else
+    {
+      this->retval_ = new CORBA::Any (value);
+    }
 }
 
 // Store the exception value.
 
 void
 TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   if (this->retval_ || this->exception_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    env.exception (new CORBA::BAD_INV_ORDER ());
   else
   {
 
@@ -417,7 +420,7 @@ TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value,
 // parameters
 
 void
-TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &env)
 {
   // NOTE: if "env" is set, it takes precedence over exceptions
   // reported using the mechanism of the ServerRequest.  Only system
@@ -440,17 +443,12 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
           CORBA::TypeCode_var tc = this->retval_->type ();
                 if (this->retval_->any_owns_data ())
             {
-              (void) this->outgoing_->encode (tc.in (),
-                                              retval_->value (),
-                                              0, ACE_TRY_ENV);
-              ACE_CHECK;
+              (void) this->outgoing_->encode (tc.in (), retval_->value (), 0, env);
             }
           else
             {
               TAO_InputCDR cdr (retval_->_tao_get_cdr ());
-              (void) this->outgoing_->append (tc.in (), &cdr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
+              (void) this->outgoing_->append (tc.in (), &cdr, env);
             }
         }
 
@@ -461,9 +459,7 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
                i < this->params_->count ();
                i++)
             {
-              CORBA::NamedValue_ptr nv = this->params_->item (i, ACE_TRY_ENV);
-              ACE_CHECK;
-
+              CORBA::NamedValue_ptr nv = this->params_->item (i, env);
               if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
                 continue;
 
@@ -471,17 +467,12 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
               CORBA::TypeCode_var tc = any->type ();
               if (any->any_owns_data ())
                 {
-                  (void) this->outgoing_->encode (tc.in (),
-                                                  any->value (),
-                                                  0, ACE_TRY_ENV);
-                  ACE_CHECK;
+                  (void) this->outgoing_->encode (tc.in (), any->value (), 0, env);
                 }
               else
                 {
                   TAO_InputCDR cdr (any->_tao_get_cdr ());
-                  (void) this->outgoing_->append (tc.in (),
-                                                  &cdr, ACE_TRY_ENV);
-                  ACE_CHECK;
+                  (void) this->outgoing_->append (tc.in (), &cdr, env);
                 }
             }
         }
@@ -492,7 +483,7 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
 
 // Extension
 void
-TAO_GIOP_ServerRequest::demarshal (CORBA::Environment &ACE_TRY_ENV,
+TAO_GIOP_ServerRequest::demarshal (CORBA::Environment &orb_env,
                                    // ORB related exception reporting
                                    const TAO_Call_Data_Skel *info,
                                    // call description
@@ -513,8 +504,13 @@ TAO_GIOP_ServerRequest::demarshal (CORBA::Environment &ACE_TRY_ENV,
           || (pdp->mode == CORBA::ARG_INOUT))
         {
           // Then just unmarshal the value.
-          (void) incoming_->decode (pdp->tc, ptr, 0, ACE_TRY_ENV);
-          ACE_CHECK;
+          (void) incoming_->decode (pdp->tc, ptr, 0, orb_env);
+        }
+
+      if (orb_env.exception ())
+        {
+          orb_env.print_exception ("TAO_GIOP_ServerRequest::demarshal - parameter decode failed");
+          return;
         }
     }
   va_end (param_vector);
@@ -552,7 +548,7 @@ TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
       // The Any does not own the because ultimately it will be owned
       // by the Server_Request via the call to "set_exception"
       CORBA::Any any (skel_env.exception ()->_type (), exception);
-      this->set_exception (any, ACE_TRY_ENV);
+      this->set_exception (any, orb_env);
     }
 #endif
 
@@ -590,8 +586,7 @@ TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
               if (result != CORBA::tk_void)
                 {
                   // Then just marshal the value.
-                  (void) this->outgoing_->encode (pdp->tc, ptr, 0,
-                                                  ACE_TRY_ENV);
+                  (void) this->outgoing_->encode (pdp->tc, ptr, 0, ACE_TRY_ENV);
                   ACE_TRY_CHECK;
                 }
             }
@@ -608,10 +603,9 @@ TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "TAO_GIOP_ServerRequest::marshal - parameter encode failed");
-      ACE_RETHROW;
+      return;
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 
   va_end (param_vector);
 }
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index 5d6b4269b9f..77ee397b5e1 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -53,18 +53,18 @@ public:
 
   // = General ServerRequest operations
   void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &ACE_TRY_ENV =
+                  CORBA_Environment &TAO_IN_ENV =
                       TAO_default_environment ());
 
   void set_result (const CORBA::Any &value,
-                   CORBA_Environment &ACE_TRY_ENV =
+                   CORBA_Environment &TAO_IN_ENV =
                        TAO_default_environment ());
 
   void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &ACE_TRY_ENV =
+                      CORBA_Environment &TAO_IN_ENV =
                           TAO_default_environment ());
 
-  virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV =
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV =
                                 TAO_default_environment ());
   // does the marshaling of outgoing parameters and is used by the DSI
   // based scheme
@@ -95,20 +95,20 @@ public:
   // meant to be used internally.
   //
 
-  virtual void demarshal (CORBA_Environment &ACE_TRY_ENV,
+  virtual void demarshal (CORBA_Environment &orb_env,
                           const TAO_Call_Data_Skel *info,
                           ...);
   // demarshal incoming parameters. Used by the SII skeleton (i.e., the IDL
   // compiler generated skeleton)
 
-  virtual void marshal (CORBA_Environment &ACE_TRY_ENV,
+  virtual void marshal (CORBA_Environment &orb_env,
                         //                        CORBA_Environment &skel_env,
                         const TAO_Call_Data_Skel *info,
                         ...);
   // marshal outgoing parameters and return value. This is used by the SSI
   // i.e., by the IDL compiler generated skeletons.
 
-  virtual void init_reply (CORBA_Environment &ACE_TRY_ENV =
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV =
                                TAO_default_environment ());
   // start a Reply message
 
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index 1a35d7df728..3c4173641f1 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -2,51 +2,57 @@
 
 #include "tao/IIOP_Connect.h"
 #include "tao/Timeprobe.h"
+#include "tao/IIOP_Transport.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/CDR.h"
-#include "tao/GIOP.h"
+#include "tao/Wait_Strategy.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/IIOP_Connect.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, IIOP_Connect, "$Id$")
+ACE_RCSID(tao, Connect, "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_IIOP_Connect_Timeprobe_Description[] =
+  static const char *TAO_Connect_Timeprobe_Description[] =
 {
-  "IIOP_Server_Connection_Handler::handle_input - start",
-  "IIOP_Server_Connection_Handler::handle_input - end",
+  "Server_Connection_Handler::handle_input - start",
+  "Server_Connection_Handler::handle_input - end",
 
-  "IIOP_Server_Connection_Handler::handle_locate - start",
-  "IIOP_Server_Connection_Handler::handle_locate - end",
+  "Server_Connection_Handler::handle_locate - start",
+  "Server_Connection_Handler::handle_locate - end",
 
-  "IIOP_Server_Connection_Handler::receive_request - end",
+  "Server_Connection_Handler::receive_request - end",
 
   "IIOP_Client_Connection_Handler::send_request - start",
-  "IIOP_Client_Connection_Handler::send_request - end"};
+  "IIOP_Client_Connection_Handler::send_request - end",
+
+  "GIOP::Send_Request - return"
+};
 
 enum
 {
   // Timeprobe description table start key
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 300,
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 300,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
 
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
 
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
+  TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
 
   TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
-  TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END
+  TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END,
+
+  GIOP_SEND_REQUEST_RETURN
 };
 
 // Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_Connect_Timeprobe_Description,
-                                  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Connect_Timeprobe_Description,
+                                  TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
@@ -64,7 +70,6 @@ TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t)
 
 TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_Handler_Base (t),
-    transport_ (this, 0),
     orb_core_ (0),
     tss_resources_ (0)
 {
@@ -78,14 +83,24 @@ TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thre
 
 TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_IIOP_Handler_Base (orb_core),
-    transport_ (this, orb_core),
     orb_core_ (orb_core),
     tss_resources_ (orb_core->get_tss_resources ())
 {
+  transport_ = new TAO_IIOP_Server_Transport (this,
+                                              this->orb_core_);
 }
 
 TAO_IIOP_Server_Connection_Handler::~TAO_IIOP_Server_Connection_Handler (void)
 {
+  delete this->transport_;
+  this->transport_ = 0;
+}
+
+TAO_Transport *
+TAO_IIOP_Server_Connection_Handler::transport (void)
+{
+  // @@ For now return nothing since all is not in place!
+  return transport_;
 }
 
 int
@@ -137,9 +152,8 @@ TAO_IIOP_Server_Connection_Handler::open (void*)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) IIOP connection from client <%s> on %d\n",
+                "(%P|%t) connection from client <%s> on %d\n",
                 client, this->peer ().get_handle ()));
-
   return 0;
 }
 
@@ -157,8 +171,7 @@ TAO_IIOP_Server_Connection_Handler::activate (long flags,
 {
   if (TAO_orbdebug)
     ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_IIOP_Server_Connection_Handler::activate %d "
-                 "threads, flags = %d\n",
+                 "(%P|%t) TAO_IIOP_Server_Connection_Handler::activate %d threads, flags = %d\n",
                  n_threads,
                  flags,
                  THR_BOUND));
@@ -181,8 +194,7 @@ TAO_IIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
 {
   if (TAO_orbdebug)
     ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_IIOP_Server_Connection_Handler::handle_close "
-                 "(%d, %d)\n",
+                 "(%P|%t) TAO_IIOP_Server_Connection_Handler::handle_close (%d, %d)\n",
                  handle,
                  rm));
 
@@ -223,30 +235,24 @@ TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
 {
   int result = TAO_GIOP::handle_input (this->transport (),
                                        this->orb_core_,
-                                       this->transport_.message_state_);
+                                       this->transport_->message_state_);
 
   if (result == -1 && TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - %p\n",
-                  "TAO_IIOP_Server_Connection_Handler::handle_input, "
-                  "handle_input"));
+                  "IIOP_Server_CH::handle_input, handle_input"));
     }
 
   if (result == 0 || result == -1)
     return result;
 
-  result = TAO_GIOP::process_server_message (this->transport (),
-                                             this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
-  if (result != -1)
-    {
-      this->transport_.message_state_.reset ();
-      result = 0;
-    }
-
-  return result;
+  TAO_GIOP::process_server_message (this->transport (),
+                                    this->orb_core_,
+                                    this->transport_->message_state_.cdr,
+                                    this->transport_->message_state_);
+  this->transport_->message_state_.reset ();
+  return 0;
 }
 
 // ****************************************************************
@@ -255,16 +261,23 @@ TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
 TAO_IIOP_Client_Connection_Handler::
 TAO_IIOP_Client_Connection_Handler (ACE_Thread_Manager *t,
                                     TAO_ORB_Core* orb_core)
-  : TAO_IIOP_Handler_Base (t),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core)
+  : TAO_IIOP_Handler_Base (t)
 {
+  transport_ = new TAO_IIOP_Client_Transport (this,
+                                              orb_core);
 }
 
 TAO_IIOP_Client_Connection_Handler::~TAO_IIOP_Client_Connection_Handler (void)
 {
+  delete this->transport_;
+  this->transport_ = 0;
 }
 
+TAO_Transport *
+TAO_IIOP_Client_Connection_Handler::transport (void)
+{
+  return this->transport_;
+}
 
 // @@ Should I do something here to enable non-blocking?? (Alex).
 // @@ Alex: I don't know if this is the place to do it, but the way to
@@ -282,11 +295,12 @@ TAO_IIOP_Client_Connection_Handler::open (void *)
   // Here is where we could enable all sorts of things such as
   // nonblock I/O, sock buf sizes, TCP no-delay, etc.
 
+  // @@ We should use this->orb_core_!!
 #if !defined (ACE_LACKS_SOCKET_BUFSIZ)
   int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
+    this->transport ()->orb_core ()->orb_params ()->sock_sndbuf_size ();
   int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
+    this->transport ()->orb_core ()->orb_params ()->sock_rcvbuf_size ();
 
   if (this->peer ().set_option (SOL_SOCKET,
                                 SO_SNDBUF,
@@ -332,7 +346,7 @@ TAO_IIOP_Client_Connection_Handler::open (void *)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) IIOP connection to server <%s> on %d\n",
+                "(%P|%t) connection to server <%s> on %d\n",
                 server, this->peer ().get_handle ()));
 
   // Register the handler with the Reactor if necessary.
@@ -340,6 +354,13 @@ TAO_IIOP_Client_Connection_Handler::open (void *)
 }
 
 int
+TAO_IIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
+{
+  // Call the waiter to handle the input.
+  return this->transport ()->wait_strategy ()->handle_input ();
+}
+
+int
 TAO_IIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
                                                   ACE_Reactor_Mask rm)
 {
@@ -361,8 +382,8 @@ TAO_IIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
   // Deregister this handler with the ACE_Reactor.
   if (this->reactor ())
     {
-      ACE_Reactor_Mask mask =
-        ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
+      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK |
+        ACE_Event_Handler::DONT_CALL;
 
       // Make sure there are no timers.
       this->reactor ()->cancel_timer (this);
@@ -376,11 +397,27 @@ TAO_IIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
+int
+TAO_IIOP_Client_Connection_Handler::close (u_long flags)
+{
+  this->destroy ();
+
+  return 0;
+}
 
 // ****************************************************************
 
+// @@ Are these instantiations still required?? Where? Not on this
+//    file, so they shouldn't be here!
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_Unbounded_Set<ACE_INET_Addr>;
+template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Unbounded_Set<ACE_INET_Addr>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_INET_Addr>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h
index c53c2315c84..c86d6e1fd97 100644
--- a/TAO/tao/IIOP_Connect.h
+++ b/TAO/tao/IIOP_Connect.h
@@ -29,14 +29,17 @@
 #include "ace/Svc_Handler.h"
 
 #include "tao/corbafwd.h"
-#include "tao/Wait_Strategy.h"
-
-#include "tao/IIOP_Transport.h"
+#include "tao/GIOP.h"
+#include "tao/CDR.h"
 
 // Forward Decls
+class TAO_Transport;
 class TAO_ORB_Core;
 class TAO_ORB_Core_TSS_Resources;
 
+class TAO_IIOP_Transport;
+class TAO_IIOP_Client_Transport;
+class TAO_IIOP_Server_Transport;
 
 typedef ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_SVC_HANDLER;
@@ -84,11 +87,8 @@ public:
   // Return the transport objects
 
 protected:
-  TAO_IIOP_Client_Transport transport_;
+  TAO_IIOP_Client_Transport *transport_;
   // Reference to the transport object, it is owned by this class.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
 };
 
 // ****************************************************************
@@ -141,7 +141,7 @@ protected:
   // Perform appropriate closing.
 
 protected:
-  TAO_IIOP_Server_Transport transport_;
+  TAO_IIOP_Server_Transport *transport_;
   // @@ New transport object reference.
 
   TAO_ORB_Core *orb_core_;
diff --git a/TAO/tao/IIOP_Connect.i b/TAO/tao/IIOP_Connect.i
index 1730c5a7244..c130d6682b1 100644
--- a/TAO/tao/IIOP_Connect.i
+++ b/TAO/tao/IIOP_Connect.i
@@ -1,29 +1,2 @@
 // -*- C++ -*-
 // $Id$
-
-ACE_INLINE TAO_Transport *
-TAO_IIOP_Server_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE TAO_Transport *
-TAO_IIOP_Client_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE int
-TAO_IIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // Call the waiter to handle the input.
-  return this->transport ()->wait_strategy ()->handle_input ();
-}
-
-ACE_INLINE int
-TAO_IIOP_Client_Connection_Handler::close (u_long)
-{
-  this->destroy ();
-
-  return 0;
-}
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 16a595e06b9..c1e636b208c 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -104,8 +104,7 @@ TAO_IIOP_Connector::close (void)
 
 int
 TAO_IIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport,
-                             ACE_Time_Value *max_wait_time)
+                             TAO_Transport *& transport)
 {
   if (profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
     return -1;
@@ -118,13 +117,6 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
 
   const ACE_INET_Addr &oa = iiop_profile->object_addr ();
 
-  ACE_Synch_Options synch_options;
-  if (max_wait_time != 0)
-    {
-      synch_options.set (ACE_Synch_Options::USE_TIMEOUT,
-                         *max_wait_time);
-    }
-
   TAO_IIOP_Client_Connection_Handler* result;
 
   // the connect call will set the hint () stored in the Profile
@@ -134,8 +126,7 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
   errno = 0;
   if (this->base_connector_.connect (iiop_profile->hint (),
                                      result,
-                                     oa,
-                                     synch_options) == -1)
+                                     oa) == -1)
     { // Give users a clue to the problem.
       if (TAO_orbdebug)
         {
@@ -307,26 +298,26 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
   return pfile;
 }
 
-void
+int
 TAO_IIOP_Connector::make_profile (const char *endpoint,
                                   TAO_Profile *&profile,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // The endpoint should be of the form:
   //
-  //    N.n@host:port/object_key
+  //    N.n//host:port/object_key
   //
   // or:
   //
-  //    host:port/object_key
+  //    //host:port/object_key
 
-  ACE_NEW_THROW_EX (profile,
-                    TAO_IIOP_Profile (endpoint,
-                                      this->orb_core_,
-                                      ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
+  ACE_NEW_RETURN (profile,
+                  TAO_IIOP_Profile (endpoint,
+                                    this->orb_core_,
+                                    ACE_TRY_ENV),
+                  -1);
 
-  ACE_CHECK;
+  return 0;  // Success
 }
 
 
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 39265a10519..8560f106798 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -73,29 +73,26 @@ public:
   // Pluggable.h
   int open (TAO_ORB_Core *orb_core);
   int close (void);
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time);
+  int connect (TAO_Profile *profile, TAO_Transport *&transport);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
-  virtual int check_prefix (const char *endpoint);
+  typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
+        TAO_NULL_ACTIVATION_STRATEGY;
 
-  virtual char object_key_delimiter (void) const;
+  typedef ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
+        TAO_NULL_CREATION_STRATEGY;
 
 protected:
   // = More TAO_Connector methods, please check the documentation on
-  //   Pluggable.h
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // Pluggable.h
+  virtual int make_profile (const char *endpoint,
+                            TAO_Profile *&,
+                            CORBA::Environment &ACE_TRY_ENV);
 
-protected:
-  typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
+  virtual int check_prefix (const char *endpoint);
 
-  typedef ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
+  virtual char object_key_delimiter (void) const;
 
 private:
   TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index 68e58e61d95..0cdbe9ee656 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -35,6 +35,7 @@ public:
   virtual int init (int argc, char* argv[]);
   // Dynamic linking hook
 
+  // @@ Fred&Ossama: Shouldn't we use a plain const char* here?
   virtual int match_prefix (const ACE_CString &prefix);
   // verify prefix is a match
 
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index e01973e9ef3..dcc239e7a58 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -28,7 +28,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
+    host_ (0),
     port_ (0),
     version_ (version),
     object_key_ (object_key),
@@ -46,7 +46,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
                                     const TAO_GIOP_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
+    host_ (0),
     port_ (port),
     version_ (version),
     object_key_ (object_key),
@@ -54,29 +54,35 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     hint_ (0),
     orb_core_ (orb_core)
 {
-  if (host != 0)
-    this->host_ = host;
+  if (host)
+    {
+      ACE_NEW (this->host_,
+               char[ACE_OS::strlen (host) + 1]);
+      ACE_OS::strcpy (this->host_, host);
+    }
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
   : TAO_Profile (pfile.tag ()),
-    host_ (pfile.host_),
-    port_ (pfile.port_),
-    version_ (pfile.version_),
-    object_key_ (pfile.object_key_),
-    object_addr_ (pfile.object_addr_),
-    hint_ (pfile.hint_),
+    host_(0),
+    port_(pfile.port_),
+    version_(pfile.version_),
+    object_key_(pfile.object_key_),
+    object_addr_(pfile.object_addr_),
+    hint_(0),
     orb_core_ (pfile.orb_core_)
 {
-  // @@ Do we need this copy constructor?  Won't the default copy
-  // constructor work just as well?
+  ACE_NEW (this->host_,
+           char[ACE_OS::strlen (pfile.host_) + 1]);
+  ACE_OS::strcpy (this->host_, pfile.host_);
+  hint_ = pfile.hint_;
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char *string,
                                     TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
+    host_ (0),
     port_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     object_key_ (),
@@ -84,13 +90,12 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char *string,
     hint_ (0),
     orb_core_ (orb_core)
 {
-  parse_string (string, ACE_TRY_ENV);
-  ACE_CHECK;
+  parse_string (string, env);
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
+    host_ (0),
     port_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     object_key_ (),
@@ -103,32 +108,39 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
 int
 TAO_IIOP_Profile::set (const ACE_INET_Addr &addr)
 {
+  char temphost[MAXHOSTNAMELEN + 1];
+  const char *temphost2 = 0;
+
   this->port_ = addr.get_port_number();
 
   if (this->orb_core_->orb_params ()->use_dotted_decimal_addresses ())
     {
-      const char *temp = addr.get_host_addr ();
-      if (temp == 0)
+      temphost2 = addr.get_host_addr ();
+      if (temphost2 == 0)
         return -1;
-      else
-        this->host_ = temp;
     }
   else
     {
-      char temphost[MAXHOSTNAMELEN + 1];
-
       if (addr.get_host_name (temphost,
                               sizeof temphost) != 0)
         return -1;
 
-      this->host_ = CORBA::string_dup (temphost);
+      temphost2 = temphost;
     }
 
+  ACE_NEW_RETURN (this->host_,
+                  char[ACE_OS::strlen (temphost2) + 1],
+                  -1);
+  ACE_OS::strcpy (this->host_, temphost2);
+
   return 0;
+
 }
 
 TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
 {
+  delete [] this->host_;
+  this->host_ = 0;
 }
 
 // return codes:
@@ -143,6 +155,11 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
   // Read and verify major, minor versions, ignoring IIOP
   // profiles whose versions we don't understand.
   //
+  // @@ Fred: if we find a version like 1.5 we are supposed to handle
+  // it, i.e. read the fields we know about and ignore the rest!
+  //
+  // XXX this doesn't actually go back and skip the whole
+  // encapsulation...
   if (!(cdr.read_octet (this->version_.major)
         && this->version_.major == TAO_DEF_GIOP_MAJOR
         && cdr.read_octet (this->version_.minor)
@@ -157,8 +174,14 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
       }
   }
 
+  if (this->host_)
+    {
+      delete [] this->host_;
+      this->host_ = 0;
+    }
+
   // Get host and port
-  if (cdr.read_string (this->host_.out ()) == 0
+  if (cdr.read_string (this->host_) == 0
       || cdr.read_ushort (this->port_) == 0)
     {
       if (TAO_debug_level > 0)
@@ -170,15 +193,13 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
       return -1;
     }
 
-  this->object_addr_.set (this->port_, this->host_.in ());
+  this->object_addr_.set (this->port_, this->host_);
 
   // ... and object key.
 
   if ((cdr >> this->object_key_) == 0)
     return -1;
 
-  // Tagged Components *only* exist after version 1.0!
-  // For GIOP 1.2, IIOP and GIOP have same version numbers!
   if (this->version_.major > 1
       || this->version_.minor > 0)
     if (this->tagged_components_.decode (cdr) == 0)
@@ -205,14 +226,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
   if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
+    return 0;
 
   // Remove the "N.n@" version prefix, if it exists, and verify the
   // version is one that we accept.
@@ -234,29 +248,38 @@ TAO_IIOP_Profile::parse_string (const char *string,
   if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
       this->version_.minor >  TAO_DEF_GIOP_MINOR)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
 
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
+  CORBA::String_var copy = CORBA::string_dup (string);
 
   char *start = copy.inout ();
   char *cp = ACE_OS::strchr (start, ':');
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
 
-  CORBA::String_var tmp = CORBA::string_alloc (cp - start);
+  if (this->host_)
+    {
+      // @@ You are setting this->host_ using CORBA::string_alloc() a
+      // couple of lines below, you should then use CORBA::string_free()
+      // to release it!  In general use a single form of memory
+      // allocation for a field/variable to avoid new/free() and
+      // malloc/delete() mismatches.
+      // Ohh, and if you are going to use CORBA::string_alloc() &
+      // friends you may consider using CORBA::String_var to manage
+      // the memory automatically (though there may be forces that
+      // suggest otherwise).
+      delete [] this->host_;
+      this->host_ = 0;
+    }
 
-  for (cp = tmp.inout (); *start != ':'; *cp++ = *start++)
+  this->host_ = CORBA::string_alloc (1 + cp - start);
+  for (cp = this->host_; *start != ':'; *cp++ = *start++)
     continue;
 
   *cp = 0; start++; // increment past :
@@ -265,24 +288,18 @@ TAO_IIOP_Profile::parse_string (const char *string,
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
+      CORBA::string_free (this->host_);
+      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
 
-  this->host_ = tmp._retn ();
   this->port_ = (CORBA::UShort) ACE_OS::atoi (start);
-
   // @@ This call to atoi appears to pass in a string that
   //    still has the object key appended to it.
   //    Shouldn't we actually parse the port from the string
   //    rather than pass a `port/object_key' combined string?
   //                      -Ossama
 
-  this->object_addr_.set (this->port_, this->host_.in ());
+  this->object_addr_.set (this->port_, this->host_);
 
   start = ++cp;  // increment past the /
 
@@ -292,29 +309,33 @@ TAO_IIOP_Profile::parse_string (const char *string,
 }
 
 CORBA::Boolean
-TAO_IIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
+TAO_IIOP_Profile::is_equivalent (TAO_Profile *other_profile,
+                                 CORBA::Environment &env)
 {
+  env.clear ();
 
   if (other_profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
     return 0;
 
-  const TAO_IIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_IIOP_Profile *, other_profile);
+  TAO_IIOP_Profile *op =
+    ACE_dynamic_cast (TAO_IIOP_Profile *, other_profile);
 
   ACE_ASSERT (op->object_key_.length () < UINT_MAX);
 
   return this->port_ == op->port_
     && this->object_key_ == op->object_key_
-    && ACE_OS::strcmp (this->host_.in (), op->host_.in ()) == 0
+    && ACE_OS::strcmp (this->host_, op->host_) == 0
     && this->version_ == op->version_;
 }
 
 CORBA::ULong
 TAO_IIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
+                        CORBA::Environment &env)
 {
   CORBA::ULong hashval;
 
+  env.clear ();
+
   // Just grab a bunch of convenient bytes and hash them; could do
   // more (hostname, full key, exponential hashing) but no real need
   // to do so except if performance requires a more costly hash.
@@ -332,29 +353,38 @@ TAO_IIOP_Profile::hash (CORBA::ULong max,
 }
 
 int
-TAO_IIOP_Profile::addr_to_string (char *buffer, size_t length)
+TAO_IIOP_Profile::addr_to_string(char *buffer, size_t length)
 {
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
+  size_t actual_len = ACE_OS::strlen (this->host_) // chars in host name
+                    + sizeof (':')               // delimiter
+                    + ACE_OS::strlen ("65536")    // max port
+                    + sizeof ('\0');
   if (length < actual_len)
     return -1;
 
   ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
+                   this->host_, port_);
   return 0;
 }
 
 const char *
 TAO_IIOP_Profile::host (const char *h)
 {
-  this->host_ = h;
+  if (this->host_)
+    {
+      delete [] this->host_;
+      this->host_ = 0;
+    }
 
-  return this->host_.in ();
+  if (h)
+    {
+      ACE_NEW_RETURN (this->host_,
+                      char[ACE_OS::strlen (h) + 1],
+                      0);
+      ACE_OS::strcpy (this->host_, h);
+    }
+
+  return this->host_;
 }
 
 void
@@ -378,14 +408,28 @@ TAO_IIOP_Profile::operator= (const TAO_IIOP_Profile &src)
 
   this->port_ = src.port_;
 
-  this->host_ = src.host_;
+  if (this->host_)
+    {
+      delete [] this->host_;
+      this->host_ = 0;
+    }
+
+  if (src.host_)
+    {
+      ACE_NEW_RETURN (this->host_,
+                      char[ACE_OS::strlen (src.host_) + 1],
+                      *this);
+      ACE_OS::strcpy (this->host_, src.host_);
+    }
 
   return *this;
 }
 
 CORBA::String
-TAO_IIOP_Profile::to_string (CORBA::Environment &)
+TAO_IIOP_Profile::to_string (CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
+
   CORBA::String_var key;
   TAO_POA::encode_sequence_to_string (key.inout(),
                                       this->object_key ());
@@ -396,11 +440,12 @@ TAO_IIOP_Profile::to_string (CORBA::Environment &)
                   1 /* decimal point */ +
                   1 /* minor version */ +
                   1 /* `@' character */ +
-                  ACE_OS::strlen (this->host_.in ()) +
+                  ACE_OS::strlen (this->host_) +
                   1 /* colon separator */ +
                   5 /* port number */ +
                   1 /* object key separator */ +
-                  ACE_OS::strlen (key));
+                  ACE_OS::strlen (key) +
+                  1 /* zero terminator */);
 
   CORBA::String buf = CORBA::string_alloc (buflen);
 
@@ -411,7 +456,7 @@ TAO_IIOP_Profile::to_string (CORBA::Environment &)
                    ::prefix_,
                    digits [this->version_.major],
                    digits [this->version_.minor],
-                   this->host_.in (),
+                   this->host_,
                    this->port_,
                    this->object_key_delimiter,
                    key.in ());
@@ -446,7 +491,7 @@ TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
   encap.write_octet (this->version_.minor);
 
   // STRING hostname from profile
-  encap.write_string (this->host_.in ());
+  encap.write_string (this->host_);
 
   // UNSIGNED SHORT port number
   encap.write_ushort (this->port_);
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index de1e980cb26..eecf974bc38 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -20,7 +20,6 @@
 #ifndef TAO_IIOP_PROFILE_H
 #define TAO_IIOP_PROFILE_H
 
-#include "tao/ORB.h"
 #include "tao/Pluggable.h"
 #include "tao/Object_KeyC.h"
 #include "tao/GIOP.h"
@@ -66,7 +65,7 @@ public:
 
   TAO_IIOP_Profile (const char *string,
                     TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &env);
   // Create object using a string ior.
 
   TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile);
@@ -82,10 +81,10 @@ public:
   // Destructor is to be called only through <_decr_refcnt>.
 
   int parse_string (const char *string,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &env);
   // Initialize this object using the given input string.
 
-  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::String to_string (CORBA::Environment &env);
   // Return a string representation for this profile.
   // client must deallocate memory.
 
@@ -104,13 +103,14 @@ public:
   TAO_ObjectKey *_key (void) const;
   //  Return a pointer to the Object Key.
 
-  CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
+  CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
+                                CORBA::Environment &env);
   // Return true if this profile is equivalent to other_profile.  Two
   // profiles are equivalent iff their key, port, host, object_key and
   // version are the same.
 
   CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                     CORBA::Environment &env);
   // Return a hash value for this object.
 
   int addr_to_string (char *buffer, size_t length);
@@ -154,7 +154,7 @@ private:
 
 private:
 
-  CORBA::String_var host_;
+  char *host_;
   // String representing the hosts name.
 
   CORBA::UShort port_;
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
index 805a6faf961..0b1acee39c4 100644
--- a/TAO/tao/IIOP_Profile.i
+++ b/TAO/tao/IIOP_Profile.i
@@ -29,7 +29,7 @@ TAO_IIOP_Profile::object_addr (void) const
 ACE_INLINE const char *
 TAO_IIOP_Profile::host (void)
 {
-  return this->host_.in ();
+  return this->host_;
 }
 
 ACE_INLINE CORBA::UShort
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 8b5fb5ea2c4..5a0f052f57c 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -22,7 +22,7 @@ static const char *TAO_Transport_Timeprobe_Description[] =
     "IIOP_Transport::send - end",
 
     "IIOP_Transport::receive - start",
-    "IIOP_Transport::receive - end",
+    "IIOP_Transport::recieve - end",
 
     "IIOP_Client_Transport::send_request - start",
     "IIOP_Client_Transport::send_request - end"
@@ -130,7 +130,7 @@ TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
+    ACE_dynamic_cast(const TAO_IIOP_Profile*,pfile);
 
   // Obtain object key.
   const TAO_ObjectKey& key = profile->object_key ();
@@ -171,13 +171,13 @@ TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
 void
 TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
                                          const TAO_Profile* pfile,
-                                         CORBA::ULong request_id,
+                                         CORBA::ULong /* request_id */,
                                          TAO_OutputCDR &output,
                                          CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
+    ACE_dynamic_cast(const TAO_IIOP_Profile*,pfile);
 
   // Obtain object key.
   const TAO_ObjectKey& key = profile->object_key ();
@@ -191,7 +191,7 @@ TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
     ACE_THROW (CORBA::MARSHAL ());
 
 
-  if (TAO_GIOP::write_locate_request_header (request_id,
+  if (TAO_GIOP::write_locate_request_header (this->request_id (),
                                              key,
                                              output) != 0)
     ACE_THROW (CORBA::MARSHAL ());
@@ -200,8 +200,7 @@ TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
 int
 TAO_IIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                          TAO_OutputCDR &stream,
-                                         int two_way,
-                                         ACE_Time_Value *max_wait_time)
+                                         int two_way)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_IIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
 
@@ -209,18 +208,19 @@ TAO_IIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                   two_way) == -1)
     return -1;
 
-  return TAO_GIOP::send_message (this,
-                                 stream,
-                                 orb_core,
-                                 max_wait_time);
+  if (TAO_GIOP::send_message (this,
+                              stream,
+                              orb_core) == -1)
+    return -1;
+
+  return this->idle_after_send ();
 }
 
 // Return 0, when the reply is not read fully, 1 if it is read fully.
 // @@ This code should go in the TAO_Transport class is repeated for
 //    each transport!!
 int
-TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
-                                                ACE_Time_Value *max_wait_time)
+TAO_IIOP_Client_Transport::handle_client_input (int /* block */)
 {
   // When we multiplex several invocations over a connection we need
   // to allocate the CDR stream *here*, but when there is a single
@@ -251,19 +251,9 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
   TAO_GIOP_Message_State* message_state =
     this->tms_->get_message_state ();
 
-  if (message_state == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) IIOP_Transport::handle_client_input -"
-                    " nil message state\n"));
-      return -1;
-    }
-
   int result = TAO_GIOP::handle_input (this,
                                        this->orb_core_,
-                                       *message_state,
-                                       max_wait_time);
+                                       *message_state);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -297,14 +287,11 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
       return -1;
     }
 
-  result =
-    this->tms_->dispatch_reply (request_id,
-                                reply_status,
-                                message_state->giop_version,
-                                reply_ctx,
-                                message_state);
-
-  if (result == -1)
+  if (this->tms_->dispatch_reply (request_id,
+                                  reply_status,
+                                  message_state->giop_version,
+                                  reply_ctx,
+                                  message_state) != 0)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
@@ -315,17 +302,12 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
       return -1;
     }
 
-  if (result == 0)
-    {
-      message_state->reset ();
-      return 0;
-    }
-
   // This is a NOOP for the Exclusive request case, but it actually
   // destroys the stream in the muxed case.
   this->tms_->destroy_message_state (message_state);
 
-  return result;
+  // Return something to indicate the reply is received.
+  return 1;
 }
 
 int
@@ -398,8 +380,7 @@ TAO_IIOP_Client_Transport::check_unexpected_data (void)
 // *********************************************************************
 
 ssize_t
-TAO_IIOP_Transport::send (const ACE_Message_Block *mblk,
-                          ACE_Time_Value *max_wait_time)
+TAO_IIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
 
@@ -430,16 +411,9 @@ TAO_IIOP_Transport::send (const ACE_Message_Block *mblk,
           // we should set IOV_MAX to that limit.
           if (iovcnt == IOV_MAX)
             {
-              if (max_wait_time == 0)
-                n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                     iovcnt);
-              else
-                n = ACE::writev (this->handler_->peer ().get_handle (),
-                                 (const iovec*)iov,
-                                 iovcnt,
-                                 max_wait_time);
-
-              if (n <= 0)
+              n = this->handler_->peer ().sendv_n ((const iovec *) iov,
+                                                   iovcnt);
+              if (n < 1)
                 return n;
 
               nbytes += n;
@@ -486,29 +460,24 @@ TAO_IIOP_Transport::send (const iovec *iov,
 ssize_t
 TAO_IIOP_Transport::recv (char *buf,
                           size_t len,
-                          ACE_Time_Value *max_wait_time)
+                          ACE_Time_Value *)
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
 
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      max_wait_time);
+  return this->handler_->peer ().recv_n (buf, len);
 }
 
 ssize_t
 TAO_IIOP_Transport::recv (char *buf,
                           size_t len,
                           int flags,
-                          ACE_Time_Value *max_wait_time)
+                          ACE_Time_Value *)
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
 
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      flags,
-                      max_wait_time);
+  return this->handler_->peer ().recv_n (buf,
+                                         len,
+                                         flags);
 }
 
 ssize_t
@@ -525,8 +494,7 @@ TAO_IIOP_Transport::recv (iovec *iov,
 int
 TAO_IIOP_Transport::send_request (TAO_ORB_Core *  /* orb_core */,
                                   TAO_OutputCDR & /* stream   */,
-                                  int             /* twoway   */,
-                                  ACE_Time_Value * /* max_wait_time */)
+                                  int             /* twoway   */)
 {
   return -1;
 }
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index cfffb34a181..574b4544858 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -37,7 +37,7 @@ class TAO_Export TAO_IIOP_Transport : public TAO_Transport
   //
   // = DESCRIPTION
   //   Specialization of the base TAO_Transport class to handle the IIOP
-  //   protocol.  This class in turn will be further specialized for
+  //   protocol.  This class in turn will be further speciialized for
   //   the client and server side.
 public:
   TAO_IIOP_Transport (TAO_IIOP_Handler_Base *handler,
@@ -94,8 +94,7 @@ public:
 
   virtual int send_request (TAO_ORB_Core *orb_core ,
                             TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_wait_time);
+                            int twoway);
   // Default action to be taken for send request.
 
 protected:
@@ -133,7 +132,7 @@ public:
                               CORBA::ULong request_id,
                               CORBA::Boolean is_twoway,
                               TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a request.
 
@@ -141,21 +140,19 @@ public:
                              const TAO_Profile *profile,
                              CORBA::ULong request_id,
                              TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                             CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a locate request.
 
   int send_request (TAO_ORB_Core *orb_core,
                     TAO_OutputCDR &stream,
-                    int twoway,
-                    ACE_Time_Value *max_wait_time);
+                    int twoway);
   // This is a bridge method for the connection handlers
   // <send_request> method.  The connection handler is responsible for
   // concurrency strategies, typically using the leader-follower
   // pattern.
 
-  int handle_client_input (int block = 0,
-                           ACE_Time_Value *max_time_value = 0);
+  int handle_client_input (int block = 0);
   // Read and handle the reply. Returns 0 when there is Short Read on
   // the connection. Returns 1 when the full reply is read and
   // handled. If <block> is 1, then reply is read in a blocking
diff --git a/TAO/tao/IOR.pidl b/TAO/tao/IOR.pidl
deleted file mode 100644
index cfc7184c8e7..00000000000
--- a/TAO/tao/IOR.pidl
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   XXX
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IOR{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-module TAO_IOP {
-
-  interface TAO_IOR_Manipulation {
-
-    exception EmptyProfileList {};
-    exception NotFound {};
-    exception Duplicate {};
-    exception Invalid_IOR {};
-
-    // Manipulating Object References.  While this interface does not
-    // assume the use of CORBA complient IOPs, the IOP termonology is
-    // used throughout.
-    // Object references (Object) are used since they encapsulate the
-    // notion of object references and IORs.
-    // Note, an IOR contains one or more profiles and a profile can be
-    // considered to represent the location or route to a specific instance
-    // of an object.
-    // A profile may also contain supplimentary information useful for
-    // differrent services such as security.
-    // All Object references may have multiple profiles
-
-    typedef sequence <Object> IORList;
-
-    Object merge_iors (in IORList iors)
-      raises (EmptyProfileList,Duplicate,Invalid_IOR);
-    // Create a new object reference by merging the profiles lists in the
-    // supplied list of one or more object references.
-
-    Object add_profiles (in Object ior1,
-                         in Object ior2)
-      raises (EmptyProfileList, Duplicate, Invalid_IOR);
-    // copy the profile list from "ior2" to "ior1".
-    // Note on ordering, while the current implementation will place
-    // the profiles from ior2 (which are not already in ior1) on the
-    // end of the profile list in ior1, there is no guarantee this ordering
-    // will be maintained.  For example, string_to_object or object_to_string
-    // may reorder the profile lists.  So, if it is important to use one
-    // profile before another then policies should be used along with tagged
-    // components/tagged profiles.
-
-    Object remove_profiles (in Object ior1,
-                            in Object ior2)
-      raises (Invalid_IOR, EmptyProfileList, NotFound);
-    // Any profile in ior1 which matches at least one profile in ior2
-    // will be removed.  Returns a new object reference
-
-    unsigned long is_in_ior(in Object ior1, in Object ior2)
-      raises (NotFound);
-    // returns number of profiles which are in both ior1 and ior2.
-
-    unsigned long get_profile_count (in Object ior)
-      raises (EmptyProfileList);
-    // This will return the number of profiles contained in the
-    // corresponding object reference for this object.
-
-  };
-};
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
deleted file mode 100644
index 5f5f85ea73e..00000000000
--- a/TAO/tao/IORC.cpp
+++ /dev/null
@@ -1,1138 +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 "tao/IORC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IORC.i"
-#endif /* !defined INLINE */
-
-#include "tao/IORS.h"
-#include "tao/Stub.h"
-#include "tao/corba.h"
-
-ACE_RCSID(tao, IORC, "$Id$")
-
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_IOP::TAO_IOR_Manipulation::_nil ());
-  if (is_a == 0)
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0");
-  if (servant != 0)
-    {
-      // PortableServer::Servant iservant = ACE_reinterpret_cast(POA_TAO_IOP::TAO_IOR_Manipulation_ptr, servant);
-      // TAO_IOP::TAO_IOR_Manipulation_ptr retv = ACE_reinterpret_cast (
-          // TAO_IOP::TAO_IOR_Manipulation_ptr,
-          // iservant->_create_collocated_objref (TAO_ORB_Core::ORB_CONTROL, stub)
-        // );
-      // if (retv != 0)
-        // return retv;
-      return new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation(
-          ACE_reinterpret_cast(POA_TAO_IOP::TAO_IOR_Manipulation_ptr, servant),
-          stub
-        );
-    }
-  return new TAO_IOP::TAO_IOR_Manipulation(stub);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOP::TAO_IOR_Manipulation_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::~EmptyProfileList (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList&
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::operator= (const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList_ptr
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f456d70), ACE_NTOHL (0x74795072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x654c6973), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0
-  17, ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = EmptyProfileList
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::NotFound::~NotFound (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::NotFound&
-TAO_IOP::TAO_IOR_Manipulation::NotFound::operator= (const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr
-TAO_IOP::TAO_IOR_Manipulation::NotFound::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::NotFound::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::NotFound;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_NotFound[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f4e6f74), ACE_NTOHL (0x466f756e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0
-  9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0),  // name = NotFound
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::NotFound));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::~Duplicate (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::Duplicate&
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::operator= (const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::Duplicate_ptr
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::Duplicate_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::Duplicate;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f447570), ACE_NTOHL (0x6c696361), ACE_NTOHL (0x74653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0
-  10, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x65000000),  // name = Duplicate
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Duplicate));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::~Invalid_IOR (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR&
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::operator= (const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR_ptr
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f496e76), ACE_NTOHL (0x616c6964), ACE_NTOHL (0x5f494f52), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0
-  12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR;
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation::IORList
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (max)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (max, length, buffer, release)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (seq)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
-  8, ACE_NTOHL (0x494f524c), ACE_NTOHL (0x69737400),  // name = IORList
-  CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    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 (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-      7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::tk_alias, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "merge_iors",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << iors)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "add_profiles",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "remove_profiles",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_in_ior",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_profile_count",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean TAO_IOP::TAO_IOR_Manipulation::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x6d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
-  21, ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x6d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (CORBA::tk_objref, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TAO_IOR_Manipulation, &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
-    _tao_any.replace (TAO_IOP::_tc_TAO_IOR_Manipulation, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::_tc_TAO_IOR_Manipulation, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (TAO_IOP::_tc_TAO_IOR_Manipulation, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::_tc_TAO_IOR_Manipulation, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
-#  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::NotFound *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::NotFound (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::NotFound, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::Duplicate *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::Duplicate (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Duplicate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Duplicate, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_elem
-  ) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_any_val;
-  ACE_NEW (_tao_any_val, TAO_IOP::TAO_IOR_Manipulation::IORList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::IORList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::IORList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
deleted file mode 100644
index fd5488bef8d..00000000000
--- a/TAO/tao/IORC.h
+++ /dev/null
@@ -1,525 +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_IORC_H_
-#define _TAO_IDL_IORC_H_
-
-#include "ace/OS.h"
-#include "tao/corbafwd.h"
-#include "tao/Environment.h"
-#include "tao/CDR.h"
-#include "tao/Object.h"
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  TAO_IOP
-{
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-
-  class TAO_Export TAO_IOR_Manipulation_var
-  {
-  public:
-    TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr);
-    TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-    ~TAO_IOR_Manipulation_var (void); // destructor
-
-    TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
-    TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_ptr operator-> (void) const;
-
-    operator const TAO_IOR_Manipulation_ptr &() const;
-    operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn
-    TAO_IOR_Manipulation_ptr in (void) const;
-    TAO_IOR_Manipulation_ptr &inout (void);
-    TAO_IOR_Manipulation_ptr &out (void);
-    TAO_IOR_Manipulation_ptr _retn (void);
-    TAO_IOR_Manipulation_ptr ptr (void) const;
-
-  private:
-    TAO_IOR_Manipulation_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-
-  class TAO_Export TAO_IOR_Manipulation_out
-  {
-  public:
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-    operator TAO_IOR_Manipulation_ptr &();
-    TAO_IOR_Manipulation_ptr &ptr (void);
-    TAO_IOR_Manipulation_ptr operator-> (void);
-
-  private:
-    TAO_IOR_Manipulation_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
-  class TAO_Export TAO_IOR_Manipulation : public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_IOR_Manipulation_ptr _ptr_type;
-    typedef TAO_IOR_Manipulation_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-    static TAO_IOR_Manipulation_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static TAO_IOR_Manipulation_ptr _nil (void);
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST___PTR_CH_
-
-    class TAO_Export EmptyProfileList;
-    typedef EmptyProfileList *EmptyProfileList_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_
-
-    class TAO_Export EmptyProfileList : public CORBA::UserException
-    {
-    public:
-
-      EmptyProfileList (void); // default ctor
-      EmptyProfileList (const EmptyProfileList &); // copy ctor
-      ~EmptyProfileList (void); // dtor
-            EmptyProfileList &operator= (const EmptyProfileList &);
-
-
-      virtual void _raise (void);
-
-      static EmptyProfileList *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-
-        static CORBA::TypeCode_ptr _tc_EmptyProfileList;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_
-
-    class NotFound;
-    typedef NotFound *NotFound_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_
-
-    class TAO_Export NotFound : public CORBA::UserException
-    {
-    public:
-
-      NotFound (void); // default ctor
-      NotFound (const NotFound &); // copy ctor
-      ~NotFound (void); // dtor
-            NotFound &operator= (const NotFound &);
-
-
-      virtual void _raise (void);
-
-      static NotFound *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-
-        static CORBA::TypeCode_ptr _tc_NotFound;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE___PTR_CH_
-
-    class Duplicate;
-    typedef Duplicate *Duplicate_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_
-
-    class TAO_Export  Duplicate : public CORBA::UserException
-    {
-    public:
-
-      Duplicate (void); // default ctor
-      Duplicate (const Duplicate &); // copy ctor
-      ~Duplicate (void); // dtor
-            Duplicate &operator= (const Duplicate &);
-
-
-      virtual void _raise (void);
-
-      static Duplicate *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-
-        static CORBA::TypeCode_ptr _tc_Duplicate;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR___PTR_CH_
-
-    class Invalid_IOR;
-    typedef Invalid_IOR *Invalid_IOR_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_
-
-    class TAO_Export  Invalid_IOR : public CORBA::UserException
-    {
-    public:
-
-      Invalid_IOR (void); // default ctor
-      Invalid_IOR (const Invalid_IOR &); // copy ctor
-      ~Invalid_IOR (void); // dtor
-            Invalid_IOR &operator= (const Invalid_IOR &);
-
-
-      virtual void _raise (void);
-
-      static Invalid_IOR *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-
-        static CORBA::TypeCode_ptr _tc_Invalid_IOR;
-
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
-    // *************************************************************
-    // IORList
-    // *************************************************************
-
-    class TAO_Export IORList : public
-      TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-    {
-    public:
-      IORList (void); // default ctor
-      IORList (CORBA::ULong max); // uses max size
-      IORList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Object_ptr *buffer,
-        CORBA::Boolean release=0
-      );
-      IORList (const IORList &); // copy ctor
-      ~IORList (void); // dtor
-    };
-    typedef IORList *IORList_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
-
-// *************************************************************
-    // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-    // *************************************************************
-
-    class TAO_Export IORList_var
-    {
-    public:
-      IORList_var (void); // default constructor
-      IORList_var (IORList *);
-      IORList_var (const IORList_var &); // copy constructor
-      ~IORList_var (void); // destructor
-
-      IORList_var &operator= (IORList *);
-      IORList_var &operator= (const IORList_var &);
-      IORList *operator-> (void);
-      const IORList *operator-> (void) const;
-
-      operator const IORList &() const;
-      operator IORList &();
-      operator IORList &() const;
-
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const IORList &in (void) const;
-      IORList &inout (void);
-      IORList *&out (void);
-      IORList *_retn (void);
-      IORList *ptr (void) const;
-
-    private:
-      IORList *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
-
-    class TAO_Export IORList_out
-    {
-    public:
-      IORList_out (IORList *&);
-      IORList_out (IORList_var &);
-      IORList_out (const IORList_out &);
-      IORList_out &operator= (const IORList_out &);
-      IORList_out &operator= (IORList *);
-      operator IORList *&();
-      IORList *&ptr (void);
-      IORList *operator-> (void);
-
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
-    private:
-      IORList *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const IORList_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    static CORBA::TypeCode_ptr _tc_IORList;
-
-    virtual CORBA::Object_ptr merge_iors (
-        const IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    TAO_IOR_Manipulation (void);
-    TAO_IOR_Manipulation (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~TAO_IOR_Manipulation (void);
-  private:
-    TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-    void operator= (const TAO_IOR_Manipulation &);
-  };
-
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
-
-
-}; // module TAO_IOP
-
-// Any operators for interface TAO_IOP::TAO_IOR_Manipulation
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::NotFound &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::NotFound*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::NotFound *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Duplicate*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Duplicate *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &); //
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::Duplicate &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &); //
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &);
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "IORC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/IORC.i b/TAO/tao/IORC.i
deleted file mode 100644
index 74f2ebace5e..00000000000
--- a/TAO/tao/IORC.i
+++ /dev/null
@@ -1,552 +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
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void) // default constructor
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) // destructor
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_nil (void)
-{
-  return (TAO_IOP::TAO_IOR_Manipulation_ptr)0;
-}
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
-  : ptr_ (TAO_IOP::TAO_IOR_Manipulation::_nil ())
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
-  : ptr_ (TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (const TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::operator const TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::operator TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOP::TAO_IOR_Manipulation_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOP::TAO_IOR_Manipulation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation_out&,p).ptr_)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const TAO_IOP::TAO_IOR_Manipulation_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::operator TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-// *************************************************************
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TAO_IOP::TAO_IOR_Manipulation::IORList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator TAO_IOP::TAO_IOR_Manipulation::IORList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
-{
-  TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (TAO_IOP::TAO_IOR_Manipulation::IORList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const TAO_IOP::TAO_IOR_Manipulation::IORList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation::IORList_out&,p).ptr_)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (const TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation::IORList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      TAO_IOP::TAO_IOR_Manipulation::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp
deleted file mode 100644
index 623c06e2808..00000000000
--- a/TAO/tao/IORManipulation.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     IORManipulation.cpp
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/IORManipulation.h"
-#include "tao/corba.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/MProfile.h"
-
-ACE_RCSID(tao, IORManipulation, "$Id$")
-
-TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
-{
-}
-
-TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-                       TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-                       TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR))
-{
-  // we need to create a new CORBA::Object which has the union of the
-  // two profile lists.  However, if any profiles are duplicates (i.e. in
-  // bott lisis) then an exception is raised.
-
-  // Deterinine how many profiles we have
-  // Get an estimate of the size - pfile count could change since we
-  // neither lock nor get a copy in this loop.
-  CORBA::ULong i, count=0;
-  for (i = 0; i < iors.length (); i++)
-    {
-      count += iors[i]->_stubobj ()->get_base_profiles ().profile_count ();
-    }
-
-  // make sure we have some profiles
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Merged_Profiles (count);
-
-  // get the profile lists, start by initialize the composite reference
-  // by using the first Object.  Then for each subsequent Object verify
-  // they are the same type and they do not have duplicate profiles.
-  auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->get_profiles ());
-  if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-  CORBA::String_var type_id = iors[0]->_stubobj ()->type_id;
-
-  for (i = 1; i < iors.length () ; i++)
-    {
-      // this gets a copy of the MProfile, hense ther auto_ptr;
-
-      // @@ This is ugly, it is a work around MS C++ auto_ptr which
-      // does not implement reset ()!!
-      auto_ptr<TAO_MProfile> XXtemp (iors[i]->_stubobj ()->get_profiles ());
-      // tmp_pfiles.reset (iors[i]->_stubobj ()->get_profiles ());
-      tmp_pfiles = XXtemp;
-
-      // check to see if any of the profile in tmp_pfiles are already
-      // in Merged_Profiles.  If so raise exception.
-      if (Merged_Profiles.is_equivalent (tmp_pfiles.get ()))
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Duplicate (),
-                          CORBA::Object::_nil ());
-
-      // If the object type_is's differ then raise an exception.
-      if (type_id.in () && iors[i]->_stubobj ()->type_id.in () &&
-          ACE_OS::strcmp (type_id, iors[i]->_stubobj ()->type_id))
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-      // append profiles
-      if (Merged_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-    }
-
-  // MS C++ knows nothing abouyt reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  // @@ need some sort of auto_ptr here
-  TAO_Stub *stub;
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (type_id,
-                              Merged_Profiles,
-                              orb_core),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj;
-  ACE_NEW_THROW_EX (new_obj,
-                    CORBA_Object (stub),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj))
-    {
-      stub->_decr_refcnt ();
-      ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  return new_obj;
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ))
-{
-
-  // Get an estimate of the number of profiles
-  CORBA::Object_ptr buffer [2];
-  buffer [0] = ior1;
-  buffer [1] = ior2;
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors, ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ))
-{
-  // First verify they are the same type!
-  CORBA::String_var type_id = ior1->_stubobj ()->type_id;
-  if (type_id.in () && ior2->_stubobj ()->type_id.in () &&
-      ACE_OS::strcmp (type_id, ior2->_stubobj ()->type_id))
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  // Since we are removing from ior1 ...
-  CORBA::ULong count = ior1->_stubobj ()->get_base_profiles ().profile_count ();
-
-  // make sure we have some profiles
-  if (count == 0 ||
-      ior2->_stubobj ()->get_base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Diff_Profiles (count);
-
-  auto_ptr<TAO_MProfile> tmp_pfiles (ior1->_stubobj ()->get_profiles ());
-  if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  // @@ This is ugly, it is a work around MS C++ auto_ptr which
-  // does not implement reset ()!!
-  auto_ptr<TAO_MProfile> XXtemp (ior2->_stubobj ()->get_profiles ());
-  tmp_pfiles = XXtemp;
-  // tmp_pfiles.reset (ior2->_stubobj ()->get_profiles ());
-
-  if (Diff_Profiles.remove_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::NotFound (),
-                      CORBA::Object::_nil ());
-
-  // MS C++ knows nothing abouyt reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_Stub *stub;
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (type_id,
-                              Diff_Profiles,
-                              orb_core),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj;
-  ACE_NEW_THROW_EX (new_obj,
-                    CORBA_Object (stub),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj))
-    {
-      stub->_decr_refcnt ();
-      ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  return new_obj;
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ))
-{
-  CORBA::ULong count=0;
-  TAO_Profile *pfile1, *pfile2;
-  auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->get_profiles ());
-  auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->get_profiles ());
-
-  tmp_pfiles1->rewind ();
-  while ((pfile1 = tmp_pfiles1->get_next ()) > 0)
-    {
-      tmp_pfiles2->rewind ();
-      while ((pfile2 = tmp_pfiles2->get_next ()) > 0)
-        {
-          if (pfile1->is_equivalent (pfile2))
-            count++;
-        }
-    }
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::NotFound (),
-                      0);
-
-  return count;
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ))
-{
-  CORBA::ULong count;
-  count = ior->_stubobj ()->get_base_profiles ().profile_count ();
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      0);
-
-  return count;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Object_Manager<CORBA_Object,CORBA_Object_var>;
-template class TAO_Unbounded_Object_Sequence<CORBA_Object,CORBA_Object_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Object_Manager<CORBA_Object,CORBA_Object_var>
-#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Object,CORBA_Object_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORManipulation.h b/TAO/tao/IORManipulation.h
deleted file mode 100644
index c7616d8ec75..00000000000
--- a/TAO/tao/IORManipulation.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManipulation.h
-//
-// = DESCRIPTION
-//    This class implements IOR interface to the ORB
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IOR_MANIPULATION_H
-#define TAO_IOR_MANIPULATION_H
-
-#include "tao/Object.h"
-#include "tao/IORS.h"
-
-class TAO_IOR_Manipulation_impl : public POA_TAO_IOP::TAO_IOR_Manipulation
-{
-// = TITLE
-  //     IOR Manipulation class
-  //
-  // = DESCRIPTION
-  //
-  //
-public:
-
-  TAO_IOR_Manipulation_impl (void);
-  // constructor
-
-  ~TAO_IOR_Manipulation_impl (void);
-  // destructor
-
-  virtual CORBA::Object_ptr merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr add_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-  virtual CORBA::ULong is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-  virtual CORBA::ULong get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-};
-
-#endif /* TAO_IOR_MANIPULATION_H */
diff --git a/TAO/tao/IORS.cpp b/TAO/tao/IORS.cpp
deleted file mode 100644
index 0e1b486e7d8..00000000000
--- a/TAO/tao/IORS.cpp
+++ /dev/null
@@ -1,191 +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 "IORS.h"
-
-ACE_RCSID(tao, IORS, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "IORS.i"
-#endif /* !defined INLINE */
-
-POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-{
-}
-
-// copy ctor
-// POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs)
-//   :   TAO_Local_ServantBase (rhs)
-// {}
-//
-// skeleton destructor
-POA_TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-{
-}
-
-CORBA::Boolean POA_TAO_IOP::TAO_IOR_Manipulation::_is_a (
-    const char* value,
-    CORBA::Environment &
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_TAO_IOP::TAO_IOR_Manipulation::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0") == 0)
-    return ACE_static_cast (POA_TAO_IOP::TAO_IOR_Manipulation_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 0;
-}
-
-const char* POA_TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-
-TAO_IOP::TAO_IOR_Manipulation*
-POA_TAO_IOP::TAO_IOR_Manipulation::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this, stub);
-}
-
-void*
-POA_TAO_IOP::TAO_IOR_Manipulation::_create_collocated_objref (
-    const char* repository_id,
-    CORBA::ULong type,
-    TAO_Stub *stub)
-{
-  ACE_UNUSED_ARG (type);
-  if (!strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",repository_id))
-    return ACE_static_cast (
-        TAO_IOP::TAO_IOR_Manipulation_ptr,
-        new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this, stub)
-      );
-  return 0;
-}
-
-POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_tao_collocated_TAO_IOR_Manipulation (
-    POA_TAO_IOP::TAO_IOR_Manipulation_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (TAO_IOP,TAO_IOR_Manipulation) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_TAO_IOP::TAO_IOR_Manipulation_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::merge_iors  (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->merge_iors (
-      iors,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::add_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->add_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::remove_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->remove_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::is_in_ior  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->is_in_ior (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::get_profile_count  (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-  return this->servant_->get_profile_count (
-      ior,
-      ACE_TRY_ENV
-    );
-
-}
diff --git a/TAO/tao/IORS.h b/TAO/tao/IORS.h
deleted file mode 100644
index 121b00547a2..00000000000
--- a/TAO/tao/IORS.h
+++ /dev/null
@@ -1,211 +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_IORS_H_
-#define _TAO_IDL_IORS_H_
-
-#include "tao/IORC.h"
-#include "tao/Servant_Base.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_TAO_IOP
-{
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  class  TAO_IOR_Manipulation :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    TAO_IOR_Manipulation (void);
-
-  public:
-    TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs);
-    virtual ~TAO_IOR_Manipulation (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    TAO_IOP::TAO_IOR_Manipulation *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual void* _create_collocated_objref(const char *repository_id,
-                                            CORBA::ULong type,
-                                            TAO_Stub *sobj);
-
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      )) = 0;
-
-  };
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_
-
-  class  _tao_collocated_TAO_IOR_Manipulation     : public virtual TAO_IOP::TAO_IOR_Manipulation
-  {
-  public:
-    _tao_collocated_TAO_IOR_Manipulation (
-        TAO_IOR_Manipulation_ptr  servant,
-        TAO_Stub *stub
-      );
-    TAO_IOR_Manipulation_ptr _get_servant (void) const;
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-
-
-  private:
-    TAO_IOR_Manipulation_ptr servant_;
-  };
-
-};
-
-#endif /* end #if !defined */
-
-
-#if defined (__ACE_INLINE__)
-#include "IORS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/IORS.i b/TAO/tao/IORS.i
deleted file mode 100644
index afa59bb09dc..00000000000
--- a/TAO/tao/IORS.i
+++ /dev/null
@@ -1,10 +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/Invocation.cpp b/TAO/tao/Invocation.cpp
index 0d8e3b8eefa..783942593f3 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -79,15 +79,12 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
                  orb_core->to_iso8859 (),
                  orb_core->to_unicode ()),
     orb_core_ (orb_core),
-    transport_ (0),
-    max_wait_time_ (0)
+    transport_ (0)
 {
 }
 
 TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 {
-  if (this->transport_ != 0)
-    this->transport_->idle ();
 }
 
 // The public API involves creating an invocation, starting it, filling
@@ -142,34 +139,28 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   // So the invocation Object should handle policy decisions.
 
 #if defined (TAO_HAS_CORBA_MESSAGING)
+#if 0 // @@ TODO implement once PP are merged in
   POA_Messaging::RelativeRoundtripTimeoutPolicy* timeout =
     this->stub_->relative_roundtrip_timeout ();
-  // If max_wait_time is not zero then this is not the first attempt
-  // to send the request, the timeout value includes *all* those
-  // attempts.
-  if (this->max_wait_time_ == 0
-      && timeout != 0)
+  if (TAO_debug_level > 0)
     {
-      TimeBase::TimeT t =
-        timeout->relative_expiry (ACE_TRY_ENV);
-      ACE_CHECK;
-      TimeBase::TimeT seconds = t / 10000000;
-      TimeBase::TimeT microseconds = t % 10000000;
-      this->max_wait_time_value_.set (ACE_U64_TO_U32(seconds),
-                                      ACE_U64_TO_U32(microseconds));
-      this->max_wait_time_ = &this->max_wait_time_value_;
-      if (TAO_debug_level > 0)
+      if (timeout == 0)
+        ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) Timeout is nil\n"));
+      else
         {
+          TimeBase::TimeT expiry =
+            timeout->relative_expiry (ACE_TRY_ENV);
+          ACE_CHECK;
           CORBA::ULong msecs =
-            ACE_static_cast(CORBA::ULong, microseconds / 1000);
+            ACE_static_cast(CORBA::ULong, expiry / 10000);
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) Timeout is <%u>\n",
                       msecs));
         }
     }
+#endif /* 0 */
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-  ACE_Countdown_Time countdown (this->max_wait_time_);
   // Loop until a connection is established or there aren't any more
   // profiles to try.
   for (;;)
@@ -182,23 +173,10 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
       if (this->transport_ != 0)
         this->transport_->idle ();
 
-      countdown.update ();
-      int result = conn_reg->connect (this->profile_,
-                                      this->transport_,
-                                      this->max_wait_time_);
-      countdown.update ();
+      int result = conn_reg->connect (this->profile_, this->transport_);
       if (result == 0)
         break;
 
-      if (errno == ETIME)
-        {
-          ACE_THROW (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_CONNECT_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO));
-        }
-
       // Try moving to the next profile and starting over, if that
       // fails then we must raise the TRANSIENT exception.
       if (this->stub_->next_profile_retry () == 0)
@@ -212,8 +190,6 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   // Obtain unique request id from the RMS.
   this->request_id_ = this->transport_->request_id ();
 
-  countdown.update ();
-
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR);
 }
 
@@ -223,7 +199,6 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_Countdown_Time countdown (this->max_wait_time_);
 
   if (this->transport_ == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
@@ -235,13 +210,10 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
   //    Even for oneways: with AMI it is possible to wait for a
   //    response (empty) for oneways, just to make sure that they
   //    arrive, there are policies to control that.
-  countdown.update ();
   int result =
     this->transport_->send_request (this->orb_core_,
                                     this->out_stream_,
-                                    is_roundtrip,
-                                    this->max_wait_time_);
-  countdown.update ();
+                                    is_roundtrip);
 
   //
   // @@ highly desirable to know whether we wrote _any_ data; if
@@ -259,16 +231,8 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
 
   if (result == -1)
     {
-      if (errno == ETIME)
-        {
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-      this->transport_->close_connection ();
+      // send_request () closed the connection, we just have to forget
+      // about the hint.
       this->transport_ = 0;
 
       this->profile_->reset_hint ();
@@ -283,8 +247,6 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
   return TAO_INVOKE_OK;
 }
 
-// ****************************************************************
-
 int
 TAO_GIOP_Invocation::close_connection (void)
 {
@@ -399,6 +361,12 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
 
 // ****************************************************************
 
+TAO_GIOP_Twoway_Invocation::~TAO_GIOP_Twoway_Invocation (void)
+{
+
+  this->transport_->idle_after_reply ();
+}
+
 void
 TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -406,10 +374,6 @@ TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
   ACE_CHECK;
 
-  // If there was a previous reply, cleanup its state first.
-  if (this->message_state_.message_size != 0)
-    this->message_state_.reset ();
-
   this->transport_->start_request (this->orb_core_,
                                    this->profile_,
                                    this->opname_,
@@ -422,9 +386,9 @@ TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 int
 TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
                                     CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
+  ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
+  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_Invocation_INVOKE_START);
 
   int retval = this->invoke_i (ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
@@ -447,8 +411,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
           //    failed, but the connection seems to be still
           //    valid!
           // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_YES),
+          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                             TAO_INVOKE_EXCEPTION);
         }
 
@@ -478,13 +441,12 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
           CORBA_Exception *exception;
           ACE_NEW_THROW_EX (exception,
                             CORBA_UnknownUserException (any),
-                            CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                              CORBA::COMPLETED_YES));
+                            CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           // @@ Think about a better way to raise the exception here,
-          //    maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception);  // We can not use ACE_THROW here.
+          // maybe we need some more macros?
+          ACE_TRY_ENV.exception (exception);
           return TAO_INVOKE_EXCEPTION;
         }
 
@@ -494,8 +456,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
       // @@ It would seem like if the remote exception is a
       //    UserException we can assume that the request was
       //    completed.
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_YES),
+      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -536,8 +497,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
           //    failed, but the connection seems to be still
           //    valid!
           // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_YES),
+          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                             TAO_INVOKE_EXCEPTION);
         }
 
@@ -556,8 +516,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
           CORBA::Exception_ptr exception = excepts[i].alloc ();
 
           if (exception == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                                CORBA::COMPLETED_YES),
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                               TAO_INVOKE_EXCEPTION);
 
           this->inp_stream ().decode (exception->_type (),
@@ -571,16 +530,15 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
                         buf.in ()));
 
           // @@ Think about a better way to raise the exception here,
-          //    maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception); // We can not use ACE_THROW here.
+          // maybe we need some more macros?
+          ACE_TRY_ENV.exception (exception);
           return TAO_INVOKE_EXCEPTION;
         }
 
       // If we couldn't find the right exception, report it as
       // CORBA::UNKNOWN.
 
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_YES),
+      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                         TAO_INVOKE_EXCEPTION);
     }
 
@@ -617,6 +575,21 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
   // there is only one client thread that ever uses this connection,
   // so most response messages are illegal.
   //
+  // THREADING NOTE: to make more efficient use of connection
+  // resources, we'd multiplex I/O on connections.  For example, one
+  // thread would write its GIOP::Request (or GIOP::LocateRequest etc)
+  // message and block for the response, then another would do the
+  // same thing.  When a response came back, it would be handed to the
+  // thread which requested it.
+  //
+  // Currently the connection manager doesn't support such fine
+  // grained connection locking, and also this server implementation
+  // wouldn't take advantage of that potential concurrency in requests
+  // either.  There are often performance losses coming from
+  // fine-grained locks being used inappropriately; there's some
+  // evidence that locking at the level of requests loses on at least
+  // some platforms.
+  //
   // @@ In all MT environments, there's a cancellation point lurking
   // here; need to investigate.  Client threads would frequently be
   // canceled sometime during recv_request ... the correct action to
@@ -638,46 +611,31 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 
   // Wait for the reply.
 
-  if (TAO_debug_level > 0 && this->max_wait_time_ != 0)
-    {
-      CORBA::ULong msecs =
-        this->max_wait_time_->msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Timeout on recv is <%u>\n",
-                  msecs));
-    }
-  int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
-  if (TAO_debug_level > 0 && this->max_wait_time_ != 0)
-    {
-      CORBA::ULong msecs =
-        this->max_wait_time_->msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Timeout after recv is <%u> status <%d>\n",
-                  msecs, reply_error));
-    }
-
+  int reply_error = this->transport_->wait_for_reply ();
+
+  // Do the wait loop till we receive the reply for this invocation.
+  // while (reply_error != -1 && 
+  //        this->transport_->reply_received (this->request_id_) != 1)
+  //   {
+  //     // @@ Hack to init the Leader-Follower state, so that we can
+  //     //    wait again. (Alex).
+  //     // this->transport_->wait_strategy ()->sending_request (this->orb_core_,
+  //     //                                                  1);
+  //     
+  //     // Wait for reply.
+  //     reply_error = this->transport_->wait_for_reply ();
+  //   }
+
+  // Check the reply error.
   if (reply_error == -1)
     {
-      if (errno == ETIME)
-        {
-          // Just a timeout, don't close the connection or
-          // anything...
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-
       this->close_connection ();
       ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-          CORBA_SystemException::_tao_minor_code (
-            TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-            errno),
-          CORBA::COMPLETED_MAYBE),
-        TAO_INVOKE_EXCEPTION);
+        CORBA_SystemException::_tao_minor_code (
+          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
+          errno),
+        CORBA::COMPLETED_MAYBE),
+                        TAO_INVOKE_EXCEPTION);
     }
 
   // @@ Alex: the old version of this had some error handling code,
@@ -743,7 +701,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
         // @@ There should be a better way to raise this exception!
         //    This code works for both native and emulated exceptions,
         //    but it is ugly.
-        ACE_TRY_ENV.exception (ex); // We can not use ACE_THROW here.
+        ACE_TRY_ENV.exception (ex);
         return TAO_INVOKE_OK;
       }
       // NOTREACHED.
@@ -760,6 +718,11 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
+TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void)
+{
+  this->transport_->idle_after_reply ();
+}
+
 void
 TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -778,8 +741,12 @@ TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
-// Send request, block until any reply comes back
+TAO_GIOP_Locate_Request_Invocation::~TAO_GIOP_Locate_Request_Invocation (void)
+{
+  this->transport_->idle_after_reply ();
+}
 
+// Send request, block until any reply comes back. 
 void
 TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -787,10 +754,6 @@ TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
   ACE_CHECK;
 
-  // If there was a previous reply, cleanup its state first.
-  if (this->message_state_.message_size != 0)
-    this->message_state_.reset ();
-
   this->transport_->start_locate (this->orb_core_,
                                   this->profile_,
                                   this->request_id_,
@@ -827,15 +790,12 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
   int result =
     this->transport_->send_request (this->orb_core_,
                                     this->out_stream_,
-                                    1,
-                                    this->max_wait_time_);
-
+                                    1);
 
   if (result == -1)
     {
-      this->transport_->close_connection ();
-      this->transport_ = 0;
-
+      // send_request () closed the connection; we just set the
+      // handler to 0 here.
       this->profile_->reset_hint ();
 
       // @@ This code abort if the connection for the currenct profile
@@ -857,23 +817,18 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
 
   // Wait for the reply.
 
-  int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
+  int reply_error = this->transport_->wait_for_reply ();
 
+  //   // Do the wait loop, till we receive the reply for this invocation. 
+  //   while (reply_error != -1 && 
+  //          this->transport_->reply_received (this->request_id_) != 1)
+  //     {
+  //       reply_error = this->transport_->wait_for_reply ();
+  //     }
+  
+  // Check the reply error.
   if (reply_error == -1)
     {
-      if (errno == ETIME)
-        {
-          // Just a timeout, don't close the connection or
-          // anything...
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-
       this->close_connection ();
       ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE,
                                              CORBA::COMPLETED_MAYBE),
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 90816bd6fc0..d287244a923 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -10,7 +10,8 @@
 //    Invocation.h
 //
 // = DESCRIPTION
-//   Encapsulate the logic for remote invocations, oneways or twoways.
+//    Encapsulate the logic for remote invocations, oneways or
+//    twoways.  
 //
 //   THREADING NOTE: Threads should never manipulate another
 //   thread's invocations.  In this implementation, all data
@@ -20,7 +21,8 @@
 //   GIOP code is reentrant.
 //
 // = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
+//    Carlos O'Ryan <coryan@cs.wustl.edu> and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu> 
 //
 // ============================================================================
 
@@ -49,34 +51,41 @@ enum TAO_Invoke_Status
   // An exception was raised.
 };
 
+// ****************************************************************
+
 class TAO_Export TAO_GIOP_Invocation
 {
   // = TITLE
-  //   Encapsulates common behavior for both oneway and twoway
-  //   invocations.
+  //     Encapsulates common behavior for both oneway and twoway
+  //     invocations. 
   //
   // = DESCRIPTION
-  //   This class connects (or lookups a connection from the cache) to
-  //   the remote server, builds the CDR stream for the Request, send
-  //   the CDR stream and expects the response and interprets the
-  //   incoming CDR stream.
-  //
+  //     This class connects (or lookups a connection from the cache)
+  //     to the remote server, builds the CDR stream for the Request,
+  //     send the CDR stream and expects the response and interprets
+  //     the incoming CDR stream. 
+  
 public:
-  // = Initialization and termination methods.
   TAO_GIOP_Invocation (TAO_Stub *data,
-                       const char *operation,
-                       TAO_ORB_Core* orb_core);
-  ~TAO_GIOP_Invocation (void);
+                             const char *operation,
+                             TAO_ORB_Core* orb_core);
+  // Constructor.
+  
+  virtual ~TAO_GIOP_Invocation (void);
+  // Destructor.
+  // @@ Carlos: I have put a virtual here, since I have moved the
+  //    <transport_->idle ()> code to the destructors of the derived 
+  //    class. (Alex).
 
   void put_param (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &ACE_TRY_ENV =
+                  CORBA_Environment &TAO_IN_ENV =
                         TAO_default_environment ());
   // Encodes the value into the undelying CDR stream based on the
-  // TypeCode parameter
+  // TypeCode parameter.
 
   TAO_OutputCDR &out_stream (void);
-  // return the underlying output stream
+  // Return the underlying output stream.
 
 protected:
   void start (CORBA_Environment &ACE_TRY_ENV =
@@ -91,7 +100,7 @@ protected:
   // raises the CORBA::TRANSIENT exception.
 
   int invoke (CORBA::Boolean is_roundtrip,
-              CORBA_Environment &ACE_TRY_ENV =
+              CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sends the request, does not wait for the response.
@@ -106,7 +115,7 @@ protected:
   // (to the same server)
 
   int location_forward (TAO_InputCDR &inp_stream,
-                        CORBA_Environment &ACE_TRY_ENV =
+                        CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Helper method, the response for a Request or LocateRequest was a
@@ -140,13 +149,10 @@ protected:
 
   TAO_Profile *profile_;
   // This invocation is using this transport, may change...
-
-  ACE_Time_Value max_wait_time_value_;
-  ACE_Time_Value *max_wait_time_;
-  // The timeout remaining for this request, it is initialized in
-  // start() and updated as required.
 };
 
+// ****************************************************************
+
 class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation
 {
   // = TITLE
@@ -159,18 +165,21 @@ class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation
   //   incoming CDR stream.
   //
 public:
-  // = Initialization and termination methods.
   TAO_GIOP_Twoway_Invocation (TAO_Stub *data,
                               const char *operation,
                               TAO_ORB_Core* orb_core);
+  // Constructor.
 
-  void start (CORBA_Environment &ACE_TRY_ENV =
+  ~TAO_GIOP_Twoway_Invocation (void);
+  // Destructor.
+
+  void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Calls TAO_GIOP_Invocation::start.
 
   int invoke (CORBA::ExceptionList &exceptions,
-              CORBA_Environment &ACE_TRY_ENV =
+              CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
   // Send request, block until any reply comes back, and unmarshal
@@ -178,7 +187,7 @@ public:
 
   int invoke (TAO_Exception_Data *excepts,
               CORBA::ULong except_count,
-              CORBA_Environment &ACE_TRY_ENV =
+              CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::Exception));
   // Special purpose invoke method used by the interpretive stubs. This
@@ -188,7 +197,7 @@ public:
 
   void get_value (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &ACE_TRY_ENV =
+                  CORBA_Environment &TAO_IN_ENV =
                         TAO_default_environment ());
   // No CORBA::Context support (deprecated).
 
@@ -202,35 +211,41 @@ private:
   // send/reply code and the system exceptions.
 
 private:
-  TAO_GIOP_Message_State message_state_;
+  // TAO_GIOP_Message_State message_state_;
   // Stream into which the reply is placed.
 
   TAO_Synch_Reply_Dispatcher rd_;
   // Reply dispatcher for the current synchronous invocation.
 };
 
+// ****************************************************************
+
 class TAO_Export TAO_GIOP_Oneway_Invocation : public TAO_GIOP_Invocation
 {
   // = TITLE
   //   Sends a oneway request.
   //
 public:
-  // = Initialization and termination methods.
   TAO_GIOP_Oneway_Invocation (TAO_Stub *data,
                               const char *operation,
                               TAO_ORB_Core* orb_core);
+  // Constructor.
 
-  void start (CORBA_Environment &ACE_TRY_ENV =
+  ~TAO_GIOP_Oneway_Invocation (void);
+  // Destructor.
+
+  void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Call TAO_GIOP_Invocation::start()
 
-  int invoke (CORBA_Environment &ACE_TRY_ENV =
+  int invoke (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send request, without blocking for any response.
 };
 
+// ****************************************************************
 
 class TAO_Export TAO_GIOP_Locate_Request_Invocation : public TAO_GIOP_Invocation
 {
@@ -238,16 +253,19 @@ class TAO_Export TAO_GIOP_Locate_Request_Invocation : public TAO_GIOP_Invocation
   //   Sends a locate request.
   //
 public:
-  // = Initialization and termination methods.
   TAO_GIOP_Locate_Request_Invocation (TAO_Stub *data,
                                       TAO_ORB_Core* orb_core);
+  // Constructor.
 
-  void start (CORBA_Environment &ACE_TRY_ENV =
+  ~TAO_GIOP_Locate_Request_Invocation (void);
+  // Destructor.
+
+  void start (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Calls TAO_GIOP_Invocation::start.
 
-  int invoke (CORBA_Environment &ACE_TRY_ENV =
+  int invoke (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send request, without blocking for any response.
@@ -256,7 +274,7 @@ public:
   // return the underlying input stream
 
 private:
-  TAO_GIOP_Message_State message_state_;
+  // TAO_GIOP_Message_State message_state_;
   // Stream into which the request is placed.
 
   TAO_Synch_Reply_Dispatcher rd_;
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index d4dad8ee56f..e832e474c27 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -25,15 +25,14 @@ TAO_GIOP_Twoway_Invocation (TAO_Stub *stub,
                             const char *operation,
                             TAO_ORB_Core *orb_core)
   : TAO_GIOP_Invocation (stub, operation, orb_core),
-    message_state_ (orb_core),
-    rd_ (&message_state_)
+    rd_ (orb_core)
 {
 }
 
 ACE_INLINE TAO_InputCDR &
 TAO_GIOP_Twoway_Invocation::inp_stream (void)
 {
-  return this->message_state_.cdr;
+  return this->rd_.reply_cdr ();
 }
 
 ACE_INLINE void
@@ -69,13 +68,12 @@ TAO_GIOP_Locate_Request_Invocation::
 TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub,
                                     TAO_ORB_Core *orb_core)
   : TAO_GIOP_Invocation (stub, 0, orb_core),
-    message_state_ (orb_core),
-    rd_ (&message_state_)
+    rd_ (orb_core)
 {
 }
 
 ACE_INLINE TAO_InputCDR &
 TAO_GIOP_Locate_Request_Invocation::inp_stream (void)
 {
-  return this->message_state_.cdr;
+  return this->rd_. reply_cdr ();
 }
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 6ceeeeb928d..be281104fe5 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -3,7 +3,6 @@
 
 #include "tao/MProfile.h"
 #include "tao/Pluggable.h"
-#include "tao/Environment.h"
 
 ACE_RCSID(tao, MProfile, "$Id$")
 
@@ -53,27 +52,26 @@ TAO_MProfile::set (CORBA::ULong sz)
           }
 
       // Next see if we can reuse our profile list memory
-      if (this->size_ < sz)
+      if (this->size_ != sz)
         {
-          // we cant reuse memory since the current array is too small!
+          // we cant reuse memory since the array sized are different!
+          // @@ Fred: if sz < this->size_ you could avoid this memory
+          //    allocation, you only need another flag to keep the
+          //    "capacity".
           delete [] this->pfiles_;
 
           ACE_NEW_RETURN (this->pfiles_,
-                          TAO_Profile *[sz],
+                          TAO_Profile_ptr[sz],
                           -1);
-          this->size_ = sz;
         }
-      // else , leave this->size and this->pfiles alone!
     }
   else
-    {
-      // first time, initialize!
-      ACE_NEW_RETURN (this->pfiles_,
-                      TAO_Profile *[sz],
-                      -1);
-      this->size_ = sz;
-    }
+    // first time, initialize!
+    ACE_NEW_RETURN (this->pfiles_,
+                    TAO_Profile_ptr [sz],
+                    -1);
 
+  this->size_ = sz;
   this->last_ = 0;
   this->current_ = 0;
 
@@ -112,96 +110,44 @@ TAO_MProfile::set (const TAO_MProfile &mprofile)
 }
 
 int
-TAO_MProfile::add_profiles (TAO_MProfile *pfiles)
+TAO_MProfile::add_profile (TAO_Profile *pfile)
 {
-  // this->size_ == total number of profiles we can hold
-  // this->last_ == the index of the last profile
-  CORBA::ULong space = this->size_ - this->last_;
-
-  if (space < pfiles->last_)
-    {
-      // we need to grow!
-     if (this->grow (this->last_ + pfiles->last_) < 0)
-       return -1;
-    }
-
-  // copy over profiles
-  for (TAO_PHandle h = 0;h < pfiles->last_;h++)
-    {
-      if (this->add_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
-}
+  // skip by the used slots
+  if (last_ == size_) // full!
+    return -1;
 
+  pfiles_[last_++] = pfile;
 
-// the layout for a full list of 7 Profiles.
-//
-// last_ == one past the last valid entry, so if the list has 2
-//          profiles then last_ equals 2.
-// current_ == index of the next profile to be returned (or one past
-//             the last returned.
-//
-// this->size_ = 7; current_ = 3; last_ = 7
-//   0, 1, 2, 3, 4, 5, 6}
-// { _, _, _, _, ..., _}
-//
-int
-TAO_MProfile::remove_profile (const TAO_Profile *pfile)
-{
-  TAO_PHandle h;
-  int found=0;
-  for (h = 0;h < this->last_;h++)
-    {
-      if (this->pfiles_[h]->is_equivalent (pfile))
-        { // remove it!
-          TAO_Profile *old = this->pfiles_[h];
-          this->pfiles_[h] = 0;
-          old->_decr_refcnt ();
-          // shift other profiles up one
-          // note, if h == last_ - 1 then do nothing.
-          for (TAO_PHandle inner = h;inner < this->last_ - 1;inner++)
-            {
-              this->pfiles_[inner] = this->pfiles_[inner + 1];
-            }
-          // subtract 1 from last_ to indicate we have one fewer profiles
-          this->last_--;
-          found = 1;
-          break;
-        }
-    }
-  if ( found == 0)
-    return -1; // profile not found.
-  return 0;
-}
-
-int
-TAO_MProfile::remove_profiles (const TAO_MProfile *pfiles)
-{
-  for (TAO_PHandle h = 0;h < pfiles->last_;h++)
-    {
-      if (this->remove_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
+  if (pfile && pfile->_incr_refcnt () == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%P|%t) Unable to increment reference count in add_profile!\n"),
+                      -1);
+  return last_ - 1;
 }
 
 CORBA::Boolean
-TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
+TAO_MProfile::is_equivalent (TAO_MProfile *first,
+                             TAO_MProfile *second,
+                             CORBA::Environment &env)
 {
   // Two profile lists are equivalent iff at least one of the profiles
   // form the first list is_equivalent to at least one of the profiles
   // from the second list!!
-  for (TAO_PHandle h1 = 0; h1 < this->last_;h1++)
-    for (TAO_PHandle h2 = 0; h2 < rhs->last_; h2++ )
-      if (this->pfiles_[h1]->is_equivalent (rhs->pfiles_[h2]))
+  TAO_Profile_ptr *pfiles1 = first->pfiles ();
+  TAO_Profile_ptr *pfiles2 = second->pfiles ();
+  TAO_PHandle first_cnt = first->profile_count ();
+  TAO_PHandle second_cnt = second->profile_count ();
+
+  for (TAO_PHandle h1 = 0; h1 < first_cnt;h1++)
+    for (TAO_PHandle h2 = 0; h2 < second_cnt; h2++ )
+      if (pfiles1[h1]->is_equivalent (pfiles2[h2], env))
         return 1;
 
   return 0;
 }
 
 CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &env)
 {
   CORBA::ULong hashval = 0;
 
@@ -209,10 +155,7 @@ TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
     return 0;
 
   for (TAO_PHandle h=0; h < last_ ; h++)
-    {
-      hashval += pfiles_[h]->hash (max, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
+    hashval += pfiles_[h]->hash (max, env);
 
   // The above hash function return an ULong between 0 and max here we
   // simply take the average value and round.
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index cdd4bb0e3f2..9e702b8c84d 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -23,6 +23,10 @@
 #include "tao/corbafwd.h"
 #include "tao/Pluggable.h"
 
+// @@ Fred, this definitions are of very little use, can you make them
+//    local to the Profile class so we don't pollute the global
+//    namespace
+typedef TAO_Profile *TAO_Profile_ptr;
 typedef CORBA::ULong TAO_PHandle;
 
 class TAO_Export TAO_MProfile
@@ -40,8 +44,8 @@ class TAO_Export TAO_MProfile
   //   TAO_Stub accepts ownership of an MProfile it also assumes
   //   responsibility for controling access (i.e. locking).
 public:
-  // = Initialization and termination methods.
-  TAO_MProfile (CORBA::ULong sz = 0);
+  // = Initalization and termination methods.
+  TAO_MProfile (CORBA::ULong sz);
 
   TAO_MProfile (const TAO_MProfile &mprofiles);
   // **NOTE:  IF mprofiles->last_ > 0, THEN this->size_ will be set to
@@ -68,26 +72,26 @@ public:
   // NOT THREAD SAFE
 
   int grow (CORBA::ULong sz);
-  // increase the number of profiles this object can hold.
+  // increate the number of profiles this object can hold.
   // NOT THREAD SAFE
 
-  TAO_Profile *get_cnext (void);
+  TAO_Profile_ptr get_cnext (void);
   // Treat as a circular list.
 
-  TAO_Profile *get_next (void);
+  TAO_Profile_ptr get_next (void);
   // Get next profile in list, return 0 at end of list.
 
-  TAO_Profile *get_cprev (void);
+  TAO_Profile_ptr get_cprev (void);
   // Assume a circular list of profiles.
 
-  TAO_Profile *get_prev (void);
+  TAO_Profile_ptr get_prev (void);
   // Get previous profile, stop at beginning of list and return 0.
 
-  TAO_Profile *get_current_profile (void);
+  TAO_Profile_ptr get_current_profile (void);
   // Return a pointer to the current profile, will not increment
   // reference pointer.
 
-  TAO_Profile *get_profile (TAO_PHandle handle);
+  TAO_Profile_ptr get_profile (TAO_PHandle handle);
   // Return a pointer to the profile referenced by handle void.
 
   // rem_profile (TAO_PHandle handle); let's wait.
@@ -109,24 +113,14 @@ public:
   void rewind (void);
   // Sets the current slot back to 0.
 
-  int add_profile (TAO_Profile *pfile);
+  int add_profile (TAO_Profile_ptr pfile);
   // Return the index of this entry or -1 if it can not be added.
   // reference count on profile in incremented!
 
-  int give_profile (TAO_Profile *pfile);
+  int give_profile (TAO_Profile_ptr pfile);
   // Return the index of this entry or -1 if it can not be added.
   // this object assumes ownership of this profile!!
 
-  int add_profiles (TAO_MProfile *pfiles);
-  // append the profiles in pfiles to this object.  The count
-  // will be incremented on the individual profile objects.
-
-  int remove_profile (const TAO_Profile *pfile);
-  // remove from this MProfile any profiles which also appear in pfiles.
-
-  int remove_profiles (const TAO_MProfile *pfiles);
-  // remove from this MProfile any profiles which also appear in pfiles.
-
   void forward_from (TAO_MProfile *mprofiles);
   // Set a pointer to the MProfile whose 'current' TAO_Profile was
   // forwarded This object is the set of forwarding profiles.
@@ -134,20 +128,21 @@ public:
   TAO_MProfile *forward_from (void);
   // Returns a pointer to the profile which was forwarded.
 
-  CORBA::Boolean is_equivalent (const TAO_MProfile *rhs);
+  CORBA::Boolean is_equivalent (TAO_MProfile *first,
+                                TAO_MProfile *second,
+                                CORBA::Environment &env);
   // Returns true of there is at least one profile in first which
-  // is_equivalent with at least one profile in second.
-  // NON-THREAD SAFE, relies on some other entity to guarentee
-  // the profiles will not change during the call.
+  // is_equivalent with at least one profile in second.  @@ FRED: The
+  // lost should be locked for this!
 
   CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &env);
   // use all registered profiles.  The hash() method is called on each
   // profile and the results are averaged together.
-  // NON-THREAD SAFE.
+  // @@ FRED: The list should be locked for this!
 
 protected:
-  TAO_Profile **pfiles (void) const;
+  TAO_Profile_ptr *pfiles (void) const;
   // return the complete list of profiles, this object retains
   // ownership!
 
@@ -166,7 +161,7 @@ private:
   // received the relocate message.  The actual profile what was
   // forwarded will be forward_from_->get_current_profile ()
 
-  TAO_Profile **pfiles_;
+  TAO_Profile_ptr *pfiles_;
   // Actual list of profiles.
 
   TAO_PHandle current_;
@@ -181,6 +176,6 @@ private:
 
 #if defined (__ACE_INLINE__)
 # include "tao/MProfile.i"
-#endif /*__ACE_INLINE__ */
+#endif /* __ACE_INLINE__ */
 
-#endif /*TAO_MPROFILE_H */
+#endif /* TAO_MPROFILE_H */
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 54c46dc744d..30290e35597 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -177,7 +177,7 @@ TAO_MProfile::get_profile (CORBA::ULong slot) const
   return this->pfiles_[slot];
 }
 
-ACE_INLINE TAO_Profile **
+ACE_INLINE TAO_Profile_ptr *
 TAO_MProfile::pfiles (void) const
 {
   return this->pfiles_;
@@ -192,9 +192,9 @@ TAO_MProfile::grow (CORBA::ULong sz)
     return 0;
 
   // get the additional space
-  TAO_Profile **new_pfiles, **old_pfiles;
+  TAO_Profile_ptr *new_pfiles, *old_pfiles;
   ACE_NEW_RETURN (new_pfiles,
-                  TAO_Profile *[sz],
+                  TAO_Profile_ptr[sz],
                   -1);
 
   old_pfiles = this->pfiles_;
@@ -212,22 +212,3 @@ TAO_MProfile::grow (CORBA::ULong sz)
 
   return 0;
 }
-
-ACE_INLINE int
-TAO_MProfile::add_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    {
-      if (this->grow (this->size_ + 1) < 0)
-        return -1;
-    }
-
-  pfiles_[last_++] = pfile;
-
-  if (pfile && pfile->_incr_refcnt () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Unable to increment reference count in add_profile!\n"),
-                      -1);
-  return last_ - 1;
-}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index db7bf753b64..4dc37833852 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -26,6 +26,7 @@ PUB_HDRS = \
   UIOP_Connect \
   GIOP \
   Invocation \
+  Asynch_Invocation \
   Params \
   Marshal \
   Debug \
@@ -36,10 +37,7 @@ PUB_HDRS = \
   ORB_Core \
   Wait_Strategy \
   Transport_Mux_Strategy \
-  Reply_Dispatcher \
-  IORC \
-  IORS \
-  IORManipulation
+  Reply_Dispatcher
 
 POA_FILES = \
   Object_Adapter \
@@ -67,16 +65,12 @@ PLUGGABLE_PROTOCOLS_FILES = \
   UIOP_Transport \
   UIOP_Connector \
   UIOP_Acceptor \
-  UIOP_Connect \
-  IORC \
-  IORS \
-  IORManipulation
+  UIOP_Connect
 
 DEFAULT_RESOURCES_FILES = \
   default_client \
   default_server \
-  default_resource \
-  xt_resource
+  default_resource
 
 INTERPRETIVE_MARSHALING_FILES = \
   append \
@@ -124,6 +118,7 @@ ORB_CORE_FILES = \
   GIOP \
   GIOP_Server_Request \
   Invocation \
+  Asynch_Invocation \
   ORB_Core \
   params \
   Resource_Factory \
@@ -137,6 +132,8 @@ ORB_CORE_FILES = \
   Reply_Dispatcher \
   IOPC \
   IOPS \
+  PollableC \
+  PollableS \
   CONV_FRAMEC \
   CONV_FRAMES \
   Tagged_Components
@@ -262,15 +259,7 @@ include $(TAO_ROOT)/taoconfig.mk
 
 ifeq ($(fakesvcconf),1)
   CPPFLAGS += -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-endif # fakesvcconf
-
-ifeq ($(LYNXTARGET),ppc)
-#### POA.cpp raises internal compiler error with LynxOS 3.0.0 g++, but
-#### only when optimization is enabled.  Disable it . . .
-$(VDIR).obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp
-	@echo NOTE: compiling POA.cpp with -O instead of -O2, see Makefile.
-	$(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $<
-endif # LYNXTARGET == ppc
+endif
 
 #RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS))
 LDFLAGS += $(RLDFLAGS)
@@ -280,10 +269,10 @@ LDFLAGS += $(RLDFLAGS)
 
 .PHONY: TAO_COMPONENTS
 TAO_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --tao --set ' $(TAO_COMPONENTS) '
+	@$(ACE_ROOT)/bin/ace_components --tao --set " $(TAO_COMPONENTS) "
 
 realclean:
-	@sh $(ACE_ROOT)/bin/ace_components --tao --remove
+	@$(ACE_ROOT)/bin/ace_components --tao --remove
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -442,11 +431,6 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -809,11 +793,6 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -878,7 +857,6 @@ realclean:
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Forwarding_Servant.h
 .obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp \
  $(TAO_ROOT)/tao/POAC.h \
@@ -1007,11 +985,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -1235,11 +1208,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -1432,11 +1400,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -1751,11 +1714,6 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
@@ -1969,11 +1927,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2096,30 +2049,21 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -2131,6 +2075,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -2307,19 +2255,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2458,11 +2401,12 @@ realclean:
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Acceptor_Registry.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2474,6 +2418,10 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2485,62 +2433,23 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -2552,15 +2461,44 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -2881,8 +2819,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
@@ -2905,19 +2841,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2951,7 +2882,7 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Connector.i
 .obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3018,36 +2949,6 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3055,34 +2956,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -3096,7 +2979,23 @@ realclean:
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -3112,6 +3011,16 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3150,9 +3059,20 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
@@ -3162,6 +3082,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -3384,31 +3308,8 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Tagged_Components.h \
@@ -3421,17 +3322,35 @@ realclean:
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+ $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -3629,36 +3548,12 @@ realclean:
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Tagged_Components.h \
@@ -3670,14 +3565,31 @@ realclean:
  $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -3864,8 +3776,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -3892,19 +3802,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -4094,9 +3999,7 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4104,18 +4007,19 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/IIOP_Transport.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
@@ -4135,19 +4039,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -4171,7 +4070,8 @@ realclean:
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Wait_Strategy.h
 .obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp \
  $(TAO_ROOT)/tao/UIOP_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -4352,8 +4252,6 @@ realclean:
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
  $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
@@ -4376,19 +4274,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -4597,8 +4490,6 @@ realclean:
  $(ACE_ROOT)/ace/LSOCK.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -4617,21 +4508,12 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -4642,6 +4524,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -4872,7 +4758,6 @@ realclean:
  $(ACE_ROOT)/ace/LSOCK.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
  $(TAO_ROOT)/tao/UIOP_Profile.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4887,6 +4772,7 @@ realclean:
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+ $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -4907,19 +4793,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -5127,8 +5008,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -5163,19 +5042,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -5369,8 +5243,6 @@ realclean:
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -5397,19 +5269,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -5606,9 +5473,7 @@ realclean:
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5616,18 +5481,19 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/UIOP_Transport.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
@@ -5647,655 +5513,39 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp \
- $(TAO_ROOT)/tao/IORC.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h
-.obj/IORS.o .obj/IORS.so .shobj/IORS.o .shobj/IORS.so: IORS.cpp IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- IORS.i
-.obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ $(TAO_ROOT)/tao/Wait_Strategy.h
 .obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
  $(TAO_ROOT)/tao/default_client.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
@@ -6423,19 +5673,14 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -6617,19 +5862,14 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -6840,19 +6080,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -7021,19 +6256,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/GIOP.h \
@@ -7158,19 +6384,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/GIOP.h \
@@ -7193,6 +6410,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -7359,19 +6580,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -7392,6 +6604,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -7521,19 +6737,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -7554,6 +6761,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -7774,19 +6985,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
@@ -7912,19 +7114,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/GIOP.h \
@@ -8036,27 +7229,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/Union.o .obj/Union.so .shobj/Union.o .shobj/Union.so: Union.cpp \
  $(TAO_ROOT)/tao/Union.h \
@@ -8238,27 +7420,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
  $(TAO_ROOT)/tao/Any.h \
@@ -8379,19 +7550,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -8401,6 +7563,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -8570,26 +7736,17 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -8601,6 +7758,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -8733,19 +7894,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -9025,19 +8181,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -9205,28 +8356,19 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -9238,6 +8380,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -9406,62 +8552,30 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/Connector_Registry.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -9481,6 +8595,8 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -9489,6 +8605,8 @@ realclean:
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -9507,6 +8625,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -9517,6 +8639,25 @@ realclean:
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -9757,22 +8898,13 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -9784,6 +8916,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -9965,19 +9101,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i
 .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -10105,15 +9236,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -10126,6 +9248,10 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -10311,18 +9437,13 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h
+ $(TAO_ROOT)/tao/Servant_Base.i
 .obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -10776,17 +9897,12 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -10920,9 +10036,7 @@ realclean:
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i
+ $(TAO_ROOT)/tao/MProfile.i
 .obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -11036,30 +10150,21 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -11071,6 +10176,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -11328,25 +10437,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -11355,6 +10455,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -11591,27 +10695,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
@@ -11739,19 +10832,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -12168,19 +11256,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -12396,17 +11479,12 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -12584,19 +11662,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -12663,6 +11736,196 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Connector_Registry.h
+.obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i
 .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -12787,19 +12050,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -13152,19 +12410,14 @@ realclean:
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -13516,25 +12769,14 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
@@ -13542,6 +12784,8 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
@@ -13766,13 +13010,6 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
@@ -13901,19 +13138,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -14680,19 +13912,10 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
  $(TAO_ROOT)/tao/Request.h \
@@ -14821,19 +14044,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -14848,6 +14062,10 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -15060,19 +14278,10 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 .obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp ObjectIDList.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -15183,25 +14392,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -15249,9 +14449,13 @@ realclean:
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -15465,19 +14669,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -15658,19 +14857,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -15809,19 +15003,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -16000,19 +15189,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -16139,19 +15323,10 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -16170,6 +15345,10 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
@@ -16296,24 +15475,19 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i
 .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -16437,19 +15611,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynStruct_i.h \
  $(TAO_ROOT)/tao/DynSequence_i.h \
  $(TAO_ROOT)/tao/DynEnum_i.h \
@@ -16457,10 +15626,7 @@ realclean:
  $(TAO_ROOT)/tao/DynUnion_i.h \
  $(TAO_ROOT)/tao/DynUnion_i_T.h \
  $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -16584,19 +15750,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynArray_i.h \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp \
@@ -16722,19 +15883,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynEnum_i.h \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp \
@@ -16860,19 +16016,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynSequence_i.h \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp \
@@ -16998,19 +16149,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynStruct_i.h \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp \
@@ -17136,19 +16282,14 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/DynUnion_i.h \
  $(TAO_ROOT)/tao/DynUnion_i_T.h \
  $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
@@ -17260,27 +16401,16 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index e114196db6c..b6686185e46 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -14,136 +14,67 @@ AUTOMAKE_OPTIONS = 1.4
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
-POA_FILES = \
-	Object_Adapter.cpp \
-	Key_Adapters.cpp \
-	POA.cpp \
-	POAC.cpp \
-	POAS.cpp \
-	POAManager.cpp \
-	Active_Object_Map.cpp \
-	Servant_Base.cpp \
-	Forwarding_Servant.cpp
-
-PLUGGABLE_PROTOCOLS_FILES = \
-	Pluggable.cpp \
-	Connector_Registry.cpp \
-	Acceptor_Registry.cpp \
-	Protocol_Factory.cpp \
-	IIOP_Factory.cpp \
-	IIOP_Profile.cpp \
-	IIOP_Transport.cpp \
-	IIOP_Connector.cpp \
-	IIOP_Acceptor.cpp \
-	IIOP_Connect.cpp \
-	UIOP_Factory.cpp \
-	UIOP_Profile.cpp \
-	UIOP_Transport.cpp \
-	UIOP_Connector.cpp \
-	UIOP_Acceptor.cpp \
-	UIOP_Connect.cpp \
-	IORC.cpp \
-	IORS.cpp \
-	IORManipulation.cpp
-
-DEFAULT_RESOURCES_FILES = \
-	default_client.cpp \
-	default_server.cpp \
-	default_resource
-
-INTERPRETIVE_MARSHALING_FILES = \
-	append.cpp \
-	decode.cpp \
-	deep_free.cpp \
-	encode.cpp \
-	CDR_Interpreter.cpp \
-	Marshal.cpp \
-	skip.cpp
-
-IDL_COMPILER_FILES = \
-	Managed_Types.cpp \
-	Union.cpp \
-	Operation_Table.cpp
-
-ORB_CORE_FILES = \
-	Any.cpp \
-	CurrentC.cpp \
-	CurrentS.cpp \
-	Exception.cpp \
-	WrongTransactionC.cpp \
-	Environment.cpp \
-	Object.cpp \
-	ORB.cpp \
-	corbafwd.cpp \
-	PolicyC.cpp \
-	PolicyS.cpp \
-	DomainC.cpp \
-	DomainS.cpp \
-	TimeBaseC.cpp \
-	TimeBaseS.cpp \
-	Principal.cpp \
-	Sequence.cpp \
-	Server_Request.cpp \
-	MProfile.cpp \
-	Stub.cpp \
-	Typecode.cpp \
-	ValueBase.cpp \
-	ValueFactory.cpp \
-	ValueFactory_Map.cpp \
-	CDR.cpp \
-	Client_Strategy_Factory.cpp \
-	debug.cpp \
-	Object_KeyC.cpp \
-	GIOP.cpp \
-	GIOP_Server_Request.cpp \
-	Invocation.cpp \
-	ORB_Core.cpp \
-	params.cpp \
-	Resource_Factory.cpp \
-	Server_Strategy_Factory.cpp \
-	TAO_Internal.cpp \
-	Typecode_Constants.cpp \
-	IOR_LookupTable.cpp \
-	TAO.cpp \
-	Wait_Strategy.cpp \
-	Transport_Mux_Strategy.cpp \
-	Reply_Dispatcher.cpp \
-	IOPC.cpp \
-	IOPS.cpp \
-	CONV_FRAMEC.cpp \
-	CONV_FRAMES.cpp \
-	Tagged_Components.cpp \
-	Context.cpp \
-	Request.cpp \
-	Services.cpp \
-	NVList.cpp \
-	ObjectIDList.cpp \
-	MessagingC.cpp \
-	MessagingS.cpp \
-	Policy_Manager.cpp \
-	Messaging_Policy_i.cpp
-
-DYNAMIC_ANY_FILES = \
-	DynAnyC.cpp \
-	DynAnyS.cpp \
-	DynAny_i.cpp \
-	DynArray_i.cpp \
-	DynEnum_i.cpp \
-	DynSequence_i.cpp \
-	DynStruct_i.cpp \
-	DynUnion_i.cpp \
-	InconsistentTypeCodeC.cpp
-
 # Build a libtool library, libTAO.la for installation in libdir.
 lib_LTLIBRARIES = libTAO.la
 libTAO_la_SOURCES = \
-	$(POA_FILES) \
-	$(PLUGGABLE_PROTOCOLS_FILES) \
-	$(DEFAULT_RESOURCES_FILES) \
-	$(INTERPRETIVE_MARSHALING_FILES) \
-	$(IDL_COMPILER_FILES) \
-	$(ORB_CORE_FILES) \
-	$(DYNAMIC_ANY_FILES)
+         Active_Object_Map.cpp  \
+         Any.cpp  \
+         CDR.cpp  \
+         Client_Strategy_Factory.cpp  \
+         Connect.cpp  \
+         CurrentC.cpp  \
+         CurrentS.cpp  \
+         DynAnyC.cpp  \
+         DynAnyS.cpp  \
+         DynAny_i.cpp  \
+         DynArray_i.cpp  \
+         DynEnum_i.cpp  \
+         DynSequence_i.cpp  \
+         DynStruct_i.cpp  \
+         DynUnion_i.cpp  \
+         Environment.cpp  \
+         Exception.cpp  \
+         Forwarding_Servant.cpp  \
+         GIOP.cpp  \
+         IIOP_Interpreter.cpp  \
+         IIOP_ORB.cpp  \
+         IIOP_Object.cpp  \
+         InconsistentTypeCodeC.cpp  \
+         Invocation.cpp  \
+         Managed_Types.cpp  \
+         Marshal.cpp  \
+         NVList.cpp  \
+         ORB.cpp  \
+         ORB_Core.cpp  \
+         Object.cpp  \
+         Object_KeyC.cpp  \
+         Operation_Table.cpp  \
+         POA.cpp  \
+         POAC.cpp  \
+         POAS.cpp  \
+         PolicyC.cpp  \
+         PolicyS.cpp  \
+         Principal.cpp  \
+         Request.cpp  \
+         Sequence.cpp  \
+         Servant_Base.cpp  \
+         Server_Request.cpp  \
+         Server_Strategy_Factory.cpp  \
+         Stub.cpp  \
+         TAO.cpp  \
+         TAO_Internal.cpp  \
+         Typecode.cpp  \
+         Typecode_Constants.cpp  \
+         Union.cpp  \
+         append.cpp  \
+         debug.cpp  \
+         decode.cpp  \
+         deep_free.cpp  \
+         default_client.cpp  \
+         default_server.cpp  \
+         encode.cpp  \
+         params.cpp  \
+         skip.cpp
 
 ## The following is an excerpt from the "libtool" manual, written by
 ## Gordon Matzigkeit:
@@ -188,215 +119,120 @@ libTAO_la_LDFLAGS = -version-info @TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@
 ## macro is defined.
 if TEMPLATES_REQUIRE_SOURCE
 TEMPLATE_FILES = \
-	Acceptor_Impl.cpp \
-	CONV_FRAMES_T.cpp \
-	DomainS_T.cpp \
-	DynUnion_i_T.cpp \
-	IOPS_T.cpp \
-	MessagingS_T.cpp \
-	PollableS_T.cpp \
-	Sequence_T.cpp \
-	TimeBaseS_T.cpp \
-	varout.cpp
+         DynUnion_i_T.cpp  \
+         ORB_Strategies_T.cpp  \
+         Sequence_T.cpp  \
+         poa_T.cpp  \
+         varout.cpp
 else
 TEMPLATE_FILES = 
 endif
 
 pkgincludedir = $(prefix)/include/tao
 pkginclude_HEADERS = \
-        Acceptor_Impl.h \
-        Acceptor_Impl.i \
-        Acceptor_Registry.h \
-        Acceptor_Registry.i \
-        Active_Object_Map.h \
-        Active_Object_Map.i \
-        Any.h \
-        Any.i \
-        CDR.h \
-        CDR.i \
-        CDR_Interpreter.h \
-        CONV_FRAMEC.h \
-        CONV_FRAMEC.i \
-        CONV_FRAMES.h \
-        CONV_FRAMES.i \
-        CONV_FRAMES_T.h \
-        CONV_FRAMES_T.i \
-        Client_Strategy_Factory.h \
-        Connector_Registry.h \
-        Context.h \
-        Context.i \
-        CurrentC.h \
-        CurrentC.i \
-        DomainC.h \
-        DomainC.i \
-        DomainS_T.h \
-        DomainS_T.i \
-        DynAnyC.h \
-        DynAnyC.i \
-        DynAny_i.h \
-        DynArray_i.h \
-        DynEnum_i.h \
-        DynSequence_i.h \
-        DynStruct_i.h \
-        DynUnion_i.h \
-        DynUnion_i_T.h \
-        Environment.h \
-        Environment.i \
-        Exception.h \
-        Exception.i \
-        Forwarding_Servant.h \
-        GIOP.h \
-        GIOP.i \
-        GIOP_Server_Request.h \
-        GIOP_Server_Request.i \
-        IIOP_Acceptor.h \
-        IIOP_Acceptor.i \
-        IIOP_Connect.h \
-        IIOP_Connect.i \
-        IIOP_Connector.h \
-        IIOP_Factory.h \
-        IIOP_Profile.h \
-        IIOP_Profile.i \
-        IIOP_Transport.h \
-        IOPC.h \
-        IOPC.i \
-        IOPS.h \
-        IOPS.i \
-        IOPS_T.h \
-        IOPS_T.i \
-        IORC.h \
-        IORC.i \
-        IORManipulation.h \
-        IORS.h \
-        IORS.i \
-        IOR_LookupTable.h \
-        InconsistentTypeCodeC.h \
-        Invocation.h \
-        Invocation.i \
-        Key_Adapters.h \
-        Key_Adapters.i \
-        MProfile.h \
-        MProfile.i \
-        Managed_Types.h \
-        Managed_Types.i \
-        Marshal.h \
-        Marshal.i \
-        MessagingC.h \
-        MessagingC.i \
-        MessagingS.h \
-        MessagingS.i \
-        MessagingS_T.h \
-        MessagingS_T.i \
-        Messaging_Policy_i.h \
-        Messaging_Policy_i.i \
-        NVList.h \
-        NVList.i \
-        ORB.h \
-        ORB.i \
-        ORB_Core.h \
-        ORB_Core.i \
-        Object.h \
-        Object.i \
-        ObjectIDList.h \
-        ObjectIDList.i \
-        Object_Adapter.h \
-        Object_Adapter.i \
-        Object_KeyC.h \
-        Object_KeyC.i \
-        Operation_Table.h \
-        POA.h \
-        POA.i \
-        POAC.h \
-        POAC.i \
-        POAManager.h \
-        POAManager.i \
-        POAS.h \
-        POAS.i \
-        POA_CORBA.h \
-        Pluggable.h \
-        Pluggable.i \
-        PolicyC.h \
-        PolicyC.i \
-        Policy_Manager.h \
-        Policy_Manager.i \
-        PollableC.h \
-        PollableC.i \
-        PollableS.h \
-        PollableS.i \
-        PollableS_T.h \
-        PollableS_T.i \
-        Principal.h \
-        Principal.i \
-        Protocol_Factory.h \
-        Reply_Dispatcher.h \
-        Reply_Dispatcher.i \
-        Request.h \
-        Request.i \
-        Resource_Factory.h \
-        Sequence.h \
-        Sequence.i \
-        Sequence_T.h \
-        Sequence_T.i \
-        Servant_Base.h \
-        Servant_Base.i \
-        Server_Request.h \
-        Server_Request.i \
-        Server_Strategy_Factory.h \
-        Services.h \
-        Services.i \
-        Stub.h \
-        Stub.i \
-        TAO.h \
-        TAO_Internal.h \
-        Tagged_Components.h \
-        Tagged_Components.i \
-        TimeBaseC.h \
-        TimeBaseC.i \
-        TimeBaseS.h \
-        TimeBaseS.i \
-        TimeBaseS_T.h \
-        TimeBaseS_T.i \
-        Timeprobe.h \
-        Transport_Mux_Strategy.h \
-        Typecode.h \
-        Typecode.i \
-        UIOP_Acceptor.h \
-        UIOP_Connect.h \
-        UIOP_Connect.i \
-        UIOP_Connector.h \
-        UIOP_Factory.h \
-        UIOP_Profile.h \
-        UIOP_Profile.i \
-        UIOP_Transport.h \
-        Union.h \
-        ValueBase.h \
-        ValueBase.i \
-        ValueFactory.h \
-        ValueFactory.i \
-        ValueFactory_Map.h \
-        ValueFactory_Map.i \
-        Version.h \
-        Wait_Strategy.h \
-        WrongTransactionC.h \
-        corba.h \
-        corbafwd.h \
-        corbafwd.i \
-        debug.h \
-        default_client.h \
-        default_client.i \
-        default_resource.h \
-        default_resource.i \
-        default_server.h \
-        default_server.i \
-        orbconf.h \
-        params.h \
-        params.i \
-        poa_macros.h \
-        singletons.h \
-        try_macros.h \
-        varout.h \
-        varout.i \
-	$(TEMPLATE_FILES)
+         Active_Object_Map.h  \
+         Active_Object_Map.i  \
+         Align.h  \
+         Any.h  \
+         Any.i  \
+         CDR.h  \
+         CDR.i  \
+         Client_Strategy_Factory.h  \
+         Connect.h  \
+         Connect.i  \
+         CurrentC.h  \
+         CurrentC.i  \
+         DynAnyC.h  \
+         DynAnyC.i  \
+         DynAny_i.h  \
+         DynArray_i.h  \
+         DynEnum_i.h  \
+         DynSequence_i.h  \
+         DynStruct_i.h  \
+         DynUnion_i.h  \
+         DynUnion_i_T.h  \
+         Environment.h  \
+         Environment.i  \
+         Exception.h  \
+         Exception.i  \
+         Forwarding_Servant.h  \
+         GIOP.h  \
+         GIOP.i  \
+         IIOP_Interpreter.h  \
+         IIOP_ORB.h  \
+         IIOP_ORB.i  \
+         IIOP_Object.h  \
+         IIOP_Object.i  \
+         InconsistentTypeCodeC.h  \
+         Invocation.h  \
+         Invocation.i  \
+         Managed_Types.h  \
+         Managed_Types.i  \
+         Marshal.h  \
+         Marshal.i  \
+         NVList.h  \
+         NVList.i  \
+         ORB.h  \
+         ORB.i  \
+         ORB_Core.h  \
+         ORB_Core.i  \
+         ORB_Strategies_T.h  \
+         ORB_Strategies_T.i  \
+         Object.h  \
+         Object.i  \
+         Object_KeyC.h  \
+         Object_KeyC.i  \
+         Object_Table.h  \
+         Object_Table.i  \
+         Operation_Table.h  \
+         POA.h  \
+         POA.i  \
+         POAC.h  \
+         POAC.i  \
+         POAS.h  \
+         POAS.i  \
+         POA_CORBA.h  \
+         PolicyC.h  \
+         PolicyC.i  \
+         Principal.h  \
+         Principal.i  \
+         Request.h  \
+         Request.i  \
+         Sequence.h  \
+         Sequence.i  \
+         Sequence_T.h  \
+         Sequence_T.i  \
+         Servant_Base.h  \
+	 Servant_Base.i  \
+         Server_Request.h  \
+         Server_Request.i  \
+         Server_Strategy_Factory.h  \
+         Stub.h  \
+         Stub.i  \
+         TAO.h  \
+         TAO_Internal.h  \
+         TAO_Internal.i  \
+         Timeprobe.h  \
+         Typecode.h  \
+         Typecode.i  \
+         Union.h  \
+         config.h  \
+         corba.h  \
+         debug.h  \
+         default_client.h  \
+         default_client.i  \
+         default_server.h  \
+         default_server.i  \
+         orbconf.h  \
+         params.h  \
+         params.i  \
+         poa_T.h  \
+         poa_macros.h  \
+         singletons.h  \
+         try_macros.h  \
+         varout.h  \
+         varout.i  \
+         $(TEMPLATE_FILES)
 ## Make sure $(TEMPLATE_FILES) is in the above header list!
 
 
@@ -405,7 +241,7 @@ pkginclude_HEADERS = \
 ## t_sizes_SOURCES = t-sizes.cpp
 
 EXTRA_DIST = \
-        t-sizes.cpp
+         t-sizes.cpp
 
 ## Clean up some additional files/directories possibly created during
 ## the configure script tests.
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
deleted file mode 100644
index 2cbaa9cdeb7..00000000000
--- a/TAO/tao/Makefile.bor
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Makefile for building the TAO library
-#
-
-NAME = tao
-
-OBJFILES = \
-	$(OBJDIR)\Acceptor_Registry.obj \
-	$(OBJDIR)\Active_Object_Map.obj \
-	$(OBJDIR)\Any.obj \
-	$(OBJDIR)\append.obj \
-	$(OBJDIR)\CDR.obj \
-	$(OBJDIR)\CDR_Interpreter.obj \
-	$(OBJDIR)\Client_Strategy_Factory.obj \
-	$(OBJDIR)\Connector_Registry.obj \
-	$(OBJDIR)\Context.obj \
-	$(OBJDIR)\CONV_FRAMEC.obj \
-	$(OBJDIR)\CONV_FRAMES.obj \
-	$(OBJDIR)\corbafwd.obj \
-	$(OBJDIR)\CurrentC.obj \
-	$(OBJDIR)\CurrentS.obj \
-	$(OBJDIR)\debug.obj \
-	$(OBJDIR)\decode.obj \
-	$(OBJDIR)\deep_free.obj \
-	$(OBJDIR)\default_client.obj \
-	$(OBJDIR)\default_resource.obj \
-	$(OBJDIR)\default_server.obj \
-	$(OBJDIR)\DomainC.obj \
-	$(OBJDIR)\DomainS.obj \
-	$(OBJDIR)\DynAny_i.obj \
-	$(OBJDIR)\DynAnyC.obj \
-	$(OBJDIR)\DynAnyS.obj \
-	$(OBJDIR)\DynArray_i.obj \
-	$(OBJDIR)\DynEnum_i.obj \
-	$(OBJDIR)\DynSequence_i.obj \
-	$(OBJDIR)\DynStruct_i.obj \
-	$(OBJDIR)\DynUnion_i.obj \
-	$(OBJDIR)\encode.obj \
-	$(OBJDIR)\Environment.obj \
-	$(OBJDIR)\Exception.obj \
-	$(OBJDIR)\Forwarding_Servant.obj \
-	$(OBJDIR)\GIOP.obj \
-	$(OBJDIR)\GIOP_Server_Request.obj \
-	$(OBJDIR)\IIOP_Acceptor.obj \
-	$(OBJDIR)\IIOP_Connect.obj \
-	$(OBJDIR)\IIOP_Connector.obj \
-	$(OBJDIR)\IIOP_Factory.obj \
-	$(OBJDIR)\IIOP_Profile.obj \
-	$(OBJDIR)\IIOP_Transport.obj \
-	$(OBJDIR)\InconsistentTypeCodeC.obj \
-	$(OBJDIR)\Invocation.obj \
-	$(OBJDIR)\IOPC.obj \
-	$(OBJDIR)\IOPS.obj \
-	$(OBJDIR)\IOR_LookupTable.obj \
-	$(OBJDIR)\IORC.obj \
-	$(OBJDIR)\IORManipulation.obj \
-	$(OBJDIR)\IORS.obj \
-	$(OBJDIR)\Key_Adapters.obj \
-	$(OBJDIR)\Managed_Types.obj \
-	$(OBJDIR)\Marshal.obj \
-	$(OBJDIR)\Messaging_Policy_i.obj \
-	$(OBJDIR)\MessagingC.obj \
-	$(OBJDIR)\MessagingS.obj \
-	$(OBJDIR)\MProfile.obj \
-	$(OBJDIR)\NVList.obj \
-	$(OBJDIR)\Object.obj \
-	$(OBJDIR)\Object_Adapter.obj \
-	$(OBJDIR)\Object_KeyC.obj \
-	$(OBJDIR)\ObjectIDList.obj \
-	$(OBJDIR)\Operation_Table.obj \
-	$(OBJDIR)\ORB.obj \
-	$(OBJDIR)\ORB_Core.obj \
-	$(OBJDIR)\params.obj \
-	$(OBJDIR)\Pluggable.obj \
-	$(OBJDIR)\POA.obj \
-	$(OBJDIR)\POAC.obj \
-	$(OBJDIR)\POAManager.obj \
-	$(OBJDIR)\POAS.obj \
-	$(OBJDIR)\Policy_Manager.obj \
-	$(OBJDIR)\PolicyC.obj \
-	$(OBJDIR)\PolicyS.obj \
-	$(OBJDIR)\Principal.obj \
-	$(OBJDIR)\Protocol_Factory.obj \
-	$(OBJDIR)\Reply_Dispatcher.obj \
-	$(OBJDIR)\Request.obj \
-	$(OBJDIR)\Resource_Factory.obj \
-	$(OBJDIR)\Sequence.obj \
-	$(OBJDIR)\Servant_Base.obj \
-	$(OBJDIR)\Server_Request.obj \
-	$(OBJDIR)\Server_Strategy_Factory.obj \
-	$(OBJDIR)\Services.obj \
-	$(OBJDIR)\skip.obj \
-	$(OBJDIR)\Stub.obj \
-	$(OBJDIR)\Tagged_Components.obj \
-	$(OBJDIR)\TAO.obj \
-	$(OBJDIR)\TAO_Internal.obj \
-	$(OBJDIR)\TimeBaseC.obj \
-	$(OBJDIR)\TimeBaseS.obj \
-	$(OBJDIR)\Transport_Mux_Strategy.obj \
-	$(OBJDIR)\Typecode.obj \
-	$(OBJDIR)\Typecode_Constants.obj \
-	$(OBJDIR)\Union.obj \
-	$(OBJDIR)\ValueBase.obj \
-	$(OBJDIR)\ValueFactory.obj \
-	$(OBJDIR)\ValueFactory_Map.obj \
-	$(OBJDIR)\Wait_Strategy.obj \
-	$(OBJDIR)\WrongTransactionC.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_BUILD_CFLAGS) $(TAO_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 65d45f56889..6ddf39ce1b6 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -33,13 +33,13 @@ CORBA::TypeCode::traverse_status
 DEEP_COPY (CORBA::TypeCode_ptr  param,
            const void *source,
            const void *dest,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
 CORBA::TypeCode::traverse_status
 DEEP_FREE (CORBA::TypeCode_ptr  param,
            const void *source,
            const void *dest,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
 // = Forward declarations.
 class TAO_Marshal_Object;
@@ -71,7 +71,7 @@ public:
   // destructor
 
   virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Factory method that returns the appropriate marshal object.
 
 private:
@@ -116,25 +116,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // encoding operation
 
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // decoding operation
 
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // append operation
 
   TAO_Marshal_Object (void);
@@ -159,25 +159,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -197,25 +197,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *source,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -235,25 +235,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -273,25 +273,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -311,25 +311,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -349,25 +349,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -387,25 +387,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -425,25 +425,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -463,25 +463,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -501,25 +501,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -539,25 +539,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -576,25 +576,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
@@ -613,25 +613,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // append operation
 
 };
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 1e64afec470..9f8c4286051 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -174,9 +174,7 @@ Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::RebindPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RebindPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", ACE_TRY_ENV))
     return Messaging::RebindPolicy::_nil ();
   return Messaging::RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -207,7 +205,7 @@ CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -241,9 +239,7 @@ Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::SyncScopePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::SyncScopePolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", ACE_TRY_ENV))
     return Messaging::SyncScopePolicy::_nil ();
   return Messaging::SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -274,7 +270,7 @@ CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORB
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -336,9 +332,7 @@ Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestPriorityPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestPriorityPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", ACE_TRY_ENV))
     return Messaging::RequestPriorityPolicy::_nil ();
   return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -369,7 +363,7 @@ CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -403,9 +397,7 @@ Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyPriorityPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyPriorityPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", ACE_TRY_ENV))
     return Messaging::ReplyPriorityPolicy::_nil ();
   return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -436,7 +428,7 @@ CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value,
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -470,9 +462,7 @@ Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestStartTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestStartTimePolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", ACE_TRY_ENV))
     return Messaging::RequestStartTimePolicy::_nil ();
   return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -503,7 +493,7 @@ CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *valu
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -537,9 +527,7 @@ Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestEndTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestEndTimePolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", ACE_TRY_ENV))
     return Messaging::RequestEndTimePolicy::_nil ();
   return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -570,7 +558,7 @@ CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value,
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -604,9 +592,7 @@ Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyStartTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyStartTimePolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", ACE_TRY_ENV))
     return Messaging::ReplyStartTimePolicy::_nil ();
   return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -637,7 +623,7 @@ CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value,
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -671,9 +657,7 @@ Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyEndTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyEndTimePolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", ACE_TRY_ENV))
     return Messaging::ReplyEndTimePolicy::_nil ();
   return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -704,7 +688,7 @@ CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, C
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -738,9 +722,7 @@ Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPol
 {
   if (CORBA::is_nil (obj))
     return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RelativeRequestTimeoutPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", ACE_TRY_ENV))
     return Messaging::RelativeRequestTimeoutPolicy::_nil ();
   return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -771,7 +753,7 @@ CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -805,10 +787,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeou
 {
   if (CORBA::is_nil (obj))
     return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RelativeRoundtripTimeoutPolicy::_nil
-                    ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", ACE_TRY_ENV))
     return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
   return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -839,7 +818,7 @@ CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Ch
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -901,9 +880,7 @@ Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::RoutingPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RoutingPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", ACE_TRY_ENV))
     return Messaging::RoutingPolicy::_nil ();
   return Messaging::RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -934,7 +911,7 @@ CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA:
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -968,9 +945,7 @@ Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::MaxHopsPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::MaxHopsPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", ACE_TRY_ENV))
     return Messaging::MaxHopsPolicy::_nil ();
   return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -1001,7 +976,7 @@ CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA:
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -1035,9 +1010,7 @@ Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::QueueOrderPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::QueueOrderPolicy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", ACE_TRY_ENV))
     return Messaging::QueueOrderPolicy::_nil ();
   return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -1068,7 +1041,7 @@ CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, COR
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -1281,9 +1254,7 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyHandler::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyHandler::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", ACE_TRY_ENV))
     return Messaging::ReplyHandler::_nil ();
   return Messaging::ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -1313,7 +1284,7 @@ CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
@@ -1344,9 +1315,7 @@ Messaging::Poller_ptr Messaging::Poller::_narrow (
 {
   if (CORBA::is_nil (obj))
     return Messaging::Poller::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/Poller:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::Poller::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:Messaging/Poller:1.0", ACE_TRY_ENV))
     return Messaging::Poller::_nil ();
   return Messaging::Poller::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
@@ -1709,15 +1678,15 @@ char * Messaging::Poller::op_name (
   return _tao_retval;
 }
 
-CORBA::Boolean Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* Messaging::Poller::_interface_repository_id (void) const
@@ -2192,8 +2161,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
   template class TAO_Unbounded_Sequence<Messaging::PolicyValue>;
 
 #if defined(TAO_POLLER)
-  template class TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
-  template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>;
+  template class TAO_Object_Field_T<Messaging::ReplyHandler>;
+  template class TAO_Object_Field_T<Messaging::Poller>;
 #endif /* TAO_POLLER */
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -2201,8 +2170,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
 #pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue>
 
 #if defined(TAO_POLLER)
-#  pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
-#  pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>
+#  pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler>
+#  pragma instantiate TAO_Object_Field_T<Messaging::Poller>
 #endif /* TAO_POLLER */
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 84dd0d8b2dc..707fa10de06 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -36,6 +36,8 @@
 #include "tao/TimeBaseC.h"
 #include "tao/PolicyC.h"
 #include "tao/IOPC.h"
+#include "tao/PollableC.h"
+#include "tao/varout.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -164,12 +166,12 @@ TAO_NAMESPACE  Messaging
     static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
     static RebindPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RebindPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RebindPolicy_ptr _nil (void);
@@ -180,7 +182,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -257,12 +259,12 @@ TAO_NAMESPACE  Messaging
     static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
     static SyncScopePolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static SyncScopePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static SyncScopePolicy_ptr _nil (void);
@@ -273,7 +275,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -387,12 +389,12 @@ TAO_NAMESPACE  Messaging
     static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
     static RequestPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestPriorityPolicy_ptr _nil (void);
@@ -403,7 +405,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -480,12 +482,12 @@ TAO_NAMESPACE  Messaging
     static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
     static ReplyPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyPriorityPolicy_ptr _nil (void);
@@ -496,7 +498,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -573,12 +575,12 @@ TAO_NAMESPACE  Messaging
     static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
     static RequestStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestStartTimePolicy_ptr _nil (void);
@@ -589,7 +591,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -666,12 +668,12 @@ TAO_NAMESPACE  Messaging
     static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
     static RequestEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RequestEndTimePolicy_ptr _nil (void);
@@ -682,7 +684,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -759,12 +761,12 @@ TAO_NAMESPACE  Messaging
     static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
     static ReplyStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyStartTimePolicy_ptr _nil (void);
@@ -775,7 +777,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -852,12 +854,12 @@ TAO_NAMESPACE  Messaging
     static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
     static ReplyEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyEndTimePolicy_ptr _nil (void);
@@ -868,7 +870,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -945,12 +947,12 @@ TAO_NAMESPACE  Messaging
     static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
     static RelativeRequestTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RelativeRequestTimeoutPolicy_ptr _nil (void);
@@ -961,7 +963,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1038,12 +1040,12 @@ TAO_NAMESPACE  Messaging
     static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
     static RelativeRoundtripTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void);
@@ -1054,7 +1056,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1168,12 +1170,12 @@ TAO_NAMESPACE  Messaging
     static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
     static RoutingPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RoutingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static RoutingPolicy_ptr _nil (void);
@@ -1184,7 +1186,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1261,12 +1263,12 @@ TAO_NAMESPACE  Messaging
     static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
     static MaxHopsPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static MaxHopsPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static MaxHopsPolicy_ptr _nil (void);
@@ -1277,7 +1279,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1354,12 +1356,12 @@ TAO_NAMESPACE  Messaging
     static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
     static QueueOrderPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static QueueOrderPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static QueueOrderPolicy_ptr _nil (void);
@@ -1370,7 +1372,7 @@ TAO_NAMESPACE  Messaging
       ) = 0;
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1637,7 +1639,7 @@ TAO_NAMESPACE  Messaging
 
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-
+  
   class TAO_Export ReplyHandler_var
   {
   public:
@@ -1692,19 +1694,19 @@ TAO_NAMESPACE  Messaging
     static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
     static ReplyHandler_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyHandler_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static ReplyHandler_ptr _nil (void);
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1779,12 +1781,12 @@ TAO_NAMESPACE  Messaging
     static Poller_ptr _duplicate (Poller_ptr obj);
     static Poller_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static Poller_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     static Poller_ptr _nil (void);
@@ -1820,7 +1822,7 @@ TAO_NAMESPACE  Messaging
       );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     virtual const char* _interface_repository_id (void) const;
@@ -1837,10 +1839,23 @@ TAO_NAMESPACE  Messaging
   };
 
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller;
-#endif /* 0 */
+#endif /* TAO_POLLER */
 
 }; // module Messaging
 
+// Typedef for the Reply Handler Skeleton.
+// This is handcrafted not generated by the IDL compiler.
+
+class TAO_InputCDR;
+
+#if defined (TAO_POLLER)
+typedef void (*TAO_Reply_Handler_Skeleton)(
+    TAO_InputCDR &,
+    Messaging::ReplyHandler *,
+    CORBA::Environment &
+    );
+#endif /* TAO_POLLER */
+
 void TAO_Export operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PriorityRange *&);
 
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
index e8df7334f55..920a0795a66 100644
--- a/TAO/tao/MessagingS.cpp
+++ b/TAO/tao/MessagingS.cpp
@@ -1728,7 +1728,7 @@ void* POA_Messaging::Poller::_downcast (
   return 0;
 }
 
-void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
+void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void * context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
index 957c74c8064..22d8fb1b4a3 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -119,7 +119,7 @@ TAO_NAMESPACE  POA_Messaging
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::RebindMode rebind_mode (
@@ -240,7 +240,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::SyncScope synchronization (
@@ -361,7 +361,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::PriorityRange priority_range (
@@ -482,7 +482,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::PriorityRange priority_range (
@@ -603,7 +603,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::UtcT start_time (
@@ -724,7 +724,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::UtcT end_time (
@@ -845,7 +845,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::UtcT start_time (
@@ -966,7 +966,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::UtcT end_time (
@@ -1087,7 +1087,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::TimeT relative_expiry (
@@ -1208,7 +1208,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     TimeBase::TimeT relative_expiry (
@@ -1329,7 +1329,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::RoutingTypeRange routing_range (
@@ -1450,7 +1450,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     CORBA::UShort max_hops (
@@ -1571,7 +1571,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     Messaging::Ordering allowed_orders (
@@ -1701,7 +1701,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
 private:
@@ -1741,7 +1741,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1753,7 +1753,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1765,7 +1765,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1778,7 +1778,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1790,7 +1790,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1802,7 +1802,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1814,7 +1814,7 @@ private:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1840,7 +1840,7 @@ private:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1848,7 +1848,7 @@ private:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
 
@@ -1945,7 +1945,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     CORBA::Object_ptr operation_target (
diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp
index 0ae3a1f8db0..db15d875142 100644
--- a/TAO/tao/MessagingS_T.cpp
+++ b/TAO/tao/MessagingS_T.cpp
@@ -24,140 +24,140 @@
 #endif /* !defined INLINE */
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RebindPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RebindPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->SyncScopePolicy::_default_POA (ACE_TRY_ENV);
+  return this->SyncScopePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestPriorityPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestPriorityPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyPriorityPolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyPriorityPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestStartTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestStartTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestEndTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestEndTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyStartTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyStartTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyEndTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyEndTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RelativeRequestTimeoutPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RelativeRequestTimeoutPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RelativeRoundtripTimeoutPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RelativeRoundtripTimeoutPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RoutingPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RoutingPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->MaxHopsPolicy::_default_POA (ACE_TRY_ENV);
+  return this->MaxHopsPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->QueueOrderPolicy::_default_POA (ACE_TRY_ENV);
+  return this->QueueOrderPolicy::_default_POA (env);
 }
 
 #if defined (TAO_POLLER)
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyHandler::_default_POA (ACE_TRY_ENV);
+  return this->ReplyHandler::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->Poller::_default_POA (ACE_TRY_ENV);
+  return this->Poller::_default_POA (env);
 }
 #endif /* TAO_POLLER */
 
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 386f3aa5f35..36306a455a2 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -90,21 +90,20 @@ CORBA_NVList::~CORBA_NVList (void)
 // add an element and just initialize its flags
 CORBA::NamedValue_ptr
 CORBA_NVList::add (CORBA::Flags flags,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   CORBA::Environment &env)
 {
   // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags, ACE_TRY_ENV);
+  return this->add_element (flags, env);
 }
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item (const char *name,
                         CORBA::Flags flags,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::NamedValue_ptr nv = this->add_element (flags, env);
 
   if (nv)
     {
@@ -121,11 +120,11 @@ CORBA::NamedValue_ptr
 CORBA_NVList::add_value (const char *name,
                          const CORBA::Any &value,
                          CORBA::Flags flags,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::NamedValue_ptr nv = this->add_element (flags, env);
+
   if (nv)
     {
       // now initialize the fields
@@ -148,15 +147,14 @@ CORBA_NVList::add_value (const char *name,
               nv->any_.replace (value.type_,
                                 value.value_,
                                 0,
-                                ACE_TRY_ENV);
+                                env);
             }
           else
             {
               nv->any_._tao_replace (value.type_,
                                      value.cdr_,
-                                     ACE_TRY_ENV);
+                                     env);
             }
-          ACE_CHECK_RETURN (0);
         }
       return nv;
     }
@@ -168,12 +166,11 @@ CORBA_NVList::add_value (const char *name,
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item_consume (char *name,
                                 CORBA::Flags flags,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
 
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::NamedValue_ptr nv = this->add_element (flags, env);
 
   if (nv)
     {
@@ -192,11 +189,10 @@ CORBA::NamedValue_ptr
 CORBA_NVList::add_value_consume (char * name,
                                  CORBA::Any * value,
                                  CORBA::Flags flags,
-                                 CORBA::Environment & ACE_TRY_ENV)
+                                 CORBA::Environment & env)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::NamedValue_ptr nv = this->add_element (flags, env);
 
   if (nv)
     {
@@ -224,12 +220,14 @@ CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/)
 
 // Helper method
 CORBA::NamedValue_ptr
-CORBA_NVList::add_element (CORBA::Flags flags,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env)
 {
   if (ACE_BIT_DISABLED (flags,
                         CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    {
+      env.exception (new CORBA::BAD_PARAM ());
+      return 0;
+    }
 
   CORBA::NamedValue_ptr nv;
 
@@ -250,15 +248,20 @@ CORBA_NVList::add_element (CORBA::Flags flags,
 
 // return the item at location n
 CORBA::NamedValue_ptr
-CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &env)
 {
   if (n >= this->max_) // 0 based indexing
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  CORBA::NamedValue_ptr *nv;
+    {
+      env.exception (new CORBA::TypeCode::Bounds ());
+      return 0;
+    }
+  else
+    {
+      CORBA::NamedValue_ptr *nv;
 
-  this->values_.get (nv, n);
-  return *nv;
+      this->values_.get (nv, n);
+      return *nv;
+    }
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 7887a4c4cde..dfb7dd3e040 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -179,38 +179,38 @@ public:
   // return the current number of elements in the list
 
   CORBA_NamedValue_ptr add (CORBA::Flags,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // add an element and just initialize the flags
 
   CORBA_NamedValue_ptr add_item (const char *,
                                   CORBA::Flags,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // add an element and initialize its name and flags
 
   CORBA_NamedValue_ptr add_value (const char *,
                                    const CORBA::Any &,
                                    CORBA::Flags,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // initializes a value, name, and flags
 
   CORBA_NamedValue_ptr add_item_consume (char *,
                                           CORBA::Flags,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // just like add_item. In addition, memory management of char * name is taken
   // over by the NVList
 
   CORBA_NamedValue_ptr add_value_consume (char *,
                                            CORBA::Any_ptr,
                                            CORBA::Flags,
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // just like add_value. In addition, the NVList controls the memory
   // management of the char *name and Any *value parameter
 
-  CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // retrieve the item at the nth location. Raises Bounds
 
   //  CORBA::Status
-  void remove (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void remove (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // remove element at index n. Raises Bounds
 
   // The pseudo object static methods..
@@ -232,7 +232,7 @@ private:
   // constructor - cannot be instantiated directly other than through the
   // ORB::create_list method
 
-  CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // helper to increase the list size. This is used by all the add_ methods of
   // the NVList class
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 142a3f619c6..10430a3536b 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -46,16 +46,6 @@
 #include "tao/Messaging_Policy_i.h"
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-#if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#  include /**/ <exception>
-#  if !defined (ACE_WIN32)
-using std::set_unexpected;
-#  endif /* !ACE_WIN32 */
-# else
-#  include /**/ <exception.h>
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-#endif /* ACE_HAS_EXCEPTIONS */
 
 #if !defined (__ACE_INLINE__)
 # include "tao/ORB.i"
@@ -71,73 +61,33 @@ static const char file_prefix[] = "file://";
 // Count of the number of ORBs.
 int CORBA_ORB::orb_init_count_ = 0;
 
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm,
-            const CORBA::ORB::InvalidName &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm,
-                           CORBA::ORB::InvalidName &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
+// ****************************************************************
 
 CORBA_ORB::InvalidName::InvalidName (void)
-  : CORBA_UserException (CORBA::ORB::_tc_InvalidName)
-{
-}
-
-CORBA::ORB::InvalidName::~InvalidName (void)
-{
-}
-
-CORBA::ORB::InvalidName::InvalidName (const CORBA::ORB::InvalidName &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
 {
 }
 
-// assignment operator
-CORBA::ORB::InvalidName&
-CORBA::ORB::InvalidName::operator= (const CORBA::ORB::InvalidName &_tao_excp)
+void
+CORBA_ORB::InvalidName::_raise (void)
 {
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
+  TAO_RAISE(*this);
 }
 
 CORBA_ORB::InvalidName*
 CORBA_ORB::InvalidName::_narrow (CORBA_Exception *ex)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", ex->_id ()))
-    return ACE_dynamic_cast (CORBA::ORB::InvalidName*, ex);
-  else
-    return 0;
-}
-
-void
-CORBA_ORB::InvalidName::_raise (void)
-{
-  TAO_RAISE(*this);
+  if (ex->_is_a ("IDL:omg.orb/CORBA/ORB/InvalidName:1.0"))
+    return ACE_dynamic_cast (CORBA_ORB::InvalidName*, ex);
+  return 0;
 }
 
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
+int
+CORBA_ORB::InvalidName::_is_a (const char* interface_id) const
 {
-  return new CORBA::ORB::InvalidName;
+  return ((ACE_OS::strcmp (interface_id,
+                          "IDL:omg.orb/CORBA/ORB/InvalidName:1.0") ==
+           0)
+          || CORBA_UserException::_is_a (interface_id));
 }
 
 CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
@@ -149,7 +99,6 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
     schedule_service_ (CORBA_Object::_nil ()),
     event_service_ (CORBA_Object::_nil ()),
     trading_service_ (CORBA_Object::_nil ()),
-    implrepo_service_ (CORBA_Object::_nil ()),
     orb_core_ (orb_core),
 # ifdef TAO_HAS_VALUETYPE
     valuetype_factory_map_ (0),
@@ -168,8 +117,6 @@ CORBA_ORB::~CORBA_ORB (void)
     CORBA::release (this->event_service_);
   if (!CORBA::is_nil (this->trading_service_))
     CORBA::release (this->trading_service_);
-  if (!CORBA::is_nil (this->implrepo_service_))
-    CORBA::release (this->implrepo_service_);
 
   this->orb_core_->fini ();
 
@@ -465,22 +412,17 @@ CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_ior_manipulation (CORBA::Environment& ACE_TRY_ENV)
-{
-  return this->ior_manipulation_._this (ACE_TRY_ENV);
-}
-
-CORBA_Object_ptr
 CORBA_ORB::resolve_service (const char *service_name,
                             ACE_Time_Value *timeout,
                             CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_Object_var return_value = CORBA_Object::_nil ();
+  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
 
   // First check to see if we've already initialized this.
-  if (!CORBA::is_nil (this->name_service_))
+  if (this->name_service_ != CORBA_Object::_nil ())
     {
-      return_value = CORBA::Object::_duplicate (this->name_service_);
+      // @@ Someone please double-check this ;-)
+      return_value = this->name_service_;
     }
   else
     {
@@ -495,10 +437,13 @@ CORBA_ORB::resolve_service (const char *service_name,
 
       if (name_service_ior.length () != 0)
         {
-          return_value =
+          this->name_service_ =
             this->string_to_object (name_service_ior.c_str (),
                                     ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
+
+          // check for errors
+          if (ACE_TRY_ENV.exception () != 0)
+            this->name_service_ = CORBA_Object::_nil ();
         }
       else
         {
@@ -518,25 +463,24 @@ CORBA_ORB::resolve_service (const char *service_name,
                 port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
             }
 
-          return_value =
+          this->name_service_ =
             this->multicast_to_service (service_name,
                                         port,
                                         timeout,
                                         ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
         }
-      this->name_service_ = CORBA::Object::_duplicate (return_value.ptr ());
     }
 
   // Return ior.
-  return return_value._retn ();
+  return_value = this->name_service_;
+  return CORBA_Object::_duplicate (return_value);
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
                                     CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA_Object_var return_value = CORBA_Object::_nil ();
+  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
 
   // First check to see if we've already initialized this.
   if (this->trading_service_ != CORBA_Object::_nil ())
@@ -557,9 +501,12 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
 
       if (trading_service_ior.length () != 0)
         {
-          return_value =
+          this->trading_service_ =
             this->string_to_object (trading_service_ior.c_str (), ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
+
+          // check for errors
+          if (ACE_TRY_ENV.exception () != 0)
+            this->trading_service_ = CORBA_Object::_nil ();
         }
       else
         {
@@ -579,80 +526,20 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
                 port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
             }
 
-          return_value =
+          this->trading_service_ =
             this->multicast_to_service ("TradingService",
                                         port,
                                         timeout,
                                         ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
         }
-      this->trading_service_ = return_value.ptr ();
     }
 
-  return CORBA_Object::_duplicate (return_value._retn ());
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_implrepo_service (ACE_Time_Value *timeout,
-                                     CORBA::Environment& ACE_TRY_ENV)
-{
-    CORBA_Object_var return_value = CORBA_Object::_nil ();
-
-    // First check to see if we've already initialized this.
-    if (this->implrepo_service_ != CORBA_Object::_nil ())
-      {
-        return_value = this->implrepo_service_;
-      }
-    else
-      {
-        ACE_CString implrepo_service_ior =
-          this->orb_core_->orb_params ()->implrepo_service_ior ();
-
-        // Second, check to see if the user has give us a parameter on
-        // the command-line.
-        if (implrepo_service_ior.length () == 0)
-          // Third, check to see if the user has an environment variable.
-          implrepo_service_ior = ACE_OS::getenv ("ImplRepoServiceIOR");
-
-        if (implrepo_service_ior.length () != 0)
-          {
-            return_value =
-              this->string_to_object (implrepo_service_ior.c_str (), ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA_Object::_nil ());
-          }
-        else
-          {
-            // First, determine if the port was supplied on the command line
-            // @@ FRED: need a generic rep for this!
-            u_short port =
-              this->orb_core_->orb_params ()->implrepo_service_port ();
-
-            if (port == 0)
-              {
-                // Look for the port among our environment variables.
-                const char *port_number = ACE_OS::getenv ("ImplRepoServicePort");
-
-                if (port_number != 0)
-                  port = ACE_OS::atoi (port_number);
-                else
-                  port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
-              }
-
-            return_value =
-              this->multicast_to_service ("ImplRepoService",
-                                          port,
-                                          timeout,
-                                          ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA_Object::_nil ());
-          }
-        this->implrepo_service_ = return_value.ptr ();
-      }
-
-    return CORBA_Object::_duplicate (return_value._retn ());
+  return_value = this->trading_service_;
+  return CORBA_Object::_duplicate (return_value);
 }
 
 int
-CORBA_ORB::multicast_query (char *&buf,
+CORBA_ORB::multicast_query (char *buf,
                             const char *service_name,
                             u_short port,
                             ACE_Time_Value *timeout)
@@ -675,6 +562,7 @@ CORBA_ORB::multicast_query (char *&buf,
     }
   else
     {
+      // This starts out initialized to all zeros!
       ACE_INET_Addr multicast_addr (port,
                                     ACE_DEFAULT_MULTICAST_ADDR);
       // Open the datagram.
@@ -686,21 +574,21 @@ CORBA_ORB::multicast_query (char *&buf,
         }
       else
         {
-          // Convert the acceptor port into network byte order.
+          // Convert the port we're listening on into network byte
+          // order.
           ACE_UINT16 response_port =
             ACE_HTONS (my_addr.get_port_number ());
 
-          // Length of service name we will send.
+          // Length of data to be sent. This is sent as a header.
           CORBA::Short data_len =
-            ACE_HTONS (ACE_OS::strlen (service_name) + 1);
+            ACE_HTONS (sizeof (ACE_UINT16)
+                       + ACE_OS::strlen (service_name));
 
-          // Vector we will send.  It contains: 1) length of service
-          // name string, 2)port on which we are listening for
-          // replies, and 3) name of service we are looking for.
+          // Vector to be sent.
           const int iovcnt = 3;
           iovec iovp[iovcnt];
 
-          // The length of service name string.
+          // The length of data to be sent.
           iovp[0].iov_base = (char *) &data_len;
           iovp[0].iov_len  = sizeof (CORBA::Short);
 
@@ -710,7 +598,7 @@ CORBA_ORB::multicast_query (char *&buf,
 
           // The service name string.
           iovp[2].iov_base = (char *) service_name;
-          iovp[2].iov_len  = ACE_OS::strlen (service_name) + 1;
+          iovp[2].iov_len  = ACE_OS::strlen (service_name);
 
           // Send the multicast.
           result = dgram.send (iovp,
@@ -734,11 +622,11 @@ CORBA_ORB::multicast_query (char *&buf,
                             "# of bytes sent is %d.\n",
                             __FILE__,
                             result));
-              // Wait for response until timeout.
+              // Wait for response until
+              // TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT.
               ACE_Time_Value tv (timeout == 0
                                  ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
                                  : *timeout);
-
               // Accept reply connection from server.
               if (acceptor.accept (stream,
                                    0,
@@ -752,62 +640,35 @@ CORBA_ORB::multicast_query (char *&buf,
               else
                 {
                   // Receive the IOR.
-
-                  // IOR length.
-                  CORBA::Short ior_len;
-                  result = stream.recv_n (&ior_len,
-                                          sizeof ior_len,
-                                          0,
-                                          &tv);
-                  if (result != sizeof (ior_len))
-                    {
-                      ACE_ERROR ((LM_ERROR,
-                                  "%p\n",
-                                  "multicast_query: unable to receive ior length"));
-                      result = -1;
-                    }
+                  result = stream.recv (buf,
+                                        BUFSIZ,
+                                        0,
+                                        timeout);
+                  // Close socket now.
+                  stream.close ();
+
+                  // Check for errors.
+                  if (result == -1)
+                    ACE_ERROR ((LM_ERROR,
+                                "%p\n",
+                                "error reading IIOP multicast response"));
                   else
                     {
-                      // Allocate more space for the ior if we don't
-                      // have enough.
-                      ior_len = ACE_NTOHS (ior_len);
-                      if (ior_len > TAO_DEFAULT_IOR_SIZE)
-                        {
-                          buf = CORBA::string_alloc (ior_len);
-                          if (buf == 0)
-                            {
-                              ACE_ERROR ((LM_ERROR,
-                                          "%p\n",
-                                          "multicast_query: unable to allocate memory"));
-                              result = -1;
-                            }
-                        }
-
-                      if (result != -1)
-                        {
-                          // Receive the ior.
-                          result = stream.recv_n (buf,
-                                                  ior_len,
-                                                  0,
-                                                  &tv);
-                          if (result == -1)
-                            ACE_ERROR ((LM_ERROR,
-                                        "%p\n",
-                                        "error reading ior"));
-                          else if (TAO_debug_level > 0)
-                            ACE_DEBUG ((LM_DEBUG,
-                                        "%s: service resolved to IOR <%s>\n",
-                                        __FILE__,
-                                        buf));
-                        }
+                      // Null terminate message.
+                      buf[result] = 0;
+
+                      if (TAO_debug_level > 0)
+                        ACE_DEBUG ((LM_DEBUG,
+                                    "%s: service resolved to IOR <%s>\n",
+                                    __FILE__,
+                                    buf));
                     }
                 }
             }
         }
     }
 
-  // Clean up.
-  stream.close ();
+  // We don't need the dgram or acceptor anymore.
   dgram.close ();
   acceptor.close ();
 
@@ -822,49 +683,43 @@ CORBA_ORB::multicast_query (char *&buf,
 //    and we return NULL.
 
 CORBA_Object_ptr
-CORBA_ORB::multicast_to_service (const char *service_name,
+CORBA_ORB::multicast_to_service (const char * service_name,
                                  u_short port,
                                  ACE_Time_Value *timeout,
                                  CORBA::Environment& ACE_TRY_ENV)
 {
-  char buf[TAO_DEFAULT_IOR_SIZE];
-  char *ior = buf;
-  CORBA::String_var cleaner;
-
-  CORBA_Object_var return_value =
-    CORBA_Object::_nil ();
+  char buf[BUFSIZ + 1];
 
   // Use UDP multicast to locate the  service.
-  int result = this->multicast_query (ior,
-                                      service_name,
-                                      port,
-                                      timeout);
-
-  // If the IOR didn't fit into <buf>, memory for it was dynamically
-  // allocated - make sure it gets deallocated.
-  if (ior != buf)
-    cleaner = ior;
+  CORBA_Object_ptr return_value =
+    CORBA_Object::_nil ();
 
-  if (result == 0)
+  if (this->multicast_query (buf,
+                             service_name,
+                             port,
+                             timeout) == 0)
     {
       // Convert IOR to an object reference.
-      return_value =
-        this->string_to_object ((CORBA::String) ior,
+      CORBA_Object_ptr objectified_ior =
+        this->string_to_object ((CORBA::String) buf,
                                 ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_Object::_nil ());
+
+      // Check for errors.
+      if (ACE_TRY_ENV.exception () == 0)
+        return_value = objectified_ior;
     }
 
-  // Return object reference.
-  return return_value._retn ();
+  // Return ior.
+  return return_value;
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (const char *name,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                                       CORBA_Environment &TAO_IN_ENV)
 {
   return this->resolve_initial_references (name,
                                            0,
-                                           ACE_TRY_ENV);
+                                           TAO_IN_ENV);
 }
 
 CORBA_Object_ptr
@@ -883,8 +738,6 @@ CORBA_ORB::resolve_initial_references (const char *name,
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
     return this->resolve_policy_current (ACE_TRY_ENV);
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
-    return this->resolve_ior_manipulation (ACE_TRY_ENV);
 
   // Is not one of the well known services, try to find it in the
   // InitRef table....
@@ -910,11 +763,6 @@ CORBA_ORB::resolve_initial_references (const char *name,
       // Check if a DefaultInitRef was specified.
       if (ACE_OS::strlen (default_init_ref) != 0)
         {
-          // @@ This parsing code should be merged with or use the
-          //    parsing code used during MProfile creation in the
-          //    TAO_Connector base class.
-          //            -Ossama
-
           ACE_CString list_of_profiles;
 
           // Used by the strtok_r.
@@ -931,16 +779,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
                                        &lasts))
             {
               list_of_profiles += ACE_CString (str);
-
-              // Make sure that default initial reference doesn't
-              //    end with the object key delimiter character.
-
-              const char object_key_delimiter =
-                this->orb_core_->connector_registry ()->object_key_delimiter (str);
-
-              if (list_of_profiles[list_of_profiles.length() - 1] !=
-                  object_key_delimiter)
-                list_of_profiles += ACE_CString (object_key_delimiter);
+              list_of_profiles += ACE_CString ("/");
               list_of_profiles += object_id;
               list_of_profiles += ACE_CString (",");
             }
@@ -967,9 +806,6 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
     return this->resolve_trading_service (timeout, ACE_TRY_ENV);
 
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0)
-    return this->resolve_implrepo_service (timeout, ACE_TRY_ENV);
-
   else
     ACE_THROW_RETURN (CORBA::ORB::InvalidName (), 0);
 
@@ -1000,13 +836,15 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
   TAO_Stub *stub = 0;
 
   size_t pfile_count =
-    this->orb_core_->acceptor_registry ()->endpoint_count ();
+         this->orb_core_->acceptor_registry ()->endpoint_count ();
 
   // First we create a profile list, well actually the empty container
   TAO_MProfile mp (pfile_count);
 
   this->orb_core_->acceptor_registry ()->make_mprofile (key, mp);
 
+  ACE_CHECK_RETURN (stub);
+
   ACE_NEW_THROW_EX (stub,
                     TAO_Stub (id, mp, this->orb_core_),
                     CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
@@ -1021,10 +859,12 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
 CORBA::Object_ptr
 CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
                           const char *type_id,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  TAO_Stub *data = this->create_stub_object (key, type_id, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  TAO_Stub *data = this->create_stub_object (key, type_id, env);
+
+  if (env.exception () != 0)
+    return CORBA::Object::_nil ();
 
   // Create the CORBA level proxy
   CORBA_Object *new_obj = new CORBA_Object (data);
@@ -1033,7 +873,8 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
   if (CORBA::is_nil (new_obj))
     {
       data->_decr_refcnt ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
+      env.exception (new CORBA::INTERNAL ());
+      return CORBA::Object::_nil ();
     }
 
   return new_obj;
@@ -1045,51 +886,51 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
 
 CORBA_DynAny_ptr
 CORBA_ORB::create_dyn_any       (const CORBA_Any& any,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_any (any, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_any (any, env);
 }
 
 CORBA_DynAny_ptr
 CORBA_ORB::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_any (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_any (tc, env);
 }
 
 CORBA_DynStruct_ptr
 CORBA_ORB::create_dyn_struct    (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_struct (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_struct (tc, env);
 }
 
 CORBA_DynSequence_ptr
 CORBA_ORB::create_dyn_sequence  (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_sequence (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_sequence (tc, env);
 }
 
 CORBA_DynArray_ptr
 CORBA_ORB::create_dyn_array     (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_array (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_array (tc, env);
 }
 
 CORBA_DynUnion_ptr
 CORBA_ORB::create_dyn_union     (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_union (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_union (tc, env);
 }
 
 CORBA_DynEnum_ptr
 CORBA_ORB::create_dyn_enum      (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& env)
 {
-  return TAO_DynAny_i::create_dyn_enum (tc, ACE_TRY_ENV);
+  return TAO_DynAny_i::create_dyn_enum (tc, env);
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -1120,8 +961,11 @@ CORBA_String_var::CORBA_String_var (const CORBA_String_var& r)
 
 CORBA_String_var::~CORBA_String_var (void)
 {
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
+  if (this->ptr_ != 0)
+    {
+      CORBA::string_free (this->ptr_);
+      this->ptr_ = 0;
+    }
 }
 
 CORBA_String_var &
@@ -1129,7 +973,8 @@ CORBA_String_var::operator= (char *p)
 {
   if (this->ptr_ != p)
     {
-      CORBA::string_free (this->ptr_);
+      if (this->ptr_ != 0)
+        CORBA::string_free (this->ptr_);
       this->ptr_ = p;
     }
   return *this;
@@ -1138,7 +983,8 @@ CORBA_String_var::operator= (char *p)
 CORBA_String_var &
 CORBA_String_var::operator= (const char *p)
 {
-  CORBA::string_free (this->ptr_);
+  if (this->ptr_ != 0)
+    CORBA::string_free (this->ptr_);
 
   this->ptr_ = CORBA::string_dup (p);
   return *this;
@@ -1149,7 +995,8 @@ CORBA_String_var::operator= (const CORBA_String_var& r)
 {
   if (this != &r)
     {
-      CORBA::string_free (this->ptr_);
+      if (this->ptr_ != 0)
+        CORBA::string_free (this->ptr_);
       this->ptr_ = CORBA::string_dup (r.ptr_);
     }
   return *this;
@@ -1172,8 +1019,11 @@ CORBA_WString_var::CORBA_WString_var (const CORBA_WString_var& r)
 
 CORBA_WString_var::~CORBA_WString_var (void)
 {
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
+  if (this->ptr_ != 0)
+    {
+      CORBA::wstring_free (this->ptr_);
+      this->ptr_ = 0;
+    }
 }
 
 CORBA_WString_var &
@@ -1181,7 +1031,8 @@ CORBA_WString_var::operator= (CORBA::WChar *p)
 {
   if (this->ptr_ != p)
     {
-      CORBA::wstring_free (this->ptr_);
+      if (this->ptr_ != 0)
+        CORBA::wstring_free (this->ptr_);
       this->ptr_ = p;
     }
   return *this;
@@ -1190,7 +1041,8 @@ CORBA_WString_var::operator= (CORBA::WChar *p)
 CORBA_WString_var &
 CORBA_WString_var::operator= (const CORBA::WChar *p)
 {
-  CORBA::wstring_free (this->ptr_);
+  if (this->ptr_ != 0)
+    CORBA::wstring_free (this->ptr_);
 
   this->ptr_ = CORBA::wstring_dup (p);
   return *this;
@@ -1201,7 +1053,8 @@ CORBA_WString_var::operator= (const CORBA_WString_var& r)
 {
   if (this != &r)
     {
-      CORBA::wstring_free (this->ptr_);
+      if (this->ptr_ != 0)
+        CORBA::wstring_free (this->ptr_);
       this->ptr_ = CORBA::wstring_dup (r.ptr_);
     }
   return *this;
@@ -1220,10 +1073,6 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
 
   if (CORBA_ORB::orb_init_count_ == 0)
     {
-#if defined(ACE_HAS_EXCEPTIONS)
-      set_unexpected (CORBA_ORB::_tao_unexpected_exception);
-#endif /* ACE_HAS_EXCEPTIONS */
-
       // initialize the system TypeCodes
       TAO_TypeCodes::init ();
 
@@ -1273,18 +1122,6 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
   CORBA_ORB::orb_init_count_++;
 }
 
-void CORBA_ORB::_tao_unexpected_exception (void)
-{
-#if defined(ACE_HAS_EXCEPTIONS)
-  throw CORBA::UNKNOWN ();
-#else
-  // Nothing to do, this will be handled by the ORB core when sending
-  // the exception back to the client...
-#endif /* ACE_HAS_EXCEPTIONS */
-}
-
-// ****************************************************************
-
 // ORB initialisation, per OMG document 94-9-46.
 //
 
@@ -1387,8 +1224,10 @@ CORBA::ORB_init (int &argc,
 // Objref stringification.
 CORBA::String
 CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
+  env.clear ();
+
   // Application writer controls what kind of objref strings they get,
   // maybe along with other things, by how they initialize the ORB.
 
@@ -1400,6 +1239,7 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
       // XXX there should be a simple way to reuse this code in other
       // ORB implementations ...
 
+      // @@ Is BUFSIZ the right size here?
       char buf [ACE_CDR::DEFAULT_BUFSIZE];
 #if defined(ACE_HAS_PURIFY)
       (void) ACE_OS::memset (buf, '\0', sizeof(buf));
@@ -1450,10 +1290,22 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
     }
   else
     {
+      // The "internet" ORB uses readable URL style objrefs, as used
+      // in the World Wide Web.
+      //
+      // This only works for IIOP objrefs.  If we're handed an objref
+      // that's not an IIOP objref, fail -- application must use an
+      // ORB that's configured differently.  @@ Is this true? FRED
+      // @@ Need to fix!!
+
       if (obj->_stubobj () == 0)
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
+        return CORBA::string_copy ("iiop:");
+        // @@ This should be some sort of default prefix, not
+        // hardcoded to IIOP!! FRED
 
-      return obj->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
+      CORBA::String buf =
+        obj->_stubobj ()->profile_in_use ()->to_string (env);
+      return buf;
     }
 }
 
@@ -1464,18 +1316,53 @@ CORBA::Object_ptr
 CORBA_ORB::string_to_object (const char *str,
                              CORBA::Environment &ACE_TRY_ENV)
 {
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+
   if (ACE_OS::strncmp (str,
                        file_prefix,
                        sizeof file_prefix - 1) == 0)
-    return this->file_string_to_object (str + sizeof file_prefix - 1,
-                                        ACE_TRY_ENV);
+    obj = this->file_string_to_object (str + sizeof file_prefix - 1,
+                                       ACE_TRY_ENV);
   else if (ACE_OS::strncmp (str,
                             ior_prefix,
                             sizeof ior_prefix - 1) == 0)
-    return this->ior_string_to_object (str + sizeof ior_prefix - 1,
-                                       ACE_TRY_ENV);
+    obj = this->ior_string_to_object (str + sizeof ior_prefix - 1,
+                                      ACE_TRY_ENV);
   else
-    return this->url_ior_string_to_object (str, ACE_TRY_ENV);
+    {
+      TAO_MProfile mprofile (0);
+      // It is safe to declare this on the stack since the contents of
+      // mprofile get copied.  No memory is allocated for profile storage
+      // here.  The Connector Registry will determine the exact number
+      // of profiles and tell the MProfile object to allocate enough memory
+      // to hold them all.
+
+      if (this->orb_core_->connector_registry ()->make_mprofile (str,
+                                                                 mprofile,
+                                                                 ACE_TRY_ENV)
+          != 0)
+        {
+          ACE_THROW_RETURN (CORBA::INITIALIZE (), CORBA::Object::_nil ());
+        }
+
+      // Now make the TAO_Stub.
+      TAO_Stub *data;
+      ACE_NEW_RETURN (data,
+                      TAO_Stub ((char *) 0, mprofile, this->orb_core_),
+                      CORBA::Object::_nil ());
+
+      // Create the CORBA level proxy.
+      TAO_ServantBase *servant = this->_get_collocated_servant (data);
+
+      // This will increase the ref_count on data by one
+      ACE_NEW_RETURN (obj,
+                      CORBA_Object (data,
+                                    servant,
+                                    servant != 0),
+                      CORBA::Object::_nil ());
+    }
+
+  return obj;
 }
 
 // ****************************************************************
@@ -1614,67 +1501,6 @@ CORBA_ORB::file_string_to_object (const char* filename,
   return object;
 }
 
-// Convert an URL style IOR in an object
-
-CORBA::Object_ptr
-CORBA_ORB::url_ior_string_to_object (const char* str,
-                                     CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  TAO_MProfile mprofile;
-  // It is safe to declare this on the stack since the contents of
-  // mprofile get copied.  No memory is allocated for profile storage
-  // here.  The Connector Registry will determine the exact number
-  // of profiles and tell the MProfile object to allocate enough memory
-  // to hold them all.
-
-  int retv =
-    this->orb_core_->connector_registry ()->make_mprofile (str,
-                                                           mprofile,
-                                                           ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
-
-  if (retv != 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        CORBA::Object::_nil ());
-    }
-
-  // Now make the TAO_Stub.
-  TAO_Stub *data = 0;
-  ACE_NEW_THROW_EX (data,
-                    TAO_Stub ((char *) 0, mprofile, this->orb_core_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    this->_get_collocated_servant (data,
-                                   servant);
-
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  // Create the CORBA level proxy.  This will increase the ref_count
-  // on data by one
-  ACE_NEW_THROW_EX (obj,
-                    CORBA_Object (data,
-                                  servant,
-                                  collocated),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return obj;
-}
-
 // ****************************************************************
 
 void
@@ -1689,17 +1515,20 @@ CORBA_ORB::_optimize_collocation_objects (void) const
   return this->orb_core_->optimize_collocation_objects ();
 }
 
-TAO_SERVANT_LOCATION
-CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj,
-                                    TAO_ServantBase *&servant)
+TAO_ServantBase *
+CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
 {
+  // ACE_DEBUG ((LM_DEBUG, "CORBA_ORB: get_collocated_servant\n"));
+
   if (sobj == 0 || !this->_optimize_collocation_objects ())
-    return TAO_SERVANT_NOT_FOUND;
+    return 0;
+
+  // @@EXC@@ We should receive the <env> from the command line.
 
   // @@ What about forwarding.  Which this approach we are never forwarded
   //    when we use collocation!
 
-  const TAO_MProfile &mprofile = sobj->get_base_profiles ();
+  CORBA::Environment ACE_TRY_ENV;
 
   if (this->orb_core_->use_global_collocation ())
     {
@@ -1708,82 +1537,92 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj,
       //    then we need to use that lock in the ORB_init() function.
 
       ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), TAO_SERVANT_NOT_FOUND));
+                                *ACE_Static_Object_Lock::instance (), 0));
 
-      TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-      TAO_ORB_Table::Iterator end = table->end ();
+      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_SERVANT_LOCATION servant_location =
-            this->_find_collocated_servant (sobj,
-                                            (*i).int_id_,
-                                            servant,
-                                            mprofile);
-          if (servant_location != TAO_SERVANT_NOT_FOUND)
-            return servant_location;
-        }
 
-      // If we don't find one by this point, we return 0.
-      return TAO_SERVANT_NOT_FOUND;
+          const TAO_MProfile& mprofile = sobj->get_base_profiles ();
+          if ((*i).int_id_->is_collocated (mprofile) == 0)
+            continue;
+
+          TAO_Object_Adapter *oa = (*i).int_id_->object_adapter ();
+
+          for (TAO_PHandle j = 0;
+               j != mprofile.profile_count ();
+               ++j)
+            {
+              const TAO_Profile* profile = mprofile.get_profile (j);
+              TAO_ObjectKey_var objkey = profile->_key ();
+              ACE_CHECK_RETURN (0);
+
+              ACE_TRY
+                {
+                  PortableServer::Servant servant =
+                    oa->find_servant (objkey.in (), ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
+
+                  // Found collocated object.  Perhaps we can get around by simply
+                  // setting the servant_orb, but let get this to work first.
+                  sobj->servant_orb (CORBA::ORB::_duplicate ((*i).int_id_->orb ()));
+                  return servant;
+                }
+              ACE_CATCHANY
+                {
+                  // Ignore the exception and continue with the
+                  // next one.
+                }
+              ACE_ENDTRY;
+            }
+        }
     }
   else
     {
-      return this->_find_collocated_servant (sobj,
-                                             this->orb_core_,
-                                             servant,
-                                             mprofile);
-    }
-}
-
-TAO_SERVANT_LOCATION
-CORBA_ORB::_find_collocated_servant (TAO_Stub *sobj,
-                                     TAO_ORB_Core *orb_core,
-                                     TAO_ServantBase *&servant,
-                                     const TAO_MProfile &mprofile)
-{
-  if (!orb_core->is_collocated (mprofile))
-    return TAO_SERVANT_NOT_FOUND;
+      const TAO_MProfile& mprofile = sobj->get_base_profiles ();
+      if (!this->orb_core_->is_collocated (mprofile))
+        return 0;
 
-  TAO_Object_Adapter *oa = orb_core->object_adapter ();
+      // @@ Ossama: there is repeated code here, could you please
+      // move it to a routine....
 
-  for (TAO_PHandle j = 0;
-       j != mprofile.profile_count ();
-       ++j)
-    {
-      const TAO_Profile *profile = mprofile.get_profile (j);
-      TAO_ObjectKey_var objkey = profile->_key ();
+      TAO_Object_Adapter *oa = this->orb_core_->object_adapter ();
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      for (TAO_PHandle j = 0;
+           j != mprofile.profile_count ();
+           ++j)
         {
-          TAO_SERVANT_LOCATION servant_location =
-            oa->find_servant (objkey.in (),
-                              servant,
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          const TAO_Profile* profile = mprofile.get_profile (j);
+          TAO_ObjectKey_var objkey = profile->_key ();
+          ACE_CHECK_RETURN (0);
 
-          if (servant_location != TAO_SERVANT_NOT_FOUND)
+          ACE_TRY_EX(LOCAL_ORB)
             {
-              // Found collocated object.  Perhaps we can get around
-              // by simply setting the servant_orb, but let get this
-              // to work first.
+              PortableServer::Servant servant =
+                oa->find_servant (objkey.in (), ACE_TRY_ENV);
+              ACE_TRY_CHECK_EX(LOCAL_ORB);
 
-              // There could only be one ORB which is us.
-              sobj->servant_orb (CORBA::ORB::_duplicate (orb_core->orb ()));
+              // Found collocated object.  Perhaps we can get around by simply
+              // setting the servant_orb, but let get this to work first.
 
-              return servant_location;
+              // There could only be one ORB which is us.
+              sobj->servant_orb (CORBA::ORB::_duplicate (this));
+              return servant;
             }
+          ACE_CATCHANY
+            {
+              // Ignore the exception and continue with the
+              // next one.
+            }
+          ACE_ENDTRY;
         }
-      ACE_CATCHANY
-        {
-          // Ignore the exception and continue with the next one.
-        }
-      ACE_ENDTRY;
     }
 
-  return TAO_SERVANT_NOT_FOUND;
+  return 0;
 }
 
 // ****************************************************************
@@ -1921,7 +1760,7 @@ CORBA_ORB::unregister_value_factory (const char * /* repository_id */,
 
 CORBA::ValueFactory_ptr
 CORBA_ORB::lookup_value_factory (const char *repository_id,
-                                 CORBA_Environment &)
+                                 CORBA_Environment &ACE_TRY_ENV)
 {
 // %! guard
 // do _add_ref here not in map->find
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 52ca6484f3a..50f91ef38ab 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -24,7 +24,6 @@
 #include "tao/Exception.h"
 #include "tao/IOR_LookupTable.h"
 #include "tao/Services.h"
-#include "tao/IORManipulation.h"
 
 // IRIX needs this for the throw specs
 #include "tao/PolicyC.h"
@@ -51,10 +50,12 @@ typedef enum
 # pragma option -a                // BC++, use 1 byte alignment
 #endif
 
-// = Forward declarations.
-class TAO_MProfile;
+// Forward declarations of some data types are needed.
+
 class TAO_POA_Manager;
 class TAO_POA_Policies;
+
+// =Forward declarations
 struct TAO_Dispatch_Context;
 class TAO_Operation_Table;
 class TAO_Client_Strategy_Factory;
@@ -62,16 +63,23 @@ class TAO_Server_Strategy_Factory;
 class TAO_ORB_Parameters;
 class TAO_InputCDR;
 class TAO_OutputCDR;
+
+// Forward declaration and typedefs for the exception thrown by
+// the ORB Dynamic Any factory functions.
 class CORBA_ORB_InconsistentTypeCode;
-class TAO_ServantBase;
-class TAO_Stub;
+typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
+typedef CORBA_ORB_InconsistentTypeCode *InconsistentTypeCode_ptr;
 
 #ifdef TAO_HAS_VALUETYPE
 class TAO_ValueFactory_Map;
 #endif /* TAO_HAS_VALUETYPE */
 
-typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
-typedef CORBA_ORB_InconsistentTypeCode *InconsistentTypeCode_ptr;
+
+// The new (POA) base class for servants.
+class TAO_ServantBase;
+
+class TAO_Stub;
+// Forward declarations.
 
 class TAO_Export CORBA_String_var
 {
@@ -308,16 +316,11 @@ public:
   {
   public:
     InvalidName (void);
-    InvalidName (const InvalidName &);
-    ~InvalidName (void);
-    InvalidName &operator= (const InvalidName &);
 
     virtual void _raise (void);
-    static InvalidName* _narrow (CORBA_Exception *ex);
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
+    InvalidName* _narrow (CORBA_Exception *ex);
+    virtual int _is_a (const char* interface_id) const;
   };
-  static CORBA::TypeCode_ptr _tc_InvalidName;
 
   typedef char *ObjectId;
   typedef CORBA::String_var ObjectId_var;
@@ -446,25 +449,25 @@ public:
   // @@EXC@@ Add the ACE_THROW_SPEC for these functions...
 
   CORBA_DynAny_ptr       create_dyn_any       (const CORBA_Any& any,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynAny_ptr       create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynStruct_ptr    create_dyn_struct    (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynSequence_ptr  create_dyn_sequence  (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynArray_ptr     create_dyn_array     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynUnion_ptr     create_dyn_union     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 
   CORBA_DynEnum_ptr      create_dyn_enum      (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               CORBA::Environment &TAO_IN_ENV);
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   int run (void);
@@ -491,17 +494,17 @@ public:
   // @@EXC@@ Add the ACE_THROW_SPEC for these two functions
 
   CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               CORBA_Environment &ACE_TRY_ENV =
+                                               CORBA_Environment &TAO_IN_ENV =
                                                TAO_default_environment ());
 
   CORBA_Object_ptr resolve_initial_references (const char *name,
                                                ACE_Time_Value *timeout,
-                                               CORBA_Environment &ACE_TRY_ENV =
+                                               CORBA_Environment &TAO_IN_ENV =
                                                TAO_default_environment ());
   // This method acts as a mini-bootstrapping Naming Service, which is
-  // provided by the ORB for certain well-known object references.  TAO
-  // supports the "NameService", "TradingService", "RootPOA", "ImplRepo",
-  // and "POACurrent" via this method.  The <timeout> value bounds the
+  // provided by the ORB for certain well-known object references.
+  // TAO supports the "NameService", "TradingService", "RootPOA", and
+  // "POACurrent" via this method.  The <timeout> value bounds the
   // amount of time the ORB blocks waiting to resolve the service.
   // This is most useful for bootstrapping remote services, such as
   // the "NameService" or "TradingService", that are commonly resolved
@@ -512,7 +515,7 @@ public:
   // <resolve_initial_references> specification.
 
   // Unimplemented function - throws CORBA::NO_IMPLEMENT.
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &ACE_TRY_ENV =
+  CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &TAO_IN_ENV =
                                                     TAO_default_environment ());
 
 #if defined(TAO_HAS_CORBA_MESSAGING)
@@ -527,8 +530,7 @@ public:
   // = TAO-specific extensions to the CORBA specification.
   // ----------------------------------------------------------------
 
-  virtual TAO_SERVANT_LOCATION _get_collocated_servant (TAO_Stub *p,
-                                                        TAO_ServantBase *&servant);
+  virtual TAO_ServantBase *_get_collocated_servant (TAO_Stub *p);
   // Return the object pointer of an collocated object it there is
   // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
   // must implement this and determine what is a collocated object
@@ -542,7 +544,7 @@ public:
                                       CORBA::Object_ptr &obj);
   // Find the given ObjectID in the table.
 
-  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV,
+  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &TAO_IN_ENV,
                                      const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
                                      TAO_POA_Manager *poa_manager = 0,
                                      const TAO_POA_Policies *policies = 0);
@@ -550,13 +552,13 @@ public:
 
   TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
                                 const char *type_id,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Makes sure that the ORB is open and then creates an IIOP object
   // based on the endpoint.
 
   CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
                                   const char *type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Convert key into an object reference.  Return Object_ptr as out
   // parameter.  Errors will come through the environment.
   //
@@ -580,7 +582,7 @@ public:
   // previously-specified port for requests.  Returns -1 on failure,
   // else 0.
 
-  static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static void init_orb_globals (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Initialize the ORB globals correctly, i.e., only when they
   // haven't been initialized yet.
 
@@ -588,10 +590,6 @@ public:
   // Indicates if we have reached a point where all ORB owned
   // resources will be deallocated.
 
-  // The function used by tao to handle the "unexpected" exceptions,
-  // It raises CORBA::UNKNOWN.
-  static void _tao_unexpected_exception (void);
-
   // Reference counting...
   virtual CORBA::ULong _incr_refcnt (void);
   virtual CORBA::ULong _decr_refcnt (void);
@@ -626,13 +624,7 @@ protected:
   CORBA_ORB (TAO_ORB_Core *orb_core);
   virtual ~CORBA_ORB (void);
 
-  TAO_SERVANT_LOCATION _find_collocated_servant (TAO_Stub *sobj,
-                                                 TAO_ORB_Core *orb_core,
-                                                 TAO_ServantBase *& servant,
-                                                 const TAO_MProfile &mprofile);
-  // Check if local servant exists for <mprofile> in <orb_core>.
-
-  CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV);
+  CORBA_Object_ptr resolve_poa_current (CORBA_Environment &TAO_IN_ENV);
   // Resolve the POA current.
 
   CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
@@ -640,9 +632,6 @@ protected:
   CORBA_Object_ptr resolve_policy_current (CORBA::Environment&);
   // Resolve the Policy Current for this thread.
 
-  CORBA_Object_ptr resolve_ior_manipulation (CORBA::Environment&);
-  // Resolve the IOR Manipulation reference for this ORB.
-
   int run (ACE_Time_Value *tv,
            int break_on_timeouts);
   // Implements the run routine
@@ -658,11 +647,7 @@ private:
                                             CORBA::Environment& ACE_TRY_ENV);
   // Resolve the trading object reference.
 
-  CORBA_Object_ptr resolve_implrepo_service (ACE_Time_Value *timeout,
-                                             CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the Implementation Repository object reference.
-
-  int multicast_query (char* &buf,
+  int multicast_query (char *buf,
                        const char *service_name,
                        u_short port,
                        ACE_Time_Value *timeout);
@@ -674,20 +659,17 @@ private:
                                          u_short port,
                                          ACE_Time_Value *timeout,
                                          CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the reference of a service of type <name>.
+  // Resolve the refernce of a service of type <name>.
 
   CORBA::Object_ptr file_string_to_object (const char* filename,
-                                           CORBA::Environment &ACE_TRY_ENV);
+                                           CORBA::Environment& env);
   // Read an IOR from a file and then parse it, returning the object
   // reference.
 
   CORBA::Object_ptr ior_string_to_object (const char* ior,
-                                          CORBA::Environment &ACE_TRY_ENV);
-  // Convert an OMG IOR into an object reference.
-
-  CORBA::Object_ptr url_ior_string_to_object (const char* ior,
-                                              CORBA::Environment &ACE_TRY_ENV);
-  // Convert an URL style IOR into an object reference.
+                                          CORBA::Environment& env);
+  // Read an IOR from a file and then parse it, returning the object
+  // reference.
 
 private:
   ACE_SYNCH_MUTEX lock_;
@@ -726,10 +708,6 @@ private:
   // If this is non-_nil(), then this is the object reference to our
   // configured Trading.
 
-  CORBA_Object_ptr implrepo_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Implementation Repository.
-
   static int orb_init_count_;
   // Count of the number of times that <ORB_init> has been called.
   // This must be protected by <ACE_Static_Object_Lock>.
@@ -745,10 +723,6 @@ private:
   TAO_IOR_LookupTable lookup_table_;
   // Table of ObjectID->IOR mappings.
 
-  TAO_IOR_Manipulation_impl ior_manipulation_;
-  // object used for manipulation profiles in an object reference, that
-  // is an IOR.
-
   CORBA::Boolean use_omg_ior_format_;
   // Decides whether to use the URL notation or to use IOR notation.
 
@@ -799,17 +773,6 @@ private:
   CORBA::ORB_ptr &ptr_;
 };
 
-extern TAO_Export void
-operator<<= (CORBA::Any &, const CORBA::ORB::InvalidName &);
-extern TAO_Export void
-operator<<= (CORBA::Any &, CORBA::ORB::InvalidName*);
-extern TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &, CORBA::ORB::InvalidName *&);
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, const CORBA::ORB::InvalidName &);
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::ORB::InvalidName &);
-
 #if defined (__ACE_INLINE__)
 # include "tao/ORB.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 70997a34cb9..4f168cbd2f4 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -44,7 +44,7 @@ TAO_default_environment ()
 
 // ****************************************************************
 
-TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
+TAO_ORB_Core::TAO_ORB_Core (const char* orbid)
   : connector_registry_ (0),
     acceptor_registry_ (0),
     protocol_factories_ (0),
@@ -118,6 +118,7 @@ TAO_ORB_Core::add_to_ior_table (ACE_CString init_ref,
 
   // Add the objectID-IOR to the table and return the status.
   return table.add_ior (object_id, ior);
+
 }
 
 int
@@ -149,7 +150,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // Be certain to copy the program name so that service configurator
   // has something to skip!
   ACE_Arg_Shifter arg_shifter (argc, argv);
-  const char *argv0 = "";
+  const char* argv0 = "";
   if (argc > 0 && argv != 0)
     argv0 = argv[0];
   svc_config_argv[svc_config_argc++] = CORBA::string_dup (argv0);
@@ -205,12 +206,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // Trading Service port used for Multicast
   u_short ts_port = 0;
 
-  // Implementation Repository Service IOR string.
-  ACE_CString ir_ior;
-
-  // Implementation Repository Service port #.
-  u_short ir_port = 0;
-
   // Buffer sizes for kernel socket buffers
   // @@ should be a default defined for each protocol implementation?
   //    since we may have protocols loaded which use shared memory of
@@ -349,12 +344,12 @@ TAO_ORB_Core::init (int &argc, char *argv[])
       else if (ACE_OS::strcasecmp (current_arg,
                                    "-ORBHost") == 0)
         {
-          // @@ This option now has the same effect as specifying
-          //    an extra -ORBendpoint.  Ideally, this option
-          //    should be removed so that all INET specific
-          //    stuff can be removed from the ORB core but I
-          //    guess we need to leave it here for backward
-          //    compatibility.  C'est la vie.
+          // @@ Fred&Carlos: This option now has the same effect as specifying
+          //                 an extra -ORBendpoint.  Ideally, this option
+          //                 should be removed so that all INET specific
+          //                 stuff can be removed from the ORB core but I
+          //                 guess we need to leave it here for backward
+          //                 compatibility.  C'est la vie.
 
           old_style_endpoint = 1;
           // Specify the name of the host (i.e., interface) on which
@@ -365,8 +360,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           // may be dropped in future releases.
 
           ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) \nWARNING: The `-ORBHost' option is obsolete.\n"
-                      "In the future, use the `-ORBEndpoint' option.\n"));
+                      "(%P|%t) \nWARNING: The `-ORBhost' option is obsolete.\n"
+                      "In the future, use the `-ORBendpoint' option.\n"));
 
           if (arg_shifter.is_parameter_next())
             {
@@ -424,30 +419,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
       else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBImplRepoIOR") == 0)
-        {
-          // Specify the IOR of the Implementation Repository
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ir_ior = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBImplRepoPort") == 0)
-        {
-          // Specify the multicast port number for the Implementation Repository.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ir_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
                                    "-ORBPort") == 0)
         {
           // Issue a warning since this backward compatibilty support
@@ -524,7 +495,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
-              char *opt = arg_shifter.get_current ();
+              char* opt = arg_shifter.get_current ();
               if (ACE_OS::strcasecmp (opt,
                                       "URL") == 0)
                 use_ior = 0;
@@ -543,19 +514,12 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           if (arg_shifter.is_parameter_next ())
             {
               char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0 ||
-                  ACE_OS::strcasecmp (opt, "global") == 0)
-                {
-                  this->opt_for_collocation_ = 1;
-                  this->use_global_collocation_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
+              if (ACE_OS::strcasecmp (opt,
+                                      "YES") == 0)
+                this->opt_for_collocation_ = 1;
+              else if (ACE_OS::strcasecmp (opt,
+                                           "NO") == 0)
                 this->opt_for_collocation_ = 0;
-              else if (ACE_OS::strcasecmp (opt, "per-orb") == 0)
-                {
-                  this->opt_for_collocation_ = 1;
-                  this->use_global_collocation_ = 0;
-                }
 
               arg_shifter.consume_arg ();
             }
@@ -578,6 +542,10 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
+      // @@ Ossama: could you add this option to the Options.html
+      //    file?  And could you also remove from the .html file the
+      //    stuff we took out of the default server strategy factory
+      //    and the default resource factory?
       else if (ACE_OS::strcasecmp (current_arg,
                                    "-ORBGlobalCollocation") == 0)
         // Specify whether we want to use collocation across ORBs;
@@ -585,9 +553,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
         // calls.
         {
           arg_shifter.consume_arg ();
-          ACE_DEBUG ((LM_DEBUG,
-                      "Warning: -ORBGlobalCollocation option is obsolete."
-                      "  Please use '-ORBCollocation global/per-orb/no' instead.\n"));
           if (arg_shifter.is_parameter_next ())
             {
               char *opt = arg_shifter.get_current ();
@@ -638,7 +603,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
 
                   ACE_DEBUG ((LM_WARNING,
                               "(%P|%t) \nWARNING: The `host:port' pair style "
-                              "for `-ORBPreconnect' is obsolete.\n"
+                              "for `-ORBpreconnect' is obsolete.\n"
                               "In the future, use the URL style.\n"));
 
                   preconnections =
@@ -703,7 +668,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
                                    "-ORBInitRef") == 0)
         {
           arg_shifter.consume_arg ();
-
           if (arg_shifter.is_parameter_next ())
             {
               init_ref = arg_shifter.get_current ();
@@ -848,14 +812,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   else
     this->use_tss_resources_ = use_tss_resources;
 
-  ACE_Reactor *reactor = this->reactor ();
-
+  (void) this->reactor ();
   // Make sure the reactor is initialized...
-  if (reactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to initialize reactor"),
-                      -1);
 
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
 
@@ -914,8 +872,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   this->orb_params ()->name_service_port (ns_port);
   this->orb_params ()->trading_service_ior (ts_ior);
   this->orb_params ()->trading_service_port (ts_port);
-  this->orb_params ()->implrepo_service_ior (ir_ior);
-  this->orb_params ()->implrepo_service_port (ir_port);
   this->orb_params ()->use_dotted_decimal_addresses (dotted_decimal_addresses);
   if (rcv_sock_size != 0)
     this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
@@ -1075,7 +1031,7 @@ TAO_ORB_Core::resource_factory (void)
                     "(%P|%t) WARNING - No Resource Factory found in Service Repository."
                     "  Using default instance with GLOBAL resource source specifier.\n"));
 
-      TAO_Default_Resource_Factory *default_factory;
+      TAO_Default_Resource_Factory* default_factory;
       ACE_NEW_RETURN (default_factory,
                       TAO_Default_Resource_Factory,
                       0);
@@ -1189,7 +1145,7 @@ TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resour
   if (tss_resources->reactor_ != 0)
     {
       // We'll use the spawning thread's reactor.
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
       if (tss->reactor_ != 0 && TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -1421,7 +1377,7 @@ TAO_ORB_Core::input_cdr_dblock_allocator (void)
 {
   if (this->use_tss_resources_)
     {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
 
       if (tss->input_cdr_dblock_allocator_ == 0)
         {
@@ -1450,7 +1406,7 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void)
 {
   if (this->use_tss_resources_)
     {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
 
       if (tss->input_cdr_buffer_allocator_ == 0)
         {
@@ -1481,7 +1437,7 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void)
   if (this->use_tss_resources_)
 #endif /* 0 */
     {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
 
       if (tss->output_cdr_buffer_allocator_ == 0)
         {
@@ -1514,7 +1470,7 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void)
   if (this->use_tss_resources_)
 #endif /* 0 */
     {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
 
       if (tss->output_cdr_buffer_allocator_ == 0)
         {
@@ -1592,7 +1548,7 @@ TAO_ORB_Core::reactor (void)
 {
   if (this->use_tss_resources_)
     {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
 
       if (tss->reactor_ == 0)
         {
@@ -1629,7 +1585,7 @@ TAO_ORB_Core::default_environment (void) const
 }
 
 void
-TAO_ORB_Core::default_environment (CORBA_Environment *env)
+TAO_ORB_Core::default_environment (CORBA_Environment* env)
 {
   TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
 }
@@ -1712,7 +1668,6 @@ TAO_TSS_Resources::~TAO_TSS_Resources (void)
 // ****************************************************************
 
 TAO_ORB_Table::TAO_ORB_Table (void)
-  : first_orb_ (0)
 {
 }
 
@@ -1740,76 +1695,56 @@ TAO_ORB_Table::end (void)
 }
 
 int
-TAO_ORB_Table::bind (const char *orb_id,
-                     TAO_ORB_Core *orb_core)
+TAO_ORB_Table::bind (const char* orb_id,
+                     TAO_ORB_Core* orb_core)
 {
-  if (this->first_orb_ == 0)
-    {
-      this->first_orb_ = orb_core;
-    }
   ACE_CString id (orb_id);
   return this->table_.bind (id, orb_core);
 }
 
 TAO_ORB_Core*
-TAO_ORB_Table::find (const char *orb_id)
+TAO_ORB_Table::find (const char* orb_id)
 {
-  TAO_ORB_Core *found = 0;
+  TAO_ORB_Core* found = 0;
   ACE_CString id (orb_id);
   this->table_.find (id, found);
   return found;
 }
 
 int
-TAO_ORB_Table::unbind (const char *orb_id)
+TAO_ORB_Table::unbind (const char* orb_id)
 {
   ACE_CString id (orb_id);
-  TAO_ORB_Core *orb_core;
-  int result = this->table_.unbind (id, orb_core);
-  if (result == 0)
-    {
-      if (orb_core == this->first_orb_)
-        {
-          Iterator begin = this->begin ();
-          Iterator end = this->end ();
-          if (begin != end)
-            this->first_orb_ = (*begin).int_id_;
-        }
-    }
-  return result;
+  return this->table_.unbind (id);
 }
 
 // ****************************************************************
 
+// This function exists because of Win32's proclivity for expanding
+// templates at link time.  Since DLLs are just executables, templates
+// get expanded and instantiated at link time.  Thus, if there are
+// references to the same template in an application AND in a DLL,
+// you're screwed.  Using this function, we workaround this by
+// insuring that everybody ALWAYS accesses the same instantiation.
+//
+// There's room for optimizations by making this inline for the ORB
+// core and non-inlined elsewhere, but that can be done later--after
+// it works.
+
 TAO_Export TAO_ORB_Core *
 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 ();
-  if (orb_table->first_orb () == 0)
+  TAO_ORB_Table* orb_table = TAO_ORB_Table::instance ();
+  TAO_ORB_Table::Iterator begin = orb_table->begin ();
+  TAO_ORB_Table::Iterator end = orb_table->end ();
+  if (begin == end)
     {
-      ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), 0));
-
-      if (orb_table->first_orb () == 0)
-        {
-          int argc = 0;
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              (void) CORBA::ORB_init (argc, 0, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // @@ What should we do here?
-            }
-          ACE_ENDTRY;
-        }
+      int argc = 0;
+      return CORBA::ORB_init (argc, 0, 0)->orb_core_;
     }
-
-  return orb_table->first_orb ();
+  return (*begin).int_id_;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2cdb22b9f3a..b4e58b68cbb 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -92,7 +92,7 @@ public:
   // (potentially) TSS object.
 
   int is_server_thread_;
-  // Is this thread a server for this ORB?
+  // Is this thread a leader for this ORB?
 
   int is_leader_thread_;
   // Is this thread a leader for this ORB?
@@ -245,11 +245,11 @@ public:
   ACE_Thread_Manager *thr_mgr (void);
 
   // = Set/get <rootPOA>.
-  TAO_POA *root_poa (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (),
+  TAO_POA *root_poa (CORBA::Environment &TAO_IN_ENV = TAO_default_environment (),
                      const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
                      TAO_POA_Manager *poa_manager = 0,
                      const TAO_POA_Policies *policies = 0);
-  PortableServer::POA_ptr root_poa_reference (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (),
+  PortableServer::POA_ptr root_poa_reference (CORBA::Environment &TAO_IN_ENV = TAO_default_environment (),
                                               const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
                                               TAO_POA_Manager *poa_manager = 0,
                                               const TAO_POA_Policies *policies = 0);
@@ -432,7 +432,7 @@ protected:
   void create_and_set_root_poa (const char *adapter_name,
                                 TAO_POA_Manager *poa_manager,
                                 const TAO_POA_Policies *policies,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                CORBA::Environment &TAO_IN_ENV);
   // Initialize the root POA.
 
   TAO_Object_Adapter *object_adapter_i (void);
@@ -644,9 +644,6 @@ public:
   int unbind (const char* orb_id);
   // The canonical ACE_Map methods.
 
-  TAO_ORB_Core *first_orb (void);
-  // Obtain the first ORB for the ORB_Core_instance() implementation
-
   static TAO_ORB_Table* instance (void);
   // Return a unique instance
 
@@ -658,9 +655,6 @@ protected:
 private:
   Table table_;
   // The implementation.
-
-  TAO_ORB_Core *first_orb_;
-  // The first ORB created by the user
 };
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 150c55df3e9..35fa3afbf75 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -295,14 +295,8 @@ TAO_Leader_Follower::reverse_lock (void)
 
 // ****************************************************************
 
-ACE_INLINE TAO_ORB_Table *
+ACE_INLINE TAO_ORB_Table*
 TAO_ORB_Table::instance (void)
 {
-  return ACE_Singleton<TAO_ORB_Table, ACE_SYNCH_MUTEX>::instance ();
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Table::first_orb (void)
-{
-  return this->first_orb_;
+  return ACE_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX>::instance ();
 }
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index d182f37deb9..e37d3ecdd28 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -158,15 +158,15 @@ CORBA_Object::_hash (CORBA::ULong maximum,
 
 CORBA::Boolean
 CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                              CORBA::Environment &)
-    ACE_THROW_SPEC (())
+                              CORBA::Environment &ACE_TRY_ENV)
 {
   if (other_obj == this)
     {
+      //      env.clear ();
       return 1;
     }
 
-  return this->_stubobj ()->is_equivalent (other_obj);
+  return this->_stubobj ()->is_equivalent (other_obj, ACE_TRY_ENV);
 }
 
 // TAO's extensions
@@ -534,18 +534,12 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
   if (objdata == 0)
     return 0;
 
-  // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    objdata->orb_core ()->orb ()->_get_collocated_servant (objdata,
-                                                           servant);
+  // Create a new CORBA_Object and give it the TAO_Stub just
+  // created.
+  TAO_ServantBase *servant =
+    objdata->orb_core ()->orb ()->_get_collocated_servant (objdata);
 
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  // Create a new CORBA_Object and give it the TAO_Stub just created.
-  ACE_NEW_RETURN (x, CORBA_Object (objdata, servant, collocated), 0);
+  ACE_NEW_RETURN (x, CORBA_Object (objdata, servant, servant != 0), 0);
 
   // the corba proxy would have already incremented the reference count on
   // the objdata. So we decrement it here by 1 so that the objdata is now
@@ -563,13 +557,13 @@ TAO_Object_Field::~TAO_Object_Field (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Object_Field_T<CORBA_Object,CORBA_Object_var>;
+template class TAO_Object_Field_T<CORBA_Object>;
 template class auto_ptr<TAO_MProfile>;
 template class ACE_Auto_Basic_Ptr<TAO_MProfile>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Object_Field_T<CORBA_Object,CORBA_Object_var>
+#pragma instantiate TAO_Object_Field_T<CORBA_Object>
 #pragma instantiate auto_ptr<TAO_MProfile>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_MProfile>
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index e187b48c89b..d849643c321 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -43,7 +43,7 @@ public:
   // return a NUL object
 
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-                                   CORBA_Environment &ACE_TRY_ENV =
+                                   CORBA_Environment &TAO_IN_ENV =
                                      TAO_default_environment ());
   // no-op it is just here to simplify some templates.
 
@@ -54,7 +54,7 @@ public:
   // appropriate.
 
   virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                   TAO_default_environment ());
   // determine if we are of the type specified by the "logical_type_id"
 
@@ -70,16 +70,16 @@ public:
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
+  virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV =
                                           TAO_default_environment ());
 
   virtual CORBA::ImplementationDef_ptr
-      _get_implementation (CORBA_Environment &ACE_TRY_ENV =
+      _get_implementation (CORBA_Environment &TAO_IN_ENV =
                              TAO_default_environment ());
   // This method is deprecated in the CORBA 2.2 spec, we just return 0
   // every time.
 
-  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &ACE_TRY_ENV =
+  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV =
                                                     TAO_default_environment ());
 
   // Interface repository related operations.
@@ -96,7 +96,7 @@ public:
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                   TAO_default_environment ());
 
   virtual void _create_request (CORBA::Context_ptr ctx,
@@ -107,7 +107,7 @@ public:
                                 CORBA::ContextList_ptr ctxtlist,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                   TAO_default_environment ());
 
   // The default implementation of this method uses the same simple,
@@ -115,7 +115,7 @@ public:
   // calls above ... that's how it can have a default implementation.
 
   virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                         TAO_default_environment ());
   // DII operation to create a request.
 
@@ -151,7 +151,7 @@ public:
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &ACE_TRY_ENV =
+                              CORBA_Environment &TAO_IN_ENV =
                                 TAO_default_environment ());
   // Return a (potentially non-unique) hash value for this object.
   // This method relies on the representation of the object
@@ -160,15 +160,14 @@ public:
   // implementation.
 
   virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ())
-    ACE_THROW_SPEC (());
+                                         CORBA_Environment &TAO_IN_ENV =
+                                           TAO_default_environment ());
   // Try to determine if this object is the same as <other_obj>.  This
   // method relies on the representation of the object reference's
   // private state.  Since that changes easily (when different ORB
   // protocols are in use) there is no default implementation.
 
-  virtual TAO_ObjectKey *_key (CORBA_Environment &ACE_TRY_ENV =
+  virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV =
                                  TAO_default_environment ());
   // Return the object key as an out parameter.  Caller should release
   // return value when finished with it.
@@ -298,7 +297,7 @@ public:
   // destructor
 
   virtual void _downcast (CORBA_Object* base_ptr,
-                          CORBA_Environment &ACE_TRY_ENV =
+                          CORBA_Environment &TAO_IN_ENV =
                             TAO_default_environment ()) = 0;
   virtual CORBA_Object* _upcast (void) = 0;
   virtual void _release (void) = 0;
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
index 33614335dcc..ae80c983132 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -13,6 +13,8 @@
 
 ACE_RCSID(tao, POA, "$Id$")
 
+////////////////////////////////////////////////////////////////////////////////
+
 // Timeprobes class
 #include "tao/Timeprobe.h"
 
@@ -61,8 +63,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+////////////////////////////////////////////////////////////////////////////////
+
 /* static */
-size_t TAO_Object_Adapter::transient_poa_name_size_ = 0;
+size_t TAO_Object_Adapter::transient_poa_name_size_ (0);
 
 void
 TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
@@ -72,17 +76,19 @@ TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Facto
       switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
         {
         case TAO_LINEAR:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
+
+          TAO_Object_Adapter::transient_poa_name_size_ = sizeof (CORBA::ULong);
           break;
+
         case TAO_DYNAMIC_HASH:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
+
+          TAO_Object_Adapter::transient_poa_name_size_ = sizeof (CORBA::ULong);
           break;
+
         case TAO_ACTIVE_DEMUX:
         default:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            ACE_Active_Map_Manager_Key::size ();
+
+          TAO_Object_Adapter::transient_poa_name_size_ = ACE_Active_Map_Manager_Key::size ();
           break;
         }
     }
@@ -107,12 +113,15 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
   Hint_Strategy *hint_strategy = 0;
   if (creation_parameters.use_active_hint_in_poa_names_)
-    ACE_NEW (hint_strategy,
-             Active_Hint_Strategy (creation_parameters.poa_map_size_));
+    {
+      ACE_NEW (hint_strategy,
+               Active_Hint_Strategy (creation_parameters.poa_map_size_));
+    }
   else
-    ACE_NEW (hint_strategy,
-             No_Hint_Strategy);
-
+    {
+      ACE_NEW (hint_strategy,
+               No_Hint_Strategy);
+    }
   // Give ownership to the auto pointer.
   auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
 
@@ -122,11 +131,14 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
   switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
     {
     case TAO_LINEAR:
+
       ACE_NEW (ppnm,
                persistent_poa_name_linear_map (creation_parameters.poa_map_size_));
       break;
+
     case TAO_DYNAMIC_HASH:
     default:
+
       ACE_NEW (ppnm,
                persistent_poa_name_hash_map (creation_parameters.poa_map_size_));
       break;
@@ -138,15 +150,20 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
   switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
     {
     case TAO_LINEAR:
+
       ACE_NEW (tpm,
                transient_poa_linear_map (creation_parameters.poa_map_size_));
       break;
+
     case TAO_DYNAMIC_HASH:
+
       ACE_NEW (tpm,
                transient_poa_hash_map (creation_parameters.poa_map_size_));
       break;
+
     case TAO_ACTIVE_DEMUX:
     default:
+
       ACE_NEW (tpm,
                transient_poa_active_map (creation_parameters.poa_map_size_));
       break;
@@ -154,12 +171,9 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
   // Give ownership to the auto pointer.
   auto_ptr<transient_poa_map> new_transient_poa_map (tpm);
 
-  this->hint_strategy_ =
-    new_hint_strategy.release ();
-  this->persistent_poa_name_map_ =
-    new_persistent_poa_name_map.release ();
-  this->transient_poa_map_ =
-    new_transient_poa_map.release ();
+  this->hint_strategy_ = new_hint_strategy.release ();
+  this->persistent_poa_name_map_ = new_persistent_poa_name_map.release ();
+  this->transient_poa_map_ = new_transient_poa_map.release ();
 }
 
 TAO_Object_Adapter::~TAO_Object_Adapter (void)
@@ -167,6 +181,7 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void)
   delete this->hint_strategy_;
   delete this->persistent_poa_name_map_;
   delete this->transient_poa_map_;
+
   delete this->lock_;
 }
 
@@ -178,18 +193,22 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 #if defined (ACE_HAS_THREADS)
   if (enable_locking)
     {
-      ACE_Lock *the_lock;
+      ACE_Lock *the_lock = 0;
+
       ACE_NEW_RETURN (the_lock,
                       ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (thread_lock),
                       0);
+
       return the_lock;
     }
 #endif /* ACE_HAS_THREADS */
 
-  ACE_Lock *the_lock;
+  ACE_Lock *the_lock = 0;
+
   ACE_NEW_RETURN (the_lock,
                   ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                   0);
+
   return the_lock;
 }
 
@@ -276,7 +295,9 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
   }
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
+    {
+      ACE_THROW (CORBA::OBJ_ADAPTER ());
+    }
 
   {
     ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
@@ -291,7 +312,9 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
   }
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    {
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    }
 }
 
 int
@@ -319,10 +342,14 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 
   TAO_POA *parent = this->orb_core_.root_poa ();
   if (parent->name () != *iterator)
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      -1);
+    {
+      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                        -1);
+    }
   else
-    ++iterator;
+    {
+      ++iterator;
+    }
 
   for (;
        iterator != end;
@@ -369,12 +396,16 @@ TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
                               poa_name_out system_name)
 {
   if (poa->persistent ())
-    return this->bind_persistent_poa (folded_name,
-                                      poa,
-                                      system_name);
+    {
+      return this->bind_persistent_poa (folded_name,
+                                        poa,
+                                        system_name);
+    }
   else
-    return this->bind_transient_poa (poa,
-                                     system_name);
+    {
+      return this->bind_transient_poa (poa,
+                                       system_name);
+    }
 }
 
 int
@@ -383,10 +414,14 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
                                 const poa_name &system_name)
 {
   if (poa->persistent ())
-    return this->unbind_persistent_poa (folded_name,
-                                        system_name);
+    {
+      return this->unbind_persistent_poa (folded_name,
+                                          system_name);
+    }
   else
-    return this->unbind_transient_poa (system_name);
+    {
+      return this->unbind_transient_poa (system_name);
+    }
 }
 
 int
@@ -403,30 +438,28 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key,
   ACE_CHECK_RETURN (-1);
 
   PortableServer::Servant servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    poa->locate_servant_i (id,
-                           servant,
-                           ACE_TRY_ENV);
+  TAO_POA::LOCATION_RESULT result = poa->locate_servant_i (id,
+                                                           servant,
+                                                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  switch (servant_location)
+  switch (result)
     {
-    case TAO_SERVANT_FOUND:
+    case TAO_POA::FOUND:
       // Optimistic attitude
-    case TAO_DEFAULT_SERVANT:
-    case TAO_SERVANT_MANAGER:
+    case TAO_POA::DEFAULT_SERVANT:
+    case TAO_POA::SERVANT_MANAGER:
       return 0;
 
-    case TAO_SERVANT_NOT_FOUND:
+    case TAO_POA::NOT_FOUND:
       return -1;
     }
 
   return -1;
 }
 
-TAO_SERVANT_LOCATION
+PortableServer::Servant
 TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
-                                    PortableServer::Servant &servant,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
   PortableServer::ObjectId id;
@@ -436,16 +469,30 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
                     id,
                     poa,
                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+  ACE_CHECK_RETURN (0);
+
+  PortableServer::Servant servant = 0;
+  TAO_POA::LOCATION_RESULT result = poa->locate_servant_i (id,
+                                                           servant,
+                                                           ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
 
-  TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant,
-                                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+  switch (result)
+    {
+    case TAO_POA::FOUND:
+      return servant;
+
+    case TAO_POA::DEFAULT_SERVANT:
+    case TAO_POA::SERVANT_MANAGER:
+    case TAO_POA::NOT_FOUND:
+      return 0;
+    }
 
-  return servant_location;
+  return 0;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
 {
 }
@@ -456,6 +503,8 @@ TAO_Object_Adapter::Hint_Strategy::object_adapter (TAO_Object_Adapter *oa)
   this->object_adapter_ = oa;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map_size)
   : persistent_poa_system_map_ (map_size)
 {
@@ -478,8 +527,8 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &s
     {
       result = this->persistent_poa_system_map_.find (system_name,
                                                       poa);
-      if (result != 0
-          || folded_name != poa->folded_name ())
+      if (result != 0 ||
+          folded_name != poa->folded_name ())
         {
           result = this->object_adapter_->persistent_poa_name_map_->find (folded_name,
                                                                           poa);
@@ -507,16 +556,19 @@ TAO_Object_Adapter::Active_Hint_Strategy::bind_persistent_poa (const poa_name &f
 
   if (result == 0)
     {
-      result =
-        this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                               poa);
+      result = this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
+                                                                      poa);
 
       if (result != 0)
-        this->persistent_poa_system_map_.unbind (name);
+        {
+          this->persistent_poa_system_map_.unbind (name);
+        }
       else
-        ACE_NEW_RETURN (system_name,
-                        poa_name (name),
-                        -1);
+        {
+          ACE_NEW_RETURN (system_name,
+                          poa_name (name),
+                          -1);
+        }
     }
 
   return result;
@@ -529,12 +581,15 @@ TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa (const poa_name
   int result = this->persistent_poa_system_map_.unbind (system_name);
 
   if (result == 0)
-    result =
-      this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
+    {
+      result = this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
+    }
 
   return result;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 {
 }
@@ -548,10 +603,9 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &syste
                                                                       poa);
   if (result != 0)
     {
-      result =
-        this->object_adapter_->activate_poa (system_name,
-                                             poa,
-                                             ACE_TRY_ENV);
+      result = this->object_adapter_->activate_poa (system_name,
+                                                    poa,
+                                                    ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -563,13 +617,15 @@ TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (const poa_name &folde
                                                            TAO_POA *poa,
                                                            poa_name_out system_name)
 {
-  int result =
-    this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                           poa);
+  int result = this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
+                                                                      poa);
   if (result == 0)
-    ACE_NEW_RETURN (system_name,
-                    poa_name (folded_name),
-                    -1);
+    {
+      ACE_NEW_RETURN (system_name,
+                      poa_name (folded_name),
+                      -1);
+    }
+
   return result;
 }
 
@@ -582,6 +638,8 @@ TAO_Object_Adapter::No_Hint_Strategy::unbind_persistent_poa (const poa_name &fol
   return this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::poa_name_iterator::poa_name_iterator (int begin,
                                                           CORBA::ULong size,
                                                           const CORBA::Octet *folded_buffer)
@@ -595,7 +653,9 @@ TAO_Object_Adapter::poa_name_iterator::poa_name_iterator (int begin,
       this->operator++ ();
     }
   else
-    this->position_ = this->size_;
+    {
+      this->position_ = this->size_;
+    }
 }
 
 int
@@ -618,9 +678,9 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const
     TAO_POA::name_separator_length ();
 
   CORBA::ULong how_many =
-    this->position_
-    - this->last_separator_
-    - TAO_POA::name_separator_length ();
+    this->position_ -
+    this->last_separator_ -
+    TAO_POA::name_separator_length ();
 
   return ACE_CString (ACE_reinterpret_cast (const char *,
                                             &this->folded_buffer_[start_at]),
@@ -630,23 +690,29 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const
 TAO_Object_Adapter::poa_name_iterator &
 TAO_Object_Adapter::poa_name_iterator::operator++ (void)
 {
-  for (this->last_separator_ = this->position_;
-       ;
-       )
+  this->last_separator_ = this->position_;
+
+  while (1)
     {
       ++this->position_;
       if (this->position_ < this->size_)
         {
           if (this->folded_buffer_[this->position_] == TAO_POA::name_separator ())
-            break;
+            {
+              break;
+            }
         }
       else
-        break;
+        {
+          break;
+        }
     }
 
   return *this;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name (const poa_name &folded_name)
   : folded_name_ (folded_name)
 {
@@ -668,6 +734,8 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const
                    this->folded_name_.get_buffer ());
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::Non_Servant_Upcall::Non_Servant_Upcall (TAO_Object_Adapter &object_adapter)
   : object_adapter_ (object_adapter)
 {
@@ -690,28 +758,25 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
   this->object_adapter_.non_servant_upcall_in_progress_ = 0;
 
   // Reset thread id.
-  this->object_adapter_.non_servant_upcall_thread_ =
-    ACE_OS::NULL_thread;
+  this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::NULL_thread;
 
   // If locking is enabled.
   if (this->object_adapter_.enable_locking_)
-    // Wakeup all waiting threads.
-    this->object_adapter_.non_servant_upcall_condition_.broadcast ();
+    {
+      // Wakeup all waiting threads.
+      this->object_adapter_.non_servant_upcall_condition_.broadcast ();
+    }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_Object_Adapter &object_adapter)
   : object_adapter_ (object_adapter),
     poa_ (0),
     servant_ (0),
     state_ (INITIAL_STAGE),
     id_ (),
-    current_context_ (),
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-    cookie_ (0),
-    operation_ (0),
-#endif /* TAO_HAS_MINIMUM_CORBA */
-    active_object_map_entry_ (0),
-    using_servant_locator_ (0)
+    current_context_ ()
 {
 }
 
@@ -723,8 +788,10 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // Acquire the object adapter lock first.
   int result = this->object_adapter_.lock ().acquire ();
   if (result == -1)
-    // Locking error.
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
+    {
+      // Locking error.
+      ACE_THROW (CORBA::OBJ_ADAPTER ());
+    }
 
   // We have acquired the object adapater lock.  Record this for later
   // use.
@@ -733,8 +800,18 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  this->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
-  ACE_CHECK;
+  while (this->object_adapter_.enable_locking_ &&
+         this->object_adapter_.non_servant_upcall_in_progress_ &&
+         ! ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
+                              ACE_OS::thr_self ()))
+    {
+      // If so wait...
+      result = this->object_adapter_.non_servant_upcall_condition_.wait ();
+      if (result == -1)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
 
   // Locate the POA.
   this->object_adapter_.locate_poa (key,
@@ -750,7 +827,8 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // Setup current for this request.
   this->current_context_.setup (this->poa_,
                                 key,
-                                0);
+                                0,
+                                operation);
 
   // We have setup the POA Current.  Record this for later use.
   this->state_ = POA_CURRENT_SETUP;
@@ -761,8 +839,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
     // Lookup the servant.
     this->servant_ = this->poa_->locate_servant_i (operation,
                                                    this->id_,
-                                                   *this,
-                                                   this->current_context_,
+                                                   &this->current_context_,
                                                    ACE_TRY_ENV);
     ACE_CHECK;
   }
@@ -784,14 +861,36 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // use.
   this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
 
-  // Lock servant (if appropriate).
-  this->single_threaded_poa_setup (ACE_TRY_ENV);
-  ACE_CHECK;
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+  // Lock servant (if necessary).
+  //
+  // Note that this lock must be acquired *after* the object adapter
+  // lock has been released.  This is necessary since we cannot block
+  // waiting for the servant lock while holding the object adapter
+  // lock.  Otherwise, the thread that wants to release this lock will
+  // not be able to do so since it can't acquire the object adapterx
+  // lock.
+  //
+  if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
+    {
+      result = this->servant_->_single_threaded_poa_lock ().acquire ();
+
+      if (result == -1)
+        {
+          // Locking error.
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
   // We have acquired the servant lock.  Record this for later use.
   this->state_ = SERVANT_LOCK_ACQUIRED;
 
+  //
   // After this point, <this->servant_> is ready for dispatching.
+  //
 }
 
 TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
@@ -799,15 +898,18 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
   switch (this->state_)
     {
     case SERVANT_LOCK_ACQUIRED:
-      // Unlock servant (if appropriate).
-      this->single_threaded_poa_cleanup ();
-      /* FALLTHRU */
+
+      // Since the servant lock was acquired, we must release it.
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+      if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
+        {
+          this->servant_->_single_threaded_poa_lock ().release ();
+        }
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+      /** Fall through **/
 
     case OBJECT_ADAPTER_LOCK_RELEASED:
-      // Cleanup servant locator related state.  Note that because
-      // this operation does not change any Object Adapter related
-      // state, it is ok to call it outside the lock.
-      this->servant_locator_cleanup ();
 
       // Since the object adapter lock was released, we must acquire
       // it.
@@ -816,24 +918,42 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
       // with it.
       this->object_adapter_.lock ().acquire ();
 
-      // Cleanup servant related state.
-      this->servant_cleanup ();
-
-      // Cleanup POA related state.
-      this->poa_cleanup ();
-      /* FALLTHRU */
+      {
+        // Decrease <poa->outstanding_requests_> now that the upcall
+        // is complete.
+        //
+        // Note that the object adapter lock is acquired before
+        // <POA::outstanding_requests_> is increased.
+        CORBA::ULong outstanding_requests =
+          this->poa_->decrement_outstanding_requests ();
+
+        // If locking is enabled and some thread is waiting in POA::destroy.
+        if (this->object_adapter_.enable_locking_ &&
+            outstanding_requests == 0 &&
+            this->poa_->wait_for_completion_pending_)
+          {
+            // Wakeup all waiting threads.
+            this->poa_->outstanding_requests_condition_.broadcast ();
+          }
+      }
+
+      /** Fall through **/
 
     case POA_CURRENT_SETUP:
+
       // Teardown current for this request.
       this->current_context_.teardown ();
-      /* FALLTHRU */
+
+      /** Fall through **/
 
     case OBJECT_ADAPTER_LOCK_ACQUIRED:
+
       // Finally, since the object adapter lock was acquired, we must
       // release it.
       this->object_adapter_.lock ().release ();
 
-      /* FALLTHRU */
+      /** Fall through **/
+
     case INITIAL_STAGE:
     default:
       // @@ Keep compiler happy, the states above are the only
@@ -842,54 +962,81 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
     }
 }
 
+// ****************************************************************
+
+TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
+  : poa_impl_ (0),
+    object_id_ (),
+    object_key_ (0),
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+    cookie_ (0),
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+    servant_ (0),
+    operation_ (0),
+    previous_current_impl_ (0),
+    active_object_map_entry_ (0),
+    setup_done_ (0)
+{
+}
+
 void
-TAO_Object_Adapter::Servant_Upcall::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current_Impl::setup (TAO_POA *impl,
+                             const TAO_ObjectKey &key,
+                             PortableServer::Servant servant,
+                             const char *operation)
 {
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  while (this->object_adapter_.enable_locking_ &&
-         this->object_adapter_.non_servant_upcall_in_progress_ &&
-         ! ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
-                              ACE_OS::thr_self ()))
-    {
-      // If so wait...
-      int result =
-        this->object_adapter_.non_servant_upcall_condition_.wait ();
-      if (result == -1)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
+  // Remember information about this upcall.
+  this->poa_impl_ = impl;
+  this->object_key_ = &key;
+  this->servant_ = servant;
+  this->operation_ = operation;
+
+  // Set the current context and remember the old one.
+  TAO_TSS_Resources *tss =
+    TAO_TSS_RESOURCES::instance ();
+
+  this->previous_current_impl_ = tss->poa_current_impl_;
+  tss->poa_current_impl_ = this;
+
+  // Setup is complete.
+  this->setup_done_ = 1;
 }
 
 void
-TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
+TAO_POA_Current_Impl::teardown (void)
 {
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-  if (this->using_servant_locator_)
+  if (this->cookie_ != 0)
     {
-      // If we are a single threaded POA, teardown the appropriate
-      // locking in the servant.
-      //
-      // Note that teardown of the servant lock must happen before the
-      // post_invoke() call since that might end up deleting the
-      // servant.
-      //
-      this->poa_->teardown_servant_lock (this->servant_);
+      // 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->poa_impl_->orb_core_.object_adapter ());
+      ACE_UNUSED_ARG (non_servant_upcall);
 
       ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      ACE_TRY_EX (LOCATOR)
         {
-          PortableServer::POA_var poa = this->poa_->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (),
-                                                    poa.in (),
-                                                    this->operation_,
-                                                    this->cookie_,
-                                                    this->servant_,
-                                                    ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          PortableServer::POA_var poa = this->get_POA (ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (LOCATOR);
+
+          this->poa_impl_->servant_locator_->postinvoke (this->object_id (),
+                                                         poa.in (),
+                                                         this->operation_,
+                                                         this->cookie_,
+                                                         this->servant_,
+                                                         ACE_TRY_ENV);
+          ACE_TRY_CHECK_EX (LOCATOR);
         }
       ACE_CATCHANY
         {
@@ -899,46 +1046,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
     }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // Lock servant (if necessary).
-  //
-  // Note that this lock must be acquired *after* the object adapter
-  // lock has been released.  This is necessary since we cannot block
-  // waiting for the servant lock while holding the object adapter
-  // lock.  Otherwise, the thread that wants to release this lock will
-  // not be able to do so since it can't acquire the object adapterx
-  // lock.
-  if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      int result = this->servant_->_single_threaded_poa_lock ().acquire ();
-
-      if (result == -1)
-        // Locking error.
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_cleanup (void)
-{
-  // Since the servant lock was acquired, we must release it.
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    this->servant_->_single_threaded_poa_lock ().release ();
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
-{
   // Cleanup servant related stuff.
   if (this->active_object_map_entry_ != 0)
     {
@@ -947,19 +1055,13 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
 
       if (new_count == 0)
         {
-          if (this->poa_->waiting_servant_deactivation_ > 0)
-            {
-              // Wakeup all waiting threads.
-              this->poa_->servant_deactivation_condition_.broadcast ();
-            }
-
           ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          ACE_TRY_EX (SERVANT)
             {
-              this->poa_->cleanup_servant (this->active_object_map_entry_,
-                                           ACE_TRY_ENV);
+              this->poa_impl_->cleanup_servant (this->active_object_map_entry_,
+                                                ACE_TRY_ENV);
 
-              ACE_TRY_CHECK;
+              ACE_TRY_CHECK_EX (SERVANT);
             }
           ACE_CATCHANY
             {
@@ -968,69 +1070,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
           ACE_ENDTRY;
         }
     }
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
-{
-  // Decrease <poa->outstanding_requests_> now that the upcall
-  // is complete.
-  //
-  // Note that the object adapter lock is acquired before
-  // <POA::outstanding_requests_> is increased.
-  CORBA::ULong outstanding_requests =
-    this->poa_->decrement_outstanding_requests ();
-
-  // Check if all pending requests are over.
-  if (outstanding_requests == 0)
-    {
-      // If locking is enabled and some thread is waiting in POA::destroy.
-      if (this->object_adapter_.enable_locking_ &&
-          this->poa_->wait_for_completion_pending_)
-        // Wakeup all waiting threads.
-        this->poa_->outstanding_requests_condition_.broadcast ();
-      if (this->poa_->waiting_destruction_)
-        {
-          delete this->poa_;
-          this->poa_ = 0;
-        }
-    }
-}
 
-TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
-  : poa_ (0),
-    object_id_ (),
-    object_key_ (0),
-    servant_ (0),
-    previous_current_impl_ (0),
-    setup_done_ (0)
-{
-}
-
-void
-TAO_POA_Current_Impl::setup (TAO_POA *p,
-                             const TAO_ObjectKey &key,
-                             PortableServer::Servant servant)
-{
-  // Remember information about this upcall.
-  this->poa_ = p;
-  this->object_key_ = &key;
-  this->servant_ = servant;
-
-  // Set the current context and remember the old one.
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  this->previous_current_impl_ = tss->poa_current_impl_;
-  tss->poa_current_impl_ = this;
-
-  // Setup is complete.
-  this->setup_done_ = 1;
-}
-
-void
-TAO_POA_Current_Impl::teardown (void)
-{
   if (this->setup_done_)
     {
       TAO_TSS_Resources *tss =
@@ -1044,7 +1084,7 @@ TAO_POA_Current_Impl::teardown (void)
 PortableServer::POA_ptr
 TAO_POA_Current_Impl::get_POA (CORBA::Environment &ACE_TRY_ENV)
 {
-  PortableServer::POA_var result = this->poa_->_this (ACE_TRY_ENV);
+  PortableServer::POA_var result = this->poa_impl_->_this (ACE_TRY_ENV);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return result._retn ();
@@ -1060,17 +1100,22 @@ TAO_POA_Current_Impl::get_object_id (CORBA::Environment &)
 TAO_ORB_Core &
 TAO_POA_Current_Impl::orb_core (void) const
 {
-  return this->poa_->orb_core_;
+  return this->poa_impl_->orb_core_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 PortableServer::POA_ptr
 TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_POA_Current_Impl *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
+    {
+      ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                        0);
+    }
+
   return impl->get_POA (ACE_TRY_ENV);
 }
 
@@ -1080,8 +1125,11 @@ TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
   TAO_POA_Current_Impl *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
+    {
+      ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                        0);
+    }
+
   return impl->get_object_id (ACE_TRY_ENV);
 }
 
@@ -1102,6 +1150,8 @@ TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
   return old;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 // Common typedefs.
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h
index 60e33b58535..8abf1f6a62b 100644
--- a/TAO/tao/Object_Adapter.h
+++ b/TAO/tao/Object_Adapter.h
@@ -89,6 +89,7 @@ class TAO_Export TAO_POA_Current_Impl
   //     insure that all <set_*> operations are performed in the
   //     execution thread so that the proper <TAO_POA_Current> pointer
   //     is obtained from TSS.
+
 public:
 
   friend class TAO_POA;
@@ -103,10 +104,10 @@ public:
   // the guise of multiple object ids.  This has _out semantics Raises
   // the <CORBA::NoContext> exception.
 
-  void poa (TAO_POA *);
+  void POA_impl (TAO_POA *impl);
   // Set the POA implementation.
 
-  TAO_POA *poa (void) const;
+  TAO_POA *POA_impl (void) const;
   // Get the POA imeplemantation
 
   TAO_ORB_Core &orb_core (void) const;
@@ -130,6 +131,22 @@ public:
   PortableServer::Servant servant (void) const;
   // Get the servant for the current upcall.
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+  PortableServer::ServantLocator::Cookie locator_cookie (void) const;
+  // Get the Servant Locator's cookie
+
+  void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
+  // Set the Servant Locator's cookie
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+  void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
+  // Set the <active_object_map_entry>.
+
+  TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
+  // Get the <active_object_map_entry>.
+
   TAO_POA_Current_Impl (void);
   // Convenience constructor combining construction & initialization.
 
@@ -138,11 +155,12 @@ public:
 
   void setup (TAO_POA *impl,
               const TAO_ObjectKey &key,
-              PortableServer::Servant servant);
+              PortableServer::Servant servant,
+              const char *operation);
   // Setup the current.
 
 protected:
-  TAO_POA *poa_;
+  TAO_POA *poa_impl_;
   // The POA implementation invoking an upcall
 
   PortableServer::ObjectId object_id_;
@@ -153,12 +171,26 @@ protected:
   const TAO_ObjectKey *object_key_;
   // The object key of the current context.
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+  PortableServer::ServantLocator::Cookie cookie_;
+  // Servant Locator's cookie
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
   PortableServer::Servant servant_;
   // The servant for the current upcall.
 
+  const char *operation_;
+  // Operation name for this current.
+
   TAO_POA_Current_Impl *previous_current_impl_;
   // Current previous from <this>.
 
+  TAO_Active_Object_Map::Map_Entry *active_object_map_entry_;
+  // Pointer to the entry in the TAO_Active_Object_Map corresponding
+  // to the servant for this request.
+
   int setup_done_;
   // Is setup complete?
 
@@ -195,9 +227,8 @@ public:
   int locate_servant (const TAO_ObjectKey &key,
                       CORBA_Environment &ACE_TRY_ENV);
 
-  TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
-                                     PortableServer::Servant &servant,
-                                     CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::Servant find_servant (const TAO_ObjectKey &key,
+                                        CORBA_Environment &ACE_TRY_ENV);
 
   int find_poa (const poa_name &system_name,
                 CORBA::Boolean activate_it,
@@ -241,9 +272,8 @@ protected:
   int locate_servant_i (const TAO_ObjectKey &key,
                         CORBA_Environment &ACE_TRY_ENV);
 
-  TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
-                                       PortableServer::Servant &servant,
-                                       CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::Servant find_servant_i (const TAO_ObjectKey &key,
+                                          CORBA_Environment &ACE_TRY_ENV);
 
   void dispatch_servant_i (const TAO_ObjectKey &key,
                            CORBA::ServerRequest &req,
@@ -536,8 +566,6 @@ public:
     //     adapter's lock held.
   public:
 
-    friend class TAO_POA;
-
     Servant_Upcall (TAO_Object_Adapter &object_adapter);
     // Constructor.
 
@@ -561,40 +589,7 @@ public:
     PortableServer::Servant servant (void) const;
     // Servant accessor.
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    PortableServer::ServantLocator::Cookie locator_cookie (void) const;
-    // Get the Servant Locator's cookie
-
-    void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
-    // Set the Servant Locator's cookie
-
-    const char *operation (void) const;
-    // Get the operation name.
-
-    void operation (const char *);
-    // Set the operation name.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
-    // Set the <active_object_map_entry>.
-
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
-    // Get the <active_object_map_entry>.
-
-    void using_servant_locator (void);
-    // We are using the servant locator for this upcall.
-
   protected:
-
-    void wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV);
-    void servant_locator_cleanup (void);
-    void single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV);
-    void single_threaded_poa_cleanup (void);
-    void servant_cleanup (void);
-    void poa_cleanup (void);
-
     TAO_Object_Adapter &object_adapter_;
 
     TAO_POA *poa_;
@@ -616,23 +611,6 @@ public:
 
     TAO_POA_Current_Impl current_context_;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    PortableServer::ServantLocator::Cookie cookie_;
-    // Servant Locator's cookie
-
-    const char *operation_;
-    // Operation name for this current.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry_;
-    // Pointer to the entry in the TAO_Active_Object_Map corresponding
-    // to the servant for this request.
-
-    int using_servant_locator_;
-    // Are we using the servant locator?
-
   private:
     Servant_Upcall (const Servant_Upcall &);
     void operator= (const Servant_Upcall &);
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i
index 0b74301bc99..856d91fbf77 100644
--- a/TAO/tao/Object_Adapter.i
+++ b/TAO/tao/Object_Adapter.i
@@ -36,7 +36,7 @@ TAO_Object_Adapter::deactivate (CORBA::Boolean wait_for_completion,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->deactivate_i (wait_for_completion,
                       ACE_TRY_ENV);
@@ -47,22 +47,20 @@ TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1, ACE_TRY_ENV);
 
   return this->locate_servant_i (key,
                                  ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_SERVANT_LOCATION
+ACE_INLINE PortableServer::Servant
 TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
-                                  PortableServer::Servant &servant,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), TAO_SERVANT_NOT_FOUND);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->find_servant_i (key,
-                               servant,
                                ACE_TRY_ENV);
 }
 
@@ -165,64 +163,18 @@ TAO_Object_Adapter::Servant_Upcall::id (void) const
   return this->id_;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE PortableServer::ServantLocator::Cookie
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (void) const
-{
-  return this->cookie_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
-{
-  this->cookie_ = cookie;
-}
-
-ACE_INLINE const char *
-TAO_Object_Adapter::Servant_Upcall::operation (void) const
-{
-  return this->operation_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::operation (const char *name)
-{
-  this->operation_ = name;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry)
-{
-  this->active_object_map_entry_ = entry;
-}
-
-ACE_INLINE TAO_Active_Object_Map::Map_Entry *
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (void) const
-{
-  return this->active_object_map_entry_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::using_servant_locator (void)
-{
-  this->using_servant_locator_ = 1;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 ACE_INLINE void
-TAO_POA_Current_Impl::poa (TAO_POA *p)
+TAO_POA_Current_Impl::POA_impl (TAO_POA *impl)
 {
-  this->poa_ = p;
+  this->poa_impl_ = impl;
 }
 
 ACE_INLINE TAO_POA *
-TAO_POA_Current_Impl::poa (void) const
+TAO_POA_Current_Impl::POA_impl (void) const
 {
-  return this->poa_;
+  return this->poa_impl_;
 }
 
 ACE_INLINE void
@@ -260,3 +212,31 @@ TAO_POA_Current_Impl::servant (void) const
 {
   return this->servant_;
 }
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
+ACE_INLINE PortableServer::ServantLocator::Cookie
+TAO_POA_Current_Impl::locator_cookie (void) const
+{
+  return this->cookie_;
+}
+
+ACE_INLINE void
+TAO_POA_Current_Impl::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
+{
+  this->cookie_ = cookie;
+}
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+ACE_INLINE void
+TAO_POA_Current_Impl::active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry)
+{
+  this->active_object_map_entry_ = entry;
+}
+
+ACE_INLINE TAO_Active_Object_Map::Map_Entry *
+TAO_POA_Current_Impl::active_object_map_entry (void) const
+{
+  return this->active_object_map_entry_;
+}
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index d464bb3de11..a25d7f44e8d 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -9,7 +9,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Environment.h"
 #include "tao/Exception.h"
-#include "tao/debug.h"
 
 // Forwarding Servant class
 #include "tao/Forwarding_Servant.h"
@@ -65,10 +64,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     etherealize_objects_ (1),
     outstanding_requests_ (0),
     outstanding_requests_condition_ (thread_lock),
-    wait_for_completion_pending_ (0),
-    waiting_destruction_ (0),
-    servant_deactivation_condition_ (thread_lock),
-    waiting_servant_deactivation_ (0)
+    wait_for_completion_pending_ (0)
 {
   // Set the folded name of this POA.
   this->set_folded_name ();
@@ -282,7 +278,7 @@ TAO_POA::find_POA (const char *adapter_name,
                    CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   // A recursive thread lock without using a recursive thread
   // lock.  Non_Servant_Upcall has a magic constructor and
@@ -435,17 +431,8 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
                                   ACE_TRY_ENV);
   ACE_CHECK;
 
-  // If there are no outstanding requests.
-  if (this->outstanding_requests_ == 0)
-    {
-      // Commit suicide
-      delete this;
-    }
-  else
-    {
-      // Mark that we are ready for destruction.
-      this->waiting_destruction_ = 1;
-    }
+  // Commit suicide
+  delete this;
 }
 
 int
@@ -596,78 +583,6 @@ TAO_POA::set_servant_i (PortableServer::Servant servant,
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-int
-TAO_POA::is_servant_in_map (PortableServer::Servant servant)
-{
-  while (1)
-    {
-      int deactivated = 0;
-      int servant_in_map =
-        this->active_object_map ().is_servant_in_map (servant,
-                                                      deactivated);
-
-      if (!servant_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "(%t) TAO_POA::is_servant_in_map: waiting for servant to deactivate\n"));
-
-              ++this->waiting_servant_deactivation_;
-
-              this->servant_deactivation_condition_.wait ();
-
-              --this->waiting_servant_deactivation_;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-}
-
-int
-TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id)
-{
-  while (1)
-    {
-      int deactivated = 0;
-      int user_id_in_map =
-        this->active_object_map ().is_user_id_in_map (id,
-                                                      deactivated);
-
-      if (!user_id_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "(%t) TAO_POA::is_user_id_in_map: waiting for servant to deactivate\n"));
-
-              ++this->waiting_servant_deactivation_;
-
-              this->servant_deactivation_condition_.wait ();
-
-              --this->waiting_servant_deactivation_;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-}
-
 PortableServer::ObjectId *
 TAO_POA::activate_object_i (PortableServer::Servant servant,
                             CORBA::Environment &ACE_TRY_ENV)
@@ -685,7 +600,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
   // already in the Active Object Map, the ServantAlreadyActive
   // exception is raised.
   if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->is_servant_in_map (servant))
+      this->active_object_map ().is_servant_in_map (servant))
     {
       ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
                         0);
@@ -696,7 +611,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
   // Object Map. The Object Id is returned.
   PortableServer::ObjectId_var user_id;
   if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                         user_id.out ()) != 0)
+                                                                         user_id.out ()) == -1)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                         0);
@@ -750,7 +665,7 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // If the CORBA object denoted by the Object Id value is already
   // active in this POA (there is a servant bound to it in the Active
   // Object Map), the ObjectAlreadyActive exception is raised.
-  if (is_user_id_in_map (id))
+  if (this->active_object_map ().is_user_id_in_map (id))
     {
       ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
     }
@@ -759,7 +674,7 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // the Active Object Map, the ServantAlreadyActive exception is
   // raised.
   if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->is_servant_in_map (servant))
+      this->active_object_map ().is_servant_in_map (servant))
     {
       ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
     }
@@ -767,7 +682,7 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // Otherwise, the activate_object_with_id operation enters an
   // association between the specified Object Id and the specified
   // servant in the Active Object Map.
-  if (this->active_object_map ().bind_using_user_id (servant, id) != 0)
+  if (this->active_object_map ().bind_using_user_id (servant, id) == -1)
     {
       ACE_THROW (CORBA::OBJ_ADAPTER ());
     }
@@ -869,16 +784,12 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
   for (TAO_Active_Object_Map::user_id_map::iterator iter
          = this->active_object_map ().user_id_map_->begin ();
        iter != end;
-       ++iter)
+       ++iter, ++counter)
     {
       TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
       TAO_Active_Object_Map::Map_Entry *active_object_map_entry = map_pair.second ();
 
-      if (!active_object_map_entry->deactivated_)
-        {
-          ids[counter] = active_object_map_entry->user_id_;
-          ++counter;
-        }
+      ids[counter] = active_object_map_entry->user_id_;
     }
 
   for (size_t i = 0;
@@ -1119,7 +1030,7 @@ TAO_POA::create_reference_i (const char *intf,
   // invoking POA::reference_to_id with the created reference.
   PortableServer::ObjectId_var system_id;
   if (this->active_object_map ().bind_using_system_id_returning_system_id (0,
-                                                                           system_id.out ()) != 0)
+                                                                           system_id.out ()) == -1)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                         CORBA::Object::_nil ());
@@ -1164,7 +1075,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
   // the applicable policies.
   PortableServer::ObjectId_var system_id;
   if (this->active_object_map ().find_system_id_using_user_id (user_id,
-                                                               system_id.out ()) != 0)
+                                                               system_id.out ()) == -1)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                         CORBA::Object::_nil ());
@@ -1214,11 +1125,11 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
   if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
     {
       // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we have the UNIQUE_ID policy and we are not in the active
+      // or we xhave the UNIQUE_ID policy and we are not in the active
       // object map.
       PortableServer::ObjectId_var user_id;
       if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                             user_id.out ()) != 0)
+                                                                             user_id.out ()) == -1)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                             0);
@@ -1286,7 +1197,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
       // object map.
       PortableServer::ObjectId_var system_id;
       if (this->active_object_map ().bind_using_system_id_returning_system_id (servant,
-                                                                               system_id.out ()) != 0)
+                                                                               system_id.out ()) == -1)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                             0);
@@ -1390,12 +1301,12 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
         }
 
       // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
       // Find user id from system id.
       PortableServer::ObjectId user_id;
       if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) != 0)
+                                                                   user_id) == -1)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                             0);
@@ -1442,7 +1353,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
       // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
       PortableServer::Servant result = this->default_servant_.in ();
       if (result != 0)
@@ -1518,13 +1429,13 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
     }
 
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   // The object denoted by the reference does not have to be active
   // for this operation to succeed.
   PortableServer::ObjectId_var user_id;
   if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               user_id.out ()) != 0)
+                                                               user_id.out ()) == -1)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                         0);
@@ -1646,7 +1557,7 @@ TAO_POA::forward_object_i (const PortableServer::ObjectId &oid,
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-TAO_SERVANT_LOCATION
+TAO_POA::LOCATION_RESULT
 TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
                            PortableServer::Servant &servant,
                            CORBA::Environment &ACE_TRY_ENV)
@@ -1654,16 +1565,16 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
   // If the POA has the RETAIN policy, the POA looks in the Active
   // Object Map to find if there is a servant associated with the
   // Object Id value from the request. If such a servant exists,
-  // return TAO_SERVANT_FOUND.
+  // return TAO_POA::FOUND.
   if (this->policies ().servant_retention () == PortableServer::RETAIN)
     {
       // Find user id from system id.
       PortableServer::ObjectId user_id;
       if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) != 0)
+                                                                   user_id) == -1)
         {
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_SERVANT_NOT_FOUND);
+                            TAO_POA::NOT_FOUND);
         }
 
       TAO_Active_Object_Map::Map_Entry *entry = 0;
@@ -1674,7 +1585,7 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
       if (result == 0)
         {
           // Success
-          return TAO_SERVANT_FOUND;
+          return TAO_POA::FOUND;
         }
     }
 
@@ -1686,61 +1597,60 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
   // the OBJECT_NOT_EXIST system exception.
   if (this->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
     {
-      return TAO_SERVANT_NOT_FOUND;
+      return TAO_POA::NOT_FOUND;
     }
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
   // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA, return TAO_DEFAULT_SERVANT. If
-  // no servant has been associated with the POA, return
-  // TAO_SERVANT_NOT_FOUND.
+  // has been associated with the POA, return
+  // TAO_POA::DEFAULT_SERVANT. If no servant has been associated with
+  // the POA, return TAO_POA::NOT_FOUND.
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
       if (this->default_servant_.in () == 0)
         {
-          return TAO_SERVANT_NOT_FOUND;
+          return TAO_POA::NOT_FOUND;
         }
       else
         {
           // Success
-          return TAO_DEFAULT_SERVANT;
+          return TAO_POA::DEFAULT_SERVANT;
         }
     }
 
   // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
   // has been associated with the POA, return
-  // TAO_SERVANT_MANAGER. If no servant manager has been
-  // associated with the POA, return TAO_SERVANT_NOT_FOUND.
+  // TAO_POA::SERVANT_MANAGER. If no servant manager has been
+  // associated with the POA, return TAO_POA::NOT_FOUND.
   if (this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
     {
       if (CORBA::is_nil (this->servant_activator_.in ()) &&
           CORBA::is_nil (this->servant_locator_.in ()))
         {
-          return TAO_SERVANT_NOT_FOUND;
+          return TAO_POA::NOT_FOUND;
         }
       else
         {
           // Success
-          return TAO_SERVANT_MANAGER;
+          return TAO_POA::SERVANT_MANAGER;
         }
     }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   // Failure
-  return TAO_SERVANT_NOT_FOUND;
+  return TAO_POA::NOT_FOUND;
 }
 
 PortableServer::Servant
 TAO_POA::locate_servant_i (const char *operation,
                            const PortableServer::ObjectId &system_id,
-                           TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                           TAO_POA_Current_Impl &poa_current_impl,
+                           TAO_POA_Current_Impl *poa_current_impl,
                            CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               poa_current_impl.object_id_) != 0)
+                                                               poa_current_impl->object_id_) == -1)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                         0);
@@ -1754,14 +1664,14 @@ TAO_POA::locate_servant_i (const char *operation,
     {
       PortableServer::Servant servant = 0;
       int result = this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                                        poa_current_impl.object_id (),
+                                                                                        poa_current_impl->object_id (),
                                                                                         servant,
-                                                                                        servant_upcall.active_object_map_entry_);
+                                                                                        poa_current_impl->active_object_map_entry_);
 
       if (result == 0)
         {
           // Increment the reference count.
-          ++servant_upcall.active_object_map_entry ()->reference_count_;
+          ++poa_current_impl->active_object_map_entry ()->reference_count_;
 
           // Success
           return servant;
@@ -1852,16 +1762,13 @@ TAO_POA::locate_servant_i (const char *operation,
             // Invocations of incarnate on the servant manager are serialized.
             // Invocations of etherealize on the servant manager are serialized.
             // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-            servant = this->servant_activator_->incarnate (poa_current_impl.object_id (),
+            servant = this->servant_activator_->incarnate (poa_current_impl->object_id (),
                                                            poa.in (),
                                                            ACE_TRY_ENV);
             ACE_CHECK_RETURN (0);
 
             if (servant == 0)
-              {
-                ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                  0);
-              }
+              return 0;
           }
 
           // If the incarnate operation returns a servant that is
@@ -1871,7 +1778,7 @@ TAO_POA::locate_servant_i (const char *operation,
           // will raise an OBJ_ADAPTER system exception for the
           // request.
           if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-              this->is_servant_in_map (servant))
+              this->active_object_map ().is_servant_in_map (servant))
             {
               ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                                 0);
@@ -1882,9 +1789,9 @@ TAO_POA::locate_servant_i (const char *operation,
           // ObjectId value will be delivered directly to that servant
           // without invoking the servant manager.
           int result = this->active_object_map ().rebind_using_user_id_and_system_id (servant,
-                                                                                      poa_current_impl.object_id (),
+                                                                                      poa_current_impl->object_id (),
                                                                                       system_id,
-                                                                                      servant_upcall.active_object_map_entry_);
+                                                                                      poa_current_impl->active_object_map_entry_);
           if (result != 0)
             {
               ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
@@ -1893,19 +1800,7 @@ TAO_POA::locate_servant_i (const char *operation,
           else
             {
               // Increment the reference count.
-              ++servant_upcall.active_object_map_entry ()->reference_count_;
-
-              // If this operation causes the object to be activated,
-              // _add_ref is invoked at least once on the Servant
-              // argument before returning. Otherwise, the POA does
-              // not increment or decrement the reference count of the
-              // Servant passed to this function.
-              servant->_add_ref (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              // If we are a single threaded POA, set up the
-              // appropriate locking in the servant.
-              this->establish_servant_lock (servant);
+              ++poa_current_impl->active_object_map_entry ()->reference_count_;
 
               // Success
               return servant;
@@ -1936,7 +1831,7 @@ TAO_POA::locate_servant_i (const char *operation,
           // process the request, and postinvoke the object.
           //
           PortableServer::ServantLocator::Cookie cookie;
-          PortableServer::Servant servant = this->servant_locator_->preinvoke (poa_current_impl.object_id (),
+          PortableServer::Servant servant = this->servant_locator_->preinvoke (poa_current_impl->object_id (),
                                                                                poa.in (),
                                                                                operation,
                                                                                cookie,
@@ -1944,23 +1839,10 @@ TAO_POA::locate_servant_i (const char *operation,
           ACE_CHECK_RETURN (0);
 
           if (servant == 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          // If we are a single threaded POA, set up the
-          // appropriate locking in the servant.
-          this->establish_servant_lock (servant);
-
-          // Remember to invoke <postinvoke>
-          servant_upcall.using_servant_locator ();
+            return 0;
 
           // Remember the cookie
-          servant_upcall.locator_cookie (cookie);
-
-          // Remember operation name.
-          servant_upcall.operation (operation);
+          poa_current_impl->locator_cookie (cookie);
 
           // Success
           return servant;
@@ -2063,8 +1945,6 @@ TAO_POA::parse_key (const TAO_ObjectKey &key,
       // Skip past the timestamp
       starting_at += TAO_Creation_Time::creation_time_length ();
     }
-#else
-  ACE_UNUSED_ARG (poa_creation_time);
 #endif /* POA_NO_TIMESTAMP */
 
   // Calculate the size of the POA name.
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index 5485576e0a3..1f0cafb1e51 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -541,10 +541,6 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  int is_servant_in_map (PortableServer::Servant servant);
-
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id);
-
   PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
                                                CORBA_Environment &ACE_TRY_ENV);
 
@@ -621,15 +617,24 @@ protected:
                         CORBA::Boolean &is_system_id,
                         TAO_Temporary_Creation_Time &poa_creation_time);
 
+  // Should really be protected, but some compilers complain
+public:
+  enum LOCATION_RESULT
+  {
+    FOUND,
+    DEFAULT_SERVANT,
+    SERVANT_MANAGER,
+    NOT_FOUND
+  };
+
 protected:
-  TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
-                                         PortableServer::Servant &servant,
-                                         CORBA_Environment &ACE_TRY_ENV);
+  LOCATION_RESULT locate_servant_i (const PortableServer::ObjectId &id,
+                                    PortableServer::Servant &servant,
+                                    CORBA_Environment &ACE_TRY_ENV);
 
   PortableServer::Servant locate_servant_i (const char *operation,
                                             const PortableServer::ObjectId &id,
-                                            TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                            TAO_POA_Current_Impl &poa_current_impl,
+                                            TAO_POA_Current_Impl *poa_current_impl,
                                             CORBA_Environment &ACE_TRY_ENV);
 
   const TAO_Creation_Time &creation_time (void);
@@ -728,12 +733,6 @@ protected:
   ACE_SYNCH_CONDITION outstanding_requests_condition_;
 
   CORBA::Boolean wait_for_completion_pending_;
-
-  CORBA::Boolean waiting_destruction_;
-
-  ACE_SYNCH_CONDITION servant_deactivation_condition_;
-
-  CORBA::ULong waiting_servant_deactivation_;
 };
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index ce527e6d073..c32277a110b 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -215,7 +215,7 @@ TAO_POA::create_POA (const char *adapter_name,
                      CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->create_POA_i (adapter_name,
                              poa_manager,
@@ -229,7 +229,7 @@ TAO_POA::destroy (CORBA::Boolean etherealize_objects,
                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->destroy_i (etherealize_objects,
                    wait_for_completion,
@@ -254,7 +254,7 @@ ACE_INLINE PortableServer::ServantManager_ptr
 TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil ());
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil (), ACE_TRY_ENV);
 
   return this->get_servant_manager_i (ACE_TRY_ENV);
 }
@@ -264,7 +264,7 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
                               CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->set_servant_manager_i (imgr,
                                ACE_TRY_ENV);
@@ -274,7 +274,7 @@ ACE_INLINE PortableServer::Servant
 TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->get_servant_i (ACE_TRY_ENV);
 }
@@ -284,7 +284,7 @@ TAO_POA::set_servant (PortableServer::Servant servant,
                       CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->set_servant_i (servant,
                        ACE_TRY_ENV);
@@ -297,7 +297,7 @@ TAO_POA::activate_object (PortableServer::Servant servant,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->activate_object_i (servant,
                                   ACE_TRY_ENV);
@@ -309,7 +309,7 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->activate_object_with_id_i (id,
                                    servant,
@@ -321,7 +321,7 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
                             CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->deactivate_object_i (oid,
                              ACE_TRY_ENV);
@@ -332,7 +332,7 @@ TAO_POA::create_reference (const char *intf,
                            CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
 
   return this->create_reference_i (intf,
                                    ACE_TRY_ENV);
@@ -344,7 +344,7 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
 
   return this->create_reference_with_id_i (id,
                                            intf,
@@ -358,7 +358,7 @@ TAO_POA::servant_to_id (PortableServer::Servant servant,
   // If we had upgradeable locks, this would initially be a read lock
   //
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->servant_to_id_i (servant,
                                 ACE_TRY_ENV);
@@ -369,7 +369,7 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->servant_to_system_id_i (servant,
                                        ACE_TRY_ENV);
@@ -380,7 +380,7 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->id_to_servant_i (oid,
                                 ACE_TRY_ENV);
@@ -391,7 +391,7 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
 
   return this->id_to_reference_i (oid, ACE_TRY_ENV);
 }
@@ -404,7 +404,7 @@ TAO_POA::forward_object (const PortableServer::ObjectId &oid,
                          CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->forward_object_i (oid,
                           forward_to,
@@ -434,7 +434,7 @@ ACE_INLINE PortableServer::AdapterActivator_ptr
 TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil ());
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil (), ACE_TRY_ENV);
 
   return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
 }
@@ -444,7 +444,7 @@ TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
 }
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index 277ac7d3f6f..a53b964b56b 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -278,10 +278,7 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ThreadPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::ThreadPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -320,6 +317,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -415,10 +413,7 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::LifespanPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/LifespanPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/LifespanPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::LifespanPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -457,6 +452,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA:
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -552,10 +548,7 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr
 {
   if (CORBA::is_nil (obj))
     return PortableServer::IdUniquenessPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::IdUniquenessPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -594,6 +587,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -688,10 +682,7 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr
 {
   if (CORBA::is_nil (obj))
     return PortableServer::IdAssignmentPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::IdAssignmentPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -730,6 +721,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -827,10 +819,7 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ImplicitActivationPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::ImplicitActivationPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -869,6 +858,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -964,10 +954,7 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantRetentionPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::ServantRetentionPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1006,6 +993,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -1101,10 +1089,7 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol
 {
   if (CORBA::is_nil (obj))
     return PortableServer::RequestProcessingPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0", ACE_TRY_ENV))
     return PortableServer::RequestProcessingPolicy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -1143,6 +1128,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -1220,10 +1206,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::POAManager::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/POAManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POAManager::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/POAManager:1.0", ACE_TRY_ENV))
     return PortableServer::POAManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
@@ -1410,10 +1393,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::AdapterActivator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/AdapterActivator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::AdapterActivator::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/AdapterActivator:1.0", ACE_TRY_ENV))
     return PortableServer::AdapterActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
@@ -1474,10 +1454,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantManager::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantManager::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantManager:1.0", ACE_TRY_ENV))
     return PortableServer::ServantManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
@@ -1538,10 +1515,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantActivator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantActivator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantActivator::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantActivator:1.0", ACE_TRY_ENV))
     return PortableServer::ServantActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
       // This can only be colocated
@@ -1603,10 +1577,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantLocator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantLocator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantLocator::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantLocator:1.0", ACE_TRY_ENV))
     return PortableServer::ServantLocator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
@@ -1670,10 +1641,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::POA::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/POA:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/POA:1.0", ACE_TRY_ENV))
     return PortableServer::POA::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
     // This can only be colocated
@@ -3115,15 +3083,12 @@ PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer:
 
 PortableServer::Current_ptr PortableServer::Current::_narrow (
                                                               CORBA::Object_ptr obj,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &env
                                                               )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::Current::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/Current:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::Current::_nil ());
-  if (check)
+  if (!obj->_is_a ("IDL:omg.org/PortableServer/Current:1.0", env))
     return PortableServer::Current::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -3291,6 +3256,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
index 28e8acbd991..c8ce24fe58a 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/POAManager.i
@@ -12,7 +12,7 @@ ACE_INLINE void
 TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->activate_i (ACE_TRY_ENV);
 }
@@ -24,7 +24,7 @@ TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
                                 CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -34,7 +34,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
                                    CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -45,7 +45,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
 
   this->deactivate_i (etherealize_objects,
                       wait_for_completion,
@@ -64,7 +64,7 @@ ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_, ACE_TRY_ENV);
 
   return this->get_state_i ();
 }
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index a4de6c68583..efe3dd30961 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -298,10 +298,11 @@ POA_PortableServer::_tao_collocated_ThreadPolicy::value (
 }
 
 PortableServer::ThreadPolicy*
-POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
 }
 
@@ -584,10 +585,11 @@ POA_PortableServer::_tao_collocated_LifespanPolicy::value (
 }
 
 PortableServer::LifespanPolicy*
-POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
 }
 
@@ -1153,10 +1155,11 @@ POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
 }
 
 PortableServer::IdAssignmentPolicy*
-POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
 }
 
@@ -1439,10 +1442,11 @@ POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
 }
 
 PortableServer::ImplicitActivationPolicy*
-POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
 }
 
@@ -1723,10 +1727,11 @@ POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
 }
 
 PortableServer::ServantRetentionPolicy*
-POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
 }
 
@@ -2007,10 +2012,11 @@ POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
 }
 
 PortableServer::RequestProcessingPolicy*
-POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
 }
 
@@ -2131,10 +2137,11 @@ POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &A
 }
 
 PortableServer::POAManager*
-POA_PortableServer::POAManager::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
 }
 
@@ -2215,10 +2222,11 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada
 
 
 PortableServer::AdapterActivator*
-POA_PortableServer::AdapterActivator::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
 }
 
@@ -2284,10 +2292,11 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
 
 
 PortableServer::ServantManager*
-POA_PortableServer::ServantManager::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
 }
 
@@ -2389,10 +2398,11 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
 
 
 PortableServer::ServantActivator*
-POA_PortableServer::ServantActivator::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
 }
 
@@ -2498,10 +2508,11 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
 
 
 PortableServer::ServantLocator*
-POA_PortableServer::ServantLocator::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
 }
 
@@ -2905,10 +2916,11 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
 
 
 PortableServer::POA*
-POA_PortableServer::POA::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_POA (this, stub);
 }
 
@@ -2996,9 +3008,10 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje
 
 
 PortableServer::Current*
-POA_PortableServer::Current::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_Current (this, stub);
 }
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index b86e7067820..1a013cabab1 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -45,33 +45,33 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ThreadPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::ThreadPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -90,19 +90,19 @@ TAO_NAMESPACE POA_PortableServer
     ThreadPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::ThreadPolicyValue value (
-                                                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                     CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                      );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
   private:
     ThreadPolicy_ptr servant_;
@@ -123,34 +123,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~LifespanPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::LifespanPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -169,19 +169,19 @@ TAO_NAMESPACE POA_PortableServer
     LifespanPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::LifespanPolicyValue value (
-                                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                        );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -202,34 +202,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~IdUniquenessPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -248,19 +248,19 @@ TAO_NAMESPACE POA_PortableServer
     IdUniquenessPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::IdUniquenessPolicyValue value (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                            );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -281,34 +281,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~IdAssignmentPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -327,19 +327,19 @@ TAO_NAMESPACE POA_PortableServer
     IdAssignmentPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::IdAssignmentPolicyValue value (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                            );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -362,34 +362,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ImplicitActivationPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -408,19 +408,19 @@ TAO_NAMESPACE POA_PortableServer
     ImplicitActivationPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::ImplicitActivationPolicyValue value (
-                                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                  );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -441,34 +441,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ServantRetentionPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -487,19 +487,19 @@ TAO_NAMESPACE POA_PortableServer
     ServantRetentionPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::ServantRetentionPolicyValue value (
-                                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                               CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -520,34 +520,34 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~RequestProcessingPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -566,19 +566,19 @@ TAO_NAMESPACE POA_PortableServer
     RequestProcessingPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::RequestProcessingPolicyValue value (
-                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                 );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                            );
 
   private:
@@ -601,25 +601,25 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~POAManager (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual void activate ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void activate ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::POAManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -637,31 +637,31 @@ TAO_NAMESPACE POA_PortableServer
     POAManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual void activate (
-                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                            );
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
     virtual void hold_requests (
                                 CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                 );
     virtual void discard_requests (
                                    CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                    );
     virtual void deactivate (
                              CORBA::Boolean etherealize_objects,
                              CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                              );
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
   private:
     POAManager_ptr servant_;
@@ -683,13 +683,13 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~AdapterActivator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::AdapterActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -707,12 +707,12 @@ TAO_NAMESPACE POA_PortableServer
     AdapterActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual CORBA::Boolean unknown_adapter (
                                             PortableServer::POA_ptr  parent,
                                             const char* name,
-                                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                            CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                             );
 
   private:
@@ -733,12 +733,12 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ServantManager (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
 
-    PortableServer::ServantManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -756,7 +756,7 @@ TAO_NAMESPACE POA_PortableServer
     ServantManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
 
   private:
@@ -777,15 +777,15 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ServantActivator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::ServantActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -804,12 +804,12 @@ TAO_NAMESPACE POA_PortableServer
     ServantActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::Servant incarnate (
                                                const PortableServer::ObjectId & oid,
                                                PortableServer::POA_ptr  adapter,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                );
     virtual void etherealize (
                               const PortableServer::ObjectId & oid,
@@ -817,7 +817,7 @@ TAO_NAMESPACE POA_PortableServer
                               PortableServer::Servant serv,
                               CORBA::Boolean cleanup_in_progress,
                               CORBA::Boolean remaining_activations,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                              CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                               );
 
   private:
@@ -838,7 +838,7 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~ServantLocator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
@@ -846,11 +846,11 @@ TAO_NAMESPACE POA_PortableServer
                                                PortableServer::POA_ptr adapter,
                                                const char *operation,
                                                PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+                                               CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::ServantLocator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -869,14 +869,14 @@ TAO_NAMESPACE POA_PortableServer
     ServantLocator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::Servant preinvoke (
                                                const PortableServer::ObjectId & oid,
                                                PortableServer::POA_ptr  adapter,
                                                const char * operation,
                                                PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                );
     virtual void postinvoke (
                              const PortableServer::ObjectId & oid,
@@ -884,7 +884,7 @@ TAO_NAMESPACE POA_PortableServer
                              const char * operation,
                              PortableServer::ServantLocator::Cookie the_cookie,
                              PortableServer::Servant the_servant,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                              );
 
   private:
@@ -906,83 +906,83 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~POA (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-    virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual char * the_name (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
-    virtual PortableServer::POA_ptr  the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::POA_ptr  the_parent (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
-    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
-    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
 
-    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant get_servant ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant get_servant ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::POA *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -1000,142 +1000,142 @@ TAO_NAMESPACE POA_PortableServer
     POA_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::POA_ptr create_POA (
                                                 const char* adapter_name,
                                                 PortableServer::POAManager_ptr  a_POAManager,
                                                 const CORBA::PolicyList & policies,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                 );
     virtual PortableServer::POA_ptr find_POA (
                                               const char* adapter_name,
                                               CORBA::Boolean activate_it,
-                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                              CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                               );
     virtual void destroy (
                           CORBA::Boolean etherealize_objects,
                           CORBA::Boolean wait_for_completion,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                           );
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
     virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
                                                                    PortableServer::ThreadPolicyValue value,
-                                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                    );
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
     virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
                                                                        PortableServer::LifespanPolicyValue value,
-                                                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                       CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                        );
     virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
                                                                                 PortableServer::IdUniquenessPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                                 );
     virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
                                                                                 PortableServer::IdAssignmentPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                                 );
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
     virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
                                                                                             PortableServer::ImplicitActivationPolicyValue value,
-                                                                                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                                            CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                                             );
     virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
                                                                                         PortableServer::ServantRetentionPolicyValue value,
-                                                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                                         );
     virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
                                                                                           PortableServer::RequestProcessingPolicyValue value,
-                                                                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                                           );
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 
     virtual char*  the_name (
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                              );
     virtual PortableServer::POA_ptr the_parent (
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                 );
     virtual PortableServer::POAManager_ptr the_POAManager (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                            );
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
     virtual PortableServer::AdapterActivator_ptr the_activator (
-                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                 );
     virtual void the_activator (PortableServer::AdapterActivator_ptr  _tao_value,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                 );
     virtual PortableServer::ServantManager_ptr get_servant_manager (
-                                                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                                     );
     virtual void set_servant_manager (
                                       PortableServer::ServantManager_ptr  imgr,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                      CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                       );
     virtual PortableServer::Servant get_servant (
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                 CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                  );
     virtual void set_servant (
                               PortableServer::Servant p_servant,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                              CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                               );
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
     virtual PortableServer::ObjectId * activate_object (
                                                         PortableServer::Servant p_servant,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                         );
     virtual void activate_object_with_id (
                                           const PortableServer::ObjectId & id,
                                           PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                           );
     virtual void deactivate_object (
                                     const PortableServer::ObjectId & oid,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                     );
     virtual CORBA::Object_ptr create_reference (
                                                 const char *intf,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                 );
     virtual CORBA::Object_ptr create_reference_with_id (
                                                         const PortableServer::ObjectId & oid,
                                                         const char *intf,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                         );
     virtual PortableServer::ObjectId * servant_to_id (
                                                       PortableServer::Servant p_servant,
-                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                      CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                       );
     virtual CORBA::Object_ptr servant_to_reference (
                                                     PortableServer::Servant p_servant,
-                                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                    CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                     );
     virtual PortableServer::Servant reference_to_servant (
                                                           CORBA::Object_ptr  reference,
-                                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                           );
     virtual PortableServer::ObjectId * reference_to_id (
                                                         CORBA::Object_ptr  reference,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                         );
     virtual PortableServer::Servant id_to_servant (
                                                    const PortableServer::ObjectId & oid,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                    );
     virtual CORBA::Object_ptr id_to_reference (
                                                const PortableServer::ObjectId & oid,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                );
 
   private:
@@ -1156,15 +1156,15 @@ TAO_NAMESPACE POA_PortableServer
     virtual ~Current (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
-    PortableServer::Current *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -1183,13 +1183,13 @@ TAO_NAMESPACE POA_PortableServer
     Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                   );
     virtual PortableServer::POA_ptr get_POA (
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                             CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                              );
     virtual PortableServer::ObjectId * get_object_id (
-                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                                      CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                                       );
 
   private:
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
index 0d08448e83d..ea63bcf1531 100644
--- a/TAO/tao/POAS.i
+++ b/TAO/tao/POAS.i
@@ -16,20 +16,20 @@ POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -42,20 +42,20 @@ POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -66,20 +66,20 @@ POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -90,20 +90,20 @@ POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -116,20 +116,20 @@ POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -140,20 +140,20 @@ POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -164,20 +164,20 @@ POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index ecb5e93b537..4554cf457d9 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -57,12 +57,12 @@ public:
     virtual ~Current (void);
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual void* _downcast (
         const char* logical_type_id
       );
 
-    ACE_CORBA_1(Current) *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+    ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
@@ -75,7 +75,6 @@ public:
   class  _tao_collocated_Current     : public virtual CORBA_Current
   {
   public:
-    _tao_collocated_Current (void) {} // Needed by the IBM VisualAge C++ compiler.
     _tao_collocated_Current (
         Current_ptr  servant,
         TAO_Stub *stub
@@ -83,7 +82,7 @@ public:
     Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
         const char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
       );
 
   private:
@@ -109,22 +108,22 @@ public:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
 
     virtual void* _downcast (
         const char* logical_type_id
       );
 
     virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        ) = 0;
 
     virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        ) = 0;
 
     virtual void destroy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        ) = 0;
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
@@ -132,28 +131,28 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
       );
 
     static void copy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
       );
 
     static void destroy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
       );
 
     static void _is_a_skel (
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA_Environment &ACE_TRY_ENV =
+        CORBA_Environment &TAO_IN_ENV =
           TAO_default_environment ()
       );
 
@@ -168,13 +167,13 @@ public:
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
         void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV =
+        CORBA_Environment &TAO_IN_ENV =
           TAO_default_environment ()
       );
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     CORBA_Policy_ptr _this (
-        CORBA_Environment &ACE_TRY_ENV =
+        CORBA_Environment &TAO_IN_ENV =
           TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
 
@@ -195,16 +194,16 @@ public:
     Policy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
         const char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
       );
     virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        );
     virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        );
     virtual void destroy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
        );
 
   private:
@@ -389,7 +388,7 @@ public:
       CORBA::ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &_tao_env =
         TAO_default_environment ()
     );
 
@@ -442,7 +441,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -454,7 +453,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -556,7 +555,7 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
 
@@ -564,7 +563,7 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
 
@@ -628,7 +627,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -641,7 +640,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -654,7 +653,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -667,7 +666,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -679,7 +678,7 @@ public:
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &_tao_env =
           CORBA::Environment::default_environment ()
       );
 
@@ -770,243 +769,243 @@ public:
   virtual ~DynAny (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void assign (
       CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual CORBA::Boolean seek (
       CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
         ) = 0;
 
   CORBA_DynAny *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1028,194 +1027,194 @@ public:
   DynAny_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void assign (
       CORBA_DynAny_ptr CORBA_Dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void from_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_boolean (
       CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_octet (
       CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_char (
       CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_short (
       CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ushort (
       CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_long (
       CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulong (
       CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_float (
       CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_double (
       CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_string (
       const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_reference (
       CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_longlong (
       CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_ulonglong (
       CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_wchar (
       CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void insert_any (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean seek (
       CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1234,36 +1233,36 @@ public:
   virtual ~DynEnum (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   CORBA_DynEnum *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1286,25 +1285,25 @@ public:
   DynEnum_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_string (
       const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void value_as_ulong (
       CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1323,35 +1322,35 @@ public:
   virtual ~DynStruct (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_members (
       const CORBA::NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   CORBA_DynStruct *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1374,24 +1373,24 @@ public:
   DynStruct_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
       const CORBA::NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1410,56 +1409,56 @@ public:
   virtual ~DynUnion (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   CORBA_DynUnion *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1482,41 +1481,41 @@ public:
   DynUnion_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_as_default (
       CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void member_name (
       const char * member_name,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1535,31 +1534,31 @@ public:
   virtual ~DynSequence (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
@@ -1567,12 +1566,12 @@ public:
       CORBA::ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
 
   CORBA_DynSequence *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1595,25 +1594,25 @@ public:
   DynSequence_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1632,25 +1631,25 @@ public:
   virtual ~DynArray (void);
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual void* _downcast (
       const char* logical_type_id
     );
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   CORBA_DynArray *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -1673,16 +1672,16 @@ public:
   DynArray_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
       const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
 
@@ -1751,7 +1750,7 @@ private:
       CORBA::ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &_tao_env =
         TAO_default_environment ()
     );
 
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 4f8f0f97628..1758173826c 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -114,13 +114,14 @@ TAO_Unknown_Profile::_key (void) const
 }
 
 CORBA::Boolean
-TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile)
+TAO_Unknown_Profile::is_equivalent (TAO_Profile* other_profile,
+                                    CORBA::Environment &)
 {
   if (other_profile->tag () != this->tag ())
     return 0;
 
-  const TAO_Unknown_Profile *op =
-    ACE_dynamic_cast (const TAO_Unknown_Profile*, other_profile);
+  TAO_Unknown_Profile *op =
+    ACE_dynamic_cast (TAO_Unknown_Profile*, other_profile);
 
   return (this->body_ == op->body_);
 }
@@ -135,7 +136,7 @@ TAO_Unknown_Profile::hash (CORBA::ULong max,
 }
 
 int
-TAO_Unknown_Profile::addr_to_string (char * /* buffer */,
+TAO_Unknown_Profile::addr_to_string (char * /* buffer */, 
                                      size_t /* length */)
 {
   return 0;
@@ -161,7 +162,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   this->ws_ = orb_core->client_factory ()->create_wait_strategy (this);
 
   // Create TMS now.
-  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy ();
+  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy (orb_core);
 }
 
 TAO_Transport::~TAO_Transport (void)
@@ -214,14 +215,19 @@ TAO_Transport::bind_reply_dispatcher (CORBA::ULong request_id,
                                       rd);
 }
 
+int
+TAO_Transport::wait_for_reply (void)
+{
+  return this->ws_->wait ();
+}
+
 // Read and handle the reply. Returns 0 when there is Short Read on
 // the connection. Returns 1 when the full reply is read and
 // handled. Returns -1 on errors.
 // If <block> is 1, then reply is read in a blocking manner.
 
 int
-TAO_Transport::handle_client_input (int /* block */,
-                                    ACE_Time_Value * /* max_wait_time */)
+TAO_Transport::handle_client_input (int /* block */)
 {
   ACE_NOTSUP_RETURN (-1);
 }
@@ -233,9 +239,20 @@ TAO_Transport::register_handler (void)
 }
 
 int
-TAO_Transport::wait_for_reply (ACE_Time_Value *max_wait_time)
+TAO_Transport::idle_after_send (void)
+{
+  return this->tms ()->idle_after_send (this);
+}  
+int
+TAO_Transport::idle_after_reply (void)
+{
+  return this->tms ()->idle_after_reply (this);
+}
+
+int
+TAO_Transport::reply_received (const CORBA::ULong request_id)
 {
-  return this->ws_->wait (max_wait_time);
+  return this->tms ()->reply_received (request_id);
 }
 
 void
@@ -295,14 +312,7 @@ TAO_Connector::make_mprofile (const char *string,
 
   // Check for a valid string
   if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
+    return 1;  // Failure
 
   // 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.
@@ -331,7 +341,7 @@ TAO_Connector::make_mprofile (const char *string,
 
   if (ior_index == ACE_CString::npos)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
       // No colon ':' in the IOR!
     }
   else
@@ -344,7 +354,7 @@ TAO_Connector::make_mprofile (const char *string,
   // The delimiter used to seperate inidividual addresses.
 
   // Count the number of endpoints in the IOR.  This will be the number
-  // of entries in the MProfile.
+  // of entries in the Mprofile.
 
   CORBA::ULong profile_count = 1;
   // Number of endpoints in the IOR  (initialized to 1)
@@ -356,34 +366,28 @@ TAO_Connector::make_mprofile (const char *string,
     }
 
   // Tell the MProfile object how many Profiles it should hold.
-  // MProfile::set(size) returns the number profiles it can hold.
+  // Mprofile::set(size) returns the number profiles it can hold.
   if (mprofile.set (profile_count) != ACE_static_cast (int, profile_count))
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_MPROFILE_CREATION_ERROR,
-          0),
-        CORBA::COMPLETED_NO),
-      -1);
+      ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
       // Error while setting the MProfile size!
     }
 
   // The idea behind the following loop is to split the IOR into several
   // strings that can be parsed by each profile.
   // For example,
-  //    `1.3@moo,shu,1.1@chicken/arf'
+  //    `//1.3@moo,shu,1.1chicken/arf'
   // will be parsed into:
-  //    `1.3@moo/arf'
-  //    `shu/arf'
-  //    `1.1@chicken/arf'
+  //    `//1.3@moo/arf'
+  //    `//shu/arf'
+  //    `//1.1chicken/arf'
 
-  int objkey_index =
-    ior.find (this->object_key_delimiter (), ior_index) + ior_index;
+  int objkey_index = ior.find (this->object_key_delimiter (), ior_index);
   // Find the object key
 
   if (objkey_index == 0 || objkey_index == ACE_CString::npos)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
       // Failure: No endpoints specified or no object key specified.
     }
 
@@ -403,42 +407,39 @@ TAO_Connector::make_mprofile (const char *string,
       if (end < ACE_static_cast (int, ior.length ()) && end != ior.npos)
         {
           ACE_CString endpoint = ior.substring (begin, end);
+
           endpoint += ior.substring (objkey_index);
           // Add the object key to the string.
 
           // The endpoint should now be of the form:
-          //    `N.n@endpoint/object_key'
+          //    `//N.n@endpoint/object_key'
           // or
-          //    `endpoint/object_key'
+          //    `//endpoint/object_key'
 
           TAO_Profile *profile = 0;
           // Must initialize since pointer is passed as a reference!
 
-          this->make_profile (endpoint.c_str (),
-                              profile,
-                              ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (-1);
-          // Failure:  Problem during profile creation
+          if (this->make_profile (endpoint.c_str (),
+                                  profile,
+                                  ACE_TRY_ENV) != 0)
+            {
+              ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
+              // Failure:  Problem during profile creation
+            }
 
           // Create a Profile using the individual endpoint string
 
           // Give up ownership of the profile.
-          if (mprofile.give_profile (profile) == -1)
+          if (mprofile.give_profile (profile) != 0)
             {
-              ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                CORBA_SystemException::_tao_minor_code (
-                  TAO_MPROFILE_CREATION_ERROR,
-                  0),
-                CORBA::COMPLETED_NO),
-              -1);
+              ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
               // Failure presumably only occurs when MProfile is full!
               // This should never happen.
             }
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+          ACE_THROW_RETURN (CORBA::INITIALIZE (), -1);
           // Unable to seperate endpoints
         }
     }
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index 400141ed4d9..09a60070359 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -123,7 +123,7 @@ public:
                               CORBA::ULong request_id,
                               CORBA::Boolean is_twoway,
                               TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a request.
 
@@ -131,14 +131,13 @@ public:
                              const TAO_Profile *profile,
                              CORBA::ULong request_id,
                              TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                             CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a locate request.
 
   virtual int send_request (TAO_ORB_Core *orb_core,
                             TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_time_wait) = 0;
+                            int twoway) = 0;
   // Default action to be taken for send request.
 
   // = Get and set methods for the ORB Core.
@@ -164,14 +163,13 @@ public:
   // Get request id for the current invocation from the TMSobject.
 
   int bind_reply_dispatcher (CORBA::ULong request_id,
-                             TAO_Reply_Dispatcher *rd);
+                              TAO_Reply_Dispatcher *rd);
   // Bind the reply dispatcher with the TMS object.
 
-  virtual int wait_for_reply (ACE_Time_Value *max_wait_time);
+  virtual int wait_for_reply (void);
   // Wait for the reply depending on the strategy.
 
-  virtual int handle_client_input (int block = 0,
-                                   ACE_Time_Value *max_wait_time = 0);
+  virtual int handle_client_input (int block = 0);
   // Read and handle the reply. Returns 0 when there is Short Read on
   // the connection. Returns 1 when the full reply is read and
   // handled. Returns -1 on errors.
@@ -182,6 +180,22 @@ public:
   // Strategy if Reactor is used  for that strategy. Default
   // implementation out here returns -1 setting <errno> to ENOTSUP.
 
+  // = Setting the Transport object in Idle state. Theese methods are
+  //   routed the TMS object. The TMS starategies implement the
+  //   methods accordingly. 
+  
+  virtual int idle_after_send (void);
+  // Request has been just sent, but the reply is not received. Idle
+  // the transport now.
+  
+  virtual int idle_after_reply (void);
+  // Request is sent and the reply is received. Idle the transport
+  // now. 
+
+  virtual int reply_received (const CORBA::ULong request_id);
+  // Check with the TMS whether the reply has been receieved for the
+  // request with <request_id>.
+
 protected:
   CORBA::ULong tag_;
   // IOP protocol tag.
@@ -230,11 +244,11 @@ public:
   // MProfile accessor
 
   virtual int parse_string (const char *string,
-                            CORBA::Environment &ACE_TRY_ENV) = 0;
+                            CORBA::Environment &env) = 0;
   // Initialize this object using the given input string.
   // Supports URL stylr of object references
 
-  virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::String to_string (CORBA::Environment &env) = 0;
   // Return a string representation for this profile.  client must
   // deallocate memory.
 
@@ -254,13 +268,14 @@ public:
   // Obtain the object key, return 0 if the profile cannot be parsed.
   // The memory is owned by the caller!
 
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile) = 0;
+  virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
+                                        CORBA::Environment &env) = 0;
   // Return true if this profile is equivalent to other_profile.  Two
   // profiles are equivalent iff their key, port, host, object_key and
   // version are the same.
 
   virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+                             CORBA::Environment &env) = 0;
   // Return a hash value for this object.
 
   virtual int addr_to_string(char *buffer, size_t length) = 0;
@@ -313,15 +328,16 @@ public:
 
   // = The TAO_Profile methods look above
   virtual int parse_string (const char *string,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &env);
+  virtual CORBA::String to_string (CORBA::Environment &env);
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual const TAO_ObjectKey &object_key (void) const;
   virtual TAO_ObjectKey *_key (void) const;
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
+  virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
+                                        CORBA::Environment &env);
   virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             CORBA::Environment &env);
   virtual int addr_to_string(char *buffer, size_t length);
   virtual void reset_hint (void);
 
@@ -415,8 +431,7 @@ public:
   // Shutdown Connector bridge and concreate Connector.
 
   virtual int connect (TAO_Profile *profile,
-                       TAO_Transport *&,
-                       ACE_Time_Value *max_wait_time) = 0;
+                       TAO_Transport *&) = 0;
   // To support pluggable we need to abstract away the connect()
   // method so it can be called from the GIOP code independant of the
   // actual transport protocol in use.
@@ -428,6 +443,12 @@ public:
   // Create a profile for this protocol and initialize it based on the
   // encapsulation in <cdr>
 
+protected:
+  virtual int make_profile (const char *endpoint,
+                            TAO_Profile *&,
+                            CORBA::Environment &ACE_TRY_ENV) = 0;
+  // Create a profile with a given endpoint.
+
   virtual int check_prefix (const char *endpoint) = 0;
   // Check that the prefix of the provided endpoint is valid for use
   // with a given pluggable protocol.
@@ -435,12 +456,6 @@ public:
   virtual char object_key_delimiter (void) const = 0;
   // Return the object key delimiter to use or expect.
 
-protected:
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Create a profile with a given endpoint.
-
 private:
   CORBA::ULong tag_;
   // IOP protocol tag.
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 6e5b9734393..5101e9f2c60 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -166,14 +166,12 @@ CORBA_InvalidPolicies::CORBA_InvalidPolicies(
 
 CORBA_Policy_ptr CORBA_Policy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Policy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_Policy::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", env))
     return CORBA_Policy::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -194,7 +192,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow (
 
 CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -237,6 +235,7 @@ CORBA::PolicyType CORBA_Policy::policy_type (
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -284,6 +283,7 @@ CORBA_Policy_ptr CORBA_Policy::copy (
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK_RETURN (_tao_retval);
 
@@ -330,6 +330,7 @@ void CORBA_Policy::destroy (
 
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
         ACE_CHECK;
 
@@ -353,14 +354,14 @@ void CORBA_Policy::destroy (
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_Policy::_interface_repository_id (void) const
@@ -423,14 +424,12 @@ CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void)
 
 CORBA::PolicyManager_ptr CORBA_PolicyManager::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_PolicyManager::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PolicyManager::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", env))
     return CORBA_PolicyManager::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -447,7 +446,7 @@ CORBA::PolicyManager_ptr CORBA_PolicyManager::_narrow (
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -488,14 +487,14 @@ void CORBA_PolicyManager::set_policy_overrides (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_PolicyManager::_interface_repository_id (void) const
@@ -508,14 +507,12 @@ const char* CORBA_PolicyManager::_interface_repository_id (void) const
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_PolicyCurrent::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PolicyCurrent::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", env))
     return CORBA_PolicyCurrent::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -532,7 +529,7 @@ CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -550,16 +547,16 @@ CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
     );
 }
 
-CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
@@ -978,9 +975,9 @@ template class TAO_Unbounded_Sequence<CORBA::ULong>;
 template class TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>;
 template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>;
 
-//  template class TAO_Object_Field_T<CORBA_Policy,CORBA_Policy_var>;
-//  template class TAO_Object_Field_T<CORBA_PolicyManager,CORBA_PolicyManager_var>;
-//  template class TAO_Object_Field_T<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>;
+//  template class TAO_Object_Field_T<CORBA_Policy>;
+//  template class TAO_Object_Field_T<CORBA_PolicyManager>;
+//  template class TAO_Object_Field_T<CORBA_PolicyCurrent>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -989,8 +986,8 @@ template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>;
 #pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
 #pragma instantiate TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
 
-//#  pragma instantiate TAO_Object_Field_T<CORBA_Policy,CORBA_Policy_var>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager,CORBA_PolicyManager_var>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>
+//#  pragma instantiate TAO_Object_Field_T<CORBA_Policy>
+//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager>
+//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 9aae513c10a..5ee036fc789 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -138,47 +138,47 @@ public:
   static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
   static CORBA_Policy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
   static CORBA_Policy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
   static CORBA_Policy_ptr _nil (void);
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
   virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
   virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
 #else
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     ) = 0;
   virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     ) = 0;
   virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     ) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -395,12 +395,12 @@ public:
   static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
   static CORBA_PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   static CORBA_PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   static CORBA_PolicyManager_ptr _nil (void);
@@ -418,7 +418,7 @@ public:
       );
   virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   virtual const char* _interface_repository_id (void) const;
@@ -490,19 +490,19 @@ public:
   static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
   static CORBA_PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   static CORBA_PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   static CORBA_PolicyCurrent_ptr _nil (void);
 
   virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
   virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 752c1395803..917cfe74d7f 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -256,23 +256,24 @@ void* POA_CORBA::Policy::_downcast (
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
   {
-    ACE_THROW (CORBA_BAD_OPERATION ());
+    env.exception (new CORBA_BAD_OPERATION ());
+    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
   }
 else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_CORBA::Policy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Policy:1.0";
+  return "IDL:CORBA/Policy:1.0";
 }
 
 // ****************************************************************
@@ -331,9 +332,9 @@ void POA_CORBA::_tao_collocated_Policy::destroy  (
 }
 
 CORBA::Policy*
-POA_CORBA::Policy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA::Policy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
   ACE_CHECK_RETURN (0);
   return new POA_CORBA::_tao_collocated_Policy (this, stub);
 }
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index a58dbda1df0..72165638be9 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -18,6 +18,9 @@
 // ================================================================
 
 #include "tao/PollableC.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/POA_CORBA.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
@@ -36,9 +39,7 @@ CORBA_Pollable_ptr CORBA_Pollable::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_Pollable::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Pollable:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_Pollable::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/Pollable:1.0", env))
     return CORBA_Pollable::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -176,14 +177,14 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
   return _tao_retval;
 }
 
-CORBA::Boolean CORBA_Pollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Pollable::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_Pollable::_interface_repository_id (void) const
@@ -198,9 +199,7 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA::DIIPollable::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DIIPollable:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::DIIPollable::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/DIIPollable:1.0", env))
     return CORBA::DIIPollable::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -235,15 +234,15 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow (
     );
 }
 
-CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA::DIIPollable::_interface_repository_id (void) const
@@ -258,9 +257,7 @@ CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_PollableSet::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PollableSet:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PollableSet::_nil ());
-  if (is_a == 0)
+  if (!obj->_is_a ("IDL:omg.org/CORBA/PollableSet:1.0", env))
     return CORBA_PollableSet::_nil ();
   TAO_Stub* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
@@ -670,14 +667,14 @@ CORBA::UShort CORBA_PollableSet::number_left (
   return _tao_retval;
 }
 
-CORBA::Boolean CORBA_PollableSet::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_PollableSet::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
+    return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
 const char* CORBA_PollableSet::_interface_repository_id (void) const
@@ -736,9 +733,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Pollable_ptr &_tao
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_Pollable,CORBA_Pollable_var>;
+  template class TAO_Object_Field_T<CORBA_Pollable>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_Pollable,CORBA_Pollable_var>
+#  pragma instantiate TAO_Object_Field_T<CORBA_Pollable>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 void operator<<= (CORBA::Any &_tao_any, CORBA::DIIPollable_ptr _tao_elem)
@@ -792,9 +789,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DIIPollable_ptr &
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::DIIPollable,CORBA::DIIPollable_var>;
+  template class TAO_Object_Field_T<CORBA::DIIPollable>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::DIIPollable,CORBA::DIIPollable_var>
+#  pragma instantiate TAO_Object_Field_T<CORBA::DIIPollable>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet_ptr _tao_elem)
@@ -848,9 +845,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet_ptr &_
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_PollableSet,CORBA_PollableSet_var>;
+  template class TAO_Object_Field_T<CORBA_PollableSet>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_PollableSet,CORBA_PollableSet_var>
+#  pragma instantiate TAO_Object_Field_T<CORBA_PollableSet>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 void operator<<= (CORBA::Any &_tao_any, const CORBA_PollableSet::NoPossiblePollable &_tao_elem) // copying
@@ -1098,3 +1095,5 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
+
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index ace8b397b10..ff42f82ba62 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -21,6 +21,9 @@
 #define TAO_IDL_POLLABLEC_H
 
 #include "tao/corbafwd.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/Object.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
@@ -140,12 +143,12 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object
   static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
   static CORBA_Pollable_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_Pollable_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_Pollable_ptr _nil (void);
@@ -161,7 +164,7 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object
     );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -234,19 +237,19 @@ public:
   static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
   static CORBA_DIIPollable_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_DIIPollable_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_DIIPollable_ptr _nil (void);
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -274,12 +277,12 @@ public:
   static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
   static CORBA_PollableSet_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_PollableSet_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static CORBA_PollableSet_ptr _nil (void);
@@ -372,7 +375,7 @@ public:
     );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
@@ -434,4 +437,6 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+
 #endif /* TAO_IDL_POLLABLEC_H */
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
index 77d7952323f..7471731932d 100644
--- a/TAO/tao/PollableS.cpp
+++ b/TAO/tao/PollableS.cpp
@@ -18,6 +18,9 @@
 // ================================================================
 
 #include "tao/PollableS.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/Operation_Table.h"
 #include "tao/Server_Request.h"
 
@@ -271,7 +274,7 @@ POA_CORBA::_tao_collocated_Pollable::_tao_collocated_Pollable (
     POA_CORBA::Pollable_ptr  servant,
     TAO_Stub *stub
   )
-  : ACE_NESTED_CLASS (CORBA,Pollable) (),
+  : ACE_CORBA_1 (Pollable) (),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
 {
@@ -516,7 +519,7 @@ POA_CORBA::_tao_collocated_DIIPollable::_tao_collocated_DIIPollable (
     POA_CORBA::DIIPollable_ptr  servant,
     TAO_Stub *stub
   )
-  : ACE_NESTED_CLASS (CORBA,DIIPollable) (),
+  : ACE_CORBA_1 (DIIPollable) (),
     ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
@@ -863,7 +866,7 @@ POA_CORBA::_tao_collocated_PollableSet::_tao_collocated_PollableSet (
     POA_CORBA::PollableSet_ptr  servant,
     TAO_Stub *stub
   )
-  : ACE_NESTED_CLASS (CORBA,PollableSet) (),
+  : ACE_CORBA_1 (PollableSet) (),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
 {
@@ -944,3 +947,4 @@ POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (0);
   return new POA_CORBA::_tao_collocated_PollableSet (this, stub);
 }
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
index 12543d0c754..744988d56ed 100644
--- a/TAO/tao/PollableS.h
+++ b/TAO/tao/PollableS.h
@@ -21,6 +21,9 @@
 #define TAO_IDL_POLLABLES_H
 
 #include "tao/PollableC.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/POA_CORBA.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -66,7 +69,7 @@ TAO_NAMESPACE  POA_CORBA
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     CORBA::Boolean is_ready (
@@ -122,7 +125,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     CORBA::Boolean is_ready (
@@ -178,7 +181,7 @@ private:
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &env =
           CORBA::Environment::default_environment ()
       );
     CORBA::DIIPollable_ptr create_dii_pollable (
@@ -229,4 +232,6 @@ private:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+
 #endif /* ifndef */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index e819776faab..0185b43958d 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "tao/Reply_Dispatcher.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.i"
@@ -8,6 +10,7 @@
 
 // Constructor.
 TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
+  //  : reply_received_ (0)
 {
 }
 
@@ -22,12 +25,20 @@ TAO_Reply_Dispatcher::message_state (void) const
   return 0;
 }
 
+// int
+// TAO_Reply_Dispatcher::reply_received (void) const
+// {
+//   return reply_received_;
+// }
+
 // *********************************************************************
 
 // Constructor.
-TAO_Synch_Reply_Dispatcher::
-    TAO_Synch_Reply_Dispatcher (TAO_GIOP_Message_State* message_state)
-  : message_state_ (message_state)
+TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core)
+  : message_state_ (0),
+    reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+                TAO_ENCAP_BYTE_ORDER,
+                orb_core)
 {
 }
 
@@ -39,22 +50,15 @@ TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void)
 // Dispatch the reply.
 int
 TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
-                                            const TAO_GIOP_Version& version,
-                                            TAO_GIOP_ServiceContextList& reply_ctx,
-                                            TAO_GIOP_Message_State* message_state)
+                                            const TAO_GIOP_Version &version,
+                                            TAO_GIOP_ServiceContextList &reply_ctx,
+                                            TAO_GIOP_Message_State *message_state)
 {
-# if defined (ACE_NDEBUG)
-    ACE_UNUSED_ARG (message_state);
-# endif /* ACE_NDEBUG */
-
-  ACE_ASSERT (message_state == this->message_state_);
-  // @@ Notice that the message is ignored because we assume that
-  //    the message_state is the same we are giving down to the ORB to
-  //    use.... I.E. this class cannot be used with Muxed stream, but
-  //    chances are that the way to implement that will change several
-  //    times in the next few weeks.
+  // this->reply_received_ = 1;
+
   this->reply_status_ = reply_status;
   this->version_ = version;
+  this->message_state_ = message_state;
 
   // Steal the buffer, that way we don't do any unnecesary copies of
   // this data.
@@ -63,7 +67,10 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
   TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
   this->reply_ctx_.replace (max, len, context_list, 1);
 
-  return 1;
+  // Steal the buffer so that no copying is done.
+  this->reply_cdr_.reset (message_state->cdr.steal_contents (),
+                          message_state->cdr.byte_order ());
+  return 0;
 }
 
 TAO_GIOP_Message_State *
@@ -71,3 +78,72 @@ TAO_Synch_Reply_Dispatcher::message_state (void) const
 {
   return this->message_state_;
 }
+
+TAO_InputCDR &
+TAO_Synch_Reply_Dispatcher::reply_cdr (void)
+{
+  return this->reply_cdr_;
+}
+
+
+// *********************************************************************
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+// Constructor.
+TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
+                                                          Messaging::ReplyHandler_ptr reply_handler_ptr)
+  : reply_handler_skel_ (reply_handler_skel),
+    reply_handler_ (reply_handler_ptr)
+{
+}
+
+// Destructor.
+TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
+{
+}
+
+// Dispatch the reply.
+int
+TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
+                                             const TAO_GIOP_Version &version,
+                                             TAO_GIOP_ServiceContextList &reply_ctx,
+                                             TAO_GIOP_Message_State *message_state)
+{
+  // this->reply_received_ = 1;
+
+  this->reply_status_ = reply_status;
+  this->version_ = version;
+  this->message_state_ = message_state;
+
+  // Steal the buffer, that way we don't do any unnecesary copies of
+  // this data.
+  CORBA::ULong max = reply_ctx.maximum ();
+  CORBA::ULong len = reply_ctx.length ();
+  TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
+  this->reply_ctx_.replace (max, len, context_list, 1);
+
+  if (TAO_debug_level >= 4)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"));
+    }
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  // Call the Reply Handler's skeleton.
+  reply_handler_skel_ (message_state_->cdr,
+                       reply_handler_,
+                       ACE_TRY_ENV);
+
+  // This was dynamically allocated. Now the job is done. Commit
+  // suicide here.
+  delete this;
+
+  return 0;
+}
+
+TAO_GIOP_Message_State *
+TAO_Asynch_Reply_Dispatcher::message_state (void) const
+{
+  return this->message_state_;
+}
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 90132289124..1d9ee9c4f7b 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -1,3 +1,4 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -20,6 +21,7 @@
 #define TAO_REPLY_DISPATCHER_H
 
 #include "tao/GIOP.h"
+#include "tao/MessagingC.h"
 
 // Forward Declarations.
 
@@ -47,12 +49,18 @@ public:
   // Dispatch the reply.
 
   virtual TAO_GIOP_Message_State *message_state (void) const;
-  // Get the Message State
-  // By default it returns <0> but if the request can pre-allocate one
-  // for us then we can return it and pass it along for non-Muxed
-  // transports.
+  // Get the Message State into which the reply has been read.
+
+  // virtual int reply_received (void) const;
+  // Return the reply received flag.
+
+  // protected:
+  // int reply_received_;
+  // Reply received flag.
 };
 
+// *********************************************************************
+
 class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher
 {
   // = TITLE
@@ -63,7 +71,7 @@ class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher
   //
 
 public:
-  TAO_Synch_Reply_Dispatcher (TAO_GIOP_Message_State* message_state);
+  TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core);
   // Constructor.
 
   virtual ~TAO_Synch_Reply_Dispatcher (void);
@@ -73,6 +81,67 @@ public:
   // Get the reply status.
 
   const TAO_GIOP_Version& version (void) const;
+  // Get the GIOP version.
+
+  TAO_GIOP_ServiceContextList& reply_ctx (void);
+  // Get the reply context
+
+  virtual int dispatch_reply (CORBA::ULong reply_status,
+                              const TAO_GIOP_Version& version,
+                              TAO_GIOP_ServiceContextList& reply_ctx,
+                              TAO_GIOP_Message_State* message_state);
+  // Dispatch the reply. Copy the buffers and return. Since the
+  // invocation is synchronous demarshalling will take place on the
+  // stack.
+
+  virtual TAO_GIOP_Message_State *message_state (void) const;
+  // Return the message state of this invocation.
+
+  virtual TAO_InputCDR &reply_cdr (void);
+  // Return the reply CDR.
+
+private:
+  CORBA::ULong reply_status_;
+  // Reply or LocateReply status.
+
+  TAO_GIOP_Version version_;
+  // The version
+
+  TAO_GIOP_ServiceContextList reply_ctx_;
+  // The service context list
+
+  TAO_GIOP_Message_State *message_state_;
+  // CDR stream for reading the input.
+  // @@ Carlos : message_state should go away. All we need is the reply
+  //    cdr. Is that rite? (Alex).
+
+  TAO_InputCDR reply_cdr_;
+  // CDR where the reply message is placed.
+};
+
+// *********************************************************************
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+class TAO_Export TAO_Asynch_Reply_Dispatcher : public TAO_Reply_Dispatcher
+{
+  // = TITLE
+  //
+  //     Reply dispatcher for Asynchoronous Method Invocation (AMI)s.
+  //
+  // = DESCRIPTION
+  //
+
+public:
+  TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
+                               Messaging::ReplyHandler_ptr reply_handler_ptr);
+  // Constructor.
+
+  virtual ~TAO_Asynch_Reply_Dispatcher (void);
+  // Destructor.
+
+  CORBA::ULong reply_status (void) const;
+  // Get the reply status.
+
+  const TAO_GIOP_Version& version (void) const;
   // Get the GIOP version
 
   TAO_GIOP_ServiceContextList& reply_ctx (void);
@@ -82,7 +151,12 @@ public:
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
                               TAO_GIOP_Message_State* message_state);
+  // Dispatch the reply. This involves demarshalling the reply and
+  // calling the appropriate call back hook method on the reply
+  // handler.
+
   virtual TAO_GIOP_Message_State *message_state (void) const;
+  // Return the message state.
 
 private:
   CORBA::ULong reply_status_;
@@ -96,7 +170,17 @@ private:
 
   TAO_GIOP_Message_State *message_state_;
   // CDR stream for reading the input.
+  // @@ Carlos : message_state should go away. All we need is the reply
+  //    cdr. Is that rite? (Alex).
+
+  const TAO_Reply_Handler_Skeleton reply_handler_skel_;
+  // Skeleton for the call back method in the Reply Handler.
+
+  Messaging::ReplyHandler_ptr reply_handler_;
+  // Reply Handler passed in the Asynchronous Invocation.
 };
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+// *********************************************************************
 
 #if defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.i"
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index 43d9f170ab2..4f093e4ef39 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -49,11 +49,11 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               CORBA::NVList_ptr args,
                               CORBA::NamedValue_ptr result,
                               CORBA::Flags flags,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
   : args_ (args),
     result_ (result),
     flags_ (flags),
-    env_ (ACE_TRY_ENV),
+    env_ (TAO_IN_ENV),
     contexts_ (0),
     ctx_ (0),
     refcount_ (1)
@@ -64,9 +64,9 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
 
 CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               const CORBA::Char *op,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
   : flags_ (0),
-    env_ (ACE_TRY_ENV),
+    env_ (TAO_IN_ENV),
     contexts_ (0),
     ctx_ (0),
     refcount_ (1)
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index 6faed78b810..000157734df 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -135,12 +135,12 @@ private:
                  CORBA::NVList_ptr args,
                  CORBA::NamedValue_ptr result,
                  CORBA::Flags flags,
-                 CORBA::Environment &ACE_TRY_ENV =
+                 CORBA::Environment &TAO_IN_ENV =
                    TAO_default_environment ());
 
   CORBA_Request (CORBA::Object_ptr obj,
                  const CORBA::Char *op,
-                 CORBA::Environment &ACE_TRY_ENV =
+                 CORBA::Environment &TAO_IN_ENV =
                    TAO_default_environment ());
 
   ~CORBA_Request (void);
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 6280b6efad9..620b5289375 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -63,7 +63,7 @@ public:
   // return a pointer to the protocol factory.
 
   void factory (TAO_Protocol_Factory *factory);
-  // set the factory pointer's value.
+  // set the factory pointer's valus.
 
 private:
   ACE_CString name_;
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index bc6bfbe5f59..433bc6949c7 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -63,7 +63,7 @@ public:
 
   virtual void _downcast (void *target,
                           CORBA_Object *src,
-                          CORBA_Environment &ACE_TRY_ENV =
+                          CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ());
   // Used for sequences of objects to downcast a recently demarshalled
   // object reference into the right type.
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
index d1c262251fd..3919730220a 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -189,29 +189,24 @@ TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
 // ****************************************************************
 
 #if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
 {
   return new CORBA::Octet[size];
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE void
 TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet *buffer)
 {
   delete [] buffer;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE
 TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
   :  mb_ (0)
 {
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE
 TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
@@ -220,7 +215,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
 {
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE
 TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
                                                    CORBA::ULong length,
@@ -231,7 +225,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
 {
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE const CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
 {
@@ -240,7 +233,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
 
 // This function is a little too big to be inlined, but some compilers
 // (Sun/CC 4.1?) die if it isn't :-(
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
 {
@@ -291,7 +283,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
   return result;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE CORBA::Octet &
 TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
 {
@@ -300,7 +291,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
   return tmp[i];
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE const CORBA::Octet &
 TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
 {
@@ -309,14 +299,12 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
   return tmp[i];
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE ACE_Message_Block*
 TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
 {
   return this->mb_;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE void
 TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
                                                const ACE_Message_Block* mb)
@@ -329,7 +317,6 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
   this->release_ = 0;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE void
 TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
                                                CORBA::ULong length,
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 658b5d15af5..fc628f5381f 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_SEQUENCE_T_C
 
 #include "tao/Sequence_T.h"
-#include "tao/varout.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Sequence_T.i"
@@ -88,7 +87,7 @@ TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 template<class T> void
 TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
 {
-  if (this->release_ == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     return;
 
   T *tmp = ACE_reinterpret_cast (T *,
@@ -122,7 +121,7 @@ TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
 // Bounded_Sequence
 // ****************************************************************
 
-template <class T, size_t MAX>
+template <class T, CORBA::ULong MAX>
 TAO_Bounded_Sequence<T, MAX>::
 TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T, MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
@@ -137,7 +136,7 @@ TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T, MAX> &rhs)
   this->buffer_ = tmp1;
 }
 
-template <class T, size_t MAX> TAO_Bounded_Sequence<T, MAX> &
+template <class T, CORBA::ULong MAX> TAO_Bounded_Sequence<T, MAX> &
 TAO_Bounded_Sequence<T, MAX>::
 operator= (const TAO_Bounded_Sequence<T, MAX> &rhs)
 {
@@ -164,13 +163,13 @@ operator= (const TAO_Bounded_Sequence<T, MAX> &rhs)
   return *this;
 }
 
-template<class T, size_t MAX>
+template<class T, CORBA::ULong MAX>
 TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<class T, size_t MAX> void
+template<class T, CORBA::ULong MAX> void
 TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
 {
   // For this class memory is never reallocated so the implementation
@@ -178,12 +177,11 @@ TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
   this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
 }
 
-template<class T, size_t MAX> void
+template<class T, CORBA::ULong MAX> void
 TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
 {
-  if (this->release_ == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     return;
-
   T *tmp = ACE_reinterpret_cast (T *,
                                  this->buffer_);
   TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
@@ -194,9 +192,9 @@ TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
 // class TAO_Object_Manager
 // *************************************************************
 
-template <class T, class T_var> TAO_Object_Manager<T,T_var>&
-TAO_Object_Manager<T,T_var>::
-    operator= (const TAO_Object_Manager<T,T_var> &rhs)
+template <class T,class T_var>
+TAO_Object_Manager<T,T_var>&
+TAO_Object_Manager<T,T_var>::operator= (const TAO_Object_Manager<T,T_var> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -212,22 +210,7 @@ TAO_Object_Manager<T,T_var>::
   return *this;
 }
 
-template <class T, class T_var> TAO_Object_Manager<T,T_var>&
-TAO_Object_Manager<T,T_var>::
-    operator= (const TAO_Object_Field_T<T,T_var> &rhs)
-{
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (rhs.in ());
-    }
-  else
-    *this->ptr_ = rhs.in ();
-
-  return *this;
-}
-
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
+template <class T,class T_var>TAO_Object_Manager<T,T_var> &
 TAO_Object_Manager<T,T_var>::operator=(T* p)
 {
   if (this->release_)
@@ -245,7 +228,7 @@ TAO_Object_Manager<T,T_var>::operator=(T* p)
   return *this;
 }
 
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
+template <class T,class T_var>TAO_Object_Manager<T,T_var> &
 TAO_Object_Manager<T,T_var>::operator=(T_var &p)
 {
   if (this->release_)
@@ -268,7 +251,7 @@ TAO_Object_Manager<T,T_var>::operator=(T_var &p)
 // *************************************************************
 
 // constructor for unbounded seq
-template <class T, class T_var>
+template <class T,class T_var>
 TAO_Unbounded_Object_Sequence<T,T_var>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
@@ -276,7 +259,7 @@ TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
 {
 }
 
-template <class T, class T_var>
+template <class T,class T_var>
 TAO_Unbounded_Object_Sequence<T,T_var>::
 TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
   : TAO_Unbounded_Base_Sequence (rhs)
@@ -290,14 +273,14 @@ TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
   this->buffer_ = tmp1;
 }
 
-template<class T, class T_var>
+template<class T,class T_var>
 TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
 // assignment operator
-template <class T, class T_var>TAO_Unbounded_Object_Sequence<T,T_var>&
+template <class T,class T_var>TAO_Unbounded_Object_Sequence<T,T_var>&
 TAO_Unbounded_Object_Sequence<T,T_var>::
 operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
 {
@@ -336,10 +319,10 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
   return *this;
 }
 
-template <class T, class T_var> T **
+template <class T,class T_var> T **
 TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
 {
-  T **buf = 0;
+  T **buf;
 
   ACE_NEW_RETURN (buf, T*[nelems], 0);
 
@@ -349,7 +332,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T, class T_var> void
+template <class T,class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
 {
   if (buffer == 0)
@@ -370,7 +353,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
 {
   T **tmp = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
@@ -395,7 +378,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -410,7 +393,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
                                                   CORBA::ULong ol)
 {
@@ -423,19 +406,17 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-template <class T, class T_var> void
+template <class T,class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
                                                    CORBA_Object* src,
-                                                   CORBA_Environment &ACE_TRY_ENV)
+                                                   CORBA_Environment &env)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
-
-  ACE_CHECK;
+  *tmp = T::_narrow (src, env);
 }
 
-template <class T, class T_var> CORBA_Object*
+template <class T,class T_var> CORBA_Object*
 TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
 {
   T **tmp = ACE_static_cast (T**, src);
@@ -447,7 +428,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
 // Operations for class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
+template <class T, class T_var,CORBA::ULong MAX>
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::
 TAO_Bounded_Object_Sequence (void)
   :  TAO_Bounded_Base_Sequence (MAX,
@@ -455,7 +436,7 @@ TAO_Bounded_Object_Sequence (void)
 {
 }
 
-template <class T, class T_var, size_t MAX>
+template <class T, class T_var,CORBA::ULong MAX>
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::
 TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, T_var,MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
@@ -468,7 +449,7 @@ TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, T_var,MAX> &rh
   this->buffer_ = tmp1;
 }
 
-template <class T, class T_var, size_t MAX> TAO_Bounded_Object_Sequence<T, T_var,MAX>&
+template <class T, class T_var,CORBA::ULong MAX> TAO_Bounded_Object_Sequence<T, T_var,MAX>&
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
 (const TAO_Bounded_Object_Sequence<T,T_var, MAX> &rhs)
 {
@@ -500,10 +481,10 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> T **
+template <class T, class T_var,CORBA::ULong MAX> T **
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
 {
-  T **buf = 0;
+  T **buf;
 
   ACE_NEW_RETURN (buf, T*[MAX], 0);
 
@@ -513,7 +494,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> void
+template <class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
@@ -529,7 +510,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
 {
   // For this class memory is never reallocated so the implementation
@@ -538,17 +519,17 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length
     TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
 {
-  if (this->release_ == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     return;
   T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
   TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
                                                            CORBA::ULong ol)
 {
@@ -561,19 +542,17 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-template <class T, class T_var, size_t MAX> void
+template <class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
                                                       CORBA_Object* src,
-                                                      CORBA_Environment &ACE_TRY_ENV)
+                                                      CORBA_Environment &env)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
-
-  ACE_CHECK;
+  *tmp = T::_narrow (src, env);
 }
 
-template <class T, class T_var, size_t MAX> CORBA_Object*
+template <class T, class T_var,CORBA::ULong MAX> CORBA_Object*
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
 {
   T **tmp = ACE_static_cast (T**, src);
@@ -586,7 +565,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
 // *************************************************************
 
 // constructor for unbounded seq
-template <class T, class T_var>
+template <class T,class T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::
 TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
@@ -594,7 +573,7 @@ TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
 {
 }
 
-template <class T, class T_var>
+template <class T,class T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::
 TAO_Unbounded_Pseudo_Sequence (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
   : TAO_Unbounded_Base_Sequence (rhs)
@@ -608,14 +587,14 @@ TAO_Unbounded_Pseudo_Sequence (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs
   this->buffer_ = tmp1;
 }
 
-template<class T, class T_var>
+template<class T,class T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::~TAO_Unbounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
 // assignment operator
-template <class T, class T_var> TAO_Unbounded_Pseudo_Sequence<T,T_var>&
+template <class T,class T_var> TAO_Unbounded_Pseudo_Sequence<T,T_var>&
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::
 operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
 {
@@ -654,10 +633,10 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
   return *this;
 }
 
-template <class T, class T_var> T **
+template <class T,class T_var> T **
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
 {
-  T **buf = 0;
+  T **buf;
 
   ACE_NEW_RETURN (buf, T*[nelems], 0);
 
@@ -667,7 +646,7 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T, class T_var> void
+template <class T,class T_var> void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
 {
   if (buffer == 0)
@@ -685,10 +664,10 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
   // Mark the length in the first four bytes? For the moment we let
   // that be.
 
-  delete [] buffer;
+  delete[] buffer;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
 {
   T **tmp = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (length);
@@ -713,7 +692,7 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -728,7 +707,7 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
+template<class T,class T_var> void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
                                                         CORBA::ULong ol)
 {
@@ -745,7 +724,7 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
+template <class T, class T_var,CORBA::ULong MAX>
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
 TAO_Bounded_Pseudo_Sequence (void)
   :  TAO_Bounded_Base_Sequence (MAX,
@@ -753,7 +732,7 @@ TAO_Bounded_Pseudo_Sequence (void)
 {
 }
 
-template <class T, class T_var, size_t MAX>
+template <class T, class T_var,CORBA::ULong MAX>
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
 TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
@@ -766,7 +745,7 @@ TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rh
   this->buffer_ = tmp1;
 }
 
-template <class T, class T_var, size_t MAX> TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>&
+template <class T, class T_var,CORBA::ULong MAX> TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>&
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
 (const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs)
 {
@@ -798,10 +777,10 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> T **
+template <class T, class T_var,CORBA::ULong MAX> T **
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
 {
-  T **buf = 0;
+  T **buf;
 
   ACE_NEW_RETURN (buf, T*[MAX], 0);
 
@@ -811,7 +790,7 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> void
+template <class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
@@ -827,7 +806,7 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
 {
   // For this class memory is never reallocated so the implementation
@@ -836,17 +815,17 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length
     TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_deallocate_buffer (void)
 {
-  if (this->release_ == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     return;
   T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
   TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> void
+template<class T, class T_var,CORBA::ULong MAX> void
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
                                                            CORBA::ULong ol)
 {
@@ -863,7 +842,7 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Bounded_String_Sequence
 // *************************************************************
 
-template<size_t MAX>
+template<CORBA::ULong MAX>
 TAO_Bounded_String_Sequence<MAX>::
 TAO_Bounded_String_Sequence (void)
   :  TAO_Bounded_Base_Sequence (MAX,
@@ -871,7 +850,7 @@ TAO_Bounded_String_Sequence (void)
 {
 }
 
-template<size_t MAX>
+template<CORBA::ULong MAX>
 TAO_Bounded_String_Sequence<MAX>::
 TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
@@ -887,7 +866,7 @@ TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &rhs)
   this->buffer_ = tmp1;
 }
 
-template<size_t MAX> TAO_Bounded_String_Sequence<MAX>&
+template<CORBA::ULong MAX> TAO_Bounded_String_Sequence<MAX>&
 TAO_Bounded_String_Sequence<MAX>::operator=
 (const TAO_Bounded_String_Sequence<MAX> &rhs)
 {
@@ -921,7 +900,7 @@ TAO_Bounded_String_Sequence<MAX>::operator=
   return *this;
 }
 
-template<size_t MAX> TAO_SeqElem_String_Manager
+template<CORBA::ULong MAX> TAO_SeqElem_String_Manager
 TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
@@ -931,10 +910,10 @@ TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
                                      this->release_);
 }
 
-template<size_t MAX> char **
+template<CORBA::ULong MAX> char **
 TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
 {
-  char **buf = 0;
+  char **buf;
 
   ACE_NEW_RETURN (buf, char *[MAX], 0);
 
@@ -944,7 +923,7 @@ TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template<size_t MAX> void
+template<CORBA::ULong MAX> void
 TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
 {
   // How much do we deallocate? Easy! <allocbuf> always creates MAX
@@ -963,7 +942,7 @@ TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
   delete [] buffer;
 }
 
-template<size_t MAX> void
+template<CORBA::ULong MAX> void
 TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
 {
   // For this class memory is never reallocated so the implementation
@@ -972,17 +951,17 @@ TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
     TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
 }
 
-template<size_t MAX> void
+template<CORBA::ULong MAX> void
 TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
 {
-  if (this->release_ == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     return;
   char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
   TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<size_t MAX> void
+template<CORBA::ULong MAX> void
 TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
                                                   CORBA::ULong ol)
 {
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 5e735ce23c0..e095e57c03e 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -116,7 +116,7 @@ public:
   // to those for the <T *data> constructor for the sequence.
 };
 
-template <class T, size_t MAX>
+template <class T, CORBA::ULong MAX>
 class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
@@ -215,14 +215,12 @@ public:
 // *************************************************************
 
 template<class T,class T_var> class TAO_Unbounded_Object_Sequence;
-template<class T, class T_var, size_t MAX> class TAO_Bounded_Object_Sequence;
-template<size_t MAX> class TAO_Bounded_String_Sequence;
-
-template<class T,class T_var> class TAO_Object_Field_T;
+template<class T, class T_var, CORBA::ULong MAX> class TAO_Bounded_Object_Sequence;
+template<CORBA::ULong MAX> class TAO_Bounded_String_Sequence;
 
 // *************************************************************
 
-template<class T, class T_var>
+template<class T,class T_var>
 class TAO_Object_Manager
 {
   // = TITLE
@@ -280,11 +278,6 @@ public:
   // @@ TODO what happens if rhs.release_ is true an this->relase_ is
   // false?
 
-  TAO_Object_Manager<T,T_var> &operator= (const TAO_Object_Field_T<T,T_var> &rhs);
-  // Assignment from another var-like type, only release if
-  // <this->release_> is true and only duplicate if this->release_ is
-  // true.
-
   TAO_Object_Manager<T,T_var> &operator= (T *);
   // Assignment from T *.
 
@@ -448,7 +441,7 @@ public:
 
 // *************************************************************
 
-template<class T, class T_var, size_t MAX>
+template<class T, class T_var,CORBA::ULong MAX>
 class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
@@ -566,7 +559,7 @@ public:
 
 // *************************************************************
 
-template<class T, class T_var, size_t MAX>
+template<class T, class T_var,CORBA::ULong MAX>
 class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
@@ -614,7 +607,7 @@ public:
 
 // *************************************************************
 
-template<size_t MAX>
+template<CORBA::ULong MAX>
 class TAO_Bounded_String_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index e7df8994827..7c27d89f237 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -96,6 +96,7 @@ TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
       T *tmp = ACE_reinterpret_cast(T*,this->buffer_);
       TAO_Unbounded_Sequence<T>::freebuf (tmp);
     }
+    TAO_Unbounded_Sequence<T>::freebuf ((T *) this->buffer_);
   this->buffer_ = data;
   this->release_ = release;
 }
@@ -104,25 +105,25 @@ TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
 // operations on the generic Bounded sequence class
 // ***************************************************
 
-template <class T, size_t MAX> ACE_INLINE T *
+template <class T, CORBA::ULong MAX> ACE_INLINE T *
 TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
 {
   return new T[MAX];
 }
 
-template <class T, size_t MAX> ACE_INLINE void
+template <class T, CORBA::ULong MAX> ACE_INLINE void
 TAO_Bounded_Sequence<T, MAX>::freebuf (T *buffer)
 {
   delete [] buffer;
 }
 
-template <class T, size_t MAX> ACE_INLINE
+template <class T, CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
   : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
 {
 }
 
-template <class T, size_t MAX> ACE_INLINE
+template <class T, CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
                                                     T *data,
                                                     CORBA::Boolean release)
@@ -130,7 +131,7 @@ TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
 {
 }
 
-template <class T, size_t MAX> ACE_INLINE T *
+template <class T, CORBA::ULong MAX> ACE_INLINE T *
 TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
 {
   T *result = 0;
@@ -165,13 +166,13 @@ TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
   return result;
 }
 
-template <class T, size_t MAX> ACE_INLINE const T *
+template <class T, CORBA::ULong MAX> ACE_INLINE const T *
 TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
 {
   return ACE_reinterpret_cast(const T * ACE_CAST_CONST, this->buffer_);
 }
 
-template <class T, size_t MAX> ACE_INLINE void
+template <class T, CORBA::ULong MAX> ACE_INLINE void
 TAO_Bounded_Sequence<T, MAX>::replace (CORBA::ULong max,
                                        CORBA::ULong length,
                                        T *data,
@@ -188,7 +189,7 @@ TAO_Bounded_Sequence<T, MAX>::replace (CORBA::ULong max,
   this->release_ = release;
 }
 
-template <class T, size_t MAX> ACE_INLINE T &
+template <class T, CORBA::ULong MAX> ACE_INLINE T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
@@ -196,7 +197,7 @@ TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
   return tmp[i];
 }
 
-template <class T, size_t MAX> ACE_INLINE const T &
+template <class T, CORBA::ULong MAX> ACE_INLINE const T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
@@ -208,56 +209,56 @@ TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 // Inline operations for class TAO_Object_Manager<T>
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs)
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <class T,class T_var> ACE_INLINE T *
 TAO_Object_Manager<T,T_var>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::operator const T* () const // cast
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::operator T* &() // cast
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <class T,class T_var> ACE_INLINE T *
 TAO_Object_Manager<T,T_var>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
+template <class T,class T_var> ACE_INLINE T *&
 TAO_Object_Manager<T,T_var>::inout (void)
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
+template <class T,class T_var> ACE_INLINE T *&
 TAO_Object_Manager<T,T_var>::out (void)
 {
   CORBA::release (*this->ptr_);
@@ -265,7 +266,7 @@ TAO_Object_Manager<T,T_var>::out (void)
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <class T,class T_var> ACE_INLINE T *
 TAO_Object_Manager<T,T_var>::_retn (void)
 {
   T *temp = *this->ptr_;
@@ -278,12 +279,12 @@ TAO_Object_Manager<T,T_var>::_retn (void)
 // *************************************************************
 
 //default constructor
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Unbounded_Object_Sequence<T,T_var>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
                                CORBA::ULong length,
@@ -293,7 +294,7 @@ TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <class T, class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
+template <class T,class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
 TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
@@ -305,13 +306,13 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 // class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> ACE_INLINE
+template<class T, class T_var,CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
+template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Object_Sequence<T,T_var,MAX>::
 TAO_Bounded_Object_Sequence (CORBA::ULong length,
                              T **value,
@@ -320,7 +321,7 @@ TAO_Bounded_Object_Sequence (CORBA::ULong length,
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
+template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
@@ -333,12 +334,12 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
 // *************************************************************
 
 //default constructor
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
+template <class T,class T_var> ACE_INLINE
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::
 TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
                                CORBA::ULong length,
@@ -348,7 +349,7 @@ TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <class T, class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
+template <class T,class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
@@ -360,13 +361,13 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 // class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> ACE_INLINE
+template<class T, class T_var,CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
+template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::
 TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
                              T **value,
@@ -375,27 +376,25 @@ TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
+template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
 TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
-                                        this->buffer_);
-  return TAO_Object_Manager<T,T_var> (tmp + slot,
-                                      this->release_);
+  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_String_Sequence
 // *************************************************************
 
-template<size_t MAX> ACE_INLINE
+template<CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<size_t MAX> ACE_INLINE
+template<CORBA::ULong MAX> ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::
 TAO_Bounded_String_Sequence (CORBA::ULong length,
                              char **value,
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index b08e8dd513c..4d1bcbeb710 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/Servant_Base.cpp
@@ -409,9 +409,9 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
                                                             ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  return poa_current_impl->poa ()->orb_core ().orb ()->create_stub_object (poa_current_impl->object_key (),
-                                                                           interface,
-                                                                           ACE_TRY_ENV);
+  return poa_current_impl->POA_impl ()->orb_core ().orb ()->create_stub_object (poa_current_impl->object_key (),
+                                                                                interface,
+                                                                                ACE_TRY_ENV);
 }
 
 void
@@ -436,13 +436,3 @@ TAO_DynamicImplementation::_dispatch (CORBA::ServerRequest &request,
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index 2fb4003afd9..b40fc0e691a 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -174,7 +174,7 @@ protected:
 
 private:
 
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> ref_count_;
+  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
   // Reference counter.
 };
 
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index c33daf72639..bb03b9812e5 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -113,13 +113,13 @@ public:
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
   virtual void arguments (CORBA::NVList_ptr &list,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // Implementation uses this to provide the ORB with the operation's
   // parameter list ... on return, their values are available; the
   // list fed in has typecodes and (perhap) memory assigned.
 
   virtual void set_result (const CORBA::Any &value,
-                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
   //
@@ -127,7 +127,7 @@ public:
   // sent when this returns, and reclaim memory it allocated.
 
   virtual void set_exception (const CORBA::Any &value,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                              CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // Implementation uses this to provide the exception value which is
   // the only result of this particular invocation.
   //
@@ -143,7 +143,7 @@ public:
   // this stuff is a catastrophic error since this is all part of the
   // basic CORBA Object Model.
 
-  virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // marshal outgoing parameters. Used by DSI
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -154,7 +154,7 @@ public:
   virtual unsigned int operation_length (void) const = 0;
   // get the length of the operation name
 
-  virtual void init_reply (CORBA_Environment &ACE_TRY_ENV =
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV =
                                TAO_default_environment ()) = 0;
   // Start a Reply message.
 
@@ -169,12 +169,12 @@ public:
   virtual CORBA::ORB_ptr  orb (void) = 0;
   // get the underlying ORB
 
-  virtual void demarshal (CORBA_Environment &ACE_TRY_ENV,
+  virtual void demarshal (CORBA_Environment &orb_env,
                           const TAO_Call_Data_Skel *info,
                           ...) = 0;
   // demarshal incoming parameters
 
-  virtual void marshal (CORBA_Environment &ACE_TRY_ENV,
+  virtual void marshal (CORBA_Environment &orb_env,
                         //                        CORBA_Environment &skel_env,
                         const TAO_Call_Data_Skel *info,
                         ...) = 0;
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index b4fc7c00b0e..91e16266934 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -89,12 +89,8 @@ TAO_Stub::TAO_Stub (char *repository_id,
       this->orb_core_ = TAO_ORB_Core_instance ();
     }
 
-  // Duplicate the ORB. This will help us keep the ORB around until
-  // the CORBA::Object we represent dies.
-  this->orb_ = CORBA::ORB::_duplicate (this->orb_core_->orb ());
-
   this->profile_lock_ptr_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
+    this->orb_core_->client_factory ()->create_iiop_profile_lock ();
 
   this->set_base_profiles (profiles);
 }
@@ -108,11 +104,11 @@ TAO_Stub::TAO_Stub (char *repository_id,
 //    can get different values, depending on the profile_in_use!!
 CORBA::ULong
 TAO_Stub::hash (CORBA::ULong max,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Environment &env)
 {
   // we rely on the profile object to has it's address info
   if (profile_in_use_)
-    return profile_in_use_->hash (max, ACE_TRY_ENV);
+    return profile_in_use_->hash (max, env);
   ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) hash called on a null profile!\n"), 0);
 }
 
@@ -124,7 +120,8 @@ TAO_Stub::hash (CORBA::ULong max,
 // NOTE that this must NOT go across the network!
 // @@ Two object references are the same if any two profiles are the same!
 CORBA::Boolean
-TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
+TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj,
+                         CORBA::Environment &env)
 {
   if (CORBA::is_nil (other_obj) == 1)
     return 0;
@@ -136,7 +133,7 @@ TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
     return 0;
 
   // Compare the profiles
-  return this_profile->is_equivalent (other_profile);
+  return this_profile->is_equivalent (other_profile, env);
 }
 
 // Memory managment
@@ -336,10 +333,7 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
               // (ASG) will do 03/22/98.
               // @@ IMHO this should be handled in the stub
               // (coryan)
-              CORBA::TCKind kind = pdp->tc->kind (ACE_TRY_ENV);
-              ACE_CHECK;
-
-              switch (kind)
+              switch (pdp->tc->kind (TAO_IN_ENV))
                 {
                 case CORBA::tk_string:
                   {
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 34879c39402..04c98d1a53e 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -213,12 +213,12 @@ class TAO_Export TAO_Stub
   //   The stub and DII interpreter APIs are member functions of this
   //   type.
 public:
-  void do_static_call (CORBA_Environment &ACE_TRY_ENV,
+  void do_static_call (CORBA_Environment &TAO_IN_ENV,
                        const TAO_Call_Data *info,
                        void** args);
   // The "stub interpreter" method parameters are:
   //
-  //    - ACE_TRY_ENV ... used for exception reporting
+  //    - TAO_IN_ENV ... used for exception reporting
   //    - info ... describes the call
   //    - args parameters follow
   //
@@ -241,7 +241,7 @@ public:
                         CORBA::NamedValue_ptr result,
                         CORBA::Flags flags,
                         CORBA::ExceptionList &exceptions,
-                        CORBA_Environment &ACE_TRY_ENV =
+                        CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ());
   // Dynamic invocations use a more costly "varargs" calling
   // convention; it's got the same input data as the (static)
@@ -259,7 +259,7 @@ public:
   //    - result ... result and its description
   //    - flags ... only one DII flag is legal
   //    - exceptions ... list of legal user-defined exceptions
-  //    - ACE_TRY_ENV ... used for exception reporting.
+  //    - TAO_IN_ENV ... used for exception reporting.
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -300,14 +300,16 @@ public:
   // All objref representations carry around a type ID.
 
   CORBA::ULong hash (CORBA::ULong maximum,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // All objref representations know how to hash themselves and
   // compare themselves for equivalence to others.  It's easily
   // possible to have two objrefs that are distinct copies of data
   // that refers/points to the same remote object (i.e. are
   // equivalent).
 
-  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
+  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
+                                CORBA_Environment &TAO_IN_ENV =
+                                      TAO_default_environment ());
   // Implement the is_equivalent() method for the CORBA::Object
 
   // Our Constructors ...
@@ -400,7 +402,7 @@ public:
   // temporary.
 
 protected:
-  void put_params (CORBA_Environment &ACE_TRY_ENV,
+  void put_params (CORBA_Environment &TAO_IN_ENV,
                    const TAO_Call_Data *info,
                    TAO_GIOP_Invocation &call,
                    void** args);
@@ -411,7 +413,7 @@ protected:
 
   void put_params (TAO_GIOP_Invocation &call,
                    CORBA::NVList_ptr args,
-                   CORBA_Environment &ACE_TRY_ENV =
+                   CORBA_Environment &TAO_IN_ENV =
                          TAO_default_environment ());
   // Helper method to factor out common code in dynamic oneway
   // vs. twoway invocations.
@@ -477,10 +479,6 @@ private:
   TAO_ORB_Core* orb_core_;
   // The ORB
 
-  CORBA::ORB_var orb_;
-  // ORB required for reference counting.  This will help us keep the
-  // ORB around until the CORBA::Object we represent dies.
-
   CORBA::ORB_var servant_orb_;
   // If this stub refers to a collocated object then we need to hold on to
   // the servant's ORB (which may be different from the client ORB) so that,
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index 69e3db43d38..911f7d98e59 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -31,12 +31,12 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
   return this->init (argc,
                      argv,
                      0,
-                     ACE_TRY_ENV);
+                     env);
 }
 
 int
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index c53f6373823..1442539bdda 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="TAO DLL" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=TAO DLL - Win32 Debug

+CFG=TAO - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,14 +14,14 @@ CFG=TAO DLL - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO DLL - Win32 Debug"

+!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TAO DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -29,7 +29,7 @@ CFG=TAO DLL - Win32 Debug
 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

-!IF  "$(CFG)" == "TAO DLL - Win32 Release"

+!IF  "$(CFG)" == "TAO - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -39,12 +39,12 @@ CFG=TAO DLL - Win32 Debug
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir ".\DLL\Release"

+# PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

@@ -60,7 +60,7 @@ LINK32=link.exe
 # ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

 # SUBTRACT LINK32 /incremental:yes

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -75,7 +75,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

@@ -90,7 +90,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

 # ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -105,8 +105,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 I "../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 I "..\..\\ /I" D "WIN32" D "NDEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD ..\\ c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

@@ -120,7 +120,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

 # ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

 

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -135,8 +135,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "../../" /I"../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../../" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\..\\ /I" D "WIN32" D "_DEBUG" D "_WINDOWS" D "TAO_BUILD_DLL" FD MTd ..\\ c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

@@ -154,412 +154,1512 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "TAO DLL - Win32 Release"

-# Name "TAO DLL - Win32 Debug"

-# Name "TAO DLL - Win32 Alpha Release"

-# Name "TAO DLL - Win32 Alpha Debug"

+# Name "TAO - Win32 Release"

+# Name "TAO - Win32 Debug"

+# Name "TAO - Win32 Alpha Release"

+# Name "TAO - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Acceptor_Registry.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Object_Map.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Any.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\append.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Invocation.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Interpreter.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Client_Strategy_Factory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector_Registry.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Context.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CONV_FRAMEC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CONV_FRAMES.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\corbafwd.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CurrentC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CurrentS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\debug.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\decode.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\deep_free.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_client.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_resource.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_server.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DomainC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DomainS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynAny_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynAnyC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynAnyS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynArray_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynEnum_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynSequence_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynStruct_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynUnion_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\encode.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Environment.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Exception.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Forwarding_Servant.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Server_Request.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Acceptor.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Connect.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Connector.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Factory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Profile.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Transport.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\InconsistentTypeCodeC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Invocation.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOPC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOPS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOR_LookupTable.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\IORC.cpp

-# End Source File

-# Begin Source File

+!IF  "$(CFG)" == "TAO - Win32 Release"

 

-SOURCE=.\IORManipulation.cpp

-# End Source File

-# Begin Source File

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

 

-SOURCE=.\IORS.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=.\Key_Adapters.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Types.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Marshal.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Messaging_Policy_i.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MessagingC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MessagingS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MProfile.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NVList.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Adapter.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_KeyC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ObjectIDList.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Operation_Table.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORB.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORB_Core.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\params.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pluggable.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\POA.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\POAC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\POAManager.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\POAS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Policy_Manager.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PolicyC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PolicyS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Principal.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Protocol_Factory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reply_Dispatcher.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Request.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Resource_Factory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sequence.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Servant_Base.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Server_Request.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Server_Strategy_Factory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Services.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\skip.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stub.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Tagged_Components.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO_Internal.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeBaseC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeBaseS.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Transport_Mux_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typecode.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typecode_Constants.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Union.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueBase.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueFactory.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueFactory_Map.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Wait_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WrongTransactionC.cpp

+

+!IF  "$(CFG)" == "TAO - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -583,6 +1683,10 @@ SOURCE=.\arg_shifter.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Invocation.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\cdr.h

 # End Source File

 # Begin Source File

@@ -739,18 +1843,6 @@ SOURCE=.\IOR_LookupTable.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -859,6 +1951,14 @@ SOURCE=.\PolicyC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

@@ -1174,5 +2274,9 @@ SOURCE=.\ValueFactory.i
 SOURCE=.\ValueFactory_Map.i

 # End Source File

 # End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

 # End Target

 # End Project

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 4eac58bd8f9..06ac8cae668 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="TAO LIB" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="TAO Static" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=TAO LIB - Win32 Debug

+CFG=TAO Static - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=TAO LIB - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TAO_Static.mak" CFG="TAO LIB - Win32 Debug"

+!MESSAGE NMAKE /f "TAO_Static.mak" CFG="TAO Static - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TAO LIB - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "TAO LIB - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "TAO Static - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "TAO Static - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=TAO LIB - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "TAO LIB - Win32 Release"

+!IF  "$(CFG)" == "TAO Static - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

@@ -52,7 +52,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"TAOs.lib"

 

-!ELSEIF  "$(CFG)" == "TAO LIB - Win32 Debug"

+!ELSEIF  "$(CFG)" == "TAO Static - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\\" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

@@ -79,8 +79,8 @@ LIB32=link.exe -lib
 

 # Begin Target

 

-# Name "TAO LIB - Win32 Release"

-# Name "TAO LIB - Win32 Debug"

+# Name "TAO Static - Win32 Release"

+# Name "TAO Static - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -274,18 +274,6 @@ SOURCE=.\IOR_LookupTable.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Key_Adapters.cpp

 # End Source File

 # Begin Source File

@@ -330,10 +318,6 @@ SOURCE=.\Object_KeyC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Operation_Table.cpp

 # End Source File

 # Begin Source File

@@ -382,6 +366,14 @@ SOURCE=.\PolicyS.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.cpp

 # End Source File

 # Begin Source File

@@ -498,6 +490,10 @@ SOURCE=.\Active_Object_Map.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\align.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\any.h

 # End Source File

 # Begin Source File

@@ -522,10 +518,6 @@ SOURCE=.\Connector_Registry.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CONV_FRAMEC.h

 # End Source File

 # Begin Source File

@@ -542,10 +534,6 @@ SOURCE=.\corbafwd.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CurrentC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\debug.h

 # End Source File

 # Begin Source File

@@ -566,10 +554,6 @@ SOURCE=.\DomainC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAny_i.h

 # End Source File

 # Begin Source File

@@ -658,22 +642,6 @@ SOURCE=.\IOPS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_LookupTable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -714,7 +682,7 @@ SOURCE=.\Object_KeyC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.h

+SOURCE=.\Object_Table.h

 # End Source File

 # Begin Source File

 

@@ -750,10 +718,6 @@ SOURCE=.\poa.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\POA_CORBA.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\poa_macros.h

 # End Source File

 # Begin Source File

@@ -782,6 +746,14 @@ SOURCE=.\PolicyC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

@@ -902,10 +874,6 @@ SOURCE=.\cdr.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CONV_FRAMEC.i

 # End Source File

 # Begin Source File

@@ -918,6 +886,10 @@ SOURCE=.\corbafwd.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\CurrentC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\default_client.i

 # End Source File

 # Begin Source File

@@ -966,6 +938,10 @@ SOURCE=.\IIOP_ORB.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Invocation.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IOPC.i

 # End Source File

 # Begin Source File

@@ -1006,10 +982,6 @@ SOURCE=.\Object_KeyC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB.i

 # End Source File

 # Begin Source File

@@ -1026,6 +998,10 @@ SOURCE=.\params.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\POA.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\poaC.i

 # End Source File

 # Begin Source File

@@ -1046,6 +1022,14 @@ SOURCE=.\PolicyC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PolicyS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Principal.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Request.i

 # End Source File

 # Begin Source File

@@ -1058,6 +1042,10 @@ SOURCE=.\Sequence_T.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Servant_Base.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Server_Request.i

 # End Source File

 # Begin Source File

@@ -1096,6 +1084,14 @@ SOURCE=.\ValueFactory.i
 

 SOURCE=.\ValueFactory_Map.i

 # End Source File

+# Begin Source File

+

+SOURCE=.\varout.i

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

 # End Group

 # End Target

 # End Project

diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index 647cef53e67..b18471fb17a 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -3,14 +3,7 @@
 #include "tao/Transport_Mux_Strategy.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
-
-// @@ Alex: there is another aspect that is controlled by this
-//    strategy: the demuxed version must idle() the transport
-//    right after the request is sent, otherwise nobody else will be
-//    able to use it.
-//    The exclusive version must idle it after the reply is received,
-//    to guarantee that nobody else is using it.
-//    We may need to add a couple of methods to implement that.
+#include "tao/Pluggable.h"
 
 TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (void)
 {
@@ -22,110 +15,213 @@ TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
 
 // *********************************************************************
 
-TAO_Muxed_TMS::TAO_Muxed_TMS (void)
+TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_ORB_Core *orb_core)
+  : request_id_generator_ (0),
+    request_id_ (0),
+    rd_ (0),
+    message_state_ (orb_core)
 {
 }
 
-TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
+TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
 {
-  // @@ delete ???
 }
 
 // Generate and return an unique request id for the current
-// invocation.
+// invocation. We can actually return a predecided ULong, since we
+// allow only one invocation over this connection at a time.
 CORBA::ULong
-TAO_Muxed_TMS::request_id (void)
+TAO_Exclusive_TMS::request_id (void)
 {
-  // @@
-  return 0;
+  return this->request_id_generator_++;
 }
 
-// Bind the dispatcher with the request id.
+// Bind the handler with the request id.
 int
-TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong,
-                                TAO_Reply_Dispatcher *)
+TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
+                                    TAO_Reply_Dispatcher *rd)
 {
-  // @@
+  this->request_id_ = request_id;
+  this->rd_ = rd;
+
+  // @@ Carlos: This method marks the <start> of an invocation. This
+  //    should be the correct place to <reset> the message state. Do I
+  //    make sense? (Alex).
+
+  // If there was a previous reply, cleanup its state first.
+  if (this->message_state_.message_size != 0)
+    this->message_state_.reset ();
+
   return 0;
 }
 
 int
-TAO_Muxed_TMS::dispatch_reply (CORBA::ULong /* request_id */,
-                               CORBA::ULong /* reply_status */,
-                               const TAO_GIOP_Version&,
-                               TAO_GIOP_ServiceContextList& /* reply_ctx */,
-                               TAO_GIOP_Message_State*)
+TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
+                                   CORBA::ULong reply_status,
+                                   const TAO_GIOP_Version& version,
+                                   TAO_GIOP_ServiceContextList& reply_ctx,
+                                   TAO_GIOP_Message_State* message_state)
 {
-  // @@
-  return -1;
+  // There can be only one message state possible. Just do a sanity
+  // check here.
+  ACE_ASSERT (message_state == &(this->message_state_));
+
+  // Check the ids.
+  if (this->request_id_ != request_id)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n",
+                    this->request_id_, request_id));
+      return -1;
+    }
+
+  TAO_Reply_Dispatcher *rd = this->rd_;
+  this->request_id_ = 0xdeadbeef; // @@ What is a good value???
+  this->rd_ = 0;
+
+  return rd->dispatch_reply (reply_status,
+                             version,
+                             reply_ctx,
+                             message_state);
 }
 
 TAO_GIOP_Message_State *
-TAO_Muxed_TMS::get_message_state (void)
+TAO_Exclusive_TMS::get_message_state (void)
 {
-  return 0;
+  if (this->rd_ == 0)
+    return 0;
+
+  return &(this->message_state_);
 }
 
 void
-TAO_Muxed_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+TAO_Exclusive_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+{
+  // No Op.
+}
+
+int
+TAO_Exclusive_TMS::idle_after_send (TAO_Transport *)
 {
-  // @@ Implement.
-  // delete message_state;
-  // message_state = 0;
+  // No op.
+  return 0;
 }
+  
+int
+TAO_Exclusive_TMS::idle_after_reply (TAO_Transport *transport)
+{
+  if (transport != 0)
+    return transport->idle ();
 
+  return 0;
+}
+
+int
+TAO_Exclusive_TMS::reply_received (const CORBA::ULong request_id)
+{
+  if (this->rd_ == 0)
+    {
+      // Reply should have been dispatched already.
+      return 1;
+    }
+  else if (this->request_id_ == request_id)
+    {
+      // Reply dispatcher is still here.
+      return 0;
+    }
+  else
+    {
+      // Error. Request id is not matching.
+      
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P | %t):TAO_Exclusive_TMS::reply_received:"
+                      "Invalid request_id \n"));
+        }
+      return -1;
+    }
+}
+ 
 // *********************************************************************
 
-TAO_Exclusive_TMS::TAO_Exclusive_TMS (void)
+TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_ORB_Core *orb_core)
   : request_id_generator_ (0),
-    request_id_ (0),
-    rd_ (0)
+    orb_core_ (orb_core),
+    message_state_ (0)
 {
 }
 
-TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
+TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
 {
 }
 
 // Generate and return an unique request id for the current
-// invocation. We can actually return a predecided ULong, since we
-// allow only one invocation over this connection at a time.
+// invocation.
 CORBA::ULong
-TAO_Exclusive_TMS::request_id (void)
+TAO_Muxed_TMS::request_id (void)
 {
+  // @@ What is a good error return value?
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
+                    this->request_id_lock_, 0);
   return this->request_id_generator_++;
 }
 
-// Bind the handler with the request id.
+// Bind the dispatcher with the request id.
 int
-TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
-                                    TAO_Reply_Dispatcher *rd)
+TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
+                                TAO_Reply_Dispatcher *rd)
 {
-  this->request_id_ = request_id;
-  this->rd_ = rd;
+  int result = this->dispatcher_table_.bind (request_id, rd);
+  
+  if (result != 0)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P | %t):TAO_Muxed_TMS::bind_dispatcher: "
+                    "bind dispatcher failed: result = %d\n",
+                    result));
+
+      return -1;
+    }
   return 0;
 }
 
 int
-TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
-                                   CORBA::ULong reply_status,
-                                   const TAO_GIOP_Version& version,
-                                   TAO_GIOP_ServiceContextList& reply_ctx,
-                                   TAO_GIOP_Message_State* message_state)
+TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
+                               CORBA::ULong reply_status,
+                               const TAO_GIOP_Version &version,
+                               TAO_GIOP_ServiceContextList &reply_ctx,
+                               TAO_GIOP_Message_State *message_state)
 {
-  if (this->request_id_ != request_id)
+  // This message state should be the same as the one we have here,
+  // which we gave to the Transport to read the message. Just a sanity
+  // check here. 
+  ACE_ASSERT (message_state == this->message_state_);
+  
+  int result = 0;
+  TAO_Reply_Dispatcher *rd = 0;
+
+  // Grab the reply dispatcher for this id.
+  result = this->dispatcher_table_.unbind (request_id, rd);
+  
+  if (result != 0)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n",
-                    this->request_id_, request_id));
-      return 0;
+                    "(%P | %t):TAO_Muxed_TMS::dispatch_reply: "
+                    "unbind dispatcher failed: result = %d\n",
+                    result));
+      
+      return -1;
     }
 
-  TAO_Reply_Dispatcher *rd = this->rd_;
-  this->request_id_ = 0xdeadbeef; // @@ What is a good value???
-  this->rd_ = 0;
+  // @@ Carlos : We could save the <messagee_state> somehow and then
+  //    signal some other thread to go ahead read the incoming message
+  //    if any. Is this what you were telling me before? (Alex).
 
+  // Dispatch the reply.
   return rd->dispatch_reply (reply_status,
                              version,
                              reply_ctx,
@@ -133,16 +229,113 @@ TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
 }
 
 TAO_GIOP_Message_State *
-TAO_Exclusive_TMS::get_message_state (void)
+TAO_Muxed_TMS::get_message_state (void)
 {
-  if (this->rd_ == 0)
-    return 0;
-
-  return this->rd_->message_state ();
+  if (this->message_state_ == 0)
+    {
+      // Create the next message state.
+      ACE_NEW_RETURN (this->message_state_,
+                      TAO_GIOP_Message_State (this->orb_core_),
+                      0);
+    }
+  
+  return this->message_state_;
 }
 
-// NOOP function.
 void
-TAO_Exclusive_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+TAO_Muxed_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+{
+  delete this->message_state_;
+  this->message_state_ = 0;
+}
+
+int
+TAO_Muxed_TMS::idle_after_send (TAO_Transport *transport)
+{
+  if (transport != 0)
+    return transport->idle ();
+  
+  return 0;
+}
+  
+int
+TAO_Muxed_TMS::idle_after_reply (TAO_Transport *)
+{
+  return 0;
+}
+
+int
+TAO_Muxed_TMS::reply_received (const CORBA::ULong request_id)
 {
+  if (this->dispatcher_table_.find (request_id) == -1)
+    {
+      // Reply should have been dispatched already.
+      return 1;
+    }
+  else
+    {
+      // Reply dispatcher is still here.
+      return 0;
+    }
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Manager_Ex <CORBA::ULong,
+                                        TAO_Reply_Dispatcher *,
+                                        ACE_Hash <CORBA::ULong>,
+                                        ACE_Equal_To <CORBA::ULong>,
+                                        ACE_SYNCH_MUTEX>;
+
+template class ACE_Hash_Map_Entry<CORBA::ULong,
+                                  TAO_Reply_Dispatcher *>;
+
+template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong,
+                                             TAO_Reply_Dispatcher *,
+                                             ACE_Hash<unsigned int>, 
+                                             ACE_Equal_To<unsigned int>, 
+                                             ACE_SYNCH_MUTEX>;
+
+template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
+                                        TAO_Reply_Dispatcher*,
+                                        ACE_Hash<CORBA::ULong>,
+                                        ACE_Equal_To<CORBA::ULong>,
+                                        ACE_SYNCH_MUTEX>;
+
+template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
+                                                TAO_Reply_Dispatcher*,
+                                                ACE_Hash<CORBA::ULong>,
+                                                ACE_Equal_To<CORBA::ULong>,
+                                                ACE_SYNCH_MUTEX>;
+template class ACE_Equal_To <CORBA::ULong>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong,
+                                             TAO_Reply_Dispatcher *,
+                                             ACE_Hash <CORBA::ULong>,
+                                             ACE_Equal_To <CORBA::ULong>,
+                                             ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong,
+                                       TAO_Reply_Dispatcher *>
+
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int,
+                                                  TAO_Reply_Dispatcher *,
+                                                  ACE_Hash<unsigned int>, 
+                                                  ACE_Equal_To<unsigned int>, 
+                                                  ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
+                                             TAO_Reply_Dispatcher*,
+                                             ACE_Hash<CORBA::ULong>,
+                                             ACE_Equal_To<CORBA::ULong>,
+                                             ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
+                                                     TAO_Reply_Dispatcher*,
+                                                     ACE_Hash<CORBA::ULong>,
+                                                     ACE_Equal_To<CORBA::ULong>,
+                                                     ACE_SYNCH_MUTEX>
+
+#pragma instantiate ACE_Equal_To <CORBA::ULong>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 8cdb605aec9..6c13a03e73d 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -1,3 +1,4 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -25,6 +26,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Functor.h"
+#include "ace/Hash_Map_Manager.h"
+
 class TAO_Reply_Dispatcher;
 
 class TAO_Export TAO_Transport_Mux_Strategy
@@ -37,7 +41,7 @@ class TAO_Export TAO_Transport_Mux_Strategy
   //
   // = DESCRIPTION
   //
-
+  
 public:
   TAO_Transport_Mux_Strategy (void);
   // Base class constructor.
@@ -50,13 +54,12 @@ public:
   // invocation.
 
   // = Bind and Find methods for the <Request ID, ReplyDispatcher>
-  //   pairs. The ReplyDispatcher is not the CORBA ReplyDispatcher of
-  //   the AMI's.
+  //   pairs.
 
   virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rh) = 0;
+                               TAO_Reply_Dispatcher *rd) = 0;
   // Bind the dispatcher with the request id.
-
+  
   virtual int dispatch_reply (CORBA::ULong request_id,
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
@@ -74,78 +77,170 @@ public:
 
   virtual void destroy_message_state (TAO_GIOP_Message_State *) = 0;
   // Destroy a CDR stream.
+
+  virtual int idle_after_send (TAO_Transport *) = 0;
+  // Request has been just sent, but the reply is not received. Idle
+  // the transport now.
+  
+  virtual int idle_after_reply (TAO_Transport *) = 0;
+  // Request is sent and the reply is received. Idle the transport
+  // now. 
+
+  virtual int reply_received (const CORBA::ULong request_id) = 0;
+  // Check whether the reply has been receieved for the request with
+  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
+  // is invalid or there are some errors.
 };
 
-class TAO_Export TAO_Muxed_TMS : public  TAO_Transport_Mux_Strategy
+// *********************************************************************
+
+class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
 {
   // = TITLE
   //
-  //    Connection is multiplexed for many requests.
+  //    Connection exclusive for the request.
   //
   // = DESCRIPTION
   //
 
 public:
-  TAO_Muxed_TMS (void);
+  TAO_Exclusive_TMS (TAO_ORB_Core *orb_core);
   // Constructor.
 
-  virtual ~TAO_Muxed_TMS (void);
+  virtual ~TAO_Exclusive_TMS (void);
   // Destructor.
 
-  // = The TAO Request Strategy methods...
   virtual CORBA::ULong request_id (void);
+  // Generate and return an unique request id for the current
+  // invocation.
+
   virtual int bind_dispatcher (CORBA::ULong request_id,
                                TAO_Reply_Dispatcher *rh);
+  // Bind the dispatcher with the request id.
+
   virtual int dispatch_reply (CORBA::ULong request_id,
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
                               TAO_GIOP_Message_State* message_state);
+  // Dispatch the reply for <request_id>, cleanup any resources
+  // allocated for that request.
+
   virtual TAO_GIOP_Message_State *get_message_state (void);
+  // Return the pre-allocated message state.
+
   virtual void destroy_message_state (TAO_GIOP_Message_State *);
+  // No op in this strategy.
+
+  virtual int idle_after_send (TAO_Transport *transport);
+  // Request has been just sent, but the reply is not received. Idle
+  // the transport now.
+  
+  virtual int idle_after_reply (TAO_Transport *transport);
+  // Request is sent and the reply is received. Idle the transport
+  // now. 
+  
+  virtual int reply_received (const CORBA::ULong request_id);
+  // Check whether the reply has been receieved for the request with
+  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
+  // is invalid or there are errors.
 
 protected:
-  // @@ HASH TABLE???
+  CORBA::ULong request_id_generator_;
+  // Used to generate a different request_id on each call to
+  // request_id().
+
+  CORBA::ULong request_id_;
+  // Request id for the current request.
+
+  TAO_Reply_Dispatcher *rd_;
+  // Reply Dispatcher corresponding to the request.
+
+  TAO_GIOP_Message_State message_state_;
+  // Message state to read the incoming message. 
 };
 
-class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
+// *********************************************************************
+
+class TAO_Export TAO_Muxed_TMS : public  TAO_Transport_Mux_Strategy
 {
   // = TITLE
   //
-  //    Connection exclusive for the request.
+  //    Connection is multiplexed for many requests.
   //
   // = DESCRIPTION
   //
 
 public:
-  TAO_Exclusive_TMS (void);
+  TAO_Muxed_TMS (TAO_ORB_Core *orb_core);
   // Constructor.
 
-  virtual ~TAO_Exclusive_TMS (void);
+  virtual ~TAO_Muxed_TMS (void);
   // Destructor.
 
-  // = The TAO Request Strategy methods...
   virtual CORBA::ULong request_id (void);
+  // Generate and return an unique request id for the current
+  // invocation.
+  
   virtual int bind_dispatcher (CORBA::ULong request_id,
                                TAO_Reply_Dispatcher *rh);
+  // Bind the dispatcher with the request id.
+
   virtual int dispatch_reply (CORBA::ULong request_id,
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
                               TAO_GIOP_Message_State* message_state);
+  // Dispatch the reply for <request_id>, cleanup any resources
+  // allocated for that request.
+
   virtual TAO_GIOP_Message_State *get_message_state (void);
+  // Return the message state.
+
   virtual void destroy_message_state (TAO_GIOP_Message_State *);
+  // No op in this strategy.
+
+  virtual int idle_after_send (TAO_Transport *transport);
+  // Request has been just sent, but the reply is not received. Idle
+  // the transport now.
+  
+  virtual int idle_after_reply (TAO_Transport *transport);
+  // Request is sent and the reply is received. Idle the transport
+  // now. 
+
+  virtual int reply_received (const CORBA::ULong request_id);
+  // Check whether the reply has been receieved for the request with
+  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
+  // is invalid or there are errors.
 
 protected:
   CORBA::ULong request_id_generator_;
   // Used to generate a different request_id on each call to
-  // request_id()
+  // request_id().
 
-  CORBA::ULong request_id_;
-  // Request id for the current request.
+  ACE_SYNCH_MUTEX request_id_lock_;
+  // Lock to protect the state of the request id generator. 
 
-  TAO_Reply_Dispatcher *rd_;
-  // Reply Dispatcher corresponding to the request.
+  typedef ACE_Hash_Map_Manager_Ex <CORBA::ULong,
+                                   TAO_Reply_Dispatcher *,
+                                   ACE_Hash <CORBA::ULong>,
+                                   ACE_Equal_To <CORBA::ULong>,
+                                   ACE_SYNCH_MUTEX> REQUEST_DISPATCHER_TABLE;
+
+  REQUEST_DISPATCHER_TABLE dispatcher_table_;
+  // Table of <Request ID, Reply Dispatcher> pairs.
+
+  TAO_ORB_Core *orb_core_;
+  // Keep track of the orb core pointer. We need to this to create the
+  // Reply Dispatchers.
+
+  TAO_GIOP_Message_State *message_state_;
+  // Message state where the current input message is being read. This
+  // is created at start of each incoming message. When that message
+  // is read, the message is processed and for the next message a new
+  // message state is created.
 };
 
+// *********************************************************************
+
 #endif /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 072f02f0c3b..35d569dbd74 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -747,6 +747,7 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_objref (CORBA::TypeCode_ptr tc,
                                       CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
   // compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
   const char *my_id = this->id (ACE_TRY_ENV);
@@ -782,6 +783,8 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
                                       CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   // for structs the repoID and names are optional. However, if provided, we
   // must compare them
   const char *my_id = this->id (ACE_TRY_ENV);
@@ -854,6 +857,8 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
                                      CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   // For unions the repoID and names are optional. However, if
   // provided, we must compare them.
   const char *my_id = this->id (ACE_TRY_ENV);
@@ -949,6 +954,8 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
                                     CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   // for enum the repoID and names are optional. However, if provided, we
   // must compare them
   const char *my_id = this->id (ACE_TRY_ENV);
@@ -1069,6 +1076,8 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
                                      CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   // for structs the repoID and names are optional. However, if provided, we
   // must compare them
   const char *my_id = this->id (ACE_TRY_ENV);
@@ -1108,6 +1117,7 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
                                       CORBA::Environment &ACE_TRY_ENV) const
 {
   // exactly similar to structs, except that the repository ID is mandatory
+  //  ACE_TRY_ENV.clear ();
 
   const char *my_id = this->id (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -1179,6 +1189,8 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
 const char *
 CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   switch (this->kind_)
     {
       // These are all complex typecodes, which have as their first
@@ -1217,6 +1229,8 @@ CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
 const char *
 CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   switch (this->kind_)
     {
       // These are all complex typecodes, which have as their second
@@ -1270,6 +1284,8 @@ CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
 CORBA::ULong
 CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   switch (kind_)
     {
     case CORBA::tk_alias:
@@ -1359,6 +1375,8 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
     case CORBA::tk_except:
     case CORBA::tk_struct:              // index from 0
       mcount = this->member_count (ACE_TRY_ENV);
+      // @@EXC@@ Why are we rethrowing a different exception here?
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (CORBA::TypeCode_ptr)0);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1369,16 +1387,16 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
           if (slot < mcount)
             return  this->private_state_->tc_member_type_list_[slot];
           else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                              CORBA::TypeCode::_nil ());
+            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), CORBA::TypeCode::_nil ());
 
         // the first time in. Precompute and store types of all members
 
         // Allocate a list to hold the member typecodes
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr [mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        // @@EXC@@ Need to check for allocation failure here.
+        this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
+
+        if (this->private_state_->tc_member_type_list_ == 0)
+          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (CORBA::TypeCode_ptr)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()        // type ID, hidden
@@ -1426,7 +1444,9 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
+      // @@EXC@@ Why are we rethrowing a different exception here?
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (CORBA::TypeCode_ptr)0);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1439,11 +1459,11 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
           else
             ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), CORBA::TypeCode::_nil ());
 
-        // the first time in. Precompute and store types of all members
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr [mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      // the first time in. Precompute and store types of all members
+      // @@EXC@@ Need to check allocation failure.
+        this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
+        if (this->private_state_->tc_member_type_list_ == 0)
+          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (CORBA::TypeCode_ptr)0);
 
       // skip the id, name, and discrimant type part
         if (!stream.skip_string ()        // type ID, hidden
@@ -1519,8 +1539,9 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
   switch (kind_)
     {
     case CORBA::tk_enum:
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
       // out of bounds
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
       ACE_CHECK_RETURN ((char *)0);
 
       {
@@ -1565,8 +1586,9 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
 
     case CORBA::tk_except:
     case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
       // out of bounds
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
       ACE_CHECK_RETURN ((char *)0);
 
       {
@@ -1610,8 +1632,9 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
       // out of bounds
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
       ACE_CHECK_RETURN ((char *)0);
 
       {
@@ -1776,6 +1799,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
         return 0;
 
+      // @@EXC@@ Need to check memory allocation failure.
       ACE_NEW_THROW_EX (label_list[i],
                         CORBA::Any (tc, 0, out.begin ()),
                         CORBA::NO_MEMORY ());
@@ -2012,6 +2036,8 @@ CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
 CORBA::ULong
 CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
 {
+  //  ACE_TRY_ENV.clear ();
+
   switch (this->kind_)
     {
     default:
@@ -2100,6 +2126,8 @@ CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
   if (kind_ >= CORBA::TC_KIND_COUNT)
     ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
 
+  //  ACE_TRY_ENV.clear ();
+
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
                     this->private_state_->mutex_, 0);
@@ -2131,6 +2159,8 @@ CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
 size_t
 CORBA::TypeCode::private_alignment (CORBA::Environment &ACE_TRY_ENV)
 {
+  //  ACE_TRY_ENV.clear ();
+
   if (kind_ >= CORBA::TC_KIND_COUNT)
     ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
 
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 50276eaebd8..5e56496f222 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -91,69 +91,69 @@ public:
   // Returns a NULL typecode.
 
   CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA_Environment &ACE_TRY_ENV =
+                        CORBA_Environment &TAO_IN_ENV =
                           TAO_default_environment ()) const;
   // Compares two typecodes.
 
   CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
-                             CORBA_Environment &ACE_TRY_ENV =
+                             CORBA_Environment &TAO_IN_ENV =
                                TAO_default_environment ()) const;
   // Unaliases receiver and argument before comparing.
 
-  CORBA::TCKind kind (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV =
                         TAO_default_environment ()) const;
   // For all TypeCode kinds, returns the "kind" of the typecode.
 
-  const char *id (CORBA_Environment &ACE_TRY_ENV =
+  const char *id (CORBA_Environment &TAO_IN_ENV =
                     TAO_default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *name (CORBA_Environment &ACE_TRY_ENV =
+  const char *name (CORBA_Environment &TAO_IN_ENV =
                       TAO_default_environment ()) const;
   // Returns name (), raises (BadKind).
 
-  CORBA::ULong member_count (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV =
                                TAO_default_environment ()) const;
   // Returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   const char *member_name (CORBA::ULong slot,
-                           CORBA_Environment &ACE_TRY_ENV =
+                           CORBA_Environment &TAO_IN_ENV =
                              TAO_default_environment ()) const;
   // Returns member_name (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr member_type (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
+                                   CORBA_Environment &TAO_IN_ENV =
                                      TAO_default_environment ()) const;
   // Returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except.
 
   CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA_Environment &ACE_TRY_ENV =
+                               CORBA_Environment &TAO_IN_ENV =
                                  TAO_default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV =
                                             TAO_default_environment ()) const;
   // Returns the discriminator type for tk_union. raises (BadKind).
 
-  CORBA::Long default_index (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV =
                                TAO_default_environment ()) const;
   // Returns the default slot for the tk_union. Raises (BadKind).
 
-  CORBA::ULong length (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong length (CORBA_Environment &TAO_IN_ENV =
                          TAO_default_environment ()) const;
   // Returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array.
 
-  CORBA::TypeCode_ptr content_type (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV =
                                       TAO_default_environment ()) const;
   // Returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias.
 
-  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV =
                                        TAO_default_environment ());
   // Calculates the padded size of discriminant type TAO Extension.
 
@@ -197,11 +197,11 @@ public:
   };
   // these are used to indicate the status of marshaling
 
-  size_t size (CORBA_Environment &ACE_TRY_ENV =
+  size_t size (CORBA_Environment &TAO_IN_ENV =
                  TAO_default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t alignment (CORBA_Environment &ACE_TRY_ENV =
+  size_t alignment (CORBA_Environment &TAO_IN_ENV =
                       TAO_default_environment ());
   // returns the alignment requirements for this typecode.
   // used by the IIOP marshaling engine.
@@ -218,12 +218,12 @@ public:
   // throw CORBA::NO_IMPLEMENT.
 
   CORBA::Any_ptr parameter (const CORBA::Long slot,
-                            CORBA_Environment &ACE_TRY_ENV =
+                            CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ());
   // Deprecated in the CORBA 2.2 spec and
   // missing altogether from 2.3a (98-12-04),
 
-  CORBA::ULong param_count (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ()) const;
   // Deprecated, CORBA 1.2, not fully usable. Returns the number of
   // parameters that the typecode takes.
@@ -276,121 +276,121 @@ private:
   // = All the private/helper methods
 
   CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA_Environment &ACE_TRY_ENV =
+                                CORBA_Environment &TAO_IN_ENV =
                                   TAO_default_environment ()) const;
   // Compares the typecodes.
 
-  const char *private_id (CORBA_Environment &ACE_TRY_ENV =
+  const char *private_id (CORBA_Environment &TAO_IN_ENV =
                             TAO_default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *private_name (CORBA_Environment &ACE_TRY_ENV =
+  const char *private_name (CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ()) const;
   // returns name (), raises (BadKind)
 
-  CORBA::ULong private_member_count (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV =
                                        TAO_default_environment ()) const;
   // returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr private_member_type (CORBA::ULong slot,
-                                           CORBA_Environment &ACE_TRY_ENV =
+                                           CORBA_Environment &TAO_IN_ENV =
                                              TAO_default_environment ()) const;
   // returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except
 
   const char *private_member_name (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
+                                   CORBA_Environment &TAO_IN_ENV =
                                      TAO_default_environment ()) const;
   // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union,
   // tk_struct, tk_except, and tk_enum
 
   CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                          TAO_default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV =
                                                     TAO_default_environment ()) const;
   // returns the discriminator type for tk_union. raises (BadKind);
 
-  CORBA::Long private_default_index (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV =
                                        TAO_default_environment ()) const;
   // returns the default slot for the tk_union. Raises (BadKind);
 
-  CORBA::Long private_length (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV =
                                 TAO_default_environment ()) const;
   // returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array
 
-  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV =
                                               TAO_default_environment ()) const;
   // returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias
 
-  size_t private_size (CORBA_Environment &ACE_TRY_ENV =
+  size_t private_size (CORBA_Environment &TAO_IN_ENV =
                          TAO_default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t private_alignment (CORBA_Environment &ACE_TRY_ENV =
+  size_t private_alignment (CORBA_Environment &TAO_IN_ENV =
                               TAO_default_environment ());
   // returns the alignment requirements for this typecode. used by the
   // IIOP marshaling engine.
 
-  CORBA::ULong private_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV =
+  CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV =
                                            TAO_default_environment ());
   // Calculates the padded size of discriminant type TAO Extension
 
   // = All the private helpers testing for equality of typecodes
 
   CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                          TAO_default_environment ()) const;
   // test equality for typecodes of objrefs
 
   CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                          TAO_default_environment ()) const;
   // test equality for typecodes of structs
 
   CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
+                                      CORBA_Environment &TAO_IN_ENV =
                                         TAO_default_environment ()) const;
   // test equality for typecodes of unions
 
   CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA_Environment &ACE_TRY_ENV =
+                                     CORBA_Environment &TAO_IN_ENV =
                                        TAO_default_environment ()) const;
   // test equality for typecodes of enums
 
   CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                          TAO_default_environment ()) const;
   // test equality for typecodes of strings
 
   CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA_Environment &ACE_TRY_ENV =
+                                        CORBA_Environment &TAO_IN_ENV =
                                           TAO_default_environment ()) const;
   // test equality for typecodes of wide strings
 
   CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &ACE_TRY_ENV =
+                                         CORBA_Environment &TAO_IN_ENV =
                                            TAO_default_environment ()) const;
   // test equality for typecodes of sequences
 
   CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
+                                      CORBA_Environment &TAO_IN_ENV =
                                         TAO_default_environment ()) const;
   // test equality for typecodes of array
 
   CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
+                                      CORBA_Environment &TAO_IN_ENV =
                                         TAO_default_environment ()) const;
   // test equality for typecodes of typedefs
 
   CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
+                                       CORBA_Environment &TAO_IN_ENV =
                                          TAO_default_environment ()) const;
   // test equality for typecodes of exceptions
 
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 25dacc3b002..0a1043d0ea3 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -178,7 +178,6 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBid, 0)
 TAO_NAMESPACE_END
 
 CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0;
-CORBA::TypeCode_ptr CORBA_ORB::_tc_InvalidName = 0;
 
 #if !defined(TAO_HAS_MINIMUM_CORBA)
 
@@ -520,31 +519,6 @@ TAO_TypeCodes::init (void)
                          1,
                          sizeof (CORBA::RepositoryId));
 
-  static const CORBA::Long _oc_CORBA_ORB_InvalidName[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x422f496e),
-    ACE_NTOHL (0x76616c69),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ORB/InvalidName:1.0
-    12, ACE_NTOHL (0x496e7661),
-    ACE_NTOHL (0x6c69644e),
-    ACE_NTOHL (0x616d6500),  // name = InvalidName
-    0, // member count
-  };
-  CORBA::ORB::_tc_InvalidName =
-    new CORBA::TypeCode(CORBA::tk_except,
-                        sizeof (_oc_CORBA_ORB_InvalidName),
-                        (char *) &_oc_CORBA_ORB_InvalidName,
-                        0,
-                        sizeof (CORBA::ORB::InvalidName));
-
   static const CORBA::Long _oc_CORBA_ORBid[] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1897,8 +1871,6 @@ TAO_TypeCodes::fini (void)
 
   CORBA::release (CORBA::_tc_RepositoryId);
 
-  CORBA::release (CORBA::ORB::_tc_InvalidName);
-
   CORBA::release (CORBA::_tc_ORBid);
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
index 54294f8ddee..bdb3e5a24d1 100644
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ b/TAO/tao/UIOP_Acceptor.cpp
@@ -40,14 +40,6 @@ TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
 {
 }
 
-TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
-{
-  // Explicitly call close() to aid in post-error resource clean up.
-  // close() is called to ensure that the rendezvous point is removed
-  // from the filesystem.
-  this->close ();
-}
-
 int
 TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
                                     TAO_MProfile &mprofile)
@@ -129,8 +121,8 @@ TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                          ACE_CString &address)
 {
   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 (ACE_static_cast (CORBA::Octet,major),
+                                ACE_static_cast (CORBA::Octet,minor));
   ACE_UNIX_Addr addr (address.c_str ());
 
   return this->open_i (orb_core, addr);
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
index bcce015aa7d..4b4a19da538 100644
--- a/TAO/tao/UIOP_Acceptor.h
+++ b/TAO/tao/UIOP_Acceptor.h
@@ -46,9 +46,6 @@ public:
   TAO_UIOP_Acceptor (void);
   // Create Acceptor object using addr.
 
-  virtual ~TAO_UIOP_Acceptor (void);
-  // Destructor
-
   int open (TAO_ORB_Core *orb_core,
             int version_major,
             int version_minor,
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index a1f6bc80a23..036a11b6882 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -9,7 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/CDR.h"
-#include "tao/GIOP.h"
+#include "tao/Wait_Strategy.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/UIOP_Connect.i"
@@ -17,43 +17,6 @@
 
 ACE_RCSID(tao, UIOP_Connect, "$Id$")
 
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_UIOP_Connect_Timeprobe_Description[] =
-{
-  "UIOP_Server_Connection_Handler::handle_input - start",
-  "UIOP_Server_Connection_Handler::handle_input - end",
-
-  "UIOP_Server_Connection_Handler::handle_locate - start",
-  "UIOP_Server_Connection_Handler::handle_locate - end",
-
-  "UIOP_Server_Connection_Handler::receive_request - end",
-
-  "UIOP_Client_Connection_Handler::send_request - start",
-  "UIOP_Client_Connection_Handler::send_request - end"
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 1400,
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
-
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
-
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
-
-  TAO_UIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
-  TAO_UIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_UIOP_Connect_Timeprobe_Description,
-                                  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
 TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core)
     : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0)
 {
@@ -68,7 +31,6 @@ TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (ACE_Thread_Manager *t)
 
 TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIOP_Handler_Base (t),
-    transport_ (this, 0),
     orb_core_ (0),
     tss_resources_ (0)
 {
@@ -80,16 +42,28 @@ TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thre
   ACE_ASSERT (this->orb_core_ != 0);
 }
 
+// @@ For pluggable protocols, added a reference to the
+//    corresponding transport obj.
 TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_UIOP_Handler_Base (orb_core),
-    transport_ (this, orb_core),
     orb_core_ (orb_core),
     tss_resources_ (orb_core->get_tss_resources ())
 {
+  transport_ = new TAO_UIOP_Server_Transport (this,
+                                              this->orb_core_);
 }
 
 TAO_UIOP_Server_Connection_Handler::~TAO_UIOP_Server_Connection_Handler (void)
 {
+  delete this->transport_;
+  this->transport_ = 0;
+}
+
+TAO_Transport *
+TAO_UIOP_Server_Connection_Handler::transport (void)
+{
+  // @@ For now return nothing since all is not in place!
+  return transport_;
 }
 
 int
@@ -127,11 +101,13 @@ TAO_UIOP_Server_Connection_Handler::open (void*)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) UIOP connection from client <%s> on %d\n",
-                  addr.get_path_name (), this->peer ().get_handle ()));
+  char client[MAXPATHLEN + 16];
+  addr.addr_to_string (client, sizeof (client));
 
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) connection from client %s\n",
+                client));
   return 0;
 }
 
@@ -186,7 +162,7 @@ TAO_UIOP_Server_Connection_Handler::svc (void)
 {
   // This method is called when an instance is "activated", i.e.,
   // turned into an active object.  Presumably, activation spawns a
-  // thread with this method as the "worker function."
+  // thread with this method as the "worker function".
   int result = 0;
 
   // Inheriting the ORB_Core tss stuff from the parent thread.
@@ -215,30 +191,25 @@ TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
 {
   int result = TAO_GIOP::handle_input (this->transport (),
                                        this->orb_core_,
-                                       this->transport_.message_state_);
+                                       this->transport_->message_state_);
 
   if (result == -1 && TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - %p\n",
-                  "TAO_UIOP_Server_Connection_Handler::handle_input, "
-                  "handle_input"));
+                  "UIOP_Server_CH::handle_input, handle_input"));
     }
+  if (result == 0)
+    return 0;
 
-  if (result == 0 || result == -1)
-    return result;
+  // ACE_ASSERT (result == 1);
 
-  result = TAO_GIOP::process_server_message (this->transport (),
-                                             this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
-  if (result != -1)
-    {
-      this->transport_.message_state_.reset ();
-      result = 0;
-    }
-
-  return result;
+  TAO_GIOP::process_server_message (this->transport (),
+                                    this->orb_core_,
+                                    this->transport_->message_state_.cdr,
+                                    this->transport_->message_state_);
+  this->transport_->message_state_.reset ();
+  return 0;
 }
 
 // ****************************************************************
@@ -246,14 +217,23 @@ TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
 TAO_UIOP_Client_Connection_Handler::
 TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t,
                                     TAO_ORB_Core* orb_core)
-  : TAO_UIOP_Handler_Base (t),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core)
+  : TAO_UIOP_Handler_Base (t)
 {
+  transport_ = new TAO_UIOP_Client_Transport(this,
+                                             orb_core);
 }
 
+// @@ Need to get rid of the Transport Objects!
 TAO_UIOP_Client_Connection_Handler::~TAO_UIOP_Client_Connection_Handler (void)
 {
+  delete this->transport_;
+  this->transport_ = 0;
+}
+
+TAO_Transport *
+TAO_UIOP_Client_Connection_Handler::transport (void)
+{
+  return this->transport_;
 }
 
 // @@ Should I do something here to enable non-blocking?? (Alex).
@@ -267,16 +247,16 @@ TAO_UIOP_Client_Connection_Handler::~TAO_UIOP_Client_Connection_Handler (void)
 int
 TAO_UIOP_Client_Connection_Handler::open (void *)
 {
-  // @@ TODO: These flags should be set using the RT CORBA policies...
+  // @@ TODO: This flags should be set using the RT CORBA policies...
 
   // Here is where we could enable all sorts of things such as
-  // nonblock I/O, sock buf sizes, etc.
+  // nonblock I/O, sock buf sizes, TCP no-delay, etc.
 
 #if !defined (ACE_LACKS_SOCKET_BUFSIZ)
   int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
+    this->transport ()->orb_core ()->orb_params ()->sock_sndbuf_size ();
   int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
+    this->transport ()->orb_core ()->orb_params ()->sock_rcvbuf_size ();
 
   if (this->peer ().set_option (SOL_SOCKET,
                                 SO_SNDBUF,
@@ -304,16 +284,27 @@ TAO_UIOP_Client_Connection_Handler::open (void *)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
+  char server[MAXHOSTNAMELEN + 16];
+
+  (void) addr.addr_to_string (server, sizeof (server));
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) UIOP connection to server <%s> on %d\n",
-                addr.get_path_name (), this->peer ().get_handle ()));
+                "(%P|%t) connection to server <%s> on %d\n",
+                server, this->peer ().get_handle ()));
 
   // Register the handler with the Reactor if necessary.
   return this->transport ()->wait_strategy ()->register_handler ();
 }
 
 int
+TAO_UIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
+{
+  // Call the waiter to handle the input.
+  return this->transport ()->wait_strategy ()->handle_input ();
+}
+
+int
 TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
                                                   ACE_Reactor_Mask rm)
 {
@@ -337,8 +328,8 @@ TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
   // Deregister this handler with the ACE_Reactor.
   if (this->reactor ())
     {
-      ACE_Reactor_Mask mask =
-        ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
+      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK |
+        ACE_Event_Handler::DONT_CALL;
 
       // Make sure there are no timers.
       this->reactor ()->cancel_timer (this);
@@ -352,6 +343,14 @@ TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
+int
+TAO_UIOP_Client_Connection_Handler::close (u_long /* flags */)
+{
+  this->destroy ();
+
+  return 0;
+}
+
 // ****************************************************************
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
index ec1296023e6..e4ae0d093d1 100644
--- a/TAO/tao/UIOP_Connect.h
+++ b/TAO/tao/UIOP_Connect.h
@@ -31,14 +31,17 @@
 #include "ace/Svc_Handler.h"
 
 #include "tao/corbafwd.h"
-#include "tao/Wait_Strategy.h"
-
-#include "tao/UIOP_Transport.h"
+#include "tao/GIOP.h"
+#include "tao/CDR.h"
 
 // Forward Decls
+class TAO_Transport;
 class TAO_ORB_Core;
 class TAO_ORB_Core_TSS_Resources;
 
+class TAO_UIOP_Transport;
+class TAO_UIOP_Client_Transport;
+class TAO_UIOP_Server_Transport;
 
 typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
         TAO_UIOP_SVC_HANDLER;
@@ -85,11 +88,8 @@ public:
   virtual TAO_Transport *transport (void);
 
 protected:
-  TAO_UIOP_Client_Transport transport_;
+  TAO_UIOP_Client_Transport *transport_;
   // Reference to the transport object, it is owned by this class.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
 };
 
 // ****************************************************************
@@ -132,7 +132,7 @@ public:
   TAO_Transport *transport (void);
 
 protected:
-  TAO_UIOP_Server_Transport transport_;
+  TAO_UIOP_Server_Transport *transport_;
   // @@ New transport object reference.
 
   // = Event Handler overloads
@@ -146,7 +146,7 @@ protected:
   // Perform appropriate closing.
 
   TAO_ORB_Core *orb_core_;
-  // Cached the ORB Core.
+  // Cache the ORB Core to minimize
 
   TAO_ORB_Core_TSS_Resources *tss_resources_;
   // Cached tss resources of the ORB that activated this object.
diff --git a/TAO/tao/UIOP_Connect.i b/TAO/tao/UIOP_Connect.i
index 2ced771f3c1..2e4dc05b3ca 100644
--- a/TAO/tao/UIOP_Connect.i
+++ b/TAO/tao/UIOP_Connect.i
@@ -3,31 +3,6 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-ACE_INLINE TAO_Transport *
-TAO_UIOP_Server_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE TAO_Transport *
-TAO_UIOP_Client_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE int
-TAO_UIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // Call the waiter to handle the input.
-  return this->transport ()->wait_strategy ()->handle_input ();
-}
-
-ACE_INLINE int
-TAO_UIOP_Client_Connection_Handler::close (u_long /* flags */)
-{
-  this->destroy ();
-
-  return 0;
-}
+// EMPTY FOR NOW
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index 6b313c3194c..6ab448db199 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -109,8 +109,7 @@ TAO_UIOP_Connector::close (void)
 
 int
 TAO_UIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport,
-                             ACE_Time_Value *max_wait_time)
+                             TAO_Transport *& transport)
 {
   if (profile->tag () != TAO_IOP_TAG_UNIX_IOP)
     return -1;
@@ -123,13 +122,6 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile,
 
   const ACE_UNIX_Addr &oa = uiop_profile->object_addr ();
 
-  ACE_Synch_Options synch_options;
-  if (max_wait_time != 0)
-    {
-      synch_options.set (ACE_Synch_Options::USE_TIMEOUT,
-                         *max_wait_time);
-    }
-
   TAO_UIOP_Client_Connection_Handler* result;
 
   // the connect call will set the hint () stored in the Profile
@@ -138,13 +130,12 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile,
   // affected.
   if (this->base_connector_.connect (uiop_profile->hint (),
                                      result,
-                                     oa,
-                                     synch_options) == -1)
+                                     oa) == -1)
     { // Give users a clue to the problem.
       if (TAO_orbdebug)
         {
-          char buffer [MAXPATHLEN + 1];
-          profile->addr_to_string (buffer, MAXPATHLEN);
+          char buffer [MAXNAMELEN + 1];
+          profile->addr_to_string (buffer, MAXNAMELEN);
           ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
                       "%s failed (%p)\n",
                       __FILE__,
@@ -296,26 +287,26 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
   return pfile;
 }
 
-void
+int
 TAO_UIOP_Connector::make_profile (const char *endpoint,
                                   TAO_Profile *&profile,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // The endpoint should be of the form:
   //
-  //    N.n@rendezvous_point|object_key
+  //    N.n//rendezvous_point|object_key
   //
   // or:
   //
-  //    rendezvous_point|object_key
+  //    //rendezvous_point|object_key
 
-  ACE_NEW_THROW_EX (profile,
-                    TAO_UIOP_Profile (endpoint,
-                                      this->orb_core_,
-                                      ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
+  ACE_NEW_RETURN (profile,
+                  TAO_UIOP_Profile (endpoint,
+                                    this->orb_core_,
+                                    ACE_TRY_ENV),
+                  -1);
 
-  ACE_CHECK;
+  return 0;  // Success
 }
 
 
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
index 5036124f74e..2139c729ad0 100644
--- a/TAO/tao/UIOP_Connector.h
+++ b/TAO/tao/UIOP_Connector.h
@@ -77,24 +77,22 @@ public:
   // Pluggable.h
   int open (TAO_ORB_Core *orb_core);
   int close (void);
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time);
+  int connect (TAO_Profile *profile, TAO_Transport *&transport);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
+protected:
+  // = More TAO_Connector methods, please check the documentation on
+  // Pluggable.h
+  virtual int make_profile (const char *endpoint,
+                            TAO_Profile *&,
+                            CORBA::Environment &ACE_TRY_ENV);
+
   virtual int check_prefix (const char *endpoint);
 
   virtual char object_key_delimiter (void) const;
 
 protected:
-  // = More TAO_Connector methods, please check the documentation on
-  //   Pluggable.h
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
   typedef ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
         TAO_NULL_CREATION_STRATEGY;
 
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
index edaf53d5698..5b5dcdf9ac7 100644
--- a/TAO/tao/UIOP_Profile.cpp
+++ b/TAO/tao/UIOP_Profile.cpp
@@ -27,54 +27,69 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
                                     const TAO_GIOP_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
     version_ (version),
     object_key_ (object_key),
     object_addr_ (addr),
     hint_ (0),
     orb_core_ (orb_core)
 {
+  this->set (addr);
 }
 
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char *,
+TAO_UIOP_Profile::TAO_UIOP_Profile (const char *rendezvous_point,
                                     const TAO_ObjectKey &object_key,
                                     const ACE_UNIX_Addr &addr,
                                     const TAO_GIOP_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
     version_ (version),
     object_key_ (object_key),
     object_addr_ (addr),
     hint_ (0),
     orb_core_ (orb_core)
 {
+  if (rendezvous_point)
+    {
+      ACE_NEW (this->rendezvous_point_,
+               char[ACE_OS::strlen (rendezvous_point) + 1]);
+      ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
+    }
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile)
   : TAO_Profile (pfile.tag ()),
-    version_ (pfile.version_),
-    object_key_ (pfile.object_key_),
-    object_addr_ (pfile.object_addr_),
-    hint_ (pfile.hint_),
+    rendezvous_point_(0),
+    version_(pfile.version_),
+    object_key_(pfile.object_key_),
+    object_addr_(pfile.object_addr_),
+    hint_(0),
     orb_core_ (pfile.orb_core_)
 {
+  ACE_NEW (this->rendezvous_point_,
+           char[ACE_OS::strlen (pfile.rendezvous_point_) + 1]);
+  ACE_OS::strcpy (this->rendezvous_point_, pfile.rendezvous_point_);
+  hint_ = pfile.hint_;
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const char *string,
                                     TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     object_key_ (),
     object_addr_ (),
     hint_ (0),
     orb_core_ (orb_core)
 {
-  parse_string (string, ACE_TRY_ENV);
-  ACE_CHECK;
+  parse_string (string, env);
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     object_key_ (),
     object_addr_ (),
@@ -83,8 +98,26 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
+int
+TAO_UIOP_Profile::set (const ACE_UNIX_Addr& addr)
+{
+  char temp_rendezvous_point[MAXPATHLEN + 1];
+
+  addr.addr_to_string (temp_rendezvous_point, sizeof (temp_rendezvous_point));
+
+  ACE_NEW_RETURN (this->rendezvous_point_,
+                  char[ACE_OS::strlen (temp_rendezvous_point) + 1],
+                  -1);
+
+  ACE_OS::strcpy (this->rendezvous_point_, temp_rendezvous_point);
+
+  return 0;
+}
+
 TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
 {
+  delete [] this->rendezvous_point_;
+  this->rendezvous_point_ = 0;
 }
 
 int
@@ -92,14 +125,7 @@ TAO_UIOP_Profile::parse_string (const char *string,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
   if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
+    return 0;
 
   // Remove the "N.n@" version prefix, if it exists, and verify the
   // version is one that we accept.
@@ -121,43 +147,36 @@ TAO_UIOP_Profile::parse_string (const char *string,
   if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
       this->version_.minor  > TAO_DEF_GIOP_MINOR)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
 
   // Pull off the "rendezvous point" part of the objref
   // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
+  CORBA::String_var copy = CORBA::string_dup (string);
 
   char *start = copy.inout ();
   char *cp = ACE_OS::strchr (start, this->object_key_delimiter);
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
+      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
       // No rendezvous point specified
     }
 
-  CORBA::ULong length = cp - start;
+  if (this->rendezvous_point_)
+    {
+      delete [] this->rendezvous_point_;
+      this->rendezvous_point_ = 0;
+    }
 
-  CORBA::String_var rendezvous = CORBA::string_alloc (length);
+  ACE_NEW_RETURN (this->rendezvous_point_,
+                  char[1 + cp - start],
+                  -1);
 
-  ACE_OS::strncpy (rendezvous.inout (), start, length);
-  rendezvous[length] = '\0';
+  ACE_OS::strncpy (this->rendezvous_point_, start, cp - start);
+  this->rendezvous_point_[cp - start] = '\0';
 
-  if (this->rendezvous_point (rendezvous.in ()) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
+  this->object_addr_.set (this->rendezvous_point_);
 
   start = ++cp;  // increment past the object key separator
 
@@ -167,36 +186,39 @@ TAO_UIOP_Profile::parse_string (const char *string,
 }
 
 CORBA::Boolean
-TAO_UIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
+TAO_UIOP_Profile::is_equivalent (TAO_Profile *other_profile,
+                                 CORBA::Environment &env)
 {
+  env.clear ();
 
   if (other_profile->tag () != TAO_IOP_TAG_UNIX_IOP)
     return 0;
 
-  const TAO_UIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_UIOP_Profile *, other_profile);
+  TAO_UIOP_Profile *op =
+    ACE_dynamic_cast (TAO_UIOP_Profile *, other_profile);
 
   ACE_ASSERT (op->object_key_.length () < UINT_MAX);
 
-  return this->object_key_ == op->object_key_ &&
-    ACE_OS::strcmp (this->rendezvous_point (),
-                    op->rendezvous_point ()) == 0 &&
-    this->version_ == op->version_;
+  return this->object_key_ == op->object_key_
+    && ACE_OS::strcmp (this->rendezvous_point_, op->rendezvous_point_) == 0
+    && this->version_ == op->version_;
 }
 
 CORBA::ULong
 TAO_UIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
+                        CORBA::Environment &env)
 {
   CORBA::ULong hashval;
 
+  env.clear ();
+
   // Just grab a bunch of convenient bytes and hash them; could do
   // more (rendezvous_point, full key, exponential hashing)
   // but no real need  to do so except if performance requires a more
   // costly hash.
 
   hashval = this->object_key_.length () *
-    ACE_OS::atoi (this->rendezvous_point ());  // @@ Is this valid?
+    ACE_OS::atoi (this->rendezvous_point_);  // FIXME:  Is this valid?
   hashval += this->version_.minor;
 
   if (this->object_key_.length () >= 4)
@@ -211,60 +233,32 @@ TAO_UIOP_Profile::hash (CORBA::ULong max,
 int
 TAO_UIOP_Profile::addr_to_string (char *buffer, size_t length)
 {
-  if (length < (ACE_OS::strlen (this->rendezvous_point ()) + 1))
+  if (length < (ACE_OS::strlen (rendezvous_point_) + 1))
     return -1;
 
-  ACE_OS::strcpy (buffer, this->rendezvous_point ());
+  ACE_OS::strcpy (buffer, this->rendezvous_point_);
 
   return 0;
 }
 
 const char *
-TAO_UIOP_Profile::rendezvous_point (const char *rendezvous)
+TAO_UIOP_Profile::rendezvous_point (const char *r)
 {
-  if (!rendezvous || !*rendezvous)
-    return 0;
+  if (this->rendezvous_point_)
+    {
+      delete [] this->rendezvous_point_;
+      this->rendezvous_point_ = 0;
+    }
 
-  // To guarantee portability, local IPC rendezvous points (including
-  // the path and filename) should not be longer than 99 characters
-  // long. Some platforms may support longer rendezvous points,
-  // usually 108 characters including the null terminator, but
-  // Posix.1g only requires that local IPC rendezvous point arrays
-  // contain a maximum of at least 100 characters, including the null
-  // terminator.  If an endpoint is longer than what the platform
-  // supports then it will be truncated so that it fits, and a warning
-  // will be issued.
-
-  // Avoid using relative paths in your UIOP endpoints.  If possible,
-  // use absolute paths instead.  Imagine that the server is given an
-  // endpoint to create using -ORBEndpoint uiop://foobar.  A local IPC
-  // rendezvous point called foobar will be created in the current
-  // working directory.  If the client is not started in the directory
-  // where the foobar rendezvous point exists then the client will not
-  // be able to communicate with the server since its point of
-  // communication, the rendezvous point, was not found. On the other
-  // hand, if an absolute path was used, the client would know exactly
-  // where to find the rendezvous point.  It is up to the user to
-  // make sure that a given UIOP endpoint is accessible by both the
-  // server and the client.
-
-  this->object_addr_.set (rendezvous);
-
-  size_t length = ACE_OS::strlen (this->rendezvous_point ());
-
-  // Check if rendezvous point was truncated by ACE_UNIX_Addr since
-  // most UNIX domain socket rendezvous points can only be less than
-  // 108 characters long.
-  if (length < ACE_OS::strlen (rendezvous))
+  if (r)
     {
-      ACE_DEBUG ((LM_WARNING,
-                  "TAO (%P|%t) UIOP rendezvous point was truncated to <%s>\n"
-                  "since it was longer than %d characters long.\n",
-                  this->rendezvous_point (),
-                  length));
+      ACE_NEW_RETURN (this->rendezvous_point_,
+                      char[ACE_OS::strlen (r) + 1],
+                      0);
+      ACE_OS::strcpy (this->rendezvous_point_, r);
     }
 
-  return this->rendezvous_point ();
+  return this->rendezvous_point_;
 }
 
 void
@@ -286,6 +280,20 @@ TAO_UIOP_Profile::operator= (const TAO_UIOP_Profile &src)
 
   this->object_addr_.set (src.object_addr_);
 
+  if (this->rendezvous_point_)
+    {
+      delete [] this->rendezvous_point_;
+      this->rendezvous_point_ = 0;
+    }
+
+  if (src.rendezvous_point_)
+    {
+      ACE_NEW_RETURN (this->rendezvous_point_,
+                      char[ACE_OS::strlen (src.rendezvous_point_) + 1],
+                      *this);
+      ACE_OS::strcpy (this->rendezvous_point_, src.rendezvous_point_);
+    }
+
   return *this;
 }
 
@@ -302,9 +310,10 @@ TAO_UIOP_Profile::to_string (CORBA::Environment &)
                   1 /* decimal point */ +
                   1 /* minor version */ +
                   1 /* `@' character */ +
-                  ACE_OS::strlen (this->rendezvous_point ()) +
+                  ACE_OS::strlen (this->rendezvous_point_) +
                   1 /* object key separator */ +
-                  ACE_OS::strlen (key));
+                  ACE_OS::strlen (key) +
+                  1 /* zero terminator */);
 
   CORBA::String buf = CORBA::string_alloc (buflen);
 
@@ -315,7 +324,7 @@ TAO_UIOP_Profile::to_string (CORBA::Environment &)
                    ::prefix_,
                    digits [this->version_.major],
                    digits [this->version_.minor],
-                   this->rendezvous_point (),
+                   this->rendezvous_point_,
                    this->object_key_delimiter,
                    key.in ());
   return buf;
@@ -353,22 +362,20 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
     return -1;
   }
 
-  char *rendezvous = 0;
+  if (this->rendezvous_point_)
+    {
+      delete [] this->rendezvous_point_;
+      this->rendezvous_point_ = 0;
+    }
 
   // Get rendezvous_point
-  if (cdr.read_string (rendezvous) == 0)
+  if (cdr.read_string (this->rendezvous_point_) == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point"));
       return -1;
     }
 
-  // We could use this->rendezvous_point(rendezvous) to set and check the
-  // rendezvous point.  However, it is safe to assume that it is valid 
-  // since it should only have been encoded if it was valid.
-  this->object_addr_.set (rendezvous);
-
-  // Clean up
-  delete [] rendezvous;
+  this->object_addr_.set (this->rendezvous_point_);
 
   // ... and object key.
 
@@ -390,6 +397,10 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
                   encap_len));
     }
 
+//   ACE_DEBUG ((LM_DEBUG,
+//               "UIOP_Profile --- r point: <%s>\n",
+//               this->rendezvous_point_));
+
   if (cdr.good_bit ())
     return 1;
 
@@ -422,7 +433,7 @@ TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
   encap.write_octet (this->version_.minor);
 
   // STRING rendezvous_pointname from profile
-  encap.write_string (this->rendezvous_point ());
+  encap.write_string (this->rendezvous_point_);
 
   // OCTET SEQUENCE for object key
   encap << this->object_key_;
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
index bba66c563e4..e8caee840c3 100644
--- a/TAO/tao/UIOP_Profile.h
+++ b/TAO/tao/UIOP_Profile.h
@@ -39,7 +39,7 @@ class TAO_Export TAO_UIOP_Profile : public TAO_Profile
 {
   // = TITLE
   //   This class defines the protocol specific attributes required
-  //   for locating ORBs over local IPC.
+  //   for locating ORBs over Unix Domain Sockets.
   //
   // = DESCRIPTION
   //   This class defines the UIOP profile.
@@ -66,7 +66,7 @@ public:
 
   TAO_UIOP_Profile (const char *string,
                     TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                    CORBA::Environment &env);
   // Create object using a string ior.
 
   TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile);
@@ -82,10 +82,10 @@ public:
   // Destructor is to be called only through <_decr_refcnt>.
 
   int parse_string (const char *string,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                    CORBA::Environment &env);
   // Initialize this object using the given input string.
 
-  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  CORBA::String to_string (CORBA::Environment &env);
   // Return a string representation for this profile.
   // client must deallocate memory.
 
@@ -94,6 +94,7 @@ public:
 
   virtual int encode (TAO_OutputCDR &stream) const;
   // Encode this profile in a stream, i.e. marshal it.
+  // FIXME:  NO MARSHALING for Unix Domain Sockets is needing
 
   const TAO_ObjectKey &object_key (void) const;
   // @@ deprecated, return a reference to the Object Key.
@@ -104,13 +105,14 @@ public:
   TAO_ObjectKey *_key (void) const;
   // Return a pointer to the Object Key.
 
-  CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
+  CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
+                                CORBA::Environment &env);
   // Return true if this profile is equivalent to other_profile.  Two
   // profiles are equivalent iff their key, rendezvous point, object_key
   // and version are the same.
 
   CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                     CORBA::Environment &env);
   // Return a hash value for this object.
 
   int addr_to_string (char *buffer, size_t length);
@@ -119,14 +121,14 @@ public:
   const ACE_UNIX_Addr &object_addr (void) const;
   // return a reference to the object_addr.
 
-  const char *rendezvous_point (void) const;
-  // Return a pointer to the rendezvous point string.
-  // This object maintains ownership of the returned string.
+  const char *rendezvous_point (void);
+  // Return a pointer to the rendezvous point string.  This object maintains
+  // ownership of this string.
 
-  const char *rendezvous_point (const char *rendezvous);
-  // Set the rendezvous point and verify that it is 
-  // valid (e.g. wasn't truncated because it was too long).
-  // This object maintains ownership of the returned string.
+  const char *rendezvous_point (const char *r);
+  // Copy the string r into rendezvous_point_ and return the
+  // resulting pointer.
+  // This object maintains ownership of this string.
 
   const TAO_GIOP_Version &version (void) const;
   // Return a pointer to this profile's version.  This object
@@ -141,9 +143,16 @@ public:
   const TAO_Tagged_Components& tagged_components (void) const;
   TAO_Tagged_Components& tagged_components (void);
   // Access the tagged components, notice that they are empty and
-  // ignored for GIOP 1.0.
+  // ignored for GIOP 1.0
 
 private:
+  int set (const ACE_UNIX_Addr &addr);
+  // helper method to set the UNIX_Addr.
+
+private:
+
+  char *rendezvous_point_;
+  // String representing the rendezvous point.
 
   TAO_GIOP_Version version_;
   // UIOP version number.
diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i
index b3805d9f1a4..498384e8945 100644
--- a/TAO/tao/UIOP_Profile.i
+++ b/TAO/tao/UIOP_Profile.i
@@ -29,9 +29,9 @@ TAO_UIOP_Profile::object_addr (void) const
 }
 
 ACE_INLINE const char *
-TAO_UIOP_Profile::rendezvous_point (void) const
+TAO_UIOP_Profile::rendezvous_point (void)
 {
-  return this->object_addr_.get_path_name ();
+  return this->rendezvous_point_;
 }
 
 ACE_INLINE const TAO_GIOP_Version &
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 45b54fe9da4..c253800bf63 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -16,13 +16,13 @@
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_UIOP_Transport_Timeprobe_Description[] =
+static const char *TAO_Transport_Timeprobe_Description[] =
   {
     "UIOP_Transport::send - start",
     "UIOP_Transport::send - end",
 
     "UIOP_Transport::receive - start",
-    "UIOP_Transport::receive - end",
+    "UIOP_Transport::recieve - end",
 
     "UIOP_Client_Transport::send_request - start",
     "UIOP_Client_Transport::send_request - end"
@@ -30,7 +30,7 @@ static const char *TAO_UIOP_Transport_Timeprobe_Description[] =
 
 enum
   {
-    TAO_UIOP_TRANSPORT_SEND_START = 1300,
+    TAO_UIOP_TRANSPORT_SEND_START = 1200,
     TAO_UIOP_TRANSPORT_SEND_END,
 
     TAO_UIOP_TRANSPORT_RECEIVE_START,
@@ -42,7 +42,7 @@ enum
 
 
 // Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_UIOP_Transport_Timeprobe_Description,
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description,
                                   TAO_UIOP_TRANSPORT_SEND_START);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
@@ -120,17 +120,18 @@ TAO_UIOP_Client_Transport::client_handler (void)
 }
 
 void
-TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
-                                          const TAO_Profile* pfile,
-                                          const char* opname,
-                                          CORBA::ULong request_id,
-                                          CORBA::Boolean is_roundtrip,
-                                          TAO_OutputCDR &output,
-                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_UIOP_Client_Transport::
+    start_request (TAO_ORB_Core *orb_core,
+                   const TAO_Profile* pfile,
+                   const char* opname,
+                   CORBA::ULong request_id,
+                   CORBA::Boolean is_roundtrip,
+                   TAO_OutputCDR &output,
+                   CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
+    ACE_dynamic_cast(const TAO_UIOP_Profile*,pfile);
 
   // Obtain object key.
   const TAO_ObjectKey& key = profile->object_key ();
@@ -169,15 +170,16 @@ TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
 }
 
 void
-TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
-                                         const TAO_Profile* pfile,
-                                         CORBA::ULong request_id,
-                                         TAO_OutputCDR &output,
-                                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_UIOP_Client_Transport::
+    start_locate (TAO_ORB_Core *orb_core,
+                  const TAO_Profile* pfile,
+                  CORBA::ULong request_id,
+                  TAO_OutputCDR &output,
+                  CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
+    ACE_dynamic_cast(const TAO_UIOP_Profile*,pfile);
 
   // Obtain object key.
   const TAO_ObjectKey& key = profile->object_key ();
@@ -191,7 +193,7 @@ TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
     ACE_THROW (CORBA::MARSHAL ());
 
 
-  if (TAO_GIOP::write_locate_request_header (request_id,
+  if (TAO_GIOP::write_locate_request_header (this->request_id (),
                                              key,
                                              output) != 0)
     ACE_THROW (CORBA::MARSHAL ());
@@ -200,8 +202,7 @@ TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
 int
 TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                          TAO_OutputCDR &stream,
-                                         int two_way,
-                                         ACE_Time_Value *max_wait_time)
+                                         int two_way)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
 
@@ -211,16 +212,14 @@ TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
 
   return TAO_GIOP::send_message (this,
                                  stream,
-                                 orb_core,
-                                 max_wait_time);
+                                 orb_core);
 }
 
 // Return 0, when the reply is not read fully, 1 if it is read fully.
 // @@ This code should go in the TAO_Transport class is repeated for
 //    each transport!!
 int
-TAO_UIOP_Client_Transport::handle_client_input (int /* block */,
-                                                ACE_Time_Value *max_wait_time)
+TAO_UIOP_Client_Transport::handle_client_input (int block)
 {
   // When we multiplex several invocations over a connection we need
   // to allocate the CDR stream *here*, but when there is a single
@@ -251,19 +250,9 @@ TAO_UIOP_Client_Transport::handle_client_input (int /* block */,
   TAO_GIOP_Message_State* message_state =
     this->tms_->get_message_state ();
 
-  if (message_state == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) UIOP_Transport::handle_client_input -"
-                    " nil message state\n"));
-      return -1;
-    }
-
   int result = TAO_GIOP::handle_input (this,
                                        this->orb_core_,
-                                       *message_state,
-                                       max_wait_time);
+                                       *message_state);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -297,14 +286,11 @@ TAO_UIOP_Client_Transport::handle_client_input (int /* block */,
       return -1;
     }
 
-  result =
-    this->tms_->dispatch_reply (request_id,
-                                reply_status,
-                                message_state->giop_version,
-                                reply_ctx,
-                                message_state);
-
-  if (result == -1)
+  if (this->tms_->dispatch_reply (request_id,
+                                  reply_status,
+                                  message_state->giop_version,
+                                  reply_ctx,
+                                  message_state) != 0)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
@@ -315,18 +301,12 @@ TAO_UIOP_Client_Transport::handle_client_input (int /* block */,
       return -1;
     }
 
-  if (result == 0)
-    {
-      message_state->reset ();
-      return 0;
-    }
-
   // This is a NOOP for the Exclusive request case, but it actually
   // destroys the stream in the muxed case.
   this->tms_->destroy_message_state (message_state);
 
   // Return something to indicate the reply is received.
-  return result;
+  return 1;
 }
 
 int
@@ -399,8 +379,7 @@ TAO_UIOP_Client_Transport::check_unexpected_data (void)
 // ****************************************************************
 
 ssize_t
-TAO_UIOP_Transport::send (const ACE_Message_Block *mblk,
-                          ACE_Time_Value *max_time_wait)
+TAO_UIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
 
@@ -431,15 +410,9 @@ TAO_UIOP_Transport::send (const ACE_Message_Block *mblk,
           // we should set IOV_MAX to that limit.
           if (iovcnt == IOV_MAX)
             {
-              if (max_time_wait == 0)
-                n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                     iovcnt);
-              else
-                n = ACE::writev (this->handler_->peer ().get_handle (),
-                                 (const iovec*) iov,
-                                 iovcnt,
-                                 max_time_wait);
-              if (n <= 0)
+              n = this->handler_->peer ().sendv_n ((const iovec *) iov,
+                                                   iovcnt);
+              if (n < 1)
                 return n;
 
               nbytes += n;
@@ -486,29 +459,24 @@ TAO_UIOP_Transport::send (const iovec *iov,
 ssize_t
 TAO_UIOP_Transport::recv (char *buf,
                           size_t len,
-                          ACE_Time_Value *max_wait_time)
+                          ACE_Time_Value *)
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      max_wait_time);
+  return this->handler_->peer ().recv_n (buf, len);
 }
 
 ssize_t
 TAO_UIOP_Transport::recv (char *buf,
                           size_t len,
                           int flags,
-                          ACE_Time_Value *max_wait_time)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      flags,
-                      max_wait_time);
+  return this->handler_->peer ().recv_n (buf,
+                                         len,
+                                         flags);
 }
 
 ssize_t
@@ -516,7 +484,7 @@ TAO_UIOP_Transport::recv (iovec *iov,
                           int iovcnt,
                           ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
   return handler_->peer ().recvv_n (iov, iovcnt);
 }
@@ -525,8 +493,7 @@ TAO_UIOP_Transport::recv (iovec *iov,
 int
 TAO_UIOP_Transport::send_request (TAO_ORB_Core *  /* orb_core */,
                                   TAO_OutputCDR & /* stream   */,
-                                  int             /* twoway   */,
-                                  ACE_Time_Value * /* max_wait_time */)
+                                  int             /* twoway   */)
 {
   return -1;
 }
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index cab2dd6060a..d9a999f4a3f 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -10,7 +10,7 @@
 //     UIOP_Transport.h
 //
 // = DESCRIPTION
-//     UIOP Transport specific processing
+//     Unix Domain Socket (UIOP) Transport specific processing
 //
 // = AUTHOR
 //     Fred Kuhns <fredk@cs.wustl.edu>
@@ -39,9 +39,7 @@ class TAO_Export TAO_UIOP_Transport : public TAO_Transport
   //   connection handler (handler_).
   //
   // = DESCRIPTION
-  //   Specialization of the base TAO_Transport class to handle the UIOP
-  //   protocol.  This class in turn will be further specialized for
-  //   the client and server side.
+  //   Implements common IIOP methods for the Transport adaptor class.
 public:
   TAO_UIOP_Transport (TAO_UIOP_Handler_Base *handler,
                       TAO_ORB_Core *orb_core);
@@ -97,8 +95,7 @@ public:
 
   virtual int send_request (TAO_ORB_Core *orb_core,
                             TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_wait_time);
+                            int twoway);
   // Default action to be taken for send request.
 
 protected:
@@ -114,9 +111,7 @@ class TAO_Export TAO_UIOP_Client_Transport : public TAO_UIOP_Transport
   //   server.
   //
   // = DESCRIPTION
-  //   Specialization of the TAO_UIOP_Transport class for client
-  //   side.  Methods related to sending one and two way requests
-  //   lives here.
+  //   Implements the methods specific to the client.
 public:
   TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
                              TAO_ORB_Core *orb_core);
@@ -136,7 +131,7 @@ public:
                               CORBA::ULong request_id,
                               CORBA::Boolean is_twoway,
                               TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a request.
 
@@ -144,21 +139,19 @@ public:
                              const TAO_Profile *profile,
                              CORBA::ULong request_id,
                              TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                             CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Fill into <output> the right headers to make a locate request.
 
   int send_request (TAO_ORB_Core *orb_core,
                     TAO_OutputCDR &stream,
-                    int twoway,
-                    ACE_Time_Value *max_wait_time);
+                    int twoway);
   // This is a bridge method for the connection handlers
   // <send_request> method.  The connection handler is responsible for
   // concurrency strategies, typically using the leader-follower
   // pattern.
 
-  int handle_client_input (int block = 0,
-                           ACE_Time_Value *max_time_value = 0);
+  int handle_client_input (int block = 0);
   // Read and handle the reply. Returns 0 when there is Short Read on
   // the connection. Returns 1 when the full reply is read and
   // handled. If <block> is 1, then reply is read in a blocking
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index 188466baca0..b838f804e1c 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -57,7 +57,7 @@ CORBA_ValueBase::_downcast (CORBA_ValueBase* vt)
 CORBA::Boolean
 CORBA_ValueBase::_tao_marshal (TAO_OutputCDR &strm,
                                CORBA_ValueBase *this_,
-                               ptr_arith_t /* formal_type_id */)
+                               ptr_arith_t formal_type_id)
 {
   CORBA::Boolean retval = 1;
   // %! yet much to do ... look for +++ !
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index fa3a2844e93..40dfd65fc9d 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -2,6 +2,6 @@
 // This is an automatically generated file.
 
 #define TAO_MAJOR_VERSION 0
-#define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 0
-#define TAO_VERSION "0.4"
+#define TAO_MINOR_VERSION 3
+#define TAO_BETA_VERSION 25
+#define TAO_VERSION "0.3.25"
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 5f65b308063..d8ea54f7ab4 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -40,50 +40,25 @@ TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void)
 }
 
 int
-TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time)
+TAO_Wait_On_Reactor::wait (void)
 {
   // Reactor does not change inside the loop.
   ACE_Reactor* reactor =
     this->transport_->orb_core ()->reactor ();
 
-  // @@ Carlos: Can we rely on <reply_received> flag in the AMI case?
-  //    It depends on whether we are expecting replies or not, right?
-  //    So, I think we can simply return from this loop, when some
-  //    event occurs, and the invocation guy can call us again, if it
-  //    wants to. (AMI will call, if it is expecting replies, SMI will
-  //    call if the reply is not arrived) (Alex).
-  // @@ Alex: I think you are right, let's fix it later....
-
-  // Do the event loop, till we received the reply.
-
-  int result = 1;
+  // Do the event loop, till we fully receive a reply.
+  
+  int result = 0;
   this->reply_received_ = 0;
-  while (this->reply_received_ == 0 && result > 0)
+  while (this->reply_received_ == 0 && result >= 0)
     {
-      result = reactor->handle_events (max_wait_time);
+      result = reactor->handle_events (/* timeout */);
     }
 
   if (result == -1 || this->reply_received_ == -1)
     return -1;
 
-  // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
-    {
-      if (this->reply_received_ != 1
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-    }
-  else
-    {
-      result = 0;
-      if (this->reply_received_ == -1)
-        result = -1;
-    }
-
-  return result;
+  return 0;
 }
 
 int
@@ -153,23 +128,12 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
     //if (TAO_debug_level > 0)
     //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - sending request for <%x>\n",
     //this->transport_));
-
   }
 
-  // @@ Should we do here that checking for the difference in the
-  //    Reactor used??? (Alex).
-
   // Register the handler.
   this->transport_->register_handler ();
-  // @@ Carlos: We do this only if the reactor is different right?
-  //    (Alex)
-  // @@ Alex: that is taken care of in
-  //    IIOP_Transport::register_handler, but maybe we shouldn't do
-  //    this checking everytime, I recall that there was a problem
-  //    (sometime ago) about using the wrong ORB core, but that may
-  //    have been fixed...
-
-  // Send the request
+  
+  // Send the request.
   int result =
     this->TAO_Wait_Strategy::sending_request (orb_core,
                                               two_way);
@@ -190,7 +154,7 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
 }
 
 int
-TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
+TAO_Wait_On_Leader_Follower::wait (void)
 {
   // Cache the ORB core, it won't change and is used multiple times
   // below:
@@ -206,8 +170,6 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
 
   leader_follower.set_client_thread ();
 
-  ACE_Countdown_Time countdown (max_wait_time);
-
   // Check if there is a leader, but the leader is not us
   if (leader_follower.leader_available ()
       && !leader_follower.is_leader_thread ())
@@ -232,26 +194,16 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
       if (leader_follower.add_follower (cond) == -1)
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
-                    "add_follower failed for <%x>\n", cond));
+                    "add_follower failed for <%x>\n",
+                    cond));
 
-      while (!this->reply_received_ && leader_follower.leader_available ())
+      while (!this->reply_received_ &&
+             leader_follower.leader_available ())
         {
-          if (max_wait_time == 0)
-            {
-              if (cond == 0 || cond->wait () == -1)
-                return -1;
-            }
-          else
-            {
-              countdown.update ();
-              ACE_Time_Value tv = ACE_OS::gettimeofday ();
-              tv += *max_wait_time;
-              if (cond == 0 || cond->wait (&tv) == -1)
-                return -1;
-            }
+          if (cond == 0 || cond->wait () == -1)
+            return -1;
         }
 
-      countdown.update ();
       if (leader_follower.remove_follower (cond) == -1)
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
@@ -264,7 +216,8 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
       // our input. We are already removed from the follower queue.
       if (this->reply_received_ == 1)
         {
-          // But first reset our state in case we are invoked again...
+          // But first reset our state in case we are invoked
+          // again... 
           this->reply_received_ = 0;
           this->expecting_response_ = 0;
           this->calling_thread_ = ACE_OS::NULL_thread;
@@ -273,7 +226,8 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
         }
       else if (this->reply_received_ == -1)
         {
-          // But first reset our state in case we are invoked again...
+          // But first reset our state in case we are invoked
+          // again... 
           this->reply_received_ = 0;
           this->expecting_response_ = 0;
           this->calling_thread_ = ACE_OS::NULL_thread;
@@ -297,7 +251,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
   // This might increase the refcount of the leader.
   leader_follower.set_leader_thread ();
 
-  int result = 1;
+  int result = 0;
 
   {
     ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, rev_mon,
@@ -312,8 +266,8 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
     //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - wait (leader) on <%x>\n",
     //this->transport_));
 
-    while (result > 0 && this->reply_received_ == 0)
-      result = orb_core->reactor ()->handle_events (max_wait_time);
+    while (result >= 0 && this->reply_received_ == 0)
+      result = orb_core->reactor ()->handle_events ();
 
     //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - done (leader) on <%x>\n",
     //this->transport_));
@@ -342,22 +296,10 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
                       -1);
 
   // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
-    {
-      if (this->reply_received_ != 1
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-    }
-  else
+  result = 0;
+  if (this->reply_received_ == -1)
     {
-      result = 0;
-      if (this->reply_received_ == -1)
-        {
-          result = -1;
-        }
+      result = -1;
     }
 
   // Make us reusable
@@ -377,7 +319,8 @@ TAO_Wait_On_Leader_Follower::handle_input (void)
 
   // Obtain the lock.
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                    orb_core->leader_follower ().lock (), -1);
+                    orb_core->leader_follower ().lock (), 
+                    -1);
 
   //  ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - reading reply <%x>\n",
   //              this->transport_));
@@ -399,7 +342,6 @@ TAO_Wait_On_Leader_Follower::handle_input (void)
   // Receive any data that is available, without blocking...
   int result = this->transport_->handle_client_input (0);
 
-
   // Data was read, but there the reply has not been completely
   // received...
   if (result == 0)
@@ -492,13 +434,12 @@ TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
 
 // Wait on the read operation.
 int
-TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time)
+TAO_Wait_On_Read::wait (void)
 {
   int received_reply = 0;
-  while (received_reply != 1)
+  while (received_reply == 0)
     {
-      received_reply =
-        this->transport_->handle_client_input (1, max_wait_time);
+      received_reply = this->transport_->handle_client_input (1);
       if (received_reply == -1)
         return -1;
     }
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index b436903f605..92a5a95d7f0 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -1,3 +1,4 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -47,7 +48,7 @@ public:
   // variables because the reply may arrive *before* the user calls
   // wait.
 
-  virtual int wait (ACE_Time_Value *max_wait_time) = 0;
+  virtual int wait (void) = 0;
   // Base class virtual method.
 
   virtual int handle_input (void) = 0;
@@ -83,11 +84,15 @@ public:
   virtual ~TAO_Wait_On_Reactor (void);
   // Destructor.
 
-  // = Documented in TAO_Wait_Strategy.
+  virtual int wait (void);
+  // Do the event loop of the Reactor.
 
-  virtual int wait (ACE_Time_Value *max_wait_time);
   virtual int handle_input (void);
+  // Handle the input. Delegate this job to Transport object. Before
+  // that suspend the handler in the Reactor.
+
   virtual int register_handler (void);
+  // Register the handler with the Reactor.
 
 private:
   int reply_received_;
@@ -117,8 +122,11 @@ public:
 
   virtual int sending_request (TAO_ORB_Core *orb_core,
                                int two_way);
-  virtual int wait (ACE_Time_Value *max_wait_time);
+
+  virtual int wait (void);
+
   virtual int handle_input (void);
+
   virtual int register_handler (void);
 
 protected:
@@ -150,8 +158,9 @@ class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
 {
   // = TITLE
   //
+  //    Wait on receiving the reply.
+  //
   // = DESCRIPTION
-  //   Simply block on read() to wait for the reply.
   //
 
 public:
@@ -161,9 +170,14 @@ public:
   virtual ~TAO_Wait_On_Read (void);
   // Destructor.
 
-  virtual int wait (ACE_Time_Value *max_wait_time);
+  virtual int wait (void);
+  // Wait on the read operation.
+
   virtual int handle_input (void);
+  // Handle the input. Delegate this job to Transport object.
+
   virtual int register_handler (void);
+  // No-op. Return 0.
 };
 
 #endif /* TAO_WAIT_STRATEGY_H */
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 475577f159a..f380e853eac 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -38,7 +38,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -85,58 +85,54 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Primitive::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Primitive::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
                          TAO_InputCDR *src,
                          TAO_OutputCDR *dest,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
+  CORBA::TypeCode_ptr elem_tc;
 
   // Status of append operation.
+  CORBA::TypeCode::traverse_status retval =
+    CORBA::TypeCode::TRAVERSE_CONTINUE;
+
   // Decode the typecode description for the element so that we can append the
   // data appropriately
-  CORBA::TypeCode::traverse_status retval =
-    src->decode (CORBA::_tc_TypeCode,
-                 &elem_tc.inout (),
-                 0,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if ((retval = src->decode (CORBA::_tc_TypeCode,
+                             &elem_tc,
+                             0,
+                             env))
+      == CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
       // encode the typecode
-      retval = dest->encode (CORBA::_tc_TypeCode, &elem_tc, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      retval = dest->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env);
       if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
           // append the data
-          retval = dest->append (elem_tc.in (), src, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = dest->append (elem_tc, src, env);
+          CORBA::release (elem_tc);
         }
     }
-
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Any::append detected error\n"));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      CORBA::release (elem_tc);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
     }
-
   return retval;
 }
 
@@ -144,7 +140,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest,
-                              CORBA::Environment  &ACE_TRY_ENV)
+                              CORBA::Environment  &env)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -175,8 +171,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
             case CORBA::tk_wstring:
               {
                 // read and write the bounds
-                retval = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+                retval = dest->append (CORBA::_tc_long, src, env);
               }
             break;
 
@@ -184,8 +179,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
             case ~0u:
               {
                 // read and write the negative offset
-                retval = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+                retval = dest->append (CORBA::_tc_long, src, env);
               }
             break;
 
@@ -201,8 +195,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
             case CORBA::tk_except:
               {
                 // write the encapsulation i.e., octet sequence
-                retval = dest->append (TC_opaque, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+                retval = dest->append (TC_opaque, src, env);
               }
             } // end of switch
         }
@@ -212,23 +205,22 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
             ACE_DEBUG ((LM_DEBUG,
                         "TAO_Marshal_TypeCode: "
                         "Bad kind_ value in CDR stream\n"));
-
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            CORBA::TypeCode::TRAVERSE_STOP);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
 
   if ((continue_append == 1) &&
       (retval == CORBA::TypeCode::TRAVERSE_CONTINUE))
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_TypeCode::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_TypeCode::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Encode Principal.
@@ -237,17 +229,17 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // write the octet sequence representing the Principal
-  return dest->append (TC_opaque, src, ACE_TRY_ENV);
+  return dest->append (TC_opaque, src, env);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -264,7 +256,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
   // just need to be able to access such preloaded libraries here as
   // we unmarshal objrefs.
 
-  CORBA::ULong profiles = 0;
+  CORBA::ULong profiles;
 
   // get the count of profiles that follow. This will tell us the length of the
   // sequence
@@ -274,39 +266,38 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
   // No profiles means a NIL objref.
   while (profiles-- != 0 && continue_append)
     {
-      CORBA::ULong tag = 0;
+      CORBA::ULong tag;
 
       // get the profile ID tag
       if ((continue_append = (src->read_ulong (tag) ?
                               dest->write_ulong (tag) : 0))  == 0)
         continue;
 
-      CORBA::ULong length = 0;
+      CORBA::ULong length;
       if ((continue_append = (src->read_ulong (length)
                               ? dest->write_ulong (length) : 0)) == 0)
         continue;
 
       // @@ This can be optimized! Pre-allocating on the destination
       //    and then copying directly into that.
-      CORBA::Octet* body = 0;
-      ACE_NEW_RETURN (body, 
-                      CORBA::Octet[length],
+      CORBA::Octet* body;
+      ACE_NEW_RETURN (body, CORBA::Octet[length],
                       CORBA::TypeCode::TRAVERSE_STOP);
       continue_append = (src->read_octet_array (body, length)
                          ? dest->write_octet_array (body, length)
                          : 0);
-      delete [] body;
+      delete[] body;
     }
 
   if (continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Decode structs.
@@ -314,7 +305,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -322,33 +313,37 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode_ptr param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_append == 1;
-       i++)
-    {
-      // get member type
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = dest->append (param, src, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
+  int member_count = tc->member_count (env);
+
+  if (env.exception () == 0)
+    for (int i = 0; i < member_count
+           && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+           && continue_append == 1;
+         i++)
+      {
+        // get member type
+        param = tc->member_type (i, env);
+        if (env.exception () == 0)
+          {
+            retval = dest->append (param, src, env);
+          }
+        else
+          return CORBA::TypeCode::TRAVERSE_STOP;
+      }
+  else
+    return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::encode detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Struct::encode detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Encode unions.
@@ -356,7 +351,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -364,7 +359,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode_ptr discrim_tc;
   CORBA::TypeCode_ptr member_tc;
   CORBA::Any_ptr member_label;
-  CORBA::ULongLong discrim_val;
+  CORBA::Long discrim_val;
   CORBA::ULong member_count;
   CORBA::Long  default_index;
   CORBA::ULong i;
@@ -372,143 +367,174 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
   CORBA::Boolean discrim_matched = 0;
 
   // get the discriminator type
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  discrim_tc = tc->discriminator_type (env);
 
-  // decode the discriminator value
-  retval = src->decode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if (env.exception () == 0)
     {
-      // write the discriminant back to the dest
-      retval = dest->encode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      // decode the discriminator value
+      retval = src->decode (discrim_tc, &discrim_val, 0, env);
       if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          // now get ready to marshal the actual union value
-          default_index = tc->default_index (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          member_count = tc->member_count (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // check which label value matches with the discriminator
-          // value. Accordingly, marshal the corresponding
-          // member_type. If none match, check if default exists
-          // and marshal accordingly. Otherwise it is an error.
-
-          for (i = 0; member_count-- != 0; i++)
+          // write the discriminant back to the dest
+          retval = dest->encode (discrim_tc, &discrim_val, 0, env);
+          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
             {
-              member_label = tc->member_label (i, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+              // now get ready to marshal the actual union value
+              default_index = tc->default_index (env);
 
-              CORBA::TypeCode_var type = member_label->type ();
-              // do the matching
-              switch (type->kind (ACE_TRY_ENV))
+              if (env.exception () == 0)
                 {
-                case CORBA::tk_short:
-                  {
-                    CORBA::Short s;
-                    *member_label >>= s;
-                    if (s == *(CORBA::Short *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_ushort:
-                  {
-                    CORBA::UShort s;
-                    *member_label >>= s;
-                    if (s == *(CORBA::UShort *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_long:
-                  {
-                    CORBA::Long l;
-                    *member_label >>= l;
-                    if (l == *(CORBA::Long *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_ulong:
-                  {
-                    CORBA::ULong l;
-                    *member_label >>= l;
-                    if (l == *(CORBA::ULong *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_enum:
-                  {
-                    CORBA::Long l;
-                    TAO_InputCDR stream (member_label->_tao_get_cdr ());
-                    (void)stream.decode (discrim_tc, &l, 0, ACE_TRY_ENV);
-                    if (l == *(CORBA::Long *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_char:
-                  {
-                    CORBA::Char c;
-                    *member_label >>= CORBA::Any::to_char (c);
-                    if (c == *(CORBA::Char *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_wchar:
-                  {
-                    CORBA::WChar wc;
-                    *member_label >>= CORBA::Any::to_wchar (wc);
-                    if (wc == *(CORBA::WChar *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_boolean:
-                  {
-                    CORBA::Boolean b;
-                    *member_label >>= CORBA::Any::to_boolean (b);
-                    if (b == *(CORBA::Boolean *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                default:
-                  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                    CORBA::TypeCode::TRAVERSE_STOP);
-                }// end of switch
-
-              // get the member typecode
-              member_tc = tc->member_type (i, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              if (default_index >= 0 && default_index-- == 0)
-                // have we reached the default label?, if so,
-                // save a handle to the typecode for the default
-                default_tc = member_tc;
-              if (discrim_matched)
+                  member_count = tc->member_count (env);
+                  if (env.exception () == 0)
+                    {
+                      // check which label value matches with the discriminator
+                      // value. Accordingly, marshal the corresponding
+                      // member_type. If none match, check if default exists
+                      // and marshal accordingly. Otherwise it is an error.
+
+                      for (i = 0; member_count-- != 0; i++)
+                        {
+                          member_label = tc->member_label (i, env);
+                          if (env.exception () == 0)
+                            {
+			                        CORBA::TypeCode_var type = member_label->type ();
+                              // do the matching
+                              switch (type->kind (env))
+                                {
+                                case CORBA::tk_short:
+                                  {
+                                    CORBA::Short s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::Short *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ushort:
+                                  {
+                                    CORBA::UShort s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::UShort *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_long:
+                                  {
+                                    CORBA::Long l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::Long *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ulong:
+                                  {
+                                    CORBA::ULong l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::ULong *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_enum:
+                                  {
+                                    CORBA::Long l;
+                                    TAO_InputCDR stream (member_label->_tao_get_cdr ());
+                                    (void)stream.decode (discrim_tc, &l, 0, env);
+                                    if (l == *(CORBA::Long *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_char:
+                                  {
+                                    CORBA::Char c;
+                                    *member_label >>= CORBA::Any::to_char (c);
+                                    if (c == *(CORBA::Char *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_wchar:
+                                  {
+                                    CORBA::WChar wc;
+                                    *member_label >>= CORBA::Any::to_wchar (wc);
+                                    if (wc == *(CORBA::WChar *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_boolean:
+                                  {
+                                    CORBA::Boolean b;
+                                    *member_label >>= CORBA::Any::to_boolean (b);
+                                    if (b == *(CORBA::Boolean *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                default:
+                                  env.exception (new CORBA::BAD_TYPECODE ());
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
+                                }// end of switch
+
+                              // get the member typecode
+                              member_tc = tc->member_type (i, env);
+                              if (env.exception () == 0)
+                                {
+                                  if (default_index >= 0 && default_index-- == 0)
+                                    // have we reached the default label?, if so,
+                                    // save a handle to the typecode for the default
+                                    default_tc = member_tc;
+                                  if (discrim_matched)
+                                    {
+                                      // marshal according to the matched typecode
+                                      return dest->append (member_tc, src,
+                                                           env);
+                                    }
+                                }
+                              else
+                                {
+                                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
+                                }
+                            }
+                          else
+                            {
+                              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                              return CORBA::TypeCode::TRAVERSE_STOP;
+                            }
+                        } // end of for loop
+                      // we are here only if there was no match
+                      if (default_tc)
+                        {
+                          return dest->append (default_tc, src, env);
+                        }
+                      else
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                    }
+                  else
+                    {
+                      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                      return CORBA::TypeCode::TRAVERSE_STOP;
+                    }
+                }
+              else
                 {
-                  // marshal according to the matched typecode
-                  return dest->append (member_tc, src, ACE_TRY_ENV);
+                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  return CORBA::TypeCode::TRAVERSE_STOP;
                 }
-            } // end of for loop
-          // we are here only if there was no match
-          if (default_tc)
-            {
-              return dest->append (default_tc, src, ACE_TRY_ENV);
             }
           else
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
+            {
+              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              return CORBA::TypeCode::TRAVERSE_STOP;
+            }
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_MAYBE),
-                            CORBA::TypeCode::TRAVERSE_STOP);
+          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // decode string
@@ -516,7 +542,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_String::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -531,14 +557,14 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
   continue_append = dest->append_string (*src);
   if (continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_TypeCode::append detected error"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_TypeCode::append detected error"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Decode sequence.
@@ -547,7 +573,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::Boolean continue_append = 1;
   // Return status.
@@ -568,26 +594,27 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
   if (continue_append)
     {
       // Get element typecode.
-      tc2 = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      tc2 = tc->content_type (env);
 
-      // For those aggregate types whose size is
-      // constant, we compute it only once.
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+      if (env.exception () == 0)
         {
-          retval = dest->append (tc2, src, ACE_TRY_ENV);
-        }
-      // CORBA::release (tc2);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+          // For those aggregate types whose size is
+          // constant, we compute it only once.
+          while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+            {
+              retval = dest->append (tc2, src, env);
+            }
+          // CORBA::release (tc2);
+          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+            return CORBA::TypeCode::TRAVERSE_CONTINUE;
+        } // no exception computing content type
     }
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "marshaling TAO_Marshal_Sequence::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 // Decode array.
@@ -596,7 +623,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // unused:  CORBA::Boolean continue_append = 1;
 
@@ -610,29 +637,29 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
   CORBA::ULong  bounds;
 
   // retrieve the bounds of the array
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  bounds = tc->length (env);
+  if (env.exception () == 0)
     {
-      retval = dest->append (tc2, src, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
+      // get element typecode
+      tc2 = tc->content_type (env);
+      if (env.exception () == 0)
+        {
+          while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+            {
+              retval = dest->append (tc2, src, env);
+            }
+          // CORBA::release (tc2);
+          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+            return CORBA::TypeCode::TRAVERSE_CONTINUE;
+        } // no exception computing content type
+    } // no exception computing bounds
 
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_Marshal_Sequence::append detected error"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 // Decode alias.
@@ -640,7 +667,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_ptr tc2;
@@ -650,23 +677,24 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  retval = dest->append (tc2, src, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  tc2 = tc->content_type (env);
+  if (env.exception () == 0)
+    {
+      retval = dest->append (tc2, src, env);
+    }
 
   //  tc2->_decr_refcnt ();
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Alias::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Decode exception For exceptions, the "hidden" type ID near the
@@ -680,7 +708,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -691,29 +719,36 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
   continue_append = dest->append_string (*src);
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_append == 1; i++)
+  int member_count = tc->member_count (env);
+  if (env.exception () == 0)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = dest->append (param, src, ACE_TRY_ENV);
+      for (int i = 0; i < member_count
+             && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+             && continue_append == 1; i++)
+        {
+          param = tc->member_type (i, env);
+          if (env.exception () == 0)
+            {
+              retval = dest->append (param, src, env);
+            }
+          else
+            return CORBA::TypeCode::TRAVERSE_STOP;
+        }
     }
+  else
+      return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Except::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // decode wstring
@@ -721,7 +756,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_InputCDR *src,
                              TAO_OutputCDR *dest,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -737,11 +772,12 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
 
   if (continue_append == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_WString::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_WString::append detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 10f55545c36..7b2b140f100 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -344,7 +343,7 @@ typedef void (*TAO_Skeleton)(
     CORBA_ServerRequest &,
     void *,
     void *,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Environment &TAO_IN_ENV
   );
 
 // forward declare sequences.
@@ -356,14 +355,6 @@ template <class T,class T_var> class TAO_Unbounded_Object_Sequence;
 // CORBA::default_environment() and others.
 extern TAO_Export CORBA_Environment& TAO_default_environment (void);
 
-enum TAO_SERVANT_LOCATION
-{
-  TAO_SERVANT_FOUND,
-  TAO_DEFAULT_SERVANT,
-  TAO_SERVANT_MANAGER,
-  TAO_SERVANT_NOT_FOUND
-};
-
 TAO_NAMESPACE CORBA
 {
   // = TITLE
@@ -896,7 +887,7 @@ TAO_NAMESPACE CORBA
   TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
                                                 char *argv[],
                                                 const char *orb_name,
-                                                CORBA_Environment &ACE_TRY_ENV);
+                                                CORBA_Environment &TAO_IN_ENV);
   // ORB initialisation
 
   // = TAO extensions...
@@ -916,7 +907,7 @@ TAO_NAMESPACE CORBA
 //
 // For details on how to ask more numbers check:
 //
-// http://www.omg.org/cgi-bin/doc?ptc/99-02-01
+// http://www.omg.org/cgi-bin/doc?ptc/99-02-01 
 //
 
 // These numbers were assigned by the OMG.  Do *NOT* change.
@@ -926,7 +917,7 @@ TAO_NAMESPACE CORBA
 
 // We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
 // define our own profile ids in TAO.
-#define TAO_TAG_UIOP_PROFILE   0x54414f00U /* Local IPC (Unix Domain) */
+#define TAO_TAG_UIOP_PROFILE   0x54414f00U /* Unix Domain */
 // @@ The values below are suggestions for some of the protocols
 //    we have thought of, subject to change at any point
 // #define TAO_TAG_AIOP_PROFILE   0x54414f01U /* ATM/AAL5 */
@@ -961,28 +952,21 @@ TAO_NAMESPACE CORBA
 #define TAO_DEFAULT_MINOR_CODE 0x54410000
 #define TAO_MAX_MINOR_CODE 0x54410FFF
 
-// Minor code encoding.  Encode the location in 5 bits, and the errno
-// in 7 bits:
-// 0x   0101 0100   0100 0001   0000   ____ _     ___ ____
-//          T           A        0    location      errno
-
-// Location encoding:  5 bits, after the errno encoding.
-#define TAO_INVOCATION_CONNECT_MINOR_CODE          (0x01U << 7)
-#define TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE (0x02U << 7)
-#define TAO_INVOCATION_SEND_REQUEST_MINOR_CODE     (0x03U << 7)
-#define TAO_POA_DISCARDING                         (0x04U << 7)
-#define TAO_POA_HOLDING                            (0x05U << 7)
-#define TAO_UNHANDLED_SERVER_CXX_EXCEPTION         (0x06U << 7)
-#define TAO_INVOCATION_RECV_REQUEST_MINOR_CODE     (0x07U << 7)
-#define TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL  (0x08U << 7)
-#define TAO_NULL_POINTER_MINOR_CODE                (0x09U << 7)
-#define TAO_MPROFILE_CREATION_ERROR                (0x0AU << 7)
-#define TAO_TIMEOUT_CONNECT_MINOR_CODE             (0x0BU << 7)
-#define TAO_TIMEOUT_SEND_MINOR_CODE                (0x0CU << 7)
-#define TAO_TIMEOUT_RECV_MINOR_CODE                (0x0DU << 7)
-// *Don't* use TAO_<location>_MINOR_CODE greater than 0x1FU!
-
-// errno encoding:  bottom 7 bits.
+// Minor code encoding.  Encode the location in 8 bits, and the errno
+// in 4 bits:
+// 0x   0101 0100   0100 0001   0000   ____  ____     ____
+//          T           A        0      location      errno
+
+// Location encoding:  8 bits, after the errno encoding.
+#define TAO_INVOCATION_CONNECT_MINOR_CODE          (0x01U << 4)
+#define TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE (0x02U << 4)
+#define TAO_INVOCATION_SEND_REQUEST_MINOR_CODE     (0x03U << 4)
+#define TAO_POA_DISCARDING                         (0x04U << 4)
+#define TAO_POA_HOLDING                            (0x05U << 4)
+#define TAO_UNHANDLED_SERVER_CXX_EXCEPTION         (0x06U << 4)
+#define TAO_INVOCATION_RECV_REQUEST_MINOR_CODE     (0x07U << 4)
+
+// errno encoding:  bottom 4 bits.
 #define TAO_UNSPECIFIED_MINOR_CODE  0x0U
 #define TAO_ETIMEDOUT_MINOR_CODE    0x1U
 #define TAO_ENFILE_MINOR_CODE       0x2U
@@ -994,13 +978,7 @@ TAO_NAMESPACE CORBA
 #define TAO_ENOSYS_MINOR_CODE       0x8U
 #define TAO_EPERM_MINOR_CODE        0x9U
 #define TAO_EAFNOSUPPORT_MINOR_CODE 0xAU
-#define TAO_EAGAIN_MINOR_CODE       0xBU
-#define TAO_ENOMEM_MINOR_CODE       0xCU
-#define TAO_EACCES_MINOR_CODE       0xDU
-#define TAO_EFAULT_MINOR_CODE       0xEU
-#define TAO_EBUSY_MINOR_CODE        0xFU
-#define TAO_EEXIST_MINOR_CODE       0x10U
-// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU!
+#define TAO_UNKNOWN_MINOR_CODE      0xFU
 
 // These numbers are assigned by the OpenGroup, a database is
 // available at
@@ -1018,7 +996,7 @@ TAO_NAMESPACE CORBA
 
 // ****************************************************************
 
-// A helper class to handle the various kinds of octet sequences used
+// A helper clas to handle the various kinds of octet sequences used
 // inside the ORB.
 
 typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
index 3a074b08759..a0874e1b457 100644
--- a/TAO/tao/corbafwd.i
+++ b/TAO/tao/corbafwd.i
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 ACE_INLINE CORBA::String
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 6cb581ac6cc..858be4c11f1 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -61,8 +61,6 @@ ACE_RCSID(tao, decode, "$Id$")
 // code out into a separate routine called both by CDR::decoder () and
 // by the code retrieving typecode parameters from encapsulations.
 
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
                                const void *data,
@@ -695,8 +693,8 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
 
             if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
               {
-                TAO_Object_Field_Class* field =
-                  ACE_reinterpret_cast (TAO_Object_Field_Class *,
+                TAO_Object_Field_T<CORBA_Object>* field =
+                  ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
                                         ACE_const_cast (void *, data));
                 field->_downcast (object, ACE_TRY_ENV);
               }
@@ -715,7 +713,7 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Struct::decode detected error\n"));
-
+     
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
                         CORBA::TypeCode::TRAVERSE_STOP);
     }
@@ -734,7 +732,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
 
   CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc = 0;
+  CORBA::TypeCode_ptr member_tc;
   CORBA::Any_ptr member_label;
   CORBA::ULong discrim_size_with_pad;
   const void *discrim_val;
@@ -748,25 +746,30 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
 
   discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
   // get the discriminator type
+
+  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // decode the discriminator value
   discrim_val = base_union->_discriminant ();
   stream->decode (discrim_tc, discrim_val, data2, ACE_TRY_ENV);
+  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   discrim_size_with_pad = tc->TAO_discrim_pad_size (ACE_TRY_ENV);
+  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // move the pointer to point to the actual value
   data = (char *) data + discrim_size_with_pad;
   data2 = (char *) data2 + discrim_size_with_pad;
-
   // now get ready to marshal the actual union value
   default_index = tc->default_index (ACE_TRY_ENV);
+  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   member_count = tc->member_count (ACE_TRY_ENV);
+  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // check which label value matches with the discriminator
@@ -777,6 +780,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
   for (i = 0; member_count-- != 0; i++)
     {
       member_label = tc->member_label (i, ACE_TRY_ENV);
+      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       // do the matching
@@ -856,11 +860,12 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
 
       // get the member typecode
       member_tc = tc->member_type (i, ACE_TRY_ENV);
+      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
-      // have we reached the default label?, if so,
-      // save a handle to the typecode for the default
       if (default_index >= 0 && default_index-- == 0)
+                                // have we reached the default label?, if so,
+                                // save a handle to the typecode for the default
         default_tc = member_tc;
       if (discrim_matched)
         {
@@ -868,22 +873,13 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
           // marshal according to the matched typecode
           if (member_tc->kind () == CORBA::tk_objref)
             {
-              CORBA_Object_ptr object;
-              int retval =
-                stream->decode (member_tc, &object, data2, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                {
-                  // we know that the object pointer is stored in a
-                  // TAO_Object_Field_T parametrized type
-                  TAO_Object_Field_Class* field =
-                    ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                          member_val);
-                  field->_downcast (object, ACE_TRY_ENV);
-                  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                }
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
+              // we know that the object pointer is stored in a
+              // TAO_Object_Field_T parametrized type
+              TAO_Object_Field_T<CORBA_Object>* field =
+                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
+                                      member_val);
+              CORBA::Object_ptr ptr = field->_upcast ();
+              return stream->decode (member_tc, &ptr, data2, ACE_TRY_ENV);
             }
           else
             {
@@ -899,22 +895,13 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
       member_val = base_union->_access (1);
       if (default_tc->kind () == CORBA::tk_objref)
         {
-          CORBA_Object_ptr object;
-          int retval =
-            stream->decode (member_tc, &object, data2, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              // we know that the object pointer is stored in a
-              // TAO_Object_Field_T parametrized type
-              TAO_Object_Field_Class* field =
-                ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                      member_val);
-              field->_downcast (object, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            }
-          return CORBA::TypeCode::TRAVERSE_CONTINUE;
+          // we know that the object pointer is stored in a
+          // TAO_Object_Field_T parametrized type
+          TAO_Object_Field_T<CORBA_Object>* field =
+            ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
+                                  member_val);
+          CORBA::Object_ptr ptr = field->_upcast ();
+          return stream->decode (default_tc, &ptr, data2, ACE_TRY_ENV);
         }
       else
         {
@@ -1203,7 +1190,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
   // get element typecode
   tc2 = tc->content_type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
+  
   size = tc2->size (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index 0ba247223df..80de531d5f4 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -233,10 +233,8 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
 
         case CORBA::tk_objref:
           {
-            typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var>
-              TAO_Object_Field_Class;
-            TAO_Object_Field_Class* field =
-              ACE_reinterpret_cast (TAO_Object_Field_Class *,
+            TAO_Object_Field_T<CORBA_Object>* field =
+              ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
                                     ACE_const_cast (void *, source));
             field->_release ();
             retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -307,10 +305,13 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
 
   // Get a base pointer so we can use the union's virtual functions.
   base_union = ACE_reinterpret_cast (TAO_Base_Union *,
-                                     ACE_const_cast (void *,
+                                     ACE_const_cast (void *, 
                                                      data));
 
   discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
+  // Get the discriminator type
+  // @@EXC@@ Why are we changing the exception thrown here?
+  //  if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   discrim_val = base_union->_discriminant ();
@@ -321,10 +322,14 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
 
   default_index = tc->default_index (ACE_TRY_ENV);
   // now get ready to marshal the actual union value
+  // @@EXC@@ Why are we changing the exception thrown here?
+  // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),  CORBA::TypeCode::TRAVERSE_STOP);
   ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
 
   member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  // @@EXC@@ Why are we changing the exception thrown here?
+  // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),  CORBA::TypeCode::TRAVERSE_STOP);
+  ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
 
   // check which label value matches with the discriminator
   // value. Accordingly, marshal the corresponding
@@ -333,6 +338,8 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   for (i = 0; member_count-- != 0; i++)
     {
       member_label = tc->member_label (i, ACE_TRY_ENV);
+      // @@EXC@@ Why are we changing the exception thrown here?
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),  CORBA::TypeCode::TRAVERSE_STOP);
       ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
 
       // do the matching
@@ -376,12 +383,14 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
             discrim_matched = 1;
           break;
         default:
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
                             CORBA::TypeCode::TRAVERSE_STOP);
         }// end of switch
 
       // get the member typecode
       member_tc = tc->member_type (i, ACE_TRY_ENV);
+      // @@EXC@@ Why are we changing the exception thrown here?
+      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),  CORBA::TypeCode::TRAVERSE_STOP);
       ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
 
       if (default_index >= 0 && default_index-- == 0)
@@ -393,21 +402,22 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
       if (discrim_matched)
         {
           // deep_free the discriminator value
-          retval = DEEP_FREE (discrim_tc,
-                              discrim_val,
-                              data2,
+          retval = DEEP_FREE (discrim_tc, 
+                              discrim_val, 
+                              data2, 
                               ACE_TRY_ENV);
 
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
+            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
                               CORBA::TypeCode::TRAVERSE_STOP);
 
           // marshal according to the matched typecode
-          return DEEP_FREE (member_tc,
+          // @@EXC@@ No need to check ACE_TRY_ENV.
+          return DEEP_FREE (member_tc, 
                             member_val,
-                            data2,
+                            data2, 
                             ACE_TRY_ENV);
         } // end of if
     } // end of for
@@ -415,21 +425,21 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   // we are here only if there was no match
 
   // deep_free the discriminator value
-  retval = DEEP_FREE (discrim_tc,
-                      discrim_val,
-                      data2,
+  retval = DEEP_FREE (discrim_tc, 
+                      discrim_val, 
+                      data2, 
                       ACE_TRY_ENV);
 
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
+    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
                       CORBA::TypeCode::TRAVERSE_STOP);
 
   if (default_tc)
-    return DEEP_FREE (default_tc,
-                      member_val,
-                      data2,
+    return DEEP_FREE (default_tc, 
+                      member_val, 
+                      data2, 
                       ACE_TRY_ENV);
   else
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 18e327e16aa..e4e82c830f4 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(tao, default_client, "$Id$")
 
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-  : profile_lock_type_ (TAO_THREAD_LOCK)
+  : iiop_profile_lock_type_ (TAO_THREAD_LOCK)
 {
   // Use single thread client connection handler
 #if defined (TAO_USE_ST_CLIENT_CONNECTION_HANDLER)
@@ -56,7 +56,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
   for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
     {
       if (ACE_OS::strcasecmp (argv[curarg],
-                              "-ORBProfileLock") == 0)
+                              "-ORBIIOPProfileLock") == 0)
         {
         curarg++;
         if (curarg < argc)
@@ -65,35 +65,14 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
 
             if (ACE_OS::strcasecmp (name,
                                     "thread") == 0)
-              this->profile_lock_type_ = TAO_THREAD_LOCK;
+              this->iiop_profile_lock_type_ = TAO_THREAD_LOCK;
             else if (ACE_OS::strcasecmp (name,
                                          "null") == 0)
-              this->profile_lock_type_ = TAO_NULL_LOCK;
+              this->iiop_profile_lock_type_ = TAO_NULL_LOCK;
           }
         }
 
       else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBIIOPProfileLock") == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "WARNING: The -ORBIIOPProfileLock option"
-                      " is deprecated and will be removed.\n"
-                      "         Please use -ORBProfileLock instead\n"));
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      "thread") == 0)
-                this->profile_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           "null") == 0)
-                this->profile_lock_type_ = TAO_NULL_LOCK;
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
                                    "-ORBClientConnectionHandler") == 0)
         {
           curarg++;
@@ -133,11 +112,11 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
 }
 
 ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
+TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void)
 {
   ACE_Lock *the_lock = 0;
 
-  if (this->profile_lock_type_ == TAO_NULL_LOCK)
+  if (this->iiop_profile_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
                     ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                     0);
@@ -150,27 +129,25 @@ TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
 }
 
 // @@ Alex: implement the WS and TMS methods here, similar to the
-//    create_profile_lock above...
+//    create_iiop_profile_lock above...
 // @@ Alex: remember your idea of using the
 //    -ORBclientconnectionhandler option to implement the WS factory,
 //    but you need new options for the TMS...
 
 // Create the correct client transport muxing strategy.
 TAO_Transport_Mux_Strategy *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (void)
+TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *orb_core)
 {
   TAO_Transport_Mux_Strategy *tms = 0;
 
-  //if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
-  //ACE_NEW_RETURN (tms,
-  //                TAO_Muxed_TMS,
-  //                0);
-  //else
-
-  // @@ Alex: Always creating Exclusive TMS. (Alex).
-  ACE_NEW_RETURN (tms,
-                  TAO_Exclusive_TMS,
-                  0);
+  if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
+    ACE_NEW_RETURN (tms,
+                    TAO_Muxed_TMS (orb_core),
+                    0);
+  else
+    ACE_NEW_RETURN (tms,
+                    TAO_Exclusive_TMS (orb_core),
+                    0);
 
   return tms;
 }
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 6afeec2803d..1eb7a101d17 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -42,12 +42,12 @@ public:
   int parse_args (int argc, char* argv[]);
   // Parse svc.conf arguments
 
-  ACE_Lock* create_profile_lock (void);
-  // create the lock for the forwarding Profile used by
+  ACE_Lock* create_iiop_profile_lock (void);
+  // create the lock for the forwarding IIOP Profile used by
   // the TAO_GIOP_Invocation::location_forward and the
   // TAO_GIOP_Invocation::start
 
-  TAO_Transport_Mux_Strategy *create_transport_mux_strategy (void);
+  TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
   // Create the correct client request muxing strategy.
 
   TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
@@ -60,7 +60,7 @@ private:
     TAO_THREAD_LOCK
   };
 
-  Lock_Type profile_lock_type_;
+  Lock_Type iiop_profile_lock_type_;
   // the lock type for forwarding IIOP Profile
 
   enum Transport_Mux_Strategy
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 433ac742f64..b01ba111060 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -11,6 +11,7 @@
 #include "tao/Connector_Registry.h"
 
 #include "ace/Select_Reactor.h"
+#include "ace/XtReactor.h"
 #include "ace/FlReactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Msg_WFMO_Reactor.h"
@@ -28,8 +29,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   : use_tss_resources_ (0),
     use_locked_data_blocks_ (1),
     reactor_type_ (TAO_REACTOR_SELECT_MT),
-    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    protocol_factories_ ()
+    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK)
 {
 }
 
@@ -55,6 +55,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
     if (ACE_OS::strcasecmp (argv[curarg],
                             "-ORBResources") == 0)
       {
+        ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) The -ORBResources option "
+                    "has been moved to the ORB parameters\n"));
         curarg++;
         if (curarg < argc)
           {
@@ -110,6 +112,15 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           " not supported on this platform\n"));
 #endif /* ACE_HAS_FL */
             else if (ACE_OS::strcasecmp (name,
+                                         "xt") == 0)
+#if defined(ACE_HAS_XT)
+              reactor_type_ = TAO_REACTOR_XT;
+#else
+              ACE_DEBUG ((LM_DEBUG,
+                          "TAO_Default_Factory - XtReactor"
+                          " not supported on this platform\n"));
+#endif /* ACE_HAS_XT */
+            else if (ACE_OS::strcasecmp (name,
                                          "wfmo") == 0)
 #if defined(ACE_WIN32)
               reactor_type_ = TAO_REACTOR_WFMO;
@@ -168,7 +179,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
         curarg++;
         if (curarg < argc)
           {
-            TAO_Protocol_Item *item = 0;
+            TAO_Protocol_Item *item;
             ACE_NEW_RETURN (item,
                             TAO_Protocol_Item (argv[curarg]),
                             -1);
@@ -188,6 +199,9 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
   TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
   TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
 
+  // @@ Ossama, if you want to be very paranoid, you could get memory
+  // leak if insert operations failed.
+
   if (factory == end)
     {
       TAO_Protocol_Factory *protocol_factory = 0;
@@ -200,8 +214,9 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
         {
           if (TAO_orbdebug)
             ACE_ERROR ((LM_WARNING,
-                        "TAO (%P|%t) No %s found in Service Repository.  "
-                        "Using default instance IIOP Protocol Factory.\n"));
+                        "(%P|%t) WARNING - No %s found in Service Repository."
+                        "  Using default instance.\n",
+                        "IIOP Protocol Factory"));
 
           ACE_NEW_RETURN (protocol_factory,
                           TAO_IIOP_Protocol_Factory,
@@ -211,18 +226,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
       ACE_NEW_RETURN (item, TAO_Protocol_Item ("IIOP_Factory"), -1);
       item->factory (protocol_factory);
 
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          delete item;
-          delete protocol_factory;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) Unable to add "
-                             "<%s> to protocol factory set.\n",
-                             item->protocol_name ().c_str ()),
-                            -1);
-        }
-
+      this->protocol_factories_.insert (item);
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -249,18 +253,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
       ACE_NEW_RETURN (item, TAO_Protocol_Item ("UIOP_Factory"), -1);
       item->factory (protocol_factory);
 
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          delete item;
-          delete protocol_factory;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) Unable to add "
-                             "<%s> to protocol factory set.\n",
-                             item->protocol_name ().c_str ()),
-                            -1);
-        }
-
+      this->protocol_factories_.insert (item);
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -348,6 +341,12 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
 #endif /* ACE_HAS_FL */
       break;
 
+    case TAO_REACTOR_XT:
+#if defined(ACE_HAS_XT)
+      ACE_NEW_RETURN (impl, ACE_XtReactor, 0);
+#endif /* ACE_HAS_FL */
+      break;
+
     case TAO_REACTOR_WFMO:
 #if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE)
       ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
@@ -370,19 +369,10 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
 ACE_Reactor *
 TAO_Default_Resource_Factory::get_reactor (void)
 {
-  ACE_LOG_MSG->errnum (0);
-
-  ACE_Reactor *reactor = 0;
+  ACE_Reactor *reactor;
   ACE_NEW_RETURN (reactor,
                   ACE_Reactor (this->allocate_reactor_impl (), 1),
                   0);
-
-  if (ACE_LOG_MSG->errnum () != 0)
-    {
-      delete reactor;
-      reactor = 0;
-    }
-
   return reactor;
 }
 
@@ -441,7 +431,7 @@ TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
 ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator;
   ACE_NEW_RETURN (allocator, NULL_LOCK_ALLOCATOR, 0);
   return allocator;
 }
@@ -449,7 +439,7 @@ TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
 ACE_Allocator *
 TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
 {
-  ACE_Allocator *allocator = 0;
+  ACE_Allocator *allocator;
   ACE_NEW_RETURN (allocator, NULL_LOCK_ALLOCATOR, 0);
   return allocator;
 }
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 551311386e1..1f732a22131 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -70,6 +70,7 @@ public:
     TAO_REACTOR_SELECT_MT, // Use ACE_Token
     TAO_REACTOR_SELECT_ST, // Use ACE_Noop_Token
     TAO_REACTOR_FL,
+    TAO_REACTOR_XT,
     TAO_REACTOR_WFMO,
     TAO_REACTOR_MSGWFMO,
     TAO_REACTOR_TP
@@ -92,7 +93,7 @@ public:
   virtual int init_protocol_factories (void);
 
 protected:
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
+  ACE_Reactor_Impl *allocate_reactor_impl (void) const;
   // Obtain the reactor implementation
 
 protected:
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index 1676ee0183d..8abd7f02742 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -41,14 +41,12 @@ ACE_RCSID(tao, encode, "$Id$")
 // components.  "context" is the marshaling stream on which to encode
 // the data value.
 
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
                                const void *data,
                                const void *,
                                void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Boolean continue_encoding = 1;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
@@ -101,9 +99,8 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Primitive::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -112,7 +109,7 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
                          const void *data,
                          const void *,
                          void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   CORBA::Any *any = (CORBA::Any *) data;
 
@@ -126,9 +123,7 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
   CORBA::TypeCode_ptr elem_tc = any->type_;
 
   // Encode the typecode description for the element.
-  retval = stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
+  retval = stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env);
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
       // if the any owns the data, then the value is a CDR stream and
@@ -138,14 +133,12 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
       if (any->cdr_ != 0)
         {
           TAO_InputCDR in_strm (any->cdr_);
-          retval = stream->append (elem_tc, &in_strm, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = stream->append (elem_tc, &in_strm, env);
         }
       else if (any->value_ != 0)
         {
           // encode the value
-          retval = stream->encode (elem_tc, any->value_, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = stream->encode (elem_tc, any->value_, 0, env);
         }
     }
 
@@ -156,9 +149,8 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Any::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -167,7 +159,7 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
                               const void *data,
                               const void *,
                               void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::Boolean continue_encoding = 1;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
@@ -189,8 +181,7 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
           // A few have "simple" parameter lists
         case CORBA::tk_string:
         case CORBA::tk_wstring:
-          continue_encoding = stream->write_ulong (tc2->length (ACE_TRY_ENV));
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          continue_encoding = stream->write_ulong (tc2->length (env));
           break;
 
           // Indirected typecodes can't occur at "top level" like
@@ -228,9 +219,8 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_TypeCode::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -240,7 +230,7 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
                                const void *data,
                                const void *,
                                void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
@@ -248,9 +238,8 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
 
   if ((*stream << p) == 0)
     {
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -261,7 +250,7 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
@@ -276,9 +265,8 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
 
   if ((*stream << obj) == 0)
     {
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -289,7 +277,7 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -299,108 +287,122 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
 
   void *start_addr = (void *)data;
 
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0;
-       i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_encoding == 1;
-       i++)
+  if (env.exception () == 0)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      int member_count = tc->member_count (env);
 
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      align_offset =
-        (ptr_arith_t) ptr_align_binary (data, alignment)
-        - (ptr_arith_t) data
-        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-        - (ptr_arith_t) start_addr;
-      // if both the start_addr and data are not aligned as per
-      // the alignment, we do not add the offset
-      data = (const void *) ((ptr_arith_t) data +
-                             ((align_offset == alignment) ?
-                              0 : align_offset));
-      switch (param->kind_)
+      for (int i = 0;
+           i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+             && continue_encoding == 1;
+           i++)
         {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_encoding = stream->write_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_encoding = stream->write_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_encoding = stream->write_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_any:
-        case CORBA::tk_Principal:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-        case CORBA::tk_TypeCode:
-          retval = stream->encode (param, data, 0, ACE_TRY_ENV);
-          break;
-
-        case CORBA::tk_objref:
-          {
-            // we know that the object pointer is stored in a
-            // TAO_Object_Field_T parametrized type
-            TAO_Object_Field_Class* field =
-              ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                    ACE_const_cast (void *, data));
-            CORBA::Object_ptr ptr = field->_upcast ();
-            retval = stream->encode (param, &ptr, 0, ACE_TRY_ENV);
-          }
-          break;
-
-        default:
-          break;
+          param = tc->member_type (i, env);
+          if (env.exception () == 0)
+            {
+              size = param->size (env);
+              if (env.exception () == 0)
+                {
+                  alignment = param->alignment (env);
+                  if (env.exception () == 0)
+                    {
+                      align_offset =
+                        (ptr_arith_t) ptr_align_binary (data, alignment)
+                        - (ptr_arith_t) data
+                        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
+                        - (ptr_arith_t) start_addr;
+                      // if both the start_addr and data are not aligned as per
+                      // the alignment, we do not add the offset
+                      data = (const void *) ((ptr_arith_t) data +
+                                             ((align_offset == alignment) ?
+                                              0 : align_offset));
+                      switch (param->kind_)
+                        {
+                        case CORBA::tk_null:
+                        case CORBA::tk_void:
+                          break;
+                        case CORBA::tk_short:
+                        case CORBA::tk_ushort:
+                          continue_encoding = stream->write_short (*(CORBA::Short *) data);
+                          break;
+                        case CORBA::tk_long:
+                        case CORBA::tk_ulong:
+                        case CORBA::tk_float:
+                        case CORBA::tk_enum:
+                          continue_encoding = stream->write_long (*(CORBA::Long *) data);
+                          break;
+                        case CORBA::tk_double:
+                        case CORBA::tk_longlong:
+                        case CORBA::tk_ulonglong:
+                          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
+                          break;
+                        case CORBA::tk_boolean:
+                          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
+                          break;
+                        case CORBA::tk_char:
+                        case CORBA::tk_octet:
+                          continue_encoding = stream->write_char (*(CORBA::Char *) data);
+                          break;
+                        case CORBA::tk_longdouble:
+                          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
+                          break;
+                        case CORBA::tk_wchar:
+                          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
+                          break;
+                        case CORBA::tk_any:
+                        case CORBA::tk_Principal:
+                        case CORBA::tk_struct:
+                        case CORBA::tk_union:
+                        case CORBA::tk_sequence:
+                        case CORBA::tk_array:
+                        case CORBA::tk_alias:
+                        case CORBA::tk_except:
+                        case CORBA::tk_string:
+                        case CORBA::tk_wstring:
+                        case CORBA::tk_TypeCode:
+                          retval = stream->encode (param, data, 0, env);
+                          break;
+
+                        case CORBA::tk_objref:
+                          {
+                            // we know that the object pointer is stored in a
+                            // TAO_Object_Field_T parametrized type
+                            TAO_Object_Field_T<CORBA_Object>* field =
+                              ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
+                                                    ACE_const_cast (void *, data));
+                            CORBA::Object_ptr ptr = field->_upcast ();
+                            retval = stream->encode (param, &ptr, 0, env);
+                          }
+                          break;
+
+                        default:
+                          break;
+                        }
+                      data = (char *) data + size;
+                    }
+                  else
+                    return CORBA::TypeCode::TRAVERSE_STOP;
+                }
+              else
+                return CORBA::TypeCode::TRAVERSE_STOP;
+            }
+          else
+            return CORBA::TypeCode::TRAVERSE_STOP;
         }
-      data = (char *) data + size;
     }
+  else
+      return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_encoding == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Struct::encode detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // encode unions
@@ -464,9 +466,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
 
       // do the matching
       CORBA::TypeCode_var type = member_label->type ();
-      CORBA::ULong kind = type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      switch (kind)
+      switch (type->kind (ACE_TRY_ENV))
         {
         case CORBA::tk_short:
           {
@@ -545,8 +545,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
             ACE_DEBUG ((LM_DEBUG,
                         "Union::encode - "
                         "Bad discriminant type\n"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE,
-                                                 CORBA::COMPLETED_MAYBE),
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
                             CORBA::TypeCode::TRAVERSE_STOP);
         }// end of switch
 
@@ -570,8 +569,8 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
             {
               // we know that the object pointer is stored in a
               // TAO_Object_Field_T parametrized type
-              TAO_Object_Field_Class* field =
-                ACE_reinterpret_cast (TAO_Object_Field_Class *,
+              TAO_Object_Field_T<CORBA_Object>* field =
+                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
                                       member_val);
               CORBA::Object_ptr ptr = field->_upcast ();
               return stream->encode (member_tc, &ptr, data2, ACE_TRY_ENV);
@@ -591,8 +590,8 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
         {
           // we know that the object pointer is stored in a
           // TAO_Object_Field_T parametrized type
-          TAO_Object_Field_Class* field =
-            ACE_reinterpret_cast (TAO_Object_Field_Class *,
+          TAO_Object_Field_T<CORBA_Object>* field =
+            ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
                                   member_val);
           CORBA::Object_ptr ptr = field->_upcast ();
           return stream->encode (default_tc, &ptr, data2, ACE_TRY_ENV);
@@ -618,7 +617,7 @@ TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
   CORBA::String str = *(CORBA::String *) data;
@@ -626,9 +625,7 @@ TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc,
   // Verify string satisfies bounds requirements.  We're not so
   // permissive as to send messages violating the interface spec
   // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
+  CORBA::ULong bounds = tc->length (env);
   if (str != 0)
     {
       CORBA::ULong length = ACE_OS::strlen (str);
@@ -650,7 +647,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
                               const void *data,
                               const void *,
                               void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::Boolean continue_encoding = 1;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
@@ -668,26 +665,221 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
   if (len > 0)
     {
       // retrieve the bounds of the sequence
-      CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // encode only if it is an unbounded sequence or if length is
-      // less/equal to the bounds
-      if (bounds == 0 || len <= bounds)
+      CORBA::ULong bounds = tc->length (env);
+      if (env.exception () == 0)
         {
-          // We just encode the current elements in the sequence
-          bounds = len;
-          continue_encoding = stream->write_ulong (bounds);
-          if (continue_encoding && bounds != 0)
+          // encode only if it is an unbounded sequence or if length is
+          // less/equal to the bounds
+          if (bounds == 0 || len <= bounds)
             {
-              // get element typecode
-              tc2 = tc->content_type (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+              // We just encode the current elements in the sequence
+              bounds = len;
+              continue_encoding = stream->write_ulong (bounds);
+              if (continue_encoding && bounds != 0)
+                {
+                  // get element typecode
+                  tc2 = tc->content_type (env);
+                  if (env.exception () == 0)
+                    {
+                      size = tc2->size (env);
+                      if (env.exception () == 0)
+                        {
+                          value = (char *) seq->buffer_;
+                          switch (tc2->kind_)
+                            {
+                            case CORBA::tk_null:
+                            case CORBA::tk_void:
+                              return CORBA::TypeCode::TRAVERSE_CONTINUE;
+
+                            case CORBA::tk_short:
+                            case CORBA::tk_ushort:
+                              continue_encoding = continue_encoding &&
+                                stream->write_short_array
+                                ((CORBA::Short*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_long:
+                            case CORBA::tk_ulong:
+                            case CORBA::tk_float:
+                            case CORBA::tk_enum:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_long_array
+                                ((CORBA::Long*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_double:
+                            case CORBA::tk_longlong:
+                            case CORBA::tk_ulonglong:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_longlong_array
+                                ((CORBA::LongLong*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_boolean:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_boolean_array
+                                ((CORBA::Boolean*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_char:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_char_array
+                                ((CORBA::Char*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_octet:
+#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_octet_array
+                                ((CORBA::Octet*)value, bounds);
+#else
+                              {
+                                TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+                                  ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*,seq);
+                                if (oseq->mb_ == 0)
+                                  {
+                                    continue_encoding = continue_encoding &&
+                                      stream->write_octet_array
+                                      ((CORBA::Octet*)value, bounds);
+                                  }
+                                else
+                                  {
+                                    continue_encoding = continue_encoding &&
+                                      stream->write_octet_array_mb (oseq->mb ());
+                                  }
+                              }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_longdouble:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_longdouble_array
+                                ((CORBA::LongDouble*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_wchar:
+                              // For primitives, compute the size only once
+                              continue_encoding = continue_encoding &&
+                                stream->write_wchar_array
+                                ((CORBA::WChar*)value, bounds);
+                              if (continue_encoding == 1)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                              // handle all aggregate types here
+
+                            case CORBA::tk_any:
+                            case CORBA::tk_TypeCode:
+                            case CORBA::tk_Principal:
+                            case CORBA::tk_struct:
+                            case CORBA::tk_union:
+                            case CORBA::tk_string:
+                            case CORBA::tk_sequence:
+                            case CORBA::tk_array:
+                            case CORBA::tk_alias:
+                            case CORBA::tk_except:
+                            case CORBA::tk_wstring:
+                              // For those aggregate types whose size
+                              // is constant, we compute it only once
+                              while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                                {
+                                  retval = stream->encode (tc2, value, 0, env);
+                                  value += size;
+                                }
+                              //                              CORBA::release (tc2);
+                              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                              break;
+
+                            case CORBA::tk_objref:
+                              {
+                                size = sizeof (CORBA_Object_ptr);
+                                while (bounds-- &&
+                                       retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                                  {
+                                    CORBA_Object_ptr ptr =
+                                      seq->_upcast (value);
+                                    retval = stream->encode (tc2, &ptr, 0,  env);
+                                    if (env.exception () != 0) break;
+                                    value += size;
+                                  }
+                                if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                                  return retval;
+                              }
+                              break;
+
+                            default:
+                              break;
+                            } // end of switch
+                        } // no exception computing size
+                    } // no exception computing content type
+                } // seq length not 0
+            } // within bounds or unbounded
+        } // no exception computing bounds
+    } // length is > 0
+  else
+    {
+      // length is 0, encode it
+      continue_encoding = stream->write_ulong (len);
+      if (continue_encoding == 1)
+        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+
+    }
+  // If an error was detected but no exception was raised then raise a
+  // marshal exception.
+  if (env.exception () == 0)
+    env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
+}
 
-              size = tc2->size (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+// encode array
+CORBA::TypeCode::traverse_status
+TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
+                           const void *data,
+                           const void *,
+                           void *context,
+                           CORBA::Environment &env)
+{
+  CORBA::Boolean continue_encoding = 1;
+  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
+  CORBA::TypeCode::traverse_status retval =
+    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
+  size_t  size; // size of element
+  CORBA::ULong  bounds;
+  char *value = (char *) data;
 
-              value = (char *) seq->buffer_;
+  // retrieve the bounds of the array
+  bounds = tc->length (env);
+  if (env.exception () == 0)
+    {
+      // get element typecode.
+      CORBA::TypeCode_ptr tc2 = tc->content_type (env);
+
+      if (env.exception () == 0)
+        {
+          size = tc2->size (env);
+          if (env.exception () == 0)
+            {
               switch (tc2->kind_)
                 {
                 case CORBA::tk_null:
@@ -706,7 +898,6 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
                 case CORBA::tk_long:
                 case CORBA::tk_ulong:
                 case CORBA::tk_float:
-                case CORBA::tk_enum:
                   // For primitives, compute the size only once
                   continue_encoding = continue_encoding &&
                     stream->write_long_array
@@ -736,37 +927,11 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
                   break;
 
                 case CORBA::tk_char:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_char_array
-                    ((CORBA::Char*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
                 case CORBA::tk_octet:
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
                   // For primitives, compute the size only once
                   continue_encoding = continue_encoding &&
                     stream->write_octet_array
                     ((CORBA::Octet*)value, bounds);
-#else
-                  {
-                    TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-                      ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*,seq);
-                    if (oseq->mb_ == 0)
-                      {
-                        continue_encoding = continue_encoding &&
-                          stream->write_octet_array
-                          ((CORBA::Octet*)value, bounds);
-                      }
-                    else
-                      {
-                        continue_encoding = continue_encoding &&
-                          stream->write_octet_array_mb (oseq->mb ());
-                      }
-                  }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
                   if (continue_encoding == 1)
                     return CORBA::TypeCode::TRAVERSE_CONTINUE;
                   break;
@@ -789,11 +954,20 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
                     return CORBA::TypeCode::TRAVERSE_CONTINUE;
                   break;
 
+                case CORBA::tk_enum:
+                  // For primitives, compute the size only once
+                  continue_encoding = continue_encoding &&
+                    stream->write_long_array
+                    ((CORBA::Long*)value, bounds);
+                  if (continue_encoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
                   // handle all aggregate types here
 
                 case CORBA::tk_any:
                 case CORBA::tk_TypeCode:
                 case CORBA::tk_Principal:
+                case CORBA::tk_objref:
                 case CORBA::tk_struct:
                 case CORBA::tk_union:
                 case CORBA::tk_string:
@@ -802,202 +976,30 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
                 case CORBA::tk_alias:
                 case CORBA::tk_except:
                 case CORBA::tk_wstring:
-                  // For those aggregate types whose size
-                  // is constant, we compute it only once
+                  // For those aggregate types whose size is constant, we
+                  // compute it only once
                   while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
                     {
-                      retval = stream->encode (tc2, value, 0, ACE_TRY_ENV);
-                      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+                      retval = stream->encode (tc2, value, 0, env);
                       value += size;
                     }
-                  //                              CORBA::release (tc2);
+                  //              CORBA::release (tc2);
                   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
                     return CORBA::TypeCode::TRAVERSE_CONTINUE;
                   break;
-
-                case CORBA::tk_objref:
-                  {
-                    size = sizeof (CORBA_Object_ptr);
-                    while (bounds-- &&
-                           retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      {
-                        CORBA_Object_ptr ptr =
-                          seq->_upcast (value);
-                        retval = stream->encode (tc2, &ptr, 0,  ACE_TRY_ENV);
-                        ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                        value += size;
-                      }
-                    if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      return retval;
-                  }
-                  break;
-
                 default:
                   break;
                 } // end of switch
-            } // seq length not 0
-        } // within bounds or unbounded
-    } // length is > 0
-  else
-    {
-      // length is 0, encode it
-      continue_encoding = stream->write_ulong (len);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    }
-
-  // If an error was detected but no exception was raised then raise a
-  // marshal exception.
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// encode array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode.
-  CORBA::TypeCode_ptr tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  size = tc2->size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = continue_encoding &&
-        stream->write_short_array
-        ((CORBA::Short*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_long_array
-        ((CORBA::Long*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_longlong_array
-        ((CORBA::LongLong*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_boolean:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_boolean_array
-        ((CORBA::Boolean*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_octet_array
-        ((CORBA::Octet*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_longdouble:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_longdouble_array
-        ((CORBA::LongDouble*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_wchar:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_wchar_array
-        ((CORBA::WChar*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_enum:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_long_array
-        ((CORBA::Long*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-      // handle all aggregate types here
-
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-    case CORBA::tk_wstring:
-      // For those aggregate types whose size is constant, we
-      // compute it only once
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = stream->encode (tc2, value, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          value += size;
-        }
-      //              CORBA::release (tc2);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-    default:
-      break;
-    } // end of switch
+            } // no exception computing size
+        } // no exception computing content type
+    } // no exception computing bounds
 
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_Marshal_Sequence::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 CORBA::TypeCode::traverse_status
@@ -1005,7 +1007,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
                            const void *data,
                            const void *,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   CORBA::TypeCode_ptr tc2;  // typecode of the aliased type
   CORBA::Boolean continue_encoding = 1;
@@ -1014,75 +1016,75 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
     CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
   char *value = (char *) data;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // switch on the data type and handle the cases for primitives here for
-  // efficiency rather than calling
-  switch (tc2->kind_)
+  tc2 = tc->content_type (env);
+  if (env.exception () == 0)
     {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = stream->write_short (*(CORBA::Short *) value);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_encoding = stream->write_long (*(CORBA::Long *) value);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-      break;
-    case CORBA::tk_boolean:
-      continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_encoding = stream->write_char (*(CORBA::Char *) value);
-      break;
-    case CORBA::tk_longdouble:
-      continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-      break;
-    case CORBA::tk_wchar:
-      continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-      break;
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-    case CORBA::tk_wstring:
-      retval = stream->encode (tc2, data, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      break;
-    default:
-      // anything else is an error
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
+    // switch on the data type and handle the cases for primitives here for
+    // efficiency rather than calling
+    switch (tc2->kind_)
+      {
+      case CORBA::tk_null:
+      case CORBA::tk_void:
+        break;
+      case CORBA::tk_short:
+      case CORBA::tk_ushort:
+        continue_encoding = stream->write_short (*(CORBA::Short *) value);
+        break;
+      case CORBA::tk_long:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_enum:
+        continue_encoding = stream->write_long (*(CORBA::Long *) value);
+        break;
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+        continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
+        break;
+      case CORBA::tk_boolean:
+        continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
+        break;
+      case CORBA::tk_char:
+      case CORBA::tk_octet:
+        continue_encoding = stream->write_char (*(CORBA::Char *) value);
+        break;
+      case CORBA::tk_longdouble:
+        continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
+        break;
+      case CORBA::tk_wchar:
+        continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
+        break;
+      case CORBA::tk_any:
+      case CORBA::tk_TypeCode:
+      case CORBA::tk_Principal:
+      case CORBA::tk_objref:
+      case CORBA::tk_struct:
+      case CORBA::tk_union:
+      case CORBA::tk_string:
+      case CORBA::tk_sequence:
+      case CORBA::tk_array:
+      case CORBA::tk_alias:
+      case CORBA::tk_except:
+      case CORBA::tk_wstring:
+        retval = stream->encode (tc2, data, 0, env);
+        break;
+      default:
+        // anything else is an error
+        retval = CORBA::TypeCode::TRAVERSE_STOP;
+      }
+  }
   //  tc2->_decr_refcnt ();
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_encoding == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Alias::encode detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 
@@ -1092,124 +1094,119 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::Boolean continue_encoding = 1;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  // first encode the RepositoryID which we can grab from the
-  // typecode pointer
-  continue_encoding = stream->write_string (tc->id (ACE_TRY_ENV));
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-#if defined (__BORLANDC__)
-  // Borland C++ Builder 4.0 doesn't seem to align caught exceptions
-  // along the correct boundaries!  Therefore we will assume that the
-  // data pointer passed in is already aligned correctly and we will
-  // calculate member alignments relative to this pointer.
-  char *base_ptr = (char *) data;
-#endif /* __BORLANDC__ */
-
-  data = (char *) data + sizeof (CORBA::Exception);
-  // @@ (ASG) The reason this is done is because we want to skip the size
-  // of the the base class and its private data members (type_ and
-  // refcount_). After skipping these data members, we will have the data
-  // members of the derived class which must be encoded.
-
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0;
-       i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_encoding == 1;
-       i++)
+  if (env.exception () == 0)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      CORBA::TypeCode_ptr param;
+      CORBA::Long size, alignment;
 
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      // first encode the RepositoryID which we can grab from the
+      // typecode pointer
+      continue_encoding = stream->write_string (tc->id (env));
 
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      data = (char *) data + sizeof (CORBA::Exception);
+      // @@ (ASG) The reason this is done is because we want to skip the size
+      // of the the base class and its private data members (type_ and
+      // refcount_). After skipping these data members, we will have the data
+      // members of the derived class which must be encoded.
 
-#if defined (__BORLANDC__)
-      ptrdiff_t offset = (char *) data - base_ptr;
-      offset = (ptrdiff_t) ptr_align_binary (offset, alignment);
-      data = base_ptr + offset;
-#else
-      data = ptr_align_binary (data, alignment);
-#endif /* __BORLANDC__ */
+      int member_count = tc->member_count (env);
 
-      switch (param->kind_)
+      for (int i = 0;
+           i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+             && continue_encoding == 1;
+           i++)
         {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_encoding = stream->write_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_encoding = stream->write_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_encoding = stream->write_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_any:
-        case CORBA::tk_TypeCode:
-        case CORBA::tk_Principal:
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_string:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_wstring:
-          retval = stream->encode (param, data, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          break;
-        default:
-          break;
+          param = tc->member_type (i, env);
+          if (env.exception () == 0)
+            {
+              size = param->size (env);
+              if (env.exception () == 0)
+                {
+                  alignment = param->alignment (env);
+                  if (env.exception () == 0)
+                    {
+                      data = ptr_align_binary (data, alignment);
+                      switch (param->kind_){
+                      case CORBA::tk_null:
+                      case CORBA::tk_void:
+                        break;
+                      case CORBA::tk_short:
+                      case CORBA::tk_ushort:
+                        continue_encoding = stream->write_short (*(CORBA::Short *) data);
+                        break;
+                      case CORBA::tk_long:
+                      case CORBA::tk_ulong:
+                      case CORBA::tk_float:
+                      case CORBA::tk_enum:
+                        continue_encoding = stream->write_long (*(CORBA::Long *) data);
+                        break;
+                      case CORBA::tk_double:
+                      case CORBA::tk_longlong:
+                      case CORBA::tk_ulonglong:
+                        continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
+                        break;
+                      case CORBA::tk_boolean:
+                        continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
+                        break;
+                      case CORBA::tk_char:
+                      case CORBA::tk_octet:
+                        continue_encoding = stream->write_char (*(CORBA::Char *) data);
+                        break;
+                      case CORBA::tk_longdouble:
+                        continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
+                        break;
+                      case CORBA::tk_wchar:
+                        continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
+                        break;
+                      case CORBA::tk_any:
+                      case CORBA::tk_TypeCode:
+                      case CORBA::tk_Principal:
+                      case CORBA::tk_objref:
+                      case CORBA::tk_struct:
+                      case CORBA::tk_union:
+                      case CORBA::tk_string:
+                      case CORBA::tk_sequence:
+                      case CORBA::tk_array:
+                      case CORBA::tk_alias:
+                      case CORBA::tk_except:
+                      case CORBA::tk_wstring:
+                        retval = stream->encode (param, data, 0, env);
+                        break;
+                      default:
+                        break;
+                      }
+                      data = (char *) data + size;
+                    }
+                  else
+                    return CORBA::TypeCode::TRAVERSE_STOP;
+                }
+              else
+                return CORBA::TypeCode::TRAVERSE_STOP;
+            }
+          else
+            return CORBA::TypeCode::TRAVERSE_STOP;
         }
-      data = (char *) data + size;
     }
+  else
+    return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_encoding == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::encode detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Except::encode detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 
@@ -1219,7 +1216,7 @@ TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc,
                              const void *data,
                              const void *,
                              void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   CORBA::WChar *str = *(CORBA::WChar **) data;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
@@ -1227,7 +1224,7 @@ TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc,
   // Verify string satisfies bounds requirements.  We're not so
   // permissive as to send messages violating the interface spec
   // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
+  CORBA::ULong bounds = tc->length (env);
 
   if (str != 0)
     {
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 1412a9f790a..3cd7751ac7d 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -118,26 +118,13 @@
 // Service.
 #if !defined (TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT)
 #define TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT 10016
-#endif /* TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT */
+#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
 
 // The default UDP port number for replying to a location request to
 // the TAO Trading Service.
 #if !defined (TAO_DEFAULT_TRADING_SERVER_REPLY_PORT)
 #define TAO_DEFAULT_TRADING_SERVER_REPLY_PORT 10017
-#endif /* TAO_DEFAULT_TRADING_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO 
-// Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT 10018
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT 10019
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT */
-
+#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
 
 // The default timeout receiving the location request to the TAO
 // Naming, Trading and other servicesService.
@@ -248,15 +235,6 @@
 #undef major
 #endif /* major*/
 
-#if !defined (TAO_EXPORT_NESTED_CLASSES) \
-    && defined (ACE_EXPORT_NESTED_CLASSES)
-#define TAO_EXPORT_NESTED_CLASSES
-#endif /* !defined TAO_EXPORT_NESTED_CLASSES */
-
-#if !defined (TAO_EXPORT_NESTED_MACRO)
-#define TAO_EXPORT_NESTED_MACRO
-#endif /* !defined (TAO_EXPORT_NESTED_MACRO) */
-
 // Assume DOS/Windows if "configure" didn't get run.
 
 #if defined (_WIN32)
@@ -288,8 +266,7 @@
 // responsible for instantiating the templates.
 //
 #if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-    ( defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) )
+    defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 #define TAO_USE_SEQUENCE_TEMPLATES
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -298,13 +275,11 @@
 // something useful.
 #define TAO_OBJID_NAMESERVICE      "NameService"
 #define TAO_OBJID_TRADINGSERVICE   "TradingService"
-#define TAO_OBJID_IMPLREPOSERVICE  "ImplRepoService"
 #define TAO_OBJID_ROOTPOA          "RootPOA"
 #define TAO_OBJID_POACURRENT       "POACurrent"
 #define TAO_OBJID_INTERFACEREP     "InterfaceRepository"
 #define TAO_OBJID_POLICYMANAGER    "ORBPolicyManager"
 #define TAO_OBJID_POLICYCURRENT    "PolicyCurrent"
-#define TAO_OBJID_IORMANIPULATION  "IORManipulation"
 
 // TAO Naming Service.
 
@@ -393,10 +368,10 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
 // it creates 1.1 endpoints (and profiles).  If you need to talk to
 // old clients that only understand 1.0 (and do not attempt to use 1.0
 // with 1.1 servers), then change the values below.
-#if !defined (TAO_DEF_GIOP_MAJOR)
+#if !defined(TAO_DEF_GIOP_MAJOR)
 #define TAO_DEF_GIOP_MAJOR 1
 #endif /* TAO_DEF_GIOP_MAJOR */
-#if !defined (TAO_DEF_GIOP_MINOR)
+#if !defined(TAO_DEF_GIOP_MINOR)
 #define TAO_DEF_GIOP_MINOR 1
 #endif /* TAO_DEF_GIOP_MINOR */
 
@@ -404,9 +379,4 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
 // (ORB_TYPE and CODE_SETS)
 #define TAO_STD_PROFILE_COMPONENTS
 
-#if !defined (TAO_DEFAULT_IOR_SIZE)
-// This is the default size of the buffer used for processing IORs.
-#define TAO_DEFAULT_IOR_SIZE 1024
-#endif /* TAO_DEFAULT_IOR_SIZE */
-
 #endif  /* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index de51a7e525e..5e9430f885e 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -13,7 +13,6 @@ ACE_RCSID(tao, params, "$Id$")
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   : name_service_port_ (0),
     trading_service_port_ (0),
-    implrepo_service_port_ (0),
     ior_lookup_table_ (0),
     sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 2ceca84da56..fdbc8aa0b9e 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -86,14 +86,6 @@ public:
   void trading_service_port (CORBA::UShort port);
   // Set/Get the port of our trading service.
 
-  const char *implrepo_service_ior (void) const;
-  void implrepo_service_ior (const ACE_CString &ir);
-  // Set/Get the IOR of the Implementation Repository service.
-
-  CORBA::UShort implrepo_service_port (void) const;
-  void implrepo_service_port (CORBA::UShort port);
-  // Set/Get the port of the Implementation Repository service.
-
   int sock_rcvbuf_size (void) const;
   void sock_rcvbuf_size (int);
   // Set/Get the size to be used for a socket's receive buffer.
@@ -189,12 +181,6 @@ private:
   CORBA::UShort trading_service_port_;
   // The port number of our configured Trading Service.
 
-  ACE_CString implrepo_service_ior_;
-  // The IOR of our configured Implementation Repository.
-
-  CORBA::UShort implrepo_service_port_;
-  // The port number of our configured Implementation Repository.
-
   ACE_CString init_ref_;
   // Initial Reference supplied as <ObjectID>:<IOR>
 
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index b84874a81b6..63e924d000f 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -170,30 +170,6 @@ TAO_ORB_Parameters::trading_service_port (void) const
   return this->trading_service_port_;
 }
 
-ACE_INLINE void
-TAO_ORB_Parameters::implrepo_service_ior (const ACE_CString &ir)
-{
-  this->implrepo_service_ior_ = ir;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::implrepo_service_ior (void) const
-{
-  return this->implrepo_service_ior_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::implrepo_service_port (CORBA::UShort port)
-{
-  this->implrepo_service_port_ = port;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_ORB_Parameters::implrepo_service_port (void) const
-{
-  return this->implrepo_service_port_;
-}
-
 ACE_INLINE TAO_IOR_LookupTable *
 TAO_ORB_Parameters::ior_lookup_table (void)
 {
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
index b08756fd619..46b6d0ca3a7 100644
--- a/TAO/tao/poa_macros.h
+++ b/TAO/tao/poa_macros.h
@@ -7,25 +7,22 @@
 
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
-#define TAO_POA_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
+#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_WRITE_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK) \
-  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
+#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_WRITE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK) \
-  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
+#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
 
 #endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 83eba3cb119..a3bf07a3c71 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -31,7 +31,7 @@ ACE_RCSID(tao, skip, "$Id$")
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
                              void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
@@ -85,43 +85,46 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Primitive::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
                          void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
+  CORBA::TypeCode_ptr elem_tc;
 
   // Context is the CDR stream.
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
 
   // Status of encode operation.
   CORBA::TypeCode::traverse_status retval =
-    stream->decode (CORBA::_tc_TypeCode,
-                    &elem_tc.inout (),
-                    0,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  // First retrieve the TypeCode for the element so that we can skip
+  // the value based on this typecode.
+  if (stream->decode (CORBA::_tc_TypeCode,
+                      &elem_tc,
+                      0,
+                      env) == CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
-      retval = stream->skip (elem_tc.in (), ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      if (env.exception () == 0)
+        retval = stream->skip (elem_tc, env);
+      else
+        retval = CORBA::TypeCode::TRAVERSE_STOP;
     }
+  CORBA::release (elem_tc);
   return retval;
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             void *context,
-                            CORBA::Environment  &ACE_TRY_ENV)
+                            CORBA::Environment  &env)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -199,8 +202,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
             ACE_DEBUG ((LM_DEBUG,
                         "TAO_Marshal_TypeCode::skip: "
                         "Bad kind_ value in CDR stream"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            CORBA::TypeCode::TRAVERSE_STOP);
+          env.exception (new CORBA::BAD_TYPECODE ());
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
 
@@ -211,9 +214,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_TypeCode::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -222,7 +224,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
                                void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -245,16 +247,15 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Principal::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
                           void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -307,9 +308,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_ObjRef::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -317,7 +317,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
   CORBA::TypeCode::traverse_status retval =
@@ -325,36 +325,41 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode_ptr param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  int member_count = tc->member_count (env);
 
-      retval = stream->skip (param, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
+  if (env.exception () == 0)
+    for (int i = 0; i < member_count
+           && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
+         i++)
+      {
+        param = tc->member_type (i, env);
+        if (env.exception () == 0)
+          {
+            retval = stream->skip (param, env);
+          }
+        else
+          return CORBA::TypeCode::TRAVERSE_STOP;
+      }
+  else
+    return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Struct::skip detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Encode unions.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
                          void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // Context is the CDR stream.
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
@@ -365,7 +370,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode_ptr discrim_tc;
   CORBA::TypeCode_ptr member_tc;
   CORBA::Any_ptr member_label;
-  CORBA::ULongLong discrim_val;
+  CORBA::Long discrim_val;
   CORBA::ULong member_count;
   CORBA::Long  default_index;
   CORBA::ULong i;
@@ -374,133 +379,166 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
   // get the discriminator type which will enable us to skip the discriminator
   // value
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // decode the discriminator value
-  retval = stream->decode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  discrim_tc = tc->discriminator_type (env);
 
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if (env.exception () == 0)
     {
-      // now get ready to skip the actual union value
-      default_index = tc->default_index (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      member_count = tc->member_count (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // check which label value matches with the discriminator
-      // value. Accordingly, marshal the corresponding
-      // member_type. If none match, check if default exists
-      // and marshal accordingly. Otherwise it is an error.
-
-      for (i = 0; i < member_count; i++)
+      // decode the discriminator value
+      retval = stream->decode (discrim_tc, &discrim_val, 0, env);
+      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          member_label = tc->member_label (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // do the matching
-          CORBA::TypeCode_var type = member_label->type ();
-          CORBA::ULong kind = type->kind (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          // now get ready to skip the actual union value
+          default_index = tc->default_index (env);
 
-          switch (kind)
+          if (env.exception () == 0)
             {
-            case CORBA::tk_short:
-              {
-                CORBA::Short s;
-                *member_label >>= s;
-                if (s == *(CORBA::Short *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_ushort:
-              {
-                CORBA::UShort s;
-                *member_label >>= s;
-                if (s == *(CORBA::UShort *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_long:
-              {
-                CORBA::Long l;
-                *member_label >>= l;
-                if (l == *(CORBA::Long *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_ulong:
-              {
-                CORBA::ULong l;
-                *member_label >>= l;
-                if (l == *(CORBA::ULong *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_enum:
-              {
-                CORBA::ULong ul;
-                TAO_InputCDR stream (member_label->_tao_get_cdr ());
-                (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-                if (ul == *(CORBA::ULong *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_char:
-              {
-                CORBA::Char c;
-                *member_label >>= CORBA::Any::to_char (c);
-                if (c == *(CORBA::Char *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_wchar:
-              CORBA::WChar wc;
-              *member_label >>= CORBA::Any::to_wchar (wc);
-              if (wc == *(CORBA::WChar *) &discrim_val)
-                discrim_matched = 1;
-              break;
-            case CORBA::tk_boolean:
-              {
-                CORBA::Boolean b;
-                *member_label >>= CORBA::Any::to_boolean (b);
-                if (b == *(CORBA::Boolean *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            default:
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                CORBA::TypeCode::TRAVERSE_STOP);
-            }// end of switch
-
-          // get the member typecode
-          member_tc = tc->member_type (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // have we reached the default label, if so save a handle to
-          // the typecode for the default
-
-          if (default_index >= 0 && default_index-- == 0)
-            default_tc = member_tc;
-          if (discrim_matched)
+              member_count = tc->member_count (env);
+              if (env.exception () == 0)
+                {
+                  // check which label value matches with the discriminator
+                  // value. Accordingly, marshal the corresponding
+                  // member_type. If none match, check if default exists
+                  // and marshal accordingly. Otherwise it is an error.
+
+                  for (i = 0; i < member_count; i++)
+                    {
+                      member_label = tc->member_label (i, env);
+                      if (env.exception () == 0)
+                        {
+                          // do the matching
+			                    CORBA::TypeCode_var type = member_label->type ();
+                          switch (type->kind (env))
+                            {
+                              case CORBA::tk_short:
+                                {
+                                  CORBA::Short s;
+                                  *member_label >>= s;
+                                  if (s == *(CORBA::Short *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_ushort:
+                                {
+                                  CORBA::UShort s;
+                                  *member_label >>= s;
+                                  if (s == *(CORBA::UShort *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_long:
+                                {
+                                  CORBA::Long l;
+                                  *member_label >>= l;
+                                  if (l == *(CORBA::Long *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_ulong:
+                                {
+                                  CORBA::ULong l;
+                                  *member_label >>= l;
+                                  if (l == *(CORBA::ULong *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_enum:
+                                {
+                                  CORBA::ULong ul;
+                                  TAO_InputCDR stream (member_label->_tao_get_cdr ());
+                                  (void)stream.decode (discrim_tc, &ul, 0, env);
+                                  if (ul == *(CORBA::ULong *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_char:
+                                {
+                                  CORBA::Char c;
+                                  *member_label >>= CORBA::Any::to_char (c);
+                                  if (c == *(CORBA::Char *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              case CORBA::tk_wchar:
+                                CORBA::WChar wc;
+                                *member_label >>= CORBA::Any::to_wchar (wc);
+                                if (wc == *(CORBA::WChar *) &discrim_val)
+                                  discrim_matched = 1;
+                                break;
+                              case CORBA::tk_boolean:
+                                {
+                                  CORBA::Boolean b;
+                                  *member_label >>= CORBA::Any::to_boolean (b);
+                                  if (b == *(CORBA::Boolean *) &discrim_val)
+                                    discrim_matched = 1;
+                                }
+                                break;
+                              default:
+                                env.exception (new CORBA::BAD_TYPECODE ());
+                                return CORBA::TypeCode::TRAVERSE_STOP;
+                            }// end of switch
+
+                          // get the member typecode
+                          member_tc = tc->member_type (i, env);
+                          if (env.exception () == 0)
+                            {
+                              if (default_index >= 0 && default_index-- == 0)
+                                // have we reached the default label?, if so,
+                                // save a handle to the typecode for the default
+                                default_tc = member_tc;
+                              if (discrim_matched)
+                                {
+                                  // marshal according to the matched typecode
+                                  return stream->skip (member_tc, env);
+                                }
+                            }
+                          else
+                            {
+                              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                              return CORBA::TypeCode::TRAVERSE_STOP;
+                            }
+                        }
+                      else
+                        {
+                          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                          return CORBA::TypeCode::TRAVERSE_STOP;
+                        }
+                    } // end of for loop
+                  // we are here only if there was no match
+                  if (default_tc)
+                    return stream->skip (default_tc, env);
+                  else
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                }
+              else
+                {
+                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  return CORBA::TypeCode::TRAVERSE_STOP;
+                }
+            }
+          else
             {
-              // marshal according to the matched typecode
-              return stream->skip (member_tc, ACE_TRY_ENV);
+              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              return CORBA::TypeCode::TRAVERSE_STOP;
             }
         }
-      if (default_tc != 0)
-        return stream->skip (default_tc, ACE_TRY_ENV);
+      else
+        {
+          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          return CORBA::TypeCode::TRAVERSE_STOP;
+        }
+    }
+  else
+    {
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
-  return retval;
 }
 
 // decode string
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
                           void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
   // Context is the CDR stream.
@@ -523,9 +561,8 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_TypeCode::skip detected error"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
 
@@ -534,7 +571,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
@@ -555,27 +592,27 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
       if (bounds > 0)
         {
           // Get element typecode.
-          tc2 = tc->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          tc2 = tc->content_type (env);
 
-          while (bounds-- && continue_skipping == 1)
+          if (env.exception () == 0)
             {
-              continue_skipping = stream->skip (tc2, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            }
-          if (continue_skipping)
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
+              while (bounds-- && continue_skipping == 1)
+                {
+                  continue_skipping = stream->skip (tc2, env);
+                }
+              if (continue_skipping)
+                return CORBA::TypeCode::TRAVERSE_CONTINUE;
+            } // no exception computing content type
         } // length is > 0
       else
         return CORBA::TypeCode::TRAVERSE_CONTINUE;
     }
-
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_Marshal_Sequence::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 // Decode array.
@@ -583,7 +620,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
@@ -591,36 +628,37 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
   // Typecode of the element.
   CORBA::TypeCode_ptr tc2;
 
-  // retrieve the bounds of the array
-  CORBA::ULong  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  CORBA::ULong  bounds;
 
-  while (bounds-- && continue_skipping == 1)
+  // retrieve the bounds of the array
+  bounds = tc->length (env);
+  if (env.exception () == 0)
     {
-      continue_skipping = stream->skip (tc2, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (continue_skipping)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
+      // get element typecode
+      tc2 = tc->content_type (env);
+      if (env.exception () == 0)
+        {
+          while (bounds-- && continue_skipping == 1)
+            {
+              continue_skipping = stream->skip (tc2, env);
+            }
+          if (continue_skipping)
+            return CORBA::TypeCode::TRAVERSE_CONTINUE;
+        } // no exception computing content type
+    } // no exception computing bounds
   // error exit
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_Marshal_Sequence::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 // Decode alias.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
                          void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_ptr tc2;
@@ -633,23 +671,23 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  retval = stream->skip (tc2, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
+  tc2 = tc->content_type (env);
+  if (env.exception () == 0)
+    {
+      retval = stream->skip (tc2, env);
+    }
   //  tc2->_decr_refcnt ();
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
       && continue_skipping == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Alias::skip detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Decode exception For exceptions, the "hidden" type ID near the
@@ -662,7 +700,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
                           void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
   CORBA::TypeCode::traverse_status retval =
@@ -674,36 +712,42 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_STOP;
 
   // Number of fields in the exception
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-       i++)
+  int member_count = tc->member_count (env);
+  if (env.exception () == 0)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = stream->skip (param, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      for (int i = 0; i < member_count
+             && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
+           i++)
+        {
+          param = tc->member_type (i, env);
+          if (env.exception () == 0)
+            {
+              retval = stream->skip (param, env);
+            }
+          else
+            return CORBA::TypeCode::TRAVERSE_STOP;
+        }
     }
+  else
+      return CORBA::TypeCode::TRAVERSE_STOP;
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_Except::skip detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // decode wstring
 CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   CORBA::Boolean continue_skipping = 1;
   TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
@@ -727,11 +771,12 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
 
   if (continue_skipping == 1)
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_WString::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Marshal_WString::skip detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
diff --git a/TAO/tao/tao-dll.icc b/TAO/tao/tao-dll.icc
deleted file mode 100644
index a9c56a5fe9e..00000000000
--- a/TAO/tao/tao-dll.icc
+++ /dev/null
@@ -1,128 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1"),
-        	 define("TAO_HAS_DLL","0"),
-	         define("TAO_BUILD_DLL","0")
-	TARG = "tao.dll"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "tao.shr.a"
-}
-
-
-option
-      	 PlatformOptions,
-         define("ACE_HAS_DLL","0"),
-         define ("__ACE_INLINE__","0"),
-         incl(searchPath,'H:\ACE_wrappers'),
-         incl(searchPath,'H:\ACE_wrappers\TAO'),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         link(libSearchPath,'H:\ACE_wrappers\ace'),
-         link(linkWithMultiThreadLib,yes)
-     {
-	target type(dll) TARG
-	{
-                  option macros(global)
-                  {
-                      source type(cpp) "ace/OS.h"
-                      source type(cpp) "ace/ACE.h"
-                      source type(cpp) "tao/TAO.h"
-                  }
-
-	   source type (cpp) "Active_Object_Map.cpp"
-	   source type (cpp) "Any.cpp"
-	   source type (cpp) "CDR.cpp"
-	   source type (cpp) "Client_Strategy_Factory.cpp"
-	   source type (cpp) "Connect.cpp"
-	   source type (cpp) "CurrentC.cpp"
-	   source type (cpp) "CurrentS.cpp"
-	   source type (cpp) "DynAnyC.cpp"
-	   source type (cpp) "DynAnyS.cpp"
-	   source type (cpp) "DynAny_i.cpp"
-	   source type (cpp) "DynArray_i.cpp"
-	   source type (cpp) "DynEnum_i.cpp"
-	   source type (cpp) "DynSequence_i.cpp"
-	   source type (cpp) "DynStruct_i.cpp"
-	   source type (cpp) "DynUnion_i.cpp"
-	   source type (cpp) "DynUnion_i_T.cpp"
-	   source type (cpp) "Environment.cpp"
-	   source type (cpp) "Exception.cpp"
-	   source type (cpp) "Forwarding_Servant.cpp"
-	   source type (cpp) "GIOP.cpp"
-	   source type (cpp) "IIOP_Acceptor.cpp"
-	   source type (cpp) "IIOP_Connector.cpp"
-	   source type (cpp) "IIOP_Interpreter.cpp"
-	   source type (cpp) "IIOP_ORB.cpp"
-	   source type (cpp) "IIOP_Profile.cpp"
-	   source type (cpp) "IIOP_Transport.cpp"
-	   source type (cpp) "InconsistentTypeCodeC.cpp"
-	   source type (cpp) "Invocation.cpp"
-	   source type (cpp) "MProfile.cpp"
-	   source type (cpp) "Managed_Types.cpp"
-	   source type (cpp) "Marshal.cpp"
-	   source type (cpp) "NVList.cpp"
-	   source type (cpp) "ORB.cpp"
-	   source type (cpp) "ORB_Core.cpp"
-	   source type (cpp) "ORB_Strategies_T.cpp"
-	   source type (cpp) "Object.cpp"
-	   source type (cpp) "Object_KeyC.cpp"
-	   source type (cpp) "Operation_Table.cpp"
-	   source type (cpp) "POA.cpp"
-	   source type (cpp) "POAC.cpp"
-	   source type (cpp) "POAS.cpp"
-	   source type (cpp) "Pluggable.cpp"
-	   source type (cpp) "PolicyC.cpp"
-	   source type (cpp) "PolicyS.cpp"
-	   source type (cpp) "Principal.cpp"
-	   source type (cpp) "Request.cpp"
-	   source type (cpp) "Sequence.cpp"
-	   source type (cpp) "Sequence_T.cpp"
-	   source type (cpp) "Servant_Base.cpp"
-	   source type (cpp) "Server_Request.cpp"
-	   source type (cpp) "Server_Strategy_Factory.cpp"
-	   source type (cpp) "Stub.cpp"
-	   source type (cpp) "TAO.cpp"
-	   source type (cpp) "TAO_Internal.cpp"
-	   source type (cpp) "Typecode.cpp"
-	   source type (cpp) "Typecode_Constants.cpp"
-	   source type (cpp) "Union.cpp"
-	   source type (cpp) "append.cpp"
-	   source type (cpp) "debug.cpp"
-	   source type (cpp) "decode.cpp"
-	   source type (cpp) "deep_free.cpp"
-	   source type (cpp) "default_client.cpp"
-	   source type (cpp) "default_server.cpp"
-	   source type (cpp) "encode.cpp"
-	   source type (cpp) "params.cpp"
-	   source type (cpp) "poa_T.cpp"
-	   source type (cpp) "skip.cpp"
-	   source type (cpp) "t-sizes.cpp"
-	   source type (cpp) "varout.cpp"
-           // Template implementation files (#pragma implementation)
-           source type (cpp) "DynUnion_i_T.cpp"
-           source type (cpp) "ORB_Strategies_T.cpp"
-           source type (cpp) "Sequence_T.cpp"
-           source type (cpp) "poa_T.cpp"
-           source type (cpp) "varout.cpp"
-
-           // Libraries
-	   if $__TOS_WIN__ {
-		source type (lib) "aced.lib"
-		source type (lib) "advapi32.lib"
-		source type (lib) "user32.lib"
-		source type (lib) "ws2_32.lib"
-		source type (lib) "wsock32.lib"
-		source type (lib) "mswsock.lib"
-	   }
-	   if $__TOS_AIX__ {
-		source type (lib) "aced.shr.a"
-		source type (lib) "libtli_r.a"
-		source type (lib) "libpthreads.a"
-		source type (lib) "libc_r.a"
-	   }
-	}
-   }
diff --git a/TAO/tao/tao-lib.icc b/TAO/tao/tao-lib.icc
deleted file mode 100644
index 511ad58ec02..00000000000
--- a/TAO/tao/tao-lib.icc
+++ /dev/null
@@ -1,128 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1"),
-        	 define("TAO_HAS_DLL","0"),
-	         define("TAO_BUILD_DLL","0")
-	TARG = "tao.lib"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "tao.a"
-}
-
-
-option
-      	 PlatformOptions,
-         define("ACE_HAS_DLL","0"),
-         define ("__ACE_INLINE__","0"),
-         incl(searchPath,'H:\ACE_wrappers'),
-         incl(searchPath,'H:\ACE_wrappers\TAO'),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         link(libSearchPath,'H:\ACE_wrappers\ace'),
-         link(linkWithMultiThreadLib,yes)
-     {
-	target type(lib) TARG
-	{
-                  option macros(global)
-                  {
-                      source type(cpp) "ace/OS.h"
-                      source type(cpp) "ace/ACE.h"
-                      source type(cpp) "tao/TAO.h"
-                  }
-
-	   source type (cpp) "Active_Object_Map.cpp"
-	   source type (cpp) "Any.cpp"
-	   source type (cpp) "CDR.cpp"
-	   source type (cpp) "Client_Strategy_Factory.cpp"
-	   source type (cpp) "Connect.cpp"
-	   source type (cpp) "CurrentC.cpp"
-	   source type (cpp) "CurrentS.cpp"
-	   source type (cpp) "DynAnyC.cpp"
-	   source type (cpp) "DynAnyS.cpp"
-	   source type (cpp) "DynAny_i.cpp"
-	   source type (cpp) "DynArray_i.cpp"
-	   source type (cpp) "DynEnum_i.cpp"
-	   source type (cpp) "DynSequence_i.cpp"
-	   source type (cpp) "DynStruct_i.cpp"
-	   source type (cpp) "DynUnion_i.cpp"
-	   source type (cpp) "DynUnion_i_T.cpp"
-	   source type (cpp) "Environment.cpp"
-	   source type (cpp) "Exception.cpp"
-	   source type (cpp) "Forwarding_Servant.cpp"
-	   source type (cpp) "GIOP.cpp"
-	   source type (cpp) "IIOP_Acceptor.cpp"
-	   source type (cpp) "IIOP_Connector.cpp"
-	   source type (cpp) "IIOP_Interpreter.cpp"
-	   source type (cpp) "IIOP_ORB.cpp"
-	   source type (cpp) "IIOP_Profile.cpp"
-	   source type (cpp) "IIOP_Transport.cpp"
-	   source type (cpp) "InconsistentTypeCodeC.cpp"
-	   source type (cpp) "Invocation.cpp"
-	   source type (cpp) "MProfile.cpp"
-	   source type (cpp) "Managed_Types.cpp"
-	   source type (cpp) "Marshal.cpp"
-	   source type (cpp) "NVList.cpp"
-	   source type (cpp) "ORB.cpp"
-	   source type (cpp) "ORB_Core.cpp"
-	   source type (cpp) "ORB_Strategies_T.cpp"
-	   source type (cpp) "Object.cpp"
-	   source type (cpp) "Object_KeyC.cpp"
-	   source type (cpp) "Operation_Table.cpp"
-	   source type (cpp) "POA.cpp"
-	   source type (cpp) "POAC.cpp"
-	   source type (cpp) "POAS.cpp"
-	   source type (cpp) "Pluggable.cpp"
-	   source type (cpp) "PolicyC.cpp"
-	   source type (cpp) "PolicyS.cpp"
-	   source type (cpp) "Principal.cpp"
-	   source type (cpp) "Request.cpp"
-	   source type (cpp) "Sequence.cpp"
-	   source type (cpp) "Sequence_T.cpp"
-	   source type (cpp) "Servant_Base.cpp"
-	   source type (cpp) "Server_Request.cpp"
-	   source type (cpp) "Server_Strategy_Factory.cpp"
-	   source type (cpp) "Stub.cpp"
-	   source type (cpp) "TAO.cpp"
-	   source type (cpp) "TAO_Internal.cpp"
-	   source type (cpp) "Typecode.cpp"
-	   source type (cpp) "Typecode_Constants.cpp"
-	   source type (cpp) "Union.cpp"
-	   source type (cpp) "append.cpp"
-	   source type (cpp) "debug.cpp"
-	   source type (cpp) "decode.cpp"
-	   source type (cpp) "deep_free.cpp"
-	   source type (cpp) "default_client.cpp"
-	   source type (cpp) "default_server.cpp"
-	   source type (cpp) "encode.cpp"
-	   source type (cpp) "params.cpp"
-	   source type (cpp) "poa_T.cpp"
-	   source type (cpp) "skip.cpp"
-	   source type (cpp) "t-sizes.cpp"
-	   source type (cpp) "varout.cpp"
-           // Template implementation files (#pragma implementation)
-           source type (cpp) "DynUnion_i_T.cpp"
-           source type (cpp) "ORB_Strategies_T.cpp"
-           source type (cpp) "Sequence_T.cpp"
-           source type (cpp) "poa_T.cpp"
-           source type (cpp) "varout.cpp"
-
-           // Libraries
-	   if $__TOS_WIN__ {
-		source type (lib) "aced.lib"
-		source type (lib) "advapi32.lib"
-		source type (lib) "user32.lib"
-		source type (lib) "ws2_32.lib"
-		source type (lib) "wsock32.lib"
-		source type (lib) "mswsock.lib"
-	   }
-	   if $__TOS_AIX__ {
-		source type (lib) "aced.a"
-		source type (lib) "libtli_r.a"
-		source type (lib) "libpthreads.a"
-		source type (lib) "libc_r.a"
-	   }
-	}
-   }
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h
index 0d32e9d820c..c1a25fb26a8 100644
--- a/TAO/tao/try_macros.h
+++ b/TAO/tao/try_macros.h
@@ -39,20 +39,6 @@
 #include "tao/orbconf.h"
 #include "ace/CORBA_macros.h"
 
-#if defined (TAO_HAS_EXCEPTIONS)
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* TAO_HAS_EXCEPTIONS */
-
-// This is used in the implementation of the _raise methods
-
-// Remove the following line when we're not using TAO try macros any
-// more.
-//#define TAO_USES_DEPRECATED_TAO_TRY_MACROS
-
-#if defined (TAO_USES_DEPRECATED_TAO_TRY_MACROS)
-
 // Define a local enviroment variable...
 #define TAO_IN_ENV  ACE_TRY_ENV
 #define TAO_TRY_ENV _tao_try_environment
@@ -146,6 +132,9 @@
 // "unexpected" exception, which *could* be translated into a
 // CORBA::UNKNOWN, but I'm not sure.
 
+#define TAO_RAISE(EXCEPTION) throw EXCEPTION
+// This is used in the implementation of the _raise methods
+
 #else /* ACE_HAS_EXCEPTIONS && TAO_IDL_COMPILES_HAS_EXCEPTIONS */
 
 #define TAO_TRY_VAR(X) \
@@ -290,6 +279,8 @@ return
 
 #define TAO_THROW_SPEC(X)
 
+#define TAO_RAISE(EXCEPTION)
+
 #endif /* TAO_HAS_EXCEPTIONS */
 
 #define TAO_CATCHANY TAO_CATCH(CORBA_Exception, ex)
@@ -347,5 +338,5 @@ return
   ACE_Write_Guard<MUTEX> OBJ (LOCK); \
   if (OBJ.locked () == 0) \
       TAO_THROW_ENV_RETURN (EXCEPTION,ENV,RETURN)
-#endif /* TAO_USES_DEPRECATED_TAO_TRY_MACROS */
+
 #endif /* TAO_TRY_MACROS_H */
diff --git a/TAO/tao/varout.cpp b/TAO/tao/varout.cpp
index d06b4241fb0..30a5e36aac4 100644
--- a/TAO/tao/varout.cpp
+++ b/TAO/tao/varout.cpp
@@ -22,7 +22,6 @@
 #define TAO_VAROUT_C
 
 #include "tao/varout.h"
-#include "tao/Sequence.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/varout.i"
@@ -30,59 +29,25 @@
 
 ACE_RCSID(tao, varout, "$Id$")
 
-template<class T, class T_var>
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const TAO_Object_Manager<T,T_var> & rhs)
-  : ptr_ (T::_duplicate (rhs.in ()))
-{
-}
-
-template<class T, class T_var> TAO_Object_Field_T<T,T_var>&
-TAO_Object_Field_T<T,T_var>::
-    operator= (const TAO_Object_Manager<T,T_var> & rhs)
-{
-  T* tmp = T::_duplicate (rhs.in ());
-  CORBA::release (this->ptr_);
-  this->ptr_ = tmp;
-
-  return *this;
-}
-
-template<class T, class T_var>
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const T_var & rhs)
-  : ptr_ (T::_duplicate (rhs.in ()))
-{
-}
-
-template<class T, class T_var> TAO_Object_Field_T<T,T_var>&
-TAO_Object_Field_T<T,T_var>::
-    operator= (const T_var & rhs)
-{
-  T* tmp = T::_duplicate (rhs.in ());
-  CORBA::release (this->ptr_);
-  this->ptr_ = tmp;
-
-  return *this;
-}
-
-template<class T, class T_var> void
-TAO_Object_Field_T<T,T_var>::_downcast (CORBA_Object* base_ptr,
-                                        CORBA_Environment &ACE_TRY_ENV)
+template<class T> void
+TAO_Object_Field_T<T>::_downcast (CORBA_Object* base_ptr,
+				  CORBA_Environment &env)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = 0;
-  this->ptr_ = T::_narrow (base_ptr, ACE_TRY_ENV);
+  this->ptr_ = T::_narrow (base_ptr, env);
+  if (env.exception () != 0) 
+    return;
 }
 
-template<class T, class T_var> CORBA_Object*
-TAO_Object_Field_T<T,T_var>::_upcast (void)
+template<class T> CORBA_Object*
+TAO_Object_Field_T<T>::_upcast (void)
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> void
-TAO_Object_Field_T<T,T_var>::_release (void)
+template<class T> void
+TAO_Object_Field_T<T>::_release (void)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = 0;
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index aa053598ef4..16ed5d2af77 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -22,9 +22,7 @@
 
 #include "tao/Object.h"
 
-template<class T, class T_var> class TAO_Object_Manager;
-
-template <class T, class T_var>
+template <class T>
 class TAO_Object_Field_T : public TAO_Object_Field
 {
   // = TITLE
@@ -47,30 +45,18 @@ public:
   // constructor from a T *, assumes ownership of <object> i.e. it
   // *will* release it.
 
-  TAO_Object_Field_T (const T_var &);
-  // constructor from a var
- 
-  TAO_Object_Field_T (const TAO_Object_Field_T<T,T_var> &);
+  TAO_Object_Field_T (const TAO_Object_Field_T<T> &);
   // copy constructor
 
-  TAO_Object_Field_T (const TAO_Object_Manager<T,T_var> &);
-  // constructor from an Object_Manager (sequence var-like class)
-
   virtual ~TAO_Object_Field_T (void);
   // destructor
 
-  TAO_Object_Field_T<T,T_var> &operator= (T *object);
+  TAO_Object_Field_T<T> &operator= (T *object);
   // Assignment from a T*, it assumes ownership of <object>.
 
-  TAO_Object_Field_T<T,T_var> &operator= (const T_var& var);
-  // Assignment from a T_var, make a duplicate of the object
-
-  TAO_Object_Field_T<T,T_var> &operator= (const TAO_Object_Field_T<T,T_var> &);
+  TAO_Object_Field_T<T> &operator= (const TAO_Object_Field_T<T> &);
   // Assignment operator, in duplicates the underlying objects.
 
-  TAO_Object_Field_T<T,T_var> &operator= (const TAO_Object_Manager<T,T_var>&);
-  // Assignment from a T_var, make a duplicate of the object
-
   T *operator-> (void) const;
   // smart pointer (const)
 
@@ -110,6 +96,618 @@ private:
   T *ptr_;
 };
 
+#if 0
+// ****************************************************************
+// The following classes are experimental, some of them do *not*
+// compile and produce errors in compilers that check templates before
+// instantiation time. In the future we may use them to implement
+// several classes generated by IDL compiler, possibly reducing the
+// complexity of the compiler.
+// ****************************************************************
+
+template <class T>
+class TAO_Fixed_var
+  // = TITLE
+  //    template<class T> TAO_Fixed_var
+  //
+  // = DESCRIPTION
+  //    Provides a parametrized version of the _var class for fixed
+  //    length data structs and unions.
+{
+public:
+  // = Operations
+
+  TAO_Fixed_var (void);
+  // default constructor
+
+  TAO_Fixed_var (T *);
+  // constructor from a pointer to T
+
+  TAO_Fixed_var (const TAO_Fixed_var<T> &);
+  // copy constructor
+
+  ~TAO_Fixed_var (void);
+  // destructor
+
+  TAO_Fixed_var<T> &operator= (T *);
+  // assignment from a pointer to T
+
+  TAO_Fixed_var<T> &operator= (const TAO_Fixed_var<T> &);
+  // assignment from a TAO_Fixed_var
+
+  T *operator-> (void);
+  // smart pointer
+
+  const T *operator-> (void) const;
+  // smart pointer (const)
+
+  operator const T *&() const;
+  // cast operator
+
+  operator T *&();
+  // cast operator
+
+  // = Operations for parameter passing modes.
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T &out (void);
+  // for out parameter
+
+  T _retn (void);
+  // for return type
+
+private:
+  T *ptr_;
+  // instance
+};
+
+template <class T>
+class TAO_Variable_var
+  // = TITLE
+  //   template<class T> TAO_Variable_var
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for Variable
+  //   length data structs and unions.
+{
+public:
+  // = Operations
+
+  TAO_Variable_var (void);
+  // default constructor
+
+  TAO_Variable_var (T *);
+  // constructor from a pointer to T
+
+  TAO_Variable_var (const TAO_Variable_var<T> &);
+  // copy constructor
+
+  ~TAO_Variable_var (void);
+  // destructor
+
+  TAO_Variable_var<T> &operator= (T *);
+  // assignment from a pointer to T
+
+  TAO_Variable_var<T> &operator= (const TAO_Variable_var<T> &);
+  // assignment from a TAO_Variable_var
+
+  T *operator-> (void);
+  // smart pointer
+
+  const T *operator-> (void) const;
+  // smart pointer (const)
+
+  operator const T *&() const;
+  // cast operator
+
+  operator T *&();
+  // cast operator
+
+  // = operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T *&out (void);
+  // for out parameter
+
+  T *_retn (void);
+  // for return type
+
+private:
+  T *ptr_;
+};
+
+template <class T>
+class TAO_Sequence_var
+  // = TITLE
+  //   template<class T> TAO_Sequence_var
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for Sequence
+  //   data type.  CORBA sequences are considered to always be
+  //   variable length.
+{
+public:
+  // = Operations
+
+  TAO_Sequence_var (void);
+  // default constructor
+
+  TAO_Sequence_var (T *);
+  // constructor from a pointer to T
+
+  TAO_Sequence_var (const TAO_Sequence_var &);
+  // copy constructor
+
+  ~TAO_Sequence_var (void);
+  // destructor
+
+  TAO_Sequence_var<T> &operator= (T *);
+  // assignment from a pointer to T
+
+  TAO_Sequence_var<T> &operator= (const TAO_Sequence_var &);
+  // assignment from a TAO_Sequence_var
+
+  T *operator-> (void);
+  // smart pointer
+
+  const T *operator-> (void) const;
+  // smart pointer (const)
+
+  operator const T *&() const;
+  // cast operator
+
+  operator T *&();
+  // cast operator
+
+  // = additional operators for sequence
+
+  T::ElemType &operator[] (CORBA::ULong);
+  // operator [] that passes the argument to the [] operator of T
+
+  // = operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T *&out (void);
+  // for out parameter
+
+  T *_retn (void);
+  // for return type
+
+private:
+  T *ptr_;
+  // seq instance
+};
+
+template <class T, class T_ptr>
+class TAO_Object_var
+  // = TITLE
+  //   template<class T, class T_ptr> TAO_Object_var
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for obj
+  //   references.
+{
+public:
+  // =Operations
+
+  TAO_Object_var (void);
+  // default constructor
+
+  TAO_Object_var (T_ptr);
+  // constructor from a pointer to T
+
+  TAO_Object_var (const TAO_Object_var<T,T_ptr> &);
+  // copy constructor
+
+  ~TAO_Object_var (void);
+  // destructor
+
+  TAO_Object_var<T_ptr> &operator= (T_ptr);
+  // assignment from a pointer to T
+
+  TAO_Object_var<T_ptr> &operator= (const TAO_Object_var<T,T_ptr> &);
+  // assignment from a TAO_Object_var
+
+  T_ptr operator-> (void) const;
+  // smart pointer (const)
+
+  operator const T_ptr &() const;
+  // cast operator
+
+  operator T_ptr &();
+  // cast operator
+
+  // = operations for parameter passing modes
+
+  const T_ptr &in (void);
+  // for in type parameter
+
+  T_ptr &inout (void);
+  // for inout type parameter
+
+  T_ptr &out (void);
+  // for out parameter
+
+  T_ptr _retn (void);
+  // for return type
+
+private:
+  T_ptr ptr_;
+};
+
+template <class T, class T_slice>
+class TAO_FixedArray_var
+  // = TITLE
+  //   template<class T, class T_slice> TAO_FixedArray_var
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for obj
+  //   references.
+{
+public:
+  // = Operations
+
+  TAO_FixedArray_var (void);
+  // default constructor
+
+  TAO_FixedArray_var (T_slice *);
+  // constructor from a pointer to T
+
+  TAO_FixedArray_var (const TAO_FixedArray_var<T, T_slice> &);
+  // copy constructor
+
+  ~TAO_FixedArray_var (void);
+  // destructor
+
+  TAO_FixedArray_var<T, T_slice> &operator= (T_slice *);
+  // assignment from a pointer to T
+
+  TAO_FixedArray_var<T, T_slice> &operator= (const TAO_FixedArray_var<T, T_slice> &);
+  // assignment from a TAO_FixedArray_var
+
+  T_slice &operator[] (CORBA::ULong);
+  // index
+
+  const T_slice &operator[] (CORBA::ULong) const;
+  // index
+
+  operator const T_slice &() const;
+  // cast operator
+
+  operator T_slice &();
+  // cast operator
+
+  // = operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T &out (void);
+  // for out parameter
+
+  T_slice *_retn (void);
+  // for return type
+
+private:
+  T_slice *ptr_;
+};
+
+template <class T, class T_slice>
+class TAO_VariableArray_var
+  // = TITLE
+  //   template<class T, class T_slice> TAO_VariableArray_var
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for obj
+  //   references.
+{
+public:
+  // = Operations
+
+  TAO_VariableArray_var (void);
+  // default constructor
+
+  TAO_VariableArray_var (T_slice *);
+  // constructor from a pointer to T
+
+  TAO_VariableArray_var (const TAO_VariableArray_var<T, T_slice> &);
+  // copy constructor
+
+  ~TAO_VariableArray_var (void);
+  // destructor
+
+  TAO_VariableArray_var<T, T_slice> &operator= (T_slice *);
+  // assignment from a pointer to T
+
+  TAO_VariableArray_var<T, T_slice> &operator= (const TAO_VariableArray_var<T, T_slice> &);
+  // assignment from a TAO_VariableArray_var
+
+  T_slice &operator[] (CORBA::ULong);
+  // index
+
+  const T_slice &operator[] (CORBA::ULong) const;
+  // index
+
+  operator const T_slice &() const;
+  // cast operator
+
+  operator T_slice &();
+  // cast operator
+
+  // = operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T_slice *&out (void);
+  // for out parameter
+
+  T_slice *_retn (void);
+  // for return type
+
+private:
+  T_slice *ptr_;
+};
+
+template <class T, class T_slice>
+class TAO_FixedArray_forany
+  // = TITLE
+  //   template<class T, class T_slice> TAO_FixedArray_forany
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for obj
+  //   references.
+{
+public:
+  // =Operations
+
+  TAO_FixedArray_forany (void);
+  // default constructor
+
+  TAO_FixedArray_forany (T_slice *, CORBA::Boolean nocopy=0);
+  // constructor from a pointer to T slice
+
+  TAO_FixedArray_forany (const TAO_FixedArray_forany<T, T_slice> &);
+  // copy constructor
+
+  ~TAO_FixedArray_forany (void);
+  // destructor
+
+  TAO_FixedArray_forany<T, T_slice> &operator= (T_slice *);
+  // assignment from a pointer to T
+
+  TAO_FixedArray_forany<T, T_slice> &operator= (const TAO_FixedArray_forany<T, T_slice> &);
+  // assignment from a TAO_FixedArray_forany
+
+  T_slice &operator[] (CORBA::ULong);
+  // index
+
+  const T_slice &operator[] (CORBA::ULong) const;
+  // index
+
+  operator const T_slice &() const;
+  // cast operator
+
+  operator T_slice &();
+  // cast operator
+
+  // =operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T &out (void);
+  // for out parameter
+
+  T_slice *_retn (void);
+  // for return type
+
+private:
+  T_slice *ptr_;
+};
+
+template <class T, class T_slice>
+class TAO_VariableArray_forany
+  // = TITLE
+  //   template<class T, class T_slice> TAO_VariableArray_forany
+  //
+  // = DESCRIPTION
+  //   Provides a parametrized version of the _var class for obj
+  //   references.
+{
+public:
+  // =Operations
+
+  TAO_VariableArray_forany (void);
+  // default constructor
+
+  TAO_VariableArray_forany (T_slice *, CORBA::Boolean nocopy=0);
+  // constructor from a pointer to T slice
+
+  TAO_VariableArray_forany (const TAO_VariableArray_forany<T, T_slice> &);
+  // copy constructor
+
+  ~TAO_VariableArray_forany (void);
+  // destructor
+
+  TAO_VariableArray_forany<T, T_slice> &operator= (T_slice *);
+  // assignment from a pointer to T
+
+  TAO_VariableArray_forany<T, T_slice> &operator= (const TAO_VariableArray_forany<T, T_slice> &);
+  // assignment from a TAO_VariableArray_forany
+
+  T_slice &operator[] (CORBA::ULong);
+  // index
+
+  const T_slice &operator[] (CORBA::ULong) const;
+  // index
+
+  operator const T_slice &() const;
+  // cast operator
+
+  operator T_slice &();
+  // cast operator
+
+  // =operations for parameter passing modes
+
+  const T &in (void);
+  // for in type parameter
+
+  T &inout (void);
+  // for inout type parameter
+
+  T_slice *&out (void);
+  // for out parameter
+
+  T_slice *_retn (void);
+  // for return type
+
+private:
+  T_slice *ptr_;
+};
+
+template <class T, class T_var>
+class TAO_Variable_out
+  // = TITLE
+  //   TAO_Variable_out
+  //
+  // = Description
+  //  _out class definition for variable size struct/union.
+{
+public:
+  TAO_Variable_out (T *&);
+  // constructor
+
+  TAO_Variable_out (T_var &);
+  // constructor
+
+  TAO_Variable_out (TAO_Variable_out <T,T_var> &);
+  // copy constructor
+
+  TAO_Variable_out<T,T_var> &operator= (TAO_Variable_out<T,T_var> &);
+  // assignment operator
+
+  TAO_Variable_out<T,T_var> &operator= (T *);
+  // assignment
+
+  operator T *&();
+  // cast
+
+  T *&ptr (void);
+  // ptr method, returns a pointer to class T
+
+  T *operator-> (void);
+  // arrow operator (smart pointer)
+
+private:
+  T *&ptr_;
+};
+
+template <class T, class T_var>
+class TAO_Sequence_out
+  // = TITLE
+  //   TAO_Sequence_out
+  //
+  // = Description
+  //   _out class definition for Sequence
+{
+public:
+  TAO_Sequence_out (T *&);
+  // constructor
+
+  TAO_Sequence_out (T_var &);
+  // constructor
+
+  TAO_Sequence_out (TAO_Sequence_out <T,T_var> &);
+  // copy constructor
+
+  TAO_Sequence_out<T,T_var> &operator= (TAO_Sequence_out<T,T_var> &);
+  // assignment operator
+
+  TAO_Sequence_out<T,T_var> &operator= (T *);
+  // assignment
+
+  operator T *&();
+  // cast
+
+  T *&ptr (void);
+  // ptr method, returns a pointer to class T
+
+  T *operator-> (void);
+  // arrow operator (smart pointer)
+
+  T::ElemType operator[] (CORBA::ULong);
+  // return the element at index i
+
+private:
+  T *&ptr_;
+};
+
+template <class T_ptr, class T_var>
+class TAO_Object_out
+{
+  // = TITLE
+  //   TAO_Object_out
+  //
+  // = Description
+  //   _out class definition for Object
+public:
+  TAO_Object_out (T_ptr &);
+  // constructor
+
+  TAO_Object_out (T_var &);
+  // constructor
+
+  TAO_Object_out (TAO_Object_out <T_ptr,T_var> &);
+  // copy constructor
+
+  TAO_Object_out<T_ptr,T_var> &operator= (TAO_Object_out<T_ptr,T_var> &);
+  // assignment operator
+
+  TAO_Object_out<T_ptr,T_var> &operator= (const T_var &);
+  // assignment operator
+
+  TAO_Object_out<T_ptr,T_var> &operator= (T_ptr);
+  // assignment
+
+  operator T_ptr &();
+  // cast
+
+  T_ptr &ptr (void);
+  // ptr method, returns a pointer to class T
+
+  T_ptr operator-> (void);
+  // arrow operator (smart pointer)
+
+private:
+  T_ptr &ptr_;
+};
+#endif /* 0 */
+
 #if defined (__ACE_INLINE__)
 #include "tao/varout.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/varout.i b/TAO/tao/varout.i
index c506733d29f..6e2e92d5f47 100644
--- a/TAO/tao/varout.i
+++ b/TAO/tao/varout.i
@@ -2,43 +2,41 @@
 // $Id$
 //
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::TAO_Object_Field_T (void)
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::TAO_Object_Field_T (void)
   :  ptr_ (0)
 {
 }
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::TAO_Object_Field_T (T* object)
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::TAO_Object_Field_T (T* object)
   :  ptr_ (object)
 {
 }
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const TAO_Object_Field_T<T,T_var>& rhs)
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::TAO_Object_Field_T (const TAO_Object_Field_T<T>& rhs)
   :  TAO_Object_Field (rhs), // keep HP/aCC happy
      ptr_ (T::_duplicate (rhs.ptr_))
 {
 }
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::~TAO_Object_Field_T (void)
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::~TAO_Object_Field_T (void)
 {
   CORBA::release (this->ptr_);
 }
 
-template<class T, class T_var> ACE_INLINE TAO_Object_Field_T<T,T_var> &
-TAO_Object_Field_T<T,T_var>::operator= (T* object)
+template<class T> ACE_INLINE TAO_Object_Field_T<T> &
+TAO_Object_Field_T<T>::operator= (T* object)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = object;
   return *this;
 }
 
-template<class T, class T_var> ACE_INLINE TAO_Object_Field_T<T,T_var> &
-TAO_Object_Field_T<T,T_var>::
-    operator= (const TAO_Object_Field_T<T,T_var> &rhs)
+template<class T> ACE_INLINE TAO_Object_Field_T<T> &
+TAO_Object_Field_T<T>::operator= (const TAO_Object_Field_T<T> &rhs)
 {
   if (this != &rhs)
     {
@@ -48,52 +46,52 @@ TAO_Object_Field_T<T,T_var>::
   return *this;
 }
 
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::ptr (void) const
+template<class T> ACE_INLINE T*
+TAO_Object_Field_T<T>::ptr (void) const
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::operator T* const &() const
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::operator T* const &() const
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::operator T* &()
+template<class T> ACE_INLINE
+TAO_Object_Field_T<T>::operator T* &()
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::operator-> (void) const
+template<class T> ACE_INLINE T*
+TAO_Object_Field_T<T>::operator-> (void) const
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::in (void) const
+template<class T> ACE_INLINE T*
+TAO_Object_Field_T<T>::in (void) const
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE T* &
-TAO_Object_Field_T<T,T_var>::inout (void)
+template<class T> ACE_INLINE T* &
+TAO_Object_Field_T<T>::inout (void)
 {
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE T* &
-TAO_Object_Field_T<T,T_var>::out (void)
+template<class T> ACE_INLINE T* &
+TAO_Object_Field_T<T>::out (void)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::_retn (void)
+template<class T> ACE_INLINE T*
+TAO_Object_Field_T<T>::_retn (void)
 {
   // yield ownership of managed obj reference
   T* val = this->ptr_;
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
deleted file mode 100644
index f6204af62d2..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,
-                       ASYS_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 f65ebb2c8cf..00000000000
--- a/TAO/tao/xt_resource.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   xt_resource.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_XT_RESOURCE_H
-#define TAO_XT_RESOURCE_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 : public TAO_Default_Resource_Factory
-{
-  // = TITLE
-  //   TAO's default resource factory
-  //
-  // = DESCRIPTION
-  //   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.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_XT_Resource_Factory (void);
-  // Constructor.
-
-  static void set_context (XtAppContext context);
-  // Set the context used to create the XtReactor
-
-protected:
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-  // Obtain the reactor implementation
-
-private:
-  static XtAppContext context_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/xt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_XT_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
-
-#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/tests/NestedUpcall/Simple/Makefile b/TAO/tests/AMI/Makefile
index 92d1ee7c5b5..86ac3a83c4b 100644
--- a/TAO/tests/NestedUpcall/Simple/Makefile
+++ b/TAO/tests/AMI/Makefile
@@ -14,20 +14,20 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO
 
-IDL_SRC = testC.cpp testS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp
+IDLFILES = testC testS
+BIN =  server simple-client client
 
-NESTEDUPCALLS_SVR_OBJS = testS.o testC.o server.o server_i.o
-NESTEDUPCALLS_CLT_OBJS = testS.o testC.o client.o client_i.o
+SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
 
-SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \
-             $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp))
+CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES))
+SIMPLE_CLIENT_OBJS = simple-client.o $(addsuffix .o, $(IDLFILES))
+ORB_CREATION_OBJS = orb_creation.o $(addsuffix .o, $(IDLFILES))
+SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
-BIN = server client
-
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -44,30 +44,31 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS +=
+override TAO_IDLFLAGS += -GC
 
-.PRECIOUS: testC.h testC.i testC.cpp
-.PRECIOUS: testS.h testS.i testS.cpp
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
-server: $(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(NESTEDUPCALLS_CLT_OBJS))
+client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) testS.* testC.* testS_T.*
+orb_creation: $(addprefix $(VDIR),$(ORB_CREATION_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+simple-client: $(addprefix $(VDIR),$(SIMPLE_CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -77,17 +78,20 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -95,13 +99,18 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -109,11 +118,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -123,38 +127,24 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -166,6 +156,50 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ testC.h $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -175,25 +209,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -241,15 +266,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -283,27 +314,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -323,22 +333,10 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i \
+ testC.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/client_i.o .obj/client_i.so .shobj/client_i.o .shobj/client_i.so: client_i.cpp client_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -348,10 +346,12 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i test_i.h \
+ testS.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -446,25 +446,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -512,15 +503,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -594,9 +591,10 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
+.obj/orb_creation.o .obj/orb_creation.so .shobj/orb_creation.o .shobj/orb_creation.so: orb_creation.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -606,17 +604,20 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -624,13 +625,18 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -638,11 +644,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -652,12 +653,68 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ testC.h $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -669,21 +726,219 @@ realclean: clean
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ testC.i
+.obj/simple-client.o .obj/simple-client.so .shobj/simple-client.o .shobj/simple-client.so: simple-client.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -695,6 +950,50 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ testC.h $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -704,25 +1003,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -770,15 +1060,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -812,27 +1108,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -852,21 +1127,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/server_i.o .obj/server_i.so .shobj/server_i.o .shobj/server_i.so: server_i.cpp server_i.h testS.h testC.h \
+ testC.i
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -975,25 +1237,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1041,15 +1294,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1123,8 +1382,10 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+ testC.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1233,25 +1494,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1299,15 +1551,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1381,8 +1639,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+.obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1491,25 +1749,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1557,15 +1806,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
@@ -1639,6 +1894,6 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/AMI/README b/TAO/tests/AMI/README
new file mode 100644
index 00000000000..4c1d0b89859
--- /dev/null
+++ b/TAO/tests/AMI/README
@@ -0,0 +1,14 @@
+# $Id$
+
+Description:
+
+	This is a simple test for AMI callback model. Right now the
+IDL compiler does not generate all the code. Therefore, you need to
+copy test-handC.cpp onto testC.cpp.             
+
+        This is still in a development phase. It is not at all
+complete. 
+
+$ server -o test.ior
+$ client -k file://test.ior -n 4 -i 1000
+$ simple_client -k file://test_ior
diff --git a/TAO/tests/AMI/client.conf b/TAO/tests/AMI/client.conf
new file mode 100644
index 00000000000..5276fe68900
--- /dev/null
+++ b/TAO/tests/AMI/client.conf
@@ -0,0 +1,2 @@
+
+static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
new file mode 100644
index 00000000000..31527aa0e42
--- /dev/null
+++ b/TAO/tests/AMI/client.cpp
@@ -0,0 +1,199 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "testC.h"
+
+ACE_RCSID(MT_Client, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int nthreads = 5;
+int niterations = 5;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-n <nthreads> "
+                           "-i <niterations> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Client : public ACE_Task_Base
+{
+  // = TITLE
+  //   Run the client thread
+  //
+  // = DESCRIPTION
+  //   Use the ACE_Task_Base class to run the client threads.
+  //
+public:
+  Client (Simple_Server_ptr server, int niterations);
+  // ctor
+
+  virtual int svc (void);
+  // The thread entry point.
+
+private:
+  Simple_Server_var server_;
+  // The server.
+
+  int niterations_;
+  // The number of iterations on each client thread.
+};
+
+class Handler : public POA_AMI_Simple_Server_Handler
+{
+public:
+  Handler (void) {};
+ 
+  ~Handler (void) {};
+};
+
+int
+main (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Simple_Server_var server =
+        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      // Activate POA to handle the call back.
+      
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+      
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      Client client (server.in (), niterations);
+      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
+                           nthreads) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate client threads\n"),
+                          1);
+
+      client.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Client::Client (Simple_Server_ptr server,
+                int niterations)
+  :  server_ (Simple_Server::_duplicate (server)),
+     niterations_ (niterations)
+{
+}
+
+int
+Client::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+#if 0
+      // If we are using a global ORB this is a nop, otherwise it
+      // initializes the ORB resources for this thread.
+      int argc = 0;
+      char* argv[] = { "" };
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+#endif
+
+      Handler handler;
+      AMI_Simple_Server_Handler_var the_handler =
+        handler._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Long number = 0;
+
+      for (int i = 0; i < this->niterations_; ++i)
+        {
+          server_->sendc_get_number (the_handler.in (),
+                                     ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (TAO_debug_level > 0 && i % 100 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+        }
+
+      number = server_->get_number (ACE_TRY_ENV);
+      
+      ACE_DEBUG ((LM_DEBUG, "(%P | %t) get_number = %d\n", number));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "MT_Client: exception raised");
+    }
+  ACE_ENDTRY;
+  return 0;
+}
diff --git a/TAO/tests/Timeout/client.dsp b/TAO/tests/AMI/client.dsp
index a403f64f23e..cce3974642f 100644
--- a/TAO/tests/Timeout/client.dsp
+++ b/TAO/tests/AMI/client.dsp
@@ -1,27 +1,27 @@
-# Microsoft Developer Studio Project File - Name="Timeout Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="MT_Client Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Timeout Client - Win32 Debug

+CFG=MT_Client Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="Timeout Client - Win32 Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "client.mak" CFG="MT_Client Client - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Timeout Client - Win32 Release" (based on\

+!MESSAGE

+!MESSAGE "MT_Client Client - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "Timeout Client - Win32 Debug" (based on\

+!MESSAGE "MT_Client Client - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -29,7 +29,7 @@ CFG=Timeout Client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Timeout Client - Win32 Release"

+!IF  "$(CFG)" == "MT_Client Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,7 +52,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ELSEIF  "$(CFG)" == "Timeout Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -75,12 +75,12 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

-# Name "Timeout Client - Win32 Release"

-# Name "Timeout Client - Win32 Debug"

+# Name "MT_Client Client - Win32 Release"

+# Name "MT_Client Client - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -92,6 +92,10 @@ SOURCE=.\client.cpp
 

 SOURCE=.\testC.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\testS.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -104,10 +108,10 @@ SOURCE=.\testC.cpp
 

 SOURCE=.\test.idl

 

-!IF  "$(CFG)" == "Timeout Client - Win32 Release"

+!IF  "$(CFG)" == "MT_Client Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -143,9 +147,9 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Timeout Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client Client - Win32 Debug"

 

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -181,7 +185,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/tests/AMI/client.global.conf b/TAO/tests/AMI/client.global.conf
new file mode 100644
index 00000000000..4883a8b375b
--- /dev/null
+++ b/TAO/tests/AMI/client.global.conf
@@ -0,0 +1,3 @@
+# $Id$
+#
+static Resource_Factory "-ORBresources global"
diff --git a/TAO/tests/AMI/client.muxed.conf b/TAO/tests/AMI/client.muxed.conf
new file mode 100644
index 00000000000..e41aabecf7a
--- /dev/null
+++ b/TAO/tests/AMI/client.muxed.conf
@@ -0,0 +1,2 @@
+
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBiiopprofilelock null -ORBclientconnectionhandler MT"
diff --git a/TAO/tests/AMI/client.tss.conf b/TAO/tests/AMI/client.tss.conf
new file mode 100644
index 00000000000..d1a2308e80f
--- /dev/null
+++ b/TAO/tests/AMI/client.tss.conf
@@ -0,0 +1,3 @@
+# $Id$
+#
+static Resource_Factory "-ORBresources tss"
diff --git a/TAO/tests/AMI/orb_creation.cpp b/TAO/tests/AMI/orb_creation.cpp
new file mode 100644
index 00000000000..f3212b0f17b
--- /dev/null
+++ b/TAO/tests/AMI/orb_creation.cpp
@@ -0,0 +1,176 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "testC.h"
+
+ACE_RCSID(MT_Client, orb_creation, "$Id$")
+
+const char *ior = "file://test.ior";
+int nthreads = 5;
+int niterations = 5;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-n <nthreads> "
+                           "-i <niterations> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Client : public ACE_Task_Base
+{
+  // = TITLE
+  //   Run the client thread
+  //
+  // = DESCRIPTION
+  //   Use the ACE_Task_Base class to run the client threads.
+  //
+public:
+  Client (int niterations,
+          const char* ior);
+  // ctor
+
+  virtual int svc (void);
+  // The thread entry point.
+
+private:
+  int niterations_;
+  // The number of iterations on each client thread.
+
+  const char* ior_;
+  // The IOR that we should use.
+};
+
+int
+main (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "");
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Simple_Server_var server =
+        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      Client client (niterations, ior);
+      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
+                           nthreads) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate client threads\n"),
+                          1);
+
+      client.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+
+      server->shutdown (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Client::Client (int niterations,
+                const char* ior)
+  :  niterations_ (niterations),
+     ior_ (ior)
+{
+}
+
+int
+Client::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      for (int i = 0; i < this->niterations_; ++i)
+        {
+          // If we are using a global ORB this is a nop, otherwise it
+          // initializes the ORB resources for this thread.
+          int argc = 0;
+          const char* argv[] = { "" };
+          CORBA::ORB_var orb =
+            CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          CORBA::Object_var object =
+            orb->string_to_object (this->ior_, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          Simple_Server_var server =
+            Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (CORBA::is_nil (server.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%P|%t) Object reference <%s> is nil\n",
+                                 ior),
+                                1);
+            }
+
+          server->test_method (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          if (TAO_debug_level > 0 && i % 100 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "MT_Client: exception raised");
+    }
+  ACE_ENDTRY;
+  return 0;
+}
diff --git a/TAO/performance-tests/Latency/client.dsp b/TAO/tests/AMI/orb_creation.dsp
index bff0796f72f..b0003f4536c 100644
--- a/TAO/performance-tests/Latency/client.dsp
+++ b/TAO/tests/AMI/orb_creation.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Latency Tests Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="MT_Client ORB Creation" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Latency Tests Client - Win32 Debug

+CFG=MT_Client ORB Creation - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE

-!MESSAGE NMAKE /f "client.mak".

+!MESSAGE NMAKE /f "orb_creation.mak".

 !MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE

-!MESSAGE NMAKE /f "client.mak" CFG="Latency Tests Client - Win32 Debug"

+!MESSAGE NMAKE /f "orb_creation.mak" CFG="MT_Client ORB Creation - Win32 Debug"

 !MESSAGE

 !MESSAGE Possible choices for configuration are:

 !MESSAGE

-!MESSAGE "Latency Tests Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Latency Tests Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_Client ORB Creation - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_Client ORB Creation - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=Latency Tests Client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Latency Tests Client - Win32 Release"

+!IF  "$(CFG)" == "MT_Client ORB Creation - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -37,22 +37,22 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ELSEIF  "$(CFG)" == "Latency Tests Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client ORB Creation - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,62 +66,59 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

 !ENDIF

 

 # Begin Target

 

-# Name "Latency Tests Client - Win32 Release"

-# Name "Latency Tests Client - Win32 Debug"

+# Name "MT_Client ORB Creation - Win32 Release"

+# Name "MT_Client ORB Creation - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\client.cpp

+SOURCE=.\orb_creation.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=.\testC.cpp

 # End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\testS.cpp

 # End Source File

 # End Group

-# Begin Group "Resource Files"

+# Begin Group "Header Files"

 

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# PROP Default_Filter ""

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\test.idl

 

-!IF  "$(CFG)" == "Latency Tests Client - Win32 Release"

+!IF  "$(CFG)" == "MT_Client ORB Creation - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -151,9 +148,9 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Latency Tests Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client ORB Creation - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -193,5 +190,17 @@ BuildCmds= \
 

 # End Source File

 # End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\testC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\testS.i

+# End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/performance-tests/Latency/run_test.pl b/TAO/tests/AMI/run_test.pl
index f8034c1fde2..2c6a97e729e 100755
--- a/TAO/performance-tests/Latency/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -8,14 +8,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../bin';
 require ACEutils;
 
-$client_conf="client.conf";
-$server_conf="client.conf";
-$threads='4';
+$client_conf="client.global.conf";
+$client_process="client";
+$debug_level='5';
+$threads='2';
+$iterations='1';
+
+foreach $i (@ARGV) {
+  if ($i eq '-tss') {
+    $client_conf = "client.tss.conf";
+  } elsif ($i eq '-debug') {
+    $debug_level = '1';
+  } elsif ($i eq '-creation') {
+    $client_process = 'orb_creation';
+    $threads='2';
+  }
+}
 
-$iorfile = "test.ior";
+$iorfile = "server.ior";
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -ORBSvcConf server.conf"
-                       . " -o $iorfile -n $threads");
+                       " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
+                       . " -o $iorfile");
 
 if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
@@ -23,10 +36,11 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
   exit 1;
 }
 
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-                       " -ORBSvcConf client.conf "
-                       . " -k file://$iorfile "
-                       . " -n $threads -i 1000");
+$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ",
+		       " -ORBsvcconf $client_conf "
+		       . "-ORBdebuglevel $debug_level"
+		       . " -k file://$iorfile "
+		       . " -n $threads -i $iterations");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
diff --git a/TAO/tests/AMI/server.conf b/TAO/tests/AMI/server.conf
new file mode 100644
index 00000000000..faf9c6c874b
--- /dev/null
+++ b/TAO/tests/AMI/server.conf
@@ -0,0 +1,3 @@
+# $Id$
+#
+static Server_Strategy_Factory "-ORBconcurrency thread-per-connection"
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/AMI/server.cpp
index dee98c00732..9a2dfa93eb3 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -3,7 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 
-ACE_RCSID(Failure, server, "$Id$")
+ACE_RCSID(MT_Client, server, "$Id$")
 
 const char *ior_output_file = 0;
 
@@ -19,7 +19,6 @@ parse_args (int argc, char *argv[])
       case 'o':
 	ior_output_file = get_opts.optarg;
 	break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,9 +56,6 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -88,6 +84,16 @@ main (int argc, char *argv[])
 	  ACE_OS::fclose (output_file);
 	}
 
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      CORBA::Long number = 0;
+      
+      number = server->get_number (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "get_number = %d\n", number));
+
       if (orb->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Timeout/server.dsp b/TAO/tests/AMI/server.dsp
index 330b469d59f..b7c07f7179b 100644
--- a/TAO/tests/Timeout/server.dsp
+++ b/TAO/tests/AMI/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Timeout Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="MT_Client Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Timeout Server - Win32 Debug

+CFG=MT_Client Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,13 +13,13 @@ CFG=Timeout Server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="Timeout Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="MT_Client Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timeout Server - Win32 Release" (based on\

+!MESSAGE "MT_Client Server - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "Timeout Server - Win32 Debug" (based on\

+!MESSAGE "MT_Client Server - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +29,7 @@ CFG=Timeout Server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Timeout Server - Win32 Release"

+!IF  "$(CFG)" == "MT_Client Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -53,7 +53,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ELSEIF  "$(CFG)" == "Timeout Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -81,8 +81,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "Timeout Server - Win32 Release"

-# Name "Timeout Server - Win32 Debug"

+# Name "MT_Client Server - Win32 Release"

+# Name "MT_Client Server - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -118,7 +118,7 @@ SOURCE=.\test_i.h
 

 SOURCE=.\test.idl

 

-!IF  "$(CFG)" == "Timeout Server - Win32 Release"

+!IF  "$(CFG)" == "MT_Client Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

@@ -157,7 +157,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Timeout Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_Client Server - Win32 Debug"

 

 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

diff --git a/TAO/tests/AMI/simple-client.conf b/TAO/tests/AMI/simple-client.conf
new file mode 100644
index 00000000000..97bca811c1b
--- /dev/null
+++ b/TAO/tests/AMI/simple-client.conf
@@ -0,0 +1,2 @@
+
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBiiopprofilelock null -ORBclientconnectionhandler ST"
diff --git a/TAO/tests/AMI/simple-client.cpp b/TAO/tests/AMI/simple-client.cpp
new file mode 100644
index 00000000000..9c821f72d1b
--- /dev/null
+++ b/TAO/tests/AMI/simple-client.cpp
@@ -0,0 +1,125 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "testC.h"
+
+ACE_RCSID(MT_Client, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 5;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+class Handler : public POA_AMI_Simple_Server_Handler
+{
+public:
+  Handler (void) {};
+ 
+  ~Handler (void) {};
+};
+
+int
+main (int argc, char *argv[])
+{
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var poa =
+        PortableServer::POA::_narrow (object, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      object = orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Simple_Server_var server =
+        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      Handler handler;
+      AMI_Simple_Server_Handler_var the_handler =
+        handler._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Long number = 0;
+      
+      for (ssize_t ni = 0; ni < niterations; ni++)
+        {
+        
+          server->sendc_get_number (the_handler.in (),
+                                    ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      number = server->get_number (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      ACE_DEBUG ((LM_DEBUG,
+                  "get_number = %d\n",
+                  number));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/Faults/server.dsp b/TAO/tests/AMI/simple_client.dsp
index d40a97bb6c3..6d02789130d 100644
--- a/TAO/tests/Faults/server.dsp
+++ b/TAO/tests/AMI/simple_client.dsp
@@ -1,34 +1,35 @@
-# Microsoft Developer Studio Project File - Name="Faults Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="simple_client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Faults Server - Win32 Debug

+CFG=simple_client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

+!MESSAGE NMAKE /f "simple_client.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="Faults Server - Win32 Debug"

+!MESSAGE NMAKE /f "simple_client.mak" CFG="simple_client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Faults Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Faults Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "simple_client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "simple_client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Faults Server - Win32 Release"

+!IF  "$(CFG)" == "simple_client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -39,25 +40,24 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 

-!ELSEIF  "$(CFG)" == "Faults Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "simple_client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "simple_c"

+# PROP BASE Intermediate_Dir "simple_c"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -66,32 +66,29 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Faults Server - Win32 Release"

-# Name "Faults Server - Win32 Debug"

+# Name "simple_client - Win32 Release"

+# Name "simple_client - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\test_i.cpp

+SOURCE=".\simple-client.cpp"

 # End Source File

 # Begin Source File

 

@@ -102,42 +99,39 @@ SOURCE=.\testC.cpp
 SOURCE=.\testS.cpp

 # End Source File

 # End Group

-# Begin Group "Header Files"

+# Begin Group "Inline Files"

 

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\test_i.h

+SOURCE=.\test_i.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\testC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.h

+SOURCE=.\testS.i

 # End Source File

 # End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\test.idl

 

-!IF  "$(CFG)" == "Faults Server - Win32 Release"

+!IF  "$(CFG)" == "simple_client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,9 +161,9 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Faults Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "simple_client - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -209,5 +203,13 @@ BuildCmds= \
 

 # End Source File

 # End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\test_i.h

+# End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/tests/AMI/test-handC.cpp b/TAO/tests/AMI/test-handC.cpp
new file mode 100644
index 00000000000..b0bda5a45b0
--- /dev/null
+++ b/TAO/tests/AMI/test-handC.cpp
@@ -0,0 +1,645 @@
+// $Id$
+/* -*- C++ -*- */
+
+// ******  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 "testC.h"
+
+#if !defined (__ACE_INLINE__)
+#include "testC.i"
+#endif /* !defined INLINE */
+
+Simple_Server_ptr Simple_Server::_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &env
+  )
+{
+  if (CORBA::is_nil (obj))
+    return Simple_Server::_nil ();
+  if (!obj->_is_a ("IDL:Simple_Server:1.0", env))
+    return Simple_Server::_nil ();
+  return Simple_Server::_unchecked_narrow (obj, env);
+}
+
+Simple_Server_ptr Simple_Server::_unchecked_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  if (CORBA::is_nil (obj))
+    return Simple_Server::_nil ();
+  TAO_Stub* stub = obj->_stubobj ();
+  stub->_incr_refcnt ();
+  void* servant = 0;
+  if (obj->_is_collocated () && obj->_servant() != 0)
+    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Object:1.0");
+  if (servant != 0)
+    {
+      Simple_Server_ptr retv = ACE_reinterpret_cast (
+          Simple_Server_ptr,
+          ACE_reinterpret_cast (
+              PortableServer::Servant,
+              servant
+            )
+          ->_create_collocated_objref (
+              "IDL:Simple_Server:1.0",
+              TAO_ORB_Core::ORB_CONTROL,
+              stub
+            )
+        );
+      if (retv != 0)
+        return retv;
+    }
+  return new Simple_Server(stub);
+}
+
+Simple_Server_ptr 
+Simple_Server::_duplicate (Simple_Server_ptr obj)
+{
+  if (!CORBA::is_nil (obj))
+    obj->_incr_refcnt ();
+  return obj;
+}
+
+CORBA::Long Simple_Server::get_number (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA::Long _tao_retval = 0;
+
+  TAO_Stub *istub = this->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "get_number",
+      istub->orb_core ()
+    );
+  
+
+  for (;;)
+  {
+    ACE_TRY_ENV.clear ();
+    _tao_call.start (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (_tao_retval);
+
+    int _invoke_status =
+      _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (_tao_retval);
+
+    if (_invoke_status == TAO_INVOKE_RESTART)
+      continue;
+    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+      // cannot happen
+    if (_invoke_status != TAO_INVOKE_OK)
+    {
+      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+
+    }
+    break;
+    
+  }
+  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+  if (!(
+        (_tao_in >> _tao_retval)
+    ))
+    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+  return _tao_retval;
+}
+
+void
+Simple_Server::sendc_get_number (
+    AMI_Simple_Server_Handler_ptr _tao_ami_handler,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  
+  TAO_Stub *istub = this->_stubobj ();
+  if (istub == 0)
+    ACE_THROW (CORBA::INV_OBJREF ());
+
+  
+  TAO_GIOP_Twoway_Asynch_Invocation _tao_call (
+      istub,
+      "get_number",
+      istub->orb_core (),
+      &AMI_Simple_Server_Handler::get_number_skel,
+      _tao_ami_handler
+    );
+  
+
+  for (;;)
+  {
+    ACE_TRY_ENV.clear ();
+    _tao_call.start (ACE_TRY_ENV);
+    ACE_CHECK;
+    int _invoke_status =
+      _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+
+    if (_invoke_status == TAO_INVOKE_RESTART)
+      continue;
+    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+      // cannot happen
+    if (_invoke_status != TAO_INVOKE_OK)
+    {
+      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+
+    }
+    break;
+    
+  }
+  return;
+}
+
+CORBA::Boolean Simple_Server::_is_a (const CORBA::Char *value, CORBA::Environment &env)
+{
+  if (
+    (!ACE_OS::strcmp ((char *)value, "IDL:Simple_Server:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
+  return 1; // success using local knowledge
+  else
+    return this->CORBA_Object::_is_a (value, env);
+}
+
+const char* Simple_Server::_interface_repository_id (void) const
+{
+  return "IDL:Simple_Server:1.0";
+}
+
+static const CORBA::Long _oc_Simple_Server[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Simple_Server:1.0
+  14, ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x72000000),  // name = Simple_Server
+};
+static CORBA::TypeCode _tc_TAO_tc_Simple_Server (CORBA::tk_objref, sizeof (_oc_Simple_Server), (char *) &_oc_Simple_Server, 0, sizeof (Simple_Server));
+CORBA::TypeCode_ptr _tc_Simple_Server = &_tc_TAO_tc_Simple_Server;
+
+AMI_Simple_Server_Handler_ptr AMI_Simple_Server_Handler::_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &env
+  )
+{
+  if (CORBA::is_nil (obj))
+    return AMI_Simple_Server_Handler::_nil ();
+  if (!obj->_is_a ("IDL:AMI_Simple_Server_Handler:1.0", env))
+    return AMI_Simple_Server_Handler::_nil ();
+  return AMI_Simple_Server_Handler::_unchecked_narrow (obj, env);
+}
+
+AMI_Simple_Server_Handler_ptr AMI_Simple_Server_Handler::_unchecked_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  if (CORBA::is_nil (obj))
+    return AMI_Simple_Server_Handler::_nil ();
+  TAO_Stub* stub = obj->_stubobj ();
+  stub->_incr_refcnt ();
+  void* servant = 0;
+  if (obj->_is_collocated () && obj->_servant() != 0)
+    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Object:1.0");
+  if (servant != 0)
+    {
+      AMI_Simple_Server_Handler_ptr retv = ACE_reinterpret_cast (
+          AMI_Simple_Server_Handler_ptr,
+          ACE_reinterpret_cast (
+              PortableServer::Servant,
+              servant
+            )
+          ->_create_collocated_objref (
+              "IDL:AMI_Simple_Server_Handler:1.0",
+              TAO_ORB_Core::ORB_CONTROL,
+              stub
+            )
+        );
+      if (retv != 0)
+        return retv;
+    }
+  return new AMI_Simple_Server_Handler(stub);
+}
+
+AMI_Simple_Server_Handler_ptr 
+AMI_Simple_Server_Handler::_duplicate (AMI_Simple_Server_Handler_ptr obj)
+{
+  if (!CORBA::is_nil (obj))
+    obj->_incr_refcnt ();
+  return obj;
+}
+
+void 
+AMI_Simple_Server_Handler::get_number (
+    CORBA::Long _tao_ami_result, 
+        CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+    
+
+    TAO_Stub *istub = this->_stubobj ();
+    if (istub == 0)
+      ACE_THROW (CORBA::INTERNAL ());
+    
+        TAO_GIOP_Twoway_Invocation _tao_call (
+        istub,
+        "get_number",
+        istub->orb_core ()
+      );
+    
+
+    for (;;)
+    {
+      ACE_TRY_ENV.clear ();
+      _tao_call.start (ACE_TRY_ENV);
+ACE_CHECK;
+      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+      if (!(
+(_tao_out << _tao_ami_result)
+            
+        ))
+        ACE_THROW (CORBA::MARSHAL ());
+      int _invoke_status =
+        _tao_call.invoke (0, 0, ACE_TRY_ENV);
+      ACE_CHECK;
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        continue;
+      // if (_invoke_status == TAO_INVOKE_EXCEPTION)
+        // cannot happen
+      if (_invoke_status != TAO_INVOKE_OK)
+      {
+        ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      }
+      break;
+      
+    }
+    
+  }
+
+void
+AMI_Simple_Server_Handler::get_number_skel (TAO_InputCDR &_tao_reply_cdr,
+                                            Messaging::ReplyHandler_ptr _tao_reply_handler,
+                                            CORBA::Environment &ACE_TRY_ENV)
+{
+  // Retrive Reply Handler object.
+  AMI_Simple_Server_Handler_var _tao_reply_handler_object = 
+    AMI_Simple_Server_Handler::_narrow (_tao_reply_handler,
+                                        ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // @@ Error handling.
+  
+  // Demarshall all the arguments.
+  CORBA::Long l;
+  _tao_reply_cdr >> l;
+  
+  // Invoke the call back method.
+  _tao_reply_handler_object->get_number (l, ACE_TRY_ENV);
+}
+
+  CORBA::Boolean AMI_Simple_Server_Handler::_is_a (const CORBA::Char *value, CORBA::Environment &env)
+  {
+    if (
+(!ACE_OS::strcmp ((char *)value, "IDL:AMI_Simple_Server_Handler:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) ||
+            (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
+  return 1; // success using local knowledge
+    else
+      return this->CORBA_Object::_is_a (value, env);
+  }
+
+  const char* AMI_Simple_Server_Handler::_interface_repository_id (void) const
+  {
+    return "IDL:AMI_Simple_Server_Handler:1.0";
+  }
+
+  static const CORBA::Long _oc_AMI_Simple_Server_Handler[] =
+  {
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:AMI_Simple_Server_Handler:1.0
+    26, ACE_NTOHL (0x414d495f), ACE_NTOHL (0x53696d70), ACE_NTOHL (0x6c655f53), ACE_NTOHL (0x65727665), ACE_NTOHL (0x725f4861), ACE_NTOHL (0x6e646c65), ACE_NTOHL (0x72000000),  // name = AMI_Simple_Server_Handler
+};
+  static CORBA::TypeCode _tc_TAO_tc_AMI_Simple_Server_Handler (CORBA::tk_objref, sizeof (_oc_AMI_Simple_Server_Handler), (char *) &_oc_AMI_Simple_Server_Handler, 0, sizeof (AMI_Simple_Server_Handler));
+  CORBA::TypeCode_ptr _tc_AMI_Simple_Server_Handler = &_tc_TAO_tc_AMI_Simple_Server_Handler;
+
+  void operator<<= (CORBA::Any &_tao_any, Simple_Server_ptr _tao_elem)
+  {
+    CORBA::Object_ptr *_tao_obj_ptr = 0;
+    ACE_TRY_NEW_ENV
+    {
+      ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
+      *_tao_obj_ptr = Simple_Server::_duplicate (_tao_elem);
+      _tao_any.replace (_tc_Simple_Server, _tao_obj_ptr, 1, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      delete _tao_obj_ptr;
+    }
+    ACE_ENDTRY;
+  }
+
+  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Simple_Server_ptr &_tao_elem)
+  {
+    CORBA::Object_ptr *tmp = 0;
+    ACE_TRY_NEW_ENV
+    {
+      _tao_elem = Simple_Server::_nil ();
+      CORBA::TypeCode_var type = _tao_any.type ();
+      if (!type->equal (_tc_Simple_Server, ACE_TRY_ENV)) return 0; // not equal
+      ACE_TRY_CHECK;
+      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      CORBA::Object_var _tao_obj_var;
+      ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
+      if (stream.decode (_tc_Simple_Server, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
+         == CORBA::TypeCode::TRAVERSE_CONTINUE)
+      {
+        _tao_elem = Simple_Server::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
+        ((CORBA::Any *)&_tao_any)->replace (_tc_Simple_Server, tmp, 1, ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        return 1;
+      }
+      // failure
+    }
+    ACE_CATCHANY
+    {
+      delete tmp;
+      return 0;
+    }
+    ACE_ENDTRY;
+    return 0;
+  }
+
+// skeleton constructor
+POA_AMI_Simple_Server_Handler::POA_AMI_Simple_Server_Handler (void)
+{
+}
+
+// copy ctor
+POA_AMI_Simple_Server_Handler::POA_AMI_Simple_Server_Handler (const POA_AMI_Simple_Server_Handler& rhs)
+  :   TAO_ServantBase (rhs)
+{}
+
+// skeleton destructor
+POA_AMI_Simple_Server_Handler::~POA_AMI_Simple_Server_Handler (void)
+{
+}
+
+void POA_AMI_Simple_Server_Handler::_is_a_skel (
+    CORBA::ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *) _tao_object_reference;
+  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_TRY_ENV);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+void POA_AMI_Simple_Server_Handler::_non_existent_skel (
+    CORBA::ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+CORBA::Boolean POA_AMI_Simple_Server_Handler::_is_a (
+    const char* value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  if (
+    (!ACE_OS::strcmp ((char *)value, "IDL:AMI_Simple_Server_Handler:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      return 1;
+    else
+      return 0;
+}
+
+void* POA_AMI_Simple_Server_Handler::_downcast (
+    const char* logical_type_id
+  )
+{
+  if (ACE_OS::strcmp (logical_type_id, "IDL:AMI_Simple_Server_Handler:1.0") == 0)
+    return ACE_static_cast (POA_AMI_Simple_Server_Handler_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 0;
+}
+
+void POA_AMI_Simple_Server_Handler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_Skeleton skel; // pointer to skeleton for operation
+  const char *opname = req.operation (); // retrieve operation name
+  // find the skeleton corresponding to this opname
+  if (this->_find (opname, skel, req.operation_length ()) == -1)
+  {
+    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    ACE_THROW (CORBA_BAD_OPERATION ());
+  }
+  else
+    skel (req, this, context, ACE_TRY_ENV);
+}
+
+const char* POA_AMI_Simple_Server_Handler::_interface_repository_id (void) const
+{
+  return "IDL:AMI_Simple_Server_Handler:1.0";
+}
+
+
+AMI_Simple_Server_Handler*
+POA_AMI_Simple_Server_Handler::_this (CORBA_Environment &ACE_TRY_ENV)
+{
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  return new _tao_collocated_AMI_Simple_Server_Handler (this, stub);
+}
+
+void*
+POA_AMI_Simple_Server_Handler::_create_collocated_objref (const char* repository_id, CORBA::ULong type, TAO_Stub *stub)
+{
+  if (!ACE_OS::strcmp ("IDL:AMI_Simple_Server_Handler:1.0", repository_id))
+    return ACE_static_cast (
+         AMI_Simple_Server_Handler_ptr,
+        new _tao_collocated_AMI_Simple_Server_Handler (this, stub)
+      );
+  return 0;
+}
+
+void
+POA_AMI_Simple_Server_Handler::get_number (CORBA::Long l, CORBA::Environment &)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P | %t):POA_AMI_Simple_Server_Handler::get_number = %d\n",
+              l));
+}
+
+void
+POA_AMI_Simple_Server_Handler::get_number_skel (CORBA::ServerRequest &_tao_server_request,
+                                                void *_tao_object_reference,
+                                                void *_tao_context, 
+                                                CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_AMI_Simple_Server_Handler *_tao_impl = (POA_AMI_Simple_Server_Handler *)_tao_object_reference;
+
+  CORBA::Long l;
+  if (!(
+    (_tao_in >> l)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
+
+  _tao_impl->get_number (
+    l);
+  ACE_CHECK;
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+}
+
+// *********************************************************************
+
+_tao_collocated_AMI_Simple_Server_Handler::_tao_collocated_AMI_Simple_Server_Handler (
+    POA_AMI_Simple_Server_Handler_ptr  servant,
+    TAO_Stub *stub
+  )
+  : AMI_Simple_Server_Handler (),
+    CORBA_Object (stub, servant, 1),
+    servant_ (servant)
+{
+}
+
+CORBA::Boolean _tao_collocated_AMI_Simple_Server_Handler::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+    {
+      TAO_Object_Adapter::Servant_Upcall servant_upcall (
+          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+        );
+      servant_upcall.prepare_for_upcall (
+          this->_object_key (),
+          "_is_a",
+          ACE_TRY_ENV
+        );
+      ACE_CHECK_RETURN (0);
+      return ACE_reinterpret_cast (
+          POA_AMI_Simple_Server_Handler_ptr,
+          servant_upcall.servant ()->_downcast (
+              "IDL:AMI_Simple_Server_Handler:1.0"
+            )
+        )->_is_a (logical_type_id, ACE_TRY_ENV);
+    }
+  return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
+}
+
+
+POA_AMI_Simple_Server_Handler_ptr _tao_collocated_AMI_Simple_Server_Handler::_get_servant (void) const
+{
+  return this->servant_;
+}
+
+CORBA::Boolean _tao_collocated_AMI_Simple_Server_Handler::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+    {
+      TAO_Object_Adapter::Servant_Upcall servant_upcall (
+          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+        );
+      servant_upcall.prepare_for_upcall (
+          this->_object_key (),
+          "_non_existent",
+          ACE_TRY_ENV
+        );
+      ACE_CHECK_RETURN (0);
+      return ACE_reinterpret_cast (
+          POA_AMI_Simple_Server_Handler_ptr,
+          servant_upcall.servant ()->_downcast (
+              "IDL:AMI_Simple_Server_Handler:1.0"
+            )
+        )->_non_existent (ACE_TRY_ENV);
+    }
+  return this->servant_->_non_existent (ACE_TRY_ENV);
+}
+
+void
+_tao_collocated_AMI_Simple_Server_Handler::get_number  (CORBA::Long l, CORBA::Environment &)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  if (this->_stubobj ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+    {
+      TAO_Object_Adapter::Servant_Upcall servant_upcall (
+          *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+        );
+      servant_upcall.prepare_for_upcall (
+          this->_object_key (),
+          "get_number",
+          ACE_TRY_ENV
+        );
+      ACE_CHECK;
+      ACE_reinterpret_cast (
+          POA_AMI_Simple_Server_Handler_ptr,
+          servant_upcall.servant ()->_downcast (
+              "IDL:AMI_Simple_Server_Handler:1.0"
+            )
+        )->get_number (
+          l);
+      return;
+    }
+  this->servant_->get_number (
+      l );
+
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class TAO_Object_Field_T<Simple_Server>;
+    template class TAO_Object_Field_T<AMI_Simple_Server_Handler>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Field_T<Simple_Server>
+  #  pragma instantiate TAO_Object_Field_T<AMI_Simple_Server_Handler>
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tests/AMI/test.idl b/TAO/tests/AMI/test.idl
new file mode 100644
index 00000000000..376da4a58c6
--- /dev/null
+++ b/TAO/tests/AMI/test.idl
@@ -0,0 +1,16 @@
+/*
+ * $Id$
+ */
+
+interface Simple_Server
+{
+  // void test_method ();
+
+  long get_number ();
+
+  // void put_number (in long l);
+
+  // long get_put_number (out long out_l, in long in_l);
+ 
+  // oneway void shutdown ();
+};
diff --git a/TAO/tests/AMI/test_i.cpp b/TAO/tests/AMI/test_i.cpp
new file mode 100644
index 00000000000..1b199315a26
--- /dev/null
+++ b/TAO/tests/AMI/test_i.cpp
@@ -0,0 +1,62 @@
+// $Id$
+
+#include "test_i.h"
+#include "tao/debug.h"
+
+#if !defined(__ACE_INLINE__)
+#include "test_i.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(MT_Client, test_i, "$Id$")
+
+void
+Simple_Server_i::test_method (CORBA::Environment&)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Simple_Server_i::test_method called\n"));
+}
+
+CORBA::Long
+Simple_Server_i::get_number (CORBA::Environment&)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Simple_Server_i::get_number called\n"));
+  return this->number_++;
+}
+
+void
+Simple_Server_i::put_number (CORBA::Long l,
+                             CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Simple_Server_i::put_number: %d\n",
+                l));
+}
+
+CORBA::Long
+Simple_Server_i::get_put_number (CORBA::Long_out out_l,
+                                 CORBA::Long in_l,
+                                 CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  out_l = 931233;
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Simple_Server_i::get_put_number:  %d\n",
+                in_l));
+
+  return 931234;
+}
+
+void
+Simple_Server_i::shutdown (CORBA::Environment&)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0);
+}
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/AMI/test_i.h
index 74a62f9800a..c050a2795d8 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/AMI/test_i.h
@@ -3,7 +3,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//   TAO/tests/Timeout
+//   TAO/tests/MT_Client
 //
 // = FILENAME
 //   test_i.h
@@ -13,8 +13,8 @@
 //
 // ============================================================================
 
-#ifndef TAO_TIMEOUT_TEST_I_H
-#define TAO_TIMEOUT_TEST_I_H
+#ifndef TAO_MT_CLIENT_TEST_I_H
+#define TAO_MT_CLIENT_TEST_I_H
 
 #include "testS.h"
 
@@ -31,20 +31,32 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs,
-                    CORBA::Environment&)
+  void test_method (CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Long get_number (CORBA::Environment&)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void put_number (CORBA::Long l,
+                   CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Long get_put_number (CORBA::Long_out out_l,
+                              CORBA::Long in_l,
+                              CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   void shutdown (CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   CORBA::ORB_var orb_;
-  // The ORB
+
+  CORBA::Long number_;
 };
 
 #if defined(__ACE_INLINE__)
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_TIMEOUT_TEST_I_H */
+#endif /* TAO_MT_CLIENT_TEST_I_H */
diff --git a/TAO/tests/AMI/test_i.i b/TAO/tests/AMI/test_i.i
new file mode 100644
index 00000000000..d079ad0ae1c
--- /dev/null
+++ b/TAO/tests/AMI/test_i.i
@@ -0,0 +1,8 @@
+// $Id$
+
+ACE_INLINE
+Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb)),
+     number_ ((CORBA::Long) 931232)
+{
+}
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 3b8476e4d13..0fffa598c4f 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -35,7 +35,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -179,25 +178,16 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -245,9 +235,13 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -436,25 +430,16 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -502,9 +487,13 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -697,25 +686,16 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -763,9 +743,13 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -954,25 +938,16 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1020,9 +995,13 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1215,25 +1194,16 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1281,9 +1251,13 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index b279cd8688c..f7518b626bb 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -276,8 +276,9 @@ main (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Basic_Types");
-      return 1;
+      ACE_TRY_ENV.print_exception ("TC");
+      return 0;
+
     }
   ACE_ENDTRY;
 
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 942994a94f6..adaa00b138b 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0,
-                                            ACE_TRY_ENV);
+					    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       static const CORBA::TypeCode_ptr tcs[]=
@@ -100,55 +100,54 @@ main (int argc, char *argv[])
       for (const CORBA::TypeCode_ptr *i = tcs;
            i != tcs + n;
            ++i)
-        {
-          CORBA::TypeCode_ptr tc = *i;
+	{
+	  CORBA::TypeCode_ptr tc = *i;
 
-          CORBA::TCKind k = tc->kind (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+	  CORBA::TCKind k = tc->kind (ACE_TRY_ENV);
+	  ACE_TRY_CHECK;
 
-          switch (k)
-            {
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-              {
-                const char *id = tc->id (ACE_TRY_ENV);
-                ACE_TRY_CHECK;
+	  switch (k)
+	    {
+	    case CORBA::tk_objref:
+	    case CORBA::tk_struct:
+	    case CORBA::tk_union:
+	    case CORBA::tk_enum:
+	    case CORBA::tk_alias:
+	    case CORBA::tk_except:
+	      {
+		const char *id = tc->id (ACE_TRY_ENV);
+		ACE_TRY_CHECK;
 
-                const char *name = tc->name (ACE_TRY_ENV);
-                ACE_TRY_CHECK;
+		const char *name = tc->name (ACE_TRY_ENV);
+		ACE_TRY_CHECK;
 
-                CORBA::ULong length = 0;
+		CORBA::ULong length = 0;
                 // tc->length (TAO_TRY_ENV);
-                            // ACE_TRY_CHECK;
+		            // ACE_TRY_CHECK;
 
-                ACE_DEBUG ((LM_DEBUG,
-                            "ID = '%s'\n"
-                            "%{%{ NAME = %s%$"
-                            " KIND = %d%$"
-                            " LENGTH = %d"
-                            "%}%}\n",
-                            (id?id:"empty ID"),
+		ACE_DEBUG ((LM_DEBUG,
+			    "ID = '%s'\n"
+			    "%{%{ NAME = %s%$"
+			    " KIND = %d%$"
+			    " LENGTH = %d"
+			    "%}%}\n",
+			    (id?id:"empty ID"),
                             (name?name:"empty name"),
                             k,
                             length));
                 break;
-              }
-            default:
+	      }
+	    default:
               ACE_DEBUG ((LM_DEBUG,
                           "basic type: %d\n",
                           k));
               break;
-            }
-        }
+	    }
+	}
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TC");
-      return 1;
+      ACE_TRY_ENV.print_exception ("TC");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index de67c60ff1b..130e91bad0d 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -37,7 +37,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -176,25 +175,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -242,9 +232,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -324,7 +318,8 @@ realclean:	clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- da_testsC.i
+ da_testsC.i da_testsS.h da_testsS_T.h da_testsS_T.i da_testsS_T.cpp \
+ da_testsS.i
 .obj/da_testsS.o .obj/da_testsS.so .shobj/da_testsS.o .shobj/da_testsS.so: da_testsS.cpp da_testsS.h da_testsC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -434,25 +429,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -500,9 +486,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -692,25 +682,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -758,9 +739,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -952,25 +937,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1018,9 +994,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1211,25 +1191,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1277,9 +1248,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1469,25 +1444,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1535,9 +1501,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1727,25 +1697,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1793,9 +1754,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1985,25 +1950,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2051,9 +2007,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2243,25 +2203,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2309,9 +2260,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2501,25 +2456,16 @@ realclean:	clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2567,9 +2513,13 @@ realclean:	clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2650,19 +2600,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  da_testsC.h da_testsC.i data.h
-.obj/test_wrapper.o .obj/test_wrapper.so .shobj/test_wrapper.o .shobj/test_wrapper.so: test_wrapper.cpp test_wrapper.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
+.obj/test_wrapper.o .obj/test_wrapper.so .shobj/test_wrapper.o .shobj/test_wrapper.so: test_wrapper.cpp test_wrapper.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index a3e8baa33ce..d5f1f8028f0 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -1,19 +1,18 @@
 /* -*- C++ -*- */
 //
 // $Id$
+//
 
 #include <orb.idl>
 
 module DynAnyTests
 {
-  struct enclosed_struct 
-  {
+  struct enclosed_struct {
     float f;
     short s;
   };
 
-  struct test_struct 
-  {
+  struct test_struct {
     char c;
     long long ll;
     enclosed_struct es;
@@ -24,8 +23,7 @@ module DynAnyTests
   const unsigned long DIM = 2;
   typedef long test_array [DIM];
 
-  enum test_enum 
-  {
+  enum test_enum {
     TE_ZEROTH,
     TE_FIRST,
     TE_SECOND,
@@ -34,13 +32,13 @@ module DynAnyTests
 
   union test_union switch (test_enum)
     {
-    case TE_SECOND:
-      CORBA::TypeCode tc;
-    case TE_FIRST:
-      short s;
-    case TE_THIRD:
-      string str;
-    case TE_ZEROTH:
-      octet o;
+      case TE_SECOND:
+        CORBA::TypeCode tc;
+      case TE_FIRST:
+        short s;
+      case TE_THIRD:
+        string str;
+      case TE_ZEROTH:
+        octet o;
     };
 };
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 7d37da22d9b..a19649f6cab 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -39,74 +39,63 @@ Data::Data (CORBA::ORB_var orb)
     m_any1 (CORBA::_tc_long),
     orb_ (orb)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      labels[0] = "type boolean";
-      labels[1] = "type octet";
-      labels[2] = "type char";
-      labels[3] = "type short";
-      labels[4] = "type long",
-      labels[5] = "type ushort";
-      labels[6] = "type ulong";
-      labels[7] = "type float";
-      labels[8] = "type double";
-      labels[9] = "type longlong";
-      labels[10] = "type ulonglong";
-      labels[11] = "type string";
-      labels[12] = "type typecode";
-      labels[13] = "type wchar";
-      labels[14] = "type any";
-      labels[15] = "type objref";
-
-      // Getting the RootPOA so we can generate object references.
-      CORBA::Object_var obj = 
-        this->orb_->resolve_initial_references ("RootPOA", 
-                                                ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (obj.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Unable to get root poa reference.\n"));
-        }
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), 
-                                      ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      // Generate values for the member variables.
-     this->m_objref1 =
-        root_poa->create_reference ("foo", 
-                                    ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      this->m_objref2 =
-        root_poa->create_reference ("foo", 
-                                    ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      // Clean up after the POA
-      root_poa->destroy (1,
-                        1,
-                        ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in ORB/POA init\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Environment env;
+
+  labels[0] = "type boolean";
+  labels[1] = "type octet";
+  labels[2] = "type char";
+  labels[3] = "type short";
+  labels[4] = "type long",
+  labels[5] = "type ushort";
+  labels[6] = "type ulong";
+  labels[7] = "type float";
+  labels[8] = "type double";
+  labels[9] = "type longlong";
+  labels[10] = "type ulonglong";
+  labels[11] = "type string";
+  labels[12] = "type typecode";
+  labels[13] = "type wchar";
+  labels[14] = "type any";
+  labels[15] = "type objref";
+
+  // Getting the RootPOA so we can generate object references.
+  CORBA::Object_var obj = 
+    this->orb_->resolve_initial_references ("RootPOA");
+
+  if (CORBA::is_nil (obj.in ()))
+    ACE_ERROR ((LM_ERROR,
+                "(%P|%t) Unable to get root poa reference.\n"));
+
+  // Get the POA_var object from Object_var.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), 
+                                  env);
+
+  if (env.exception () != 0)
+    env.print_exception ("PortableServer::POA::_narrow");
+
+  // Generate values for the member variables.
+  this->m_objref1 =
+    root_poa->create_reference ("foo", 
+                                env);
+
+  if (env.exception () != 0)
+    env.print_exception ("PortableServer::POA::create_reference_with_id");
+
+  this->m_objref2 =
+    root_poa->create_reference ("foo", 
+                                env);
+
+  if (env.exception () != 0)
+    env.print_exception ("PortableServer::POA::create_reference_with_id");
+  
+  // Clean up after the POA
+  root_poa->destroy (1,
+                     1,
+                     env);
+
+  if (env.exception () != 0)
+    env.print_exception ("PortableServer::POA::destroy");
 }
 
 Data::~Data (void)
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index aa7cac1fdd1..d96b05a63c7 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -83,8 +83,7 @@ Driver::init (int argc, char* argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Driver::init");
+      ACE_TRY_ENV.print_exception ("Driver::init");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 408e5e57bff..6cfa81ec63d 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -166,8 +166,7 @@ Test_DynAny::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynany::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynany::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 0c0ed4ccc6e..739b7f2164b 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -146,8 +146,7 @@ Test_DynArray::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynarray::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynarray::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 7dfea04b81b..d09fa7796c7 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -117,8 +117,7 @@ Test_DynEnum::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynenum::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynenum::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 372ddbe2100..022a5865737 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -159,8 +159,7 @@ Test_DynSequence::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynsequence::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynsequence::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 144f26fa7d5..fe2a34bdd6c 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -179,8 +179,7 @@ Test_DynStruct::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynstruct::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynstruct::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index e74a02b2415..dc755f94a58 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -157,8 +157,7 @@ Test_DynUnion::run_test (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynunion::run_test");
+      ACE_TRY_ENV.print_exception ("test_dynunion::run_test");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile
index 0c64e60b6c3..20ae088cdc7 100644
--- a/TAO/tests/FL_Cube/Makefile
+++ b/TAO/tests/FL_Cube/Makefile
@@ -26,7 +26,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -168,25 +167,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -234,9 +224,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -428,25 +422,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -494,9 +479,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -688,25 +677,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -754,9 +734,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -836,7 +820,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
+ testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -946,25 +930,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1012,9 +987,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1204,25 +1183,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1270,9 +1240,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
index be6fb27be83..37133810cc8 100644
--- a/TAO/tests/FL_Cube/svc.conf
+++ b/TAO/tests/FL_Cube/svc.conf
@@ -1,3 +1,3 @@
 # $Id$
 #
-static Resource_Factory "-ORBReactorType fl"
+static Resource_Factory "-ORBReactorType fl_reactor"
diff --git a/TAO/tests/Faults/Faults.dsw b/TAO/tests/Faults/Faults.dsw
deleted file mode 100644
index 4384f81a25a..00000000000
--- a/TAO/tests/Faults/Faults.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Faults Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Faults Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Faults/Makefile b/TAO/tests/Faults/Makefile
deleted file mode 100644
index 6ed49d56258..00000000000
--- a/TAO/tests/Faults/Makefile
+++ /dev/null
@@ -1,1357 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#       $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
-
-CLIENT_OBJS = client.o test_i.o $(addsuffix .o, $(IDLFILES))
-SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Faults/README b/TAO/tests/Faults/README
deleted file mode 100644
index 4994b397e2a..00000000000
--- a/TAO/tests/Faults/README
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-	A little test to check the the ORB can handle server and
-client crashes.  It is a bit tricky to run so better check the
-run_test.pl script for details.
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
deleted file mode 100644
index 9eaee0f54a8..00000000000
--- a/TAO/tests/Faults/client.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-
-ACE_RCSID(Failure, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 10;
-int do_shutdown = 0;
-int do_suicide = 0;
-int do_self_shutdown = 0;
-int do_abort = 0;
-int do_crash = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "acszxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'a':
-        do_abort = 1;
-        break;
-
-      case 'c':
-        do_crash = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 1;
-        break;
-
-      case 's':
-        do_suicide = 1;
-        break;
-
-      case 'z':
-        do_self_shutdown = 1;
-        break;
-
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "[-a] [-c] [-x] [-s] [-z] "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "\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_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      Callback_i callback_impl (orb.in ());
-
-      Callback_var callback =
-        callback_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i != niterations; ++i)
-        {
-          CORBA::Long r =
-            server->test_method (0, 0, callback.in (),
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (r != 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) unexpected result = %d for %d",
-                          r, i));
-            }
-        }
-
-      if (do_abort)
-        {
-          ACE_TRY_EX(ABORT)
-            {
-              server->shutdown_now (0, ACE_TRY_ENV);
-              ACE_TRY_CHECK_EX(ABORT);
-            }
-          ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
-            {
-              ACE_UNUSED_ARG (comm_failure);
-              // Expected exception, continue....
-            }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
-        }
-      else if (do_crash)
-        {
-          ACE_TRY_EX(CRASH)
-            {
-              server->shutdown_now (1, ACE_TRY_ENV);
-              ACE_TRY_CHECK_EX(CRASH);
-            }
-          ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
-            {
-              ACE_UNUSED_ARG (comm_failure);
-              // Expected exception, continue....
-            }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
-        }
-      else if (do_suicide)
-        {
-          (void) server->test_method (1, 0, callback.in (),
-                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
-        }
-      else if (do_self_shutdown)
-        {
-          (void) server->test_method (1, 1, callback.in (),
-                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      if (do_shutdown)
-        {
-          server->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl
deleted file mode 100755
index 3cfb8055af6..00000000000
--- a/TAO/tests/Faults/run_test.pl
+++ /dev/null
@@ -1,112 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../bin';
-require ACEutils;
-
-$iorfile = "test.ior";
-$status = 0;
-
-print STDERR "===== Base test, no crashes\n";
-unlink $iorfile;
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-		       " -k file://$iorfile"
-		       . " -i 100");
-
-$client = $CL->TimedWait (20);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-print STDERR "===== Client crash (abort) during upcall\n";
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-		       " -k file://$iorfile"
-		       . " -i 100 -s");
-
-$client = $CL->TimedWait (20);
-if ($client == -1) {
-  print STDERR "ERROR: client (-s) timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-print STDERR "===== Client crash during upcall\n";
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-		       " -k file://$iorfile"
-		       . " -i 100 -z");
-
-$client = $CL->TimedWait (20);
-if ($client == -1) {
-  print STDERR "ERROR: client (-z) timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-print STDERR "===== Server crash (abort) during upcall\n";
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-		       " -k file://$iorfile"
-		       . " -i 100 -a");
-
-$client = $CL->TimedWait (20);
-if ($client == -1) {
-  print STDERR "ERROR: client (-a) timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-$server = $SV->TimedWait (20);
-if ($server == -1) {
-  print STDERR "ERROR: server (-a) timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
-
-print STDERR "===== Server crash during upcall\n";
-
-unlink $iorfile;
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-		       " -k file://$iorfile"
-		       . " -i 100 -c");
-
-$client = $CL->TimedWait (20);
-if ($client == -1) {
-  print STDERR "ERROR: client (-c) timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-$server = $SV->TimedWait (20);
-if ($server == -1) {
-  print STDERR "ERROR: server (-c) timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Faults/test.idl b/TAO/tests/Faults/test.idl
deleted file mode 100644
index 9ee2052e8b8..00000000000
--- a/TAO/tests/Faults/test.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// $Id$
-//
-
-interface Callback
-{
-  oneway void shutdown (in boolean is_clean);
-  // A safe way to shutdown the client, using either clean shutdowns
-  // or "catastrophic failures".
-};
-
-interface Simple_Server
-{
-  long test_method (in boolean do_callback,
-                    in boolean is_clean,
-                    in Callback cb);
-  // Just call a method on the server, we can pass a callback object
-  // so the server can be tested for client shutdowns.
-
-  void shutdown_now (in boolean is_clean);
-  // An unsafe way to shutdown the server, we can even ask for a
-  // "catastrophic crash" (implemented using abort())
-
-  oneway void shutdown ();
-  // A safe way to shutdown the server, it is a oneway function so we
-  // will never get a COMM_FAILURE error
-};
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
deleted file mode 100644
index 64864155998..00000000000
--- a/TAO/tests/Faults/test_i.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Failure, test_i, "$Id$")
-
-void
-Callback_i::shutdown (CORBA::Boolean is_clean,
-                      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (is_clean == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n%a"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-      this->orb_->shutdown (0, ACE_TRY_ENV);
-    }
-}
-
-CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback,
-                              CORBA::Boolean is_clean,
-                              Callback_ptr callback,
-                              CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (do_callback)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n",
-                  is_clean));
-      callback->shutdown (is_clean, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  ACE_Time_Value tv (0, 50000);
-  ACE_OS::sleep (tv);
-  return 0;
-}
-
-void
-Simple_Server_i::shutdown_now (CORBA::Boolean is_clean,
-                               CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (is_clean == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown %a\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-      this->orb_->shutdown (0, ACE_TRY_ENV);
-    }
-}
-
-void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0, ACE_TRY_ENV);
-}
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
deleted file mode 100644
index c499cefcab1..00000000000
--- a/TAO/tests/Faults/test_i.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_FAILURE_TEST_I_H
-#define TAO_FAILURE_TEST_I_H
-
-#include "testS.h"
-
-class Callback_i : public POA_Callback
-{
-  // = TITLE
-  //   A callback object to shutdown the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can tolerate client crashes the server
-  //   receives a callback object.
-  //
-public:
-  Callback_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  void shutdown (CORBA::Boolean is_clean,
-                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The callback method
-
-private:
-  CORBA::ORB_var orb_;
-  // The orb
-};
-
-class Simple_Server_i : public POA_Simple_Server
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback,
-                           CORBA::Boolean is_clean,
-                           Callback_ptr callback,
-                           CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown_now (CORBA::Boolean is_clean,
-                     CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_FAILURE_TEST_I_H */
diff --git a/TAO/tests/Faults/test_i.i b/TAO/tests/Faults/test_i.i
deleted file mode 100644
index af4b8fdf012..00000000000
--- a/TAO/tests/Faults/test_i.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Callback_i::Callback_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
diff --git a/TAO/tests/IORManipulation/IORManipulation.dsw b/TAO/tests/IORManipulation/IORManipulation.dsw
deleted file mode 100644
index a8cb17c0f5f..00000000000
--- a/TAO/tests/IORManipulation/IORManipulation.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "IORTest"=.\IORTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
deleted file mode 100644
index 54c840cfcf5..00000000000
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/IORManipultion
-//
-//
-// = FILENAME
-//     IORTest.cpp
-//
-// = DESCRIPTION
-//   This program tests the basic functionality of the
-//   IOR Manipultion interface.
-//
-// = AUTHOR
-//     Fred Kuhns
-//
-//=========================================================================
-
-
-#include "tao/corbafwd.h"
-#include "tao/ORB.h"
-#include "tao/IORManipulation.h"
-#include "tao/corbafwd.h"
-#include "tao/ORB.h"
-#include "tao/IORManipulation.h"
-#include "tao/IORS.h"
-#include "ace/SString.h"
-
-ACE_RCSID(IORManipluation, IORTest, "$Id$")
-
-int
-main (int argc, char **argv)
-{
-
-  int Status = 0;
-  CORBA::ORB_var orb_;
-  ACE_DEBUG ((LM_DEBUG, "----------------------------------\n"));
-  ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
-                              0,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      // ***********************************************************************
-
-      // Get an object reference for the ORBs IORManipultion object!
-      CORBA_Object_ptr IORM =
-        orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                          0,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      // ***********************************************************************
-
-      // Create a few fictitious IORs
-      CORBA_Object_ptr name1 =
-        orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA_Object_ptr name2 =
-        orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      // ***********************************************************************
-
-      // Get the string reps for these IORs and show them to the user
-      ACE_CString iorm_ior = orb_->object_to_string (IORM, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "\tIORManipultion IOR string = %s\n", iorm_ior.c_str()));
-
-      ACE_CString name1_ior = orb_->object_to_string (name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.c_str()));
-
-      ACE_CString name2_ior = orb_->object_to_string (name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.c_str()));
-
-      // ***********************************************************************
-      // Create IOR list for use with merge_iors.
-      TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
-      iors.length(2);
-      iors [0] = name1;
-      iors [1] = name2;
-
-      CORBA_Object_ptr merged = iorm->merge_iors (iors, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString merged_ior = orb_->object_to_string (merged, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::ULong count1 = iorm->get_profile_count (iors [0], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::ULong count2 = iorm->get_profile_count (iors [1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::ULong count = iorm->get_profile_count (merged, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count != (count1 + count2))
-        ACE_DEBUG ((LM_DEBUG, "**ERROR (merge_profiles): Merged profile count incorrect!\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "\tMerged IOR(%d) = %s\n", count, merged_ior.c_str()));
-
-      // is_in_ior throws an exception if the intersection of the two
-      // IORs is NULL.
-      CORBA::ULong in_count = iorm->is_in_ior (merged, name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count1 != in_count)
-        printf ("**ERROR (merge_iors): name1 is_in_ior returned profile count bad (%d)!\n",
-                in_count);
-
-      in_count = iorm->is_in_ior (merged, name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count2 != in_count)
-        printf ("**ERROR (merge_iors): name2 is_in_ior returned profile count bad (%d)!\n",
-                in_count);
-      // ***********************************************************************
-
-      // Verify ability to remove profiles from an IOR
-      // First remove the second IOR from the merged IOR
-      CORBA_Object_ptr just1 = iorm->remove_profiles (merged, name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString just1_ior = orb_->object_to_string (just1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      count = iorm->get_profile_count (just1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count1 != count)
-        ACE_DEBUG ((LM_DEBUG, "**ERROR (merge_profiles): removing last IOR after a merge_iors ()\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "\tJust 1 IOR(%d) = %s\n", count, just1_ior.c_str ()));
-
-      in_count = iorm->is_in_ior (just1, name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count1 != in_count)
-        printf ("**ERROR (merge_profiles): incorrect count returned for is_in_ior\
-                \nafter removal (%d)\n", in_count);
-      // ***********************************************************************
-
-      // Now try the add_profiles interface.
-      CORBA_Object_ptr merged2 = iorm->add_profiles (just1, name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      count = iorm->get_profile_count (merged2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count != (count1 + count2))
-        ACE_DEBUG ((LM_DEBUG, "**ERROR: add_profile failed profile count test!\n"));
-
-      ACE_CString merged2_ior = orb_->object_to_string (merged2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "\tAdding 2 back in IOR(%d) = %s\n", count, merged2_ior.c_str ()));
-
-      // is_in_ior throws an exception if the intersection of the two
-      // IORs is NULL.
-      in_count = iorm->is_in_ior (merged2, name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count1 != in_count)
-        printf ("**ERROR (add_profiles): is_in_ior returned profile count bad (%d)!\n",
-                 in_count);
-
-      in_count = iorm->is_in_ior (merged2, name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count2 != in_count)
-        ACE_DEBUG ((LM_DEBUG, "**ERROR (add_profiles): is_in_ior returned profile count bad!\n"));
-      // ***********************************************************************
-
-      CORBA_Object_ptr just2 = iorm->remove_profiles (merged2, name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString just2_ior = orb_->object_to_string (just2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      count = iorm->get_profile_count (just2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count2 != count)
-        ACE_DEBUG ((LM_DEBUG, "ERROR removing last IOR after a merge_iors ()\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "\tJust 2 IOR(%d) = %s\n", count, just2_ior.c_str ()));
-
-      in_count = iorm->is_in_ior (just2, name2, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (count2 != in_count)
-        ACE_DEBUG ((LM_DEBUG,
-                    "**ERROR (add_profiles): incorrect count (%d) "
-                    "returned for is_in_ior after removal\n",
-                    in_count));
-
-      // all the primary tests worked, set status to 1
-      Status = 1;
-      // Finally generate an exception and quit.
-      // This will generate a NotFound exception.
-      in_count = iorm->is_in_ior (just2, name1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-    }
-    ACE_CATCH (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList, userex)
-      {
-        ACE_UNUSED_ARG (userex);
-        ACE_DEBUG ((LM_DEBUG, "Unexpected EmptyProfileList Exception!\n"));
-        return -1;
-      }
-    ACE_CATCH (TAO_IOP::TAO_IOR_Manipulation::NotFound, userex)
-      {
-        ACE_UNUSED_ARG (userex);
-        if (Status == 1)
-          {
-            Status = 2;
-            ACE_DEBUG ((LM_DEBUG, "Caught NotFound Exception!\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Unexpected NotFound Exception!\n"));
-            return -1;
-          }
-      }
-    ACE_CATCH (TAO_IOP::TAO_IOR_Manipulation::Duplicate, userex)
-      {
-        ACE_UNUSED_ARG (userex);
-        ACE_DEBUG ((LM_DEBUG, "Unexpected Duplicate Exception!\n"));
-        return -1;
-      }
-    ACE_CATCH (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR, userex)
-      {
-        ACE_UNUSED_ARG (userex);
-        ACE_DEBUG ((LM_DEBUG, "Unexpected Invalid_IOR Exception!\n"));
-        return -1;
-      }
-    ACE_CATCH (CORBA::SystemException, sysex)
-      {
-        ACE_UNUSED_ARG (sysex);
-        ACE_DEBUG ((LM_DEBUG, "Unexpected system Exception!!\n"));
-        return -1;
-      }
-    ACE_CATCHANY
-      {
-        ACE_DEBUG ((LM_DEBUG, "Unexpected ACE_CATCHANY Exception!\n"));
-        return -1;
-      }
-  ACE_ENDTRY;
-
-  if (Status == 1)
-    {
-      // then exception didn't work!
-      ACE_DEBUG ((LM_DEBUG, "**ERROR: Unable to generate the NotFound exception!\n"));
-      Status = 0;
-    }
-  if (Status == 0)
-    ACE_DEBUG ((LM_DEBUG, "An ERROR occured during the tests!\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG, "Tests Successfully Completed!\n"));
-  ACE_DEBUG ((LM_DEBUG, "--------------------------------------\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/IORManipulation/IORTest.dsp b/TAO/tests/IORManipulation/IORTest.dsp
deleted file mode 100644
index 150fb0788c9..00000000000
--- a/TAO/tests/IORManipulation/IORTest.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IORTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=IORTest - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "IORTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "IORTest.mak" CFG="IORTest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IORTest - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IORTest - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "IORTest - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "IORTest - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "IORTest - Win32 Release"

-# Name "IORTest - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\IORTest.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/IORManipulation/Makefile b/TAO/tests/IORManipulation/Makefile
deleted file mode 100644
index 0c2920195bd..00000000000
--- a/TAO/tests/IORManipulation/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO 
-
-IDL_SRC = 
-
-PROG_SRCS = IORTest.cpp
-
-SRC = $(PROG_SRCS)
-
-SIMPLE_CLT_OBJS = IORTest.o
-SIMPLE_SVR_OBJS = 
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = IORTest
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-  BIN = $(BIN2)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-.PRECIOUS: 
-
-IORTest: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) -rf IORTest
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/IORTest.o .obj/IORTest.so .shobj/IORTest.o .shobj/IORTest.so: IORTest.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/IORManipulation/README b/TAO/tests/IORManipulation/README
deleted file mode 100644
index e3ca8562dc4..00000000000
--- a/TAO/tests/IORManipulation/README
+++ /dev/null
@@ -1,13 +0,0 @@
-This program test the basic operation of the 
-IORManipulation interface
-
-Run the application as follows.
-
-% run.pl
-
-Comments:
-========
-
-- The varios stages of the test are printed out.  Each
-  generated IOR and all error conditions.  Currently
-  the NotFound exception is tested for. 
diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl
deleted file mode 100755
index 9d3d2d78ccd..00000000000
--- a/TAO/tests/IORManipulation/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../bin';
-require Process;
-require ACEutils;
-
-$T = Process::Create ($EXEPREFIX."IORTest".$EXE_EXT);
-
-$client = $T->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $T->Kill (); $T->TimedWait (1);
-}
-
-if ($client == -1) {
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 9e0e07db934..90706e8f1a0 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -27,8 +27,6 @@ char *
 INS_i::test_ins (CORBA::Environment &env)
 ACE_THROW_SPEC (( CORBA::SystemException ))
 {
-  ACE_UNUSED_ARG (env);
-
   ACE_DEBUG ((LM_DEBUG,
               "Inside Operation\n"));
   return CORBA::string_dup ("Success");
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index 29538e30303..154bf690f08 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -7,79 +7,81 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+
+  CORBA::Environment ACE_TRY_ENV;
+
   ACE_TRY
     {
+
       // Retrieve a reference to the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
+                                             argv,
+                                             0,
+                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (argc < 2)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "No Name specified to be resolved\n"));
-          return 0;
         }
+      else
+        {
+          CORBA::Object_var objref =
+            orb_->resolve_initial_references (argv[1]);
 
-      CORBA::Object_var objref =
-        orb->resolve_initial_references (argv[1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (objref.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the given Name.\n"),
-                          -1);
+          if (CORBA::is_nil (objref.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               " (%P|%t) Unable to resolve the given Name.\n"),
+                              -1);
 
-      if (ACE_OS::strcmp (argv[1], "NameService") == 0)
-        {
-          CosNaming::NamingContext_var naming_context =
-            CosNaming::NamingContext::_narrow (objref.in (),
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (ACE_OS::strcmp (argv[1], "NameService") == 0)
+            {
               
-          ACE_DEBUG ((LM_DEBUG,
-                      "Resolved IOR for %s : %s\n",
-                      argv[1],
-                      orb->object_to_string (naming_context.in ())));
-
-          // Sanity check to see if the reference to Naming
-          // Context is alright.
-          CosNaming::Name my_name;
-          my_name.length (1);
-          my_name[0].id = CORBA::string_dup ("ObjName");
+              CosNaming::NamingContext_var naming_context =
+                CosNaming::NamingContext::_narrow (objref.in (),
+                                                   ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+              
+              ACE_DEBUG ((LM_DEBUG,
+                          "Resolved IOR for %s : %s\n",
+                          argv[1],
+                          orb_->object_to_string (naming_context.in ())));
 
-          naming_context->bind (my_name,
-                                objref.in (),
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+              // Sanity check to see if the reference to Naming Context is alright.
+              CosNaming::Name my_name;
+              my_name.length (1);
+              my_name[0].id = CORBA::string_dup ("ObjName");
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nBind successful on the resolved Naming Context\n"));
+              naming_context->bind (my_name,
+                                    objref.in (),
+                                    ACE_TRY_ENV);
+              ACE_TRY_CHECK;
 
-        }
-      else
-        {
-          INS_var server = INS::_narrow (objref.in (),
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+              ACE_DEBUG ((LM_DEBUG,
+                          "\nBind successful on the resolved Naming Context\n"));
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "Resolved IOR for %s : %s\n",
-                      argv[1],
-                      orb->object_to_string (server.in ())));
+            }
+          else
+            {
+              
+              INS_var server = INS::_narrow (objref.in (),
+                                             ACE_TRY_ENV);
+              ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nResult of Remote Call : %s\n",
-                      server->test_ins (ACE_TRY_ENV)));
+              ACE_DEBUG ((LM_DEBUG,
+                          "Resolved IOR for %s : %s\n",
+                          argv[1],
+                          orb_->object_to_string (server.in ())));
+              
+              ACE_DEBUG ((LM_DEBUG,
+                          "\nResult of Remote Call : %s\n",
+                          server->test_ins (ACE_TRY_ENV)));
+              
+            }
+          
         }
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, name)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[1]));
-    }
   ACE_CATCHANY
     {
        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
@@ -87,6 +89,10 @@ main (int argc, char *argv[])
 
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
+  
   return 0;
 }
+
+
+
+
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index 43f5d8866be..65da2b33a38 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -27,12 +27,14 @@ main (int argc, char *argv[])
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile
index cea11eedc21..b947a9338e6 100644
--- a/TAO/tests/InterOp-Naming/Makefile
+++ b/TAO/tests/InterOp-Naming/Makefile
@@ -52,12 +52,11 @@ BIN2 = \
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Naming
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -207,25 +206,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -273,9 +263,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -467,25 +461,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -533,9 +518,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -737,13 +726,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -796,6 +778,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1023,13 +1007,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1082,6 +1059,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index 7e0ea1ec769..a69c01f6d69 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -6,6 +6,7 @@
 
 Server_i::Server_i (void)
   : ior_output_file_ (0),
+    naming_ (0),
     ins_ (0)
 {
   // no-op.
@@ -39,10 +40,12 @@ Server_i::parse_args (void)
                              get_opts.optarg), -1);
         break;
 
-      case 'i': // For Testing the InterOperable Naming Service.
-        this->ins_ = CORBA::string_dup (get_opts.optarg);
+      case 'n': //Use naming service
+        this->naming_ = 1;
         break;
-
+      case 'i': // For Testing the InterOperable Naming Service.
+	this->ins_ = CORBA::string_dup (get_opts.optarg);
+	break;
       case '?':  // display help for use of the server.
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,30 +63,30 @@ Server_i::parse_args (void)
 }
 
 // Add the ObjectID:IOR mapping to the IOR table of
-// the ORB.
+// the ORB. 
 
 int
 Server_i::add_IOR_to_table (CORBA::String_var ior)
 {
-
+  
   CORBA::Object_ptr object =
     this->orb_manager_.orb ()->string_to_object (ior.in ());
-
+  
   // Add a KEY:IOR mapping to the ORB table.
   ACE_CString ins (this->ins_);
-
+  
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "Adding (KEY:IOR) %s:%s\n",
-                ins.c_str (),
-                ior.in ()));
-
+		"Adding (KEY:IOR) %s:%s\n",
+		ins.c_str (),
+		ior.in ()));
+  
   if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (ins,
-                                                        object) != 0)
+							object) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Simple_Util : Unable to add IOR to table\n"),
-                      -1);
-
+		       "Simple_Util : Unable to add IOR to table\n"),
+		      -1);
+  
   return 0;
 }
 
@@ -103,22 +106,22 @@ Server_i::init (int argc,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-
+  
   ACE_CHECK_RETURN (-1);
-
+  
   this->argc_ = argc;
   this->argv_ = argv;
-
+  
   int retval = this->parse_args ();
-
+  
   if (retval != 0)
     return retval;
-
+  
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Stash our ORB pointer for later reference.
   this->servant_.orb (orb.in ());
-
+  
   ACE_TRY
     {
       CORBA::String_var str  =
@@ -132,23 +135,23 @@ Server_i::init (int argc,
                   str.in ()));
 
       if (this->ins_)
-        if (this->add_IOR_to_table (str) != 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "test_for_ins (): failed\n"),
-                            -1);
-
+	if (this->add_IOR_to_table (str) != 0)
+	  ACE_ERROR_RETURN ((LM_ERROR,
+			     "test_for_ins (): failed\n"),
+			    -1);
+      
       if (this->ior_output_file_)
-        {
-          ACE_OS::fprintf (this->ior_output_file_,
-                           "%s",
-                           str.in ());
-          ACE_OS::fclose (this->ior_output_file_);
-        }
+	{
+	  ACE_OS::fprintf (this->ior_output_file_,
+			   "%s",
+			   str.in ());
+	  ACE_OS::fclose (this->ior_output_file_);
+	}
 
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException in activation of POA");
+      ACE_TRY_ENV.print_exception ("\tException in activation of POA");
       return -1;
     }
   ACE_ENDTRY;
@@ -164,6 +167,12 @@ Server_i::run (CORBA::Environment &env)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
-
+  
   return 0;
 }
+
+
+
+
+
+
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index cc606977c39..2b76a424a74 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -12,7 +12,7 @@
 //    The class is the driver for the INS test server.
 //
 // = AUTHOR
-//   Vishal Kachroo <vishal@cs.wustl.edu>
+//   Vishal Kachroo <vishal@cs.wustl.edu> 
 //
 // ============================================================================
 
@@ -37,17 +37,17 @@ public:
   ~Server_i (void);
   // Destructor.
 
-  int init (int argc,
-            char *argv[],
+  int init (int argc, 
+            char *argv[], 
             CORBA::Environment &env);
   // Initialize the Server state - parsing arguments and waiting.
 
   int add_IOR_to_table (CORBA::String_var ior);
   // Add an IOR to the ORB-IOR table.
-
+  
   int run (CORBA::Environment &env);
   // Run the orb.
-
+  
 protected:
 
   INS_i servant_;
@@ -66,6 +66,9 @@ protected:
   FILE *ior_output_file_;
   // File where the IOR of the server object is stored.
 
+  int naming_;
+  // Flag to indicate whether naming service could be used
+       
   char * ins_;
   // Used test the INS.
 
diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl
deleted file mode 100755
index aec5fbe794e..00000000000
--- a/TAO/tests/InterOp-Naming/run_test.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../bin';
-require Process;
-require ACEutils;
-
-$file="test.ior";
-
-$port = ACE::uniqueid () + 10000;
-
-print STDERR "\n\n==== InitRef test\n";
-
-unlink $file;
-
-$SV = Process::Create ($EXEPREFIX."INS_test_server".$EXE_EXT,
-                       "-ORBendpoint iiop://localhost:$port "
-                       . " -i object_name -o $file");
-
-if (ACE::waitforfile_timed ($file, 3) == -1) {
-  print STDERR "ERROR: cannot find file <$file>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " random_service "
-                       ."-ORBInitRef random_service="
-                       ."iioploc://localhost:$port/object_name");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-print STDERR "\n\n==== InvalidName test\n";
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " not_a_service "
-                       ."-ORBInitRef random_service="
-                       ."iioploc://localhost:$port/object_name");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-print STDERR "\n\n==== DefaultInitRef test\n";
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " object_name "
-                       . "-ORBDefaultInitRef"
-                       ." iioploc://localhost:$port");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-print STDERR "\n\n==== Multi endpoint test\n";
-
-$port1 = $port + 1;
-$port2 = $port + 2;
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " random_service "
-                       . "-ORBInitRef random_service="
-                       ."iioploc://"
-                       ."localhost:$port1,"
-                       ."localhost:$port2,"
-                       ."localhost:$port"
-                       ."/object_name");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-print STDERR "\n\n==== Multi endpoint default ref test\n";
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " object_name "
-                       . "-ORBDefaultInitRef "
-                       ."iioploc://"
-                       ."localhost:$port1,"
-                       ."localhost:$port2,"
-                       ."localhost:$port");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-print STDERR "\n\n==== Default ref with final '/'\n";
-
-$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
-                       " object_name "
-                       . "-ORBDefaultInitRef "
-                       ."iioploc://"
-                       ."localhost:$port/");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-$SV->Terminate (); $server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  unlink $file;
-  exit 1;
-}
-
-unlink $file;
-exit 0;
diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index a5bc72b71be..ab922f54110 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -27,7 +27,7 @@ SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -208,25 +208,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -274,9 +265,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -448,25 +443,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -514,9 +500,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -741,25 +731,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -807,9 +788,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1013,25 +998,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1079,9 +1055,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1250,25 +1230,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1316,9 +1287,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1398,7 +1373,7 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
+ testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1508,25 +1483,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1574,9 +1540,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1766,25 +1736,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1832,9 +1793,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/MT_Client/client.conf b/TAO/tests/MT_Client/client.conf
index 1d00531abb6..5276fe68900 100644
--- a/TAO/tests/MT_Client/client.conf
+++ b/TAO/tests/MT_Client/client.conf
@@ -1,3 +1,2 @@
-# $Id$
 
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index c8631ace720..a58df815751 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -142,17 +142,24 @@ Client::svc (void)
       ACE_TRY_CHECK;
 #endif
 
+      CORBA::Long number = 0;
+
       for (int i = 0; i < this->niterations_; ++i)
         {
-          CORBA::Long number =
-            server_->get_number (ACE_TRY_ENV);
+          number = server_->get_number (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (number == 931232);
 
+          //          ACE_DEBUG ((LM_DEBUG,
+          //                      "get_number = %d\n",
+          //                      number));
+
+          //server_->test_method (ACE_TRY_ENV);
+          //ACE_TRY_CHECK;
+
           if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d, %d\n",
-                        i, number));
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 1531e61c974..117441de000 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -132,16 +132,14 @@ Client::Client (int niterations,
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       for (int i = 0; i < this->niterations_; ++i)
         {
           // If we are using a global ORB this is a nop, otherwise it
           // initializes the ORB resources for this thread.
           int argc = 0;
-          CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
-          char* argv[1] = { argv0.inout () };
+          char* argv[] = { "" };
           CORBA::ORB_var orb =
             CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
           ACE_TRY_CHECK;
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index 70982053e33..0ef900d07f4 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -12,7 +12,6 @@ $client_conf="client.global.conf";
 $client_process="client";
 $debug_level='0';
 $threads='10';
-$status = 0;
 
 foreach $i (@ARGV) {
   if ($i eq '-tss') {
@@ -37,25 +36,27 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
 }
 
 $CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ",
-                       " -ORBsvcconf $client_conf "
-                       . "-ORBdebuglevel $debug_level"
-                       . " -k file://$iorfile "
-                       . " -n $threads -i 1000");
+		       " -ORBsvcconf $client_conf "
+		       . "-ORBdebuglevel $debug_level"
+		       . " -k file://$iorfile "
+		       . " -n $threads -i 1000");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
   print STDERR "ERROR: client timedout\n";
   $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
 }
 
 $server = $SV->TimedWait (5);
 if ($server == -1) {
   print STDERR "ERROR: server timedout\n";
   $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/MT_Server/Makefile b/TAO/tests/MT_Server/Makefile
index 00f589d2d86..d099e865a19 100644
--- a/TAO/tests/MT_Server/Makefile
+++ b/TAO/tests/MT_Server/Makefile
@@ -26,7 +26,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -201,25 +200,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -267,9 +257,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -438,25 +432,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -504,9 +489,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -709,25 +698,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -775,9 +755,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -967,25 +951,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1033,9 +1008,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1225,25 +1204,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1291,9 +1261,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/MT_Server/client.dsp b/TAO/tests/MT_Server/client.dsp
deleted file mode 100644
index 3583b8c6f66..00000000000
--- a/TAO/tests/MT_Server/client.dsp
+++ /dev/null
@@ -1,193 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MT_Server Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=MT_Server Client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="MT_Server Client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MT_Server Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Server Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "MT_Server Client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "MT_Server Client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MT_Server Client - Win32 Release"

-# Name "MT_Server Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "MT_Server Client - Win32 Release"

-

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "MT_Server Client - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/MT_Server/server.dsp b/TAO/tests/MT_Server/server.dsp
deleted file mode 100644
index 22ac376ac56..00000000000
--- a/TAO/tests/MT_Server/server.dsp
+++ /dev/null
@@ -1,205 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MT_Server Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=MT_Server Server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="MT_Server Server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MT_Server Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Server Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "MT_Server Server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "MT_Server Server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server___Win32_Debug"

-# PROP BASE Intermediate_Dir "server___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MT_Server Server - Win32 Release"

-# Name "MT_Server Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\test_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\test_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "MT_Server Server - Win32 Release"

-

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "MT_Server Server - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
index 6aa2ec9c1d9..6b1a3aff1be 100644
--- a/TAO/tests/Makefile
+++ b/TAO/tests/Makefile
@@ -19,11 +19,7 @@ DIRS  = CDR \
         Multiple_Inheritance \
 	MT_Client \
 	MT_Server \
-	FL_Cube \
-	POA \
-	Faults \
-	IORManipulation \
-	Timeout
+	FL_Cube
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index 0aff7171b7d..611fadc2215 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -27,7 +27,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -166,25 +165,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -232,9 +222,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -314,7 +308,9 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Multiple_InheritanceC.i
+ Multiple_InheritanceC.i Multiple_InheritanceS.h \
+ Multiple_InheritanceS_T.h Multiple_InheritanceS_T.i \
+ Multiple_InheritanceS_T.cpp Multiple_InheritanceS.i
 .obj/Multiple_InheritanceS.o .obj/Multiple_InheritanceS.so .shobj/Multiple_InheritanceS.o .shobj/Multiple_InheritanceS.so: Multiple_InheritanceS.cpp \
  Multiple_InheritanceS.h Multiple_InheritanceC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -425,25 +421,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -491,9 +478,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -689,25 +680,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -755,9 +737,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -955,25 +941,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1021,9 +998,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index 8566d395413..dcdcd2eb342 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -7,8 +7,6 @@ ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$")
 class Multiple_Inheritance_i : public POA_D
 {
 public:
-  Multiple_Inheritance_i (void);
-
   virtual CORBA::String method1 (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 4618dbcbb18..69b7e081cd9 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -69,102 +69,162 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Parse the command-line arguments to get the IOR
-      parse_args (argc, argv);
-
-      // If ior_input_file exists, Read the file, and get the IOR
-      // else, it must have been specified on the command line
-      if (ior_input_file != 0)
-        {
-          ACE_HANDLE input_file = ACE_OS::open (ior_input_file, 0);
-          if (input_file == ACE_INVALID_HANDLE)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open input file for reading IOR: %s\n",
-                               ior_input_file),
-                              -1);
-          ACE_Read_Buffer ior_buffer (input_file);
-          char *data = ior_buffer.read ();
-          if (data == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unable to read ior\n"),
-                              -1);
-          ior = ACE_OS::strdup (data);
-          ior_buffer.alloc ()-> free (data);
-          ACE_OS::close (input_file);
-        }
-      
-      // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var string;
-
-      // Narrow the object reference
-      A_var a = A::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow the object reference
-      B_var b = B::_narrow (a.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow the object reference
-      C_var c = C::_narrow (a.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow the object reference
-      D_var d = D::_narrow (c.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      string = a->method1 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = b->method1 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = b->method2 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = c->method1 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = c->method3 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = d->method1 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = d->method2 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = d->method3 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-      string = d->method4 (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-      return 1;
-    }
-  ACE_ENDTRY;
+  CORBA::Environment env;
+
+  // Parse the command-line arguments to get the IOR
+  parse_args (argc, argv);
+
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  // If ior_input_file exists, Read the file, and get the IOR
+  // else, it must have been specified on the command line
+  if (ior_input_file != 0)
+    {
+      ACE_HANDLE input_file = ACE_OS::open (ior_input_file, 0);
+      if (input_file == ACE_INVALID_HANDLE)
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   "Cannot open input file for reading IOR: %s\n",
+			   ior_input_file),
+			  -1);
+      ACE_Read_Buffer ior_buffer (input_file);
+      char *data = ior_buffer.read ();
+      if (data == 0)
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   "Unable to read ior\n"),
+			  -1);
+      ior = ACE_OS::strdup (data);
+      ior_buffer.alloc ()-> free (data);
+      ACE_OS::close (input_file);
+    }
+
+  // Get the object reference with the IOR
+  CORBA::Object_var object = orb->string_to_object (ior, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::string_to_object");
+      return -1;
+    }
+
+  CORBA::String_var string;
+
+  // Narrow the object reference
+  A_var a = A::_narrow (object.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("A::_narrow");
+      return -1;
+    }
+
+  // Narrow the object reference
+  B_var b = B::_narrow (a.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("B::_narrow");
+      return -1;
+    }
+
+  // Narrow the object reference
+  C_var c = C::_narrow (a.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("C::_narrow");
+      return -1;
+    }
+
+  // Narrow the object reference
+  D_var d = D::_narrow (c.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("D::_narrow");
+      return -1;
+    }
+
+  string = a->method1 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("A::method1");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = b->method1 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("B::method1");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = b->method2 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("B::method2");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = c->method1 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("C::method1");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = c->method3 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("C::method3");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = d->method1 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("D::method1");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = d->method2 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("D::method2");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = d->method3 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("A::method3");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
+
+  string = d->method4 (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("D::method4");
+      return -1;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
   return 0;
 }
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index ca23c064b4e..c8e6ca8b4aa 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -10,16 +10,16 @@ require ACEutils;
 
 $iorfile = "server.ior";
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
-                       " -f $iorfile");
+		       " -f $iorfile");
 
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
 }
 
 $CL = Process::Create ($EXEPREFIX."client$EXE_EXT",
-                       " -f $iorfile");
+		       " -f $iorfile");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
@@ -35,7 +35,7 @@ if ($server == -1) {
 
 unlink $iorfile;
 
-if ($server == -1 || $client != 0) {
+if ($server != 0 || $client != 0) {
   exit 1;
 }
 
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index c328a07e42d..05135156b37 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -8,13 +8,6 @@ ACE_RCSID(Multiple_Inheritance, server, "$Id$")
 
 static char *ior_output_file = 0;
 
-Multiple_Inheritance_i::Multiple_Inheritance_i (void)
-{
-  // Sun/CC 5.0 crashes if there is no explicit default
-  // constructor
-  // Default constructor, do nothin..
-}
-
 int
 parse_args (int argc, char **argv)
 {
@@ -48,14 +41,13 @@ main (int argc, char **argv)
   TAO_ORB_Manager orb_manager;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       orb_manager.init_child_poa (argc,
                                   argv,
                                   "child_poa",
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (parse_args (argc, argv) != 0)
 	return -1;
@@ -63,8 +55,8 @@ main (int argc, char **argv)
       CORBA::String_var ior =
 	orb_manager.activate_under_child_poa ("my_object",
 					      &servant,
-					      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+					      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n",
                   ior.in ()));
@@ -82,15 +74,16 @@ main (int argc, char **argv)
 	  ACE_OS::fclose (output_file);
 	}
 
-      orb_manager.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb_manager.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Native_Exceptions/Makefile b/TAO/tests/Native_Exceptions/Makefile
index dd400ff6429..88b0f4513be 100644
--- a/TAO/tests/Native_Exceptions/Makefile
+++ b/TAO/tests/Native_Exceptions/Makefile
@@ -24,7 +24,7 @@ SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 0
+TAO_IDLFLAGS += -Ge
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Native_Exceptions/server.dsp b/TAO/tests/Native_Exceptions/server.dsp
index d51df4cda3a..99d31c2bc37 100644
--- a/TAO/tests/Native_Exceptions/server.dsp
+++ b/TAO/tests/Native_Exceptions/server.dsp
@@ -56,8 +56,8 @@ LINK32=link.exe
 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "server___Win32_Debug"

+# PROP BASE Intermediate_Dir "server___Win32_Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index e06656b0d9c..3b6ece10c5c 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
@@ -29,7 +29,6 @@ SERVER_OBJS = MT_Client_TestS.o MT_Client_TestC.o server.o \
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 BIN = client server
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -177,25 +176,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -243,9 +233,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -325,7 +319,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- MT_Client_TestC.i
+ MT_Client_TestC.i MT_Client_TestS.h MT_Client_TestS_T.h \
+ MT_Client_TestS_T.i MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/MT_Client_TestS.o .obj/MT_Client_TestS.so .shobj/MT_Client_TestS.o .shobj/MT_Client_TestS.so: MT_Client_TestS.cpp MT_Client_TestS.h \
  MT_Client_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -436,25 +431,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -502,9 +488,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -709,13 +699,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -768,6 +751,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -995,25 +980,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1061,9 +1037,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1238,25 +1218,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1304,9 +1275,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1511,25 +1486,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1577,9 +1543,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 71857ddad32..0203fa33dd9 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -145,31 +145,29 @@ MT_Client::parse_args (void)
 int
 MT_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
+  {
+    for (unsigned long i = 0; i < this->iterations_; i++)
     {
-      for (unsigned long i = 0; i < this->iterations_; i++)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) MT_Client::run: %d of %d\n",
-                      i,
-                      this->iterations_));
-
-          // call the recursive object MT_Object for nested upcalls
-          // testing
-          this->mT_Object_var_->yadda (0,
-                                       0,
-                                       ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client:run");
-      return -1;
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) MT_Client::run: %d of %d\n",
+                  i,
+                  this->iterations_));
+
+      // call the recursive object MT_Object for nested upcalls
+      // testing
+      this->mT_Object_var_->yadda (0,
+                                   0,
+                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_ENDTRY;
+  }
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("MT_Client:run");
+    return -1;
+  }
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -197,8 +195,7 @@ MT_Client::init (int argc, char **argv,
 
   this->client_number_ = client_number;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       char buf[64];
       ACE_OS::sprintf (buf, "thread_%x", this);
@@ -270,7 +267,7 @@ MT_Client::init (int argc, char **argv,
                            "MT_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -281,8 +278,7 @@ MT_Client::init (int argc, char **argv,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
 
@@ -327,6 +323,8 @@ main (int argc, char **argv)
 
       delete [] clients;
 
+      //orb_manager.orb ()->shutdown ();
+
       // wait for the server thread to end
       result |= server_thr_mgr.wait ();
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 0f9543bbb85..2e750d704f0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -141,75 +141,76 @@ MT_Server::init (int argc,
                        "MT_Server::init: ORB_Manager is nil!\n"),
                        -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
+  {
+
+    // Call the init of TAO_ORB_Manager to create a child POA
+    // under the root POA.
+    this->orb_manager_ptr_->init_child_poa (argc,
+                                       argv,
+                                       "child_poa",
+                                       TAO_TRY_ENV);
+
+    TAO_CHECK_ENV;
+
+    this->parse_args ();
+    // ~~ check for the return value here
+
+    CORBA::String_var str  =
+      this->orb_manager_ptr_->activate_under_child_poa ("MT",
+                                                 &this->mT_Object_i_,
+                                                 TAO_TRY_ENV);
+    ACE_DEBUG ((LM_DEBUG,
+                "The IOR is: <%s>\n",
+                str.in ()));
+
+    if (this->ior_output_file_)
     {
-      // Call the init of TAO_ORB_Manager to create a child POA
-      // under the root POA.
-      this->orb_manager_ptr_->init_child_poa (argc,
-                                              argv,
-                                              "child_poa",
-                                              ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      this->parse_args ();
-      // ~~ check for the return value here
-
-      this->str_  =
-        this->orb_manager_ptr_->activate_under_child_poa ("MT",
-                                                          &this->mT_Object_i_,
-                                                          ACE_TRY_ENV);
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n",
-                  this->str_.in ()));
-
-      if (this->ior_output_file_)
-        {
-          ACE_OS::fprintf (this->ior_output_file_,
-                           "%s",
-                           this->str_.in ());
-          ACE_OS::fclose (this->ior_output_file_);
-        }
-
-      // retrieve the object reference to the distant mt object
-      if (this->object_key_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "The IOR is nil, not able to get the object.\n"),
-                          -1);
+      ACE_OS::fprintf (this->ior_output_file_,
+                       "%s",
+                       str.in ());
+      ACE_OS::fclose (this->ior_output_file_);
+    }
 
-      CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb ();
+    // retrieve the object reference to the distant mt object
+    if (this->object_key_ == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "The IOR is nil, not able to get the object.\n"),
+                            -1);
+
+    CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb ();
 
-      CORBA::Object_var object_var =
-        orb_var->string_to_object (this->object_key_,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+    CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_,
+                                                              TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
-      if (CORBA::is_nil (object_var.in()))
+    if (CORBA::is_nil (object_var.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "No proper object has been returned.\n"),
                           -1);
 
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
-                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->mT_Object_var_.in()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "We have no proper reference to the Object.\n"),
-                            -1);
-        }
+    this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
+                                               TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
-    }
-  ACE_CATCHANY
+    if (CORBA::is_nil (this->mT_Object_var_.in()))
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::init");
-      return -1;
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "We have no proper reference to the Object.\n"),
+                          -1);
     }
-  ACE_ENDTRY;
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
+
+  }
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("MT_Client::init");
+    return -1;
+  }
+  TAO_ENDTRY;
+
 
   return 0;
 }
@@ -217,23 +218,11 @@ MT_Server::init (int argc,
 int
 MT_Server::run ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int r = this->orb_manager_ptr_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "MT_Server::run"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Server::run");
-      return -1;
-    }
-  ACE_ENDTRY;
+  CORBA::Environment env;
+  if (this->orb_manager_ptr_->run (env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "MT_Server::run"),
+                      -1);
   return 0;
 }
 
@@ -241,19 +230,6 @@ MT_Server::~MT_Server (void)
 {
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in (),
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::~MT_Client");
-    }
-  ACE_ENDTRY;
 }
 
 
@@ -261,33 +237,28 @@ int
 MT_Server::run_ORB_briefly (void)
 {
   if (this->iterations_ > 0)
+  {
+    CORBA::Environment env;
+
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) MT_Server::run: "
+                "going to call distant MT Object\n"));
+
+    for (unsigned int i = 0; i < this->iterations_; i++)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) MT_Server::run: "
-                      "going to call distant MT Object\n"));
-
-          for (unsigned int i = 0; i < this->iterations_; i++)
-            {
-              MT_Object_var tmp =
-                this->mT_Object_i_._this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              this->mT_Object_var_->yadda (0,
-                                           tmp.in (),
-                                           ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "MT_Server::run_ORB_briefly");
-          return -1;
-        }
-      ACE_ENDTRY;
+      this->mT_Object_var_->yadda (0,
+                                   this->mT_Object_i_._this (env),
+                                   env);
+
+      if (env.exception () != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "MT_Server::run: failed to call distant MT object\n"),
+                          -1);
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) MT_Server::run: "
+                  "called distant MT Object i = %d\n",
+                  i));
     }
+  }
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 50bf1562ae3..d164e6625c7 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -89,9 +89,6 @@ private:
 
   unsigned int iterations_;
   // number of times the server should call to the disted MT OBject
-
-  CORBA::String_var str_;
-  // IOR of our servant.
 };
 
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index caf9caaca31..5f172c9c07a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -9,7 +9,7 @@
 //    server.cpp
 //
 // = DESCRIPTION
-//    This class implements a simple server for the
+//    This class implements a simple server for the 
 //    Nested Upcalls - MT_Client test.
 //
 // = AUTHORS
@@ -63,16 +63,16 @@ MT_Object_Server::parse_args (void)
 int
 MT_Object_Server::init (int argc,
                        char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                     env);
 
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -82,9 +82,7 @@ MT_Object_Server::init (int argc,
   CORBA::String_var str;
   str = this->orb_manager_.activate_under_child_poa ("MT_Object",
                                                      &this->mT_Object_i_,
-                                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                                     env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -123,31 +121,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      int r = MT_Object_Server.init (argc,argv,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (r == -1)
+      if (MT_Object_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          MT_Object_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          MT_Object_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Makefile b/TAO/tests/NestedUpcall/Makefile
index aea0db712ae..9cc1a40e9e4 100644
--- a/TAO/tests/NestedUpcall/Makefile
+++ b/TAO/tests/NestedUpcall/Makefile
@@ -10,7 +10,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-DIRS  = Simple \
+DIRS  = Reactor \
         Triangle_Test \
 	MT_Client_Test
 
@@ -23,3 +23,4 @@ include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+
diff --git a/TAO/examples/Logging/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
index 1a378c90bce..f429df2de7d 100644
--- a/TAO/examples/Logging/Makefile
+++ b/TAO/tests/NestedUpcall/Reactor/Makefile
@@ -1,44 +1,33 @@
-# $Id$
+#----------------------------------------------------------------------------
+#
+#       $Id$
 #
-# needed for the Logging service stuff
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
-endif # TAO_ROOT
-
-override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
+endif # ! TAO_ROOT
 
-# The following lines tell the souce code that the trading
-# service is available.
+LDLIBS = -lTAO
 
-LDLIBS = -lorbsvcs -lTAO
+IDL_SRC = ReactorC.cpp ReactorS.cpp
+PROG_SRCS = $(IDL_SRC) server.cpp client.cpp #tmplinst.cpp
 
-IDL_SRC = \
-        LoggerC.cpp LoggerS.cpp
+NESTEDUPCALLS_SVR_OBJS = ReactorS.o ReactorC.o server.o reactor_i.o
+NESTEDUPCALLS_CLT_OBJS = ReactorS.o ReactorC.o client.o eh_i.o
+NESTEDUPCALLS_MT_CLT_OBJS = ReactorS.o ReactorC.o mt_client.o eh_i.o
 
-SERVICE_SRCS = \
-        Logger_i.cpp Logging_Service.cpp Logging_Service_i.cpp
+SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \
+             $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp) \
+             $(NESTEDUPCALLS_MT_CLT_OBJS:.o=.cpp))
 
-TEST_SRCS = \
-	Logging_Test.cpp Logging_Test_i.cpp
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-LSRC= \
-        $(IDL_SRC) $(SERVICE_SRCS) $(TEST_SRCS)
-
-COMMON_OBJS = LoggerC.o LoggerS.o
-SERVICE_OBJS = $(COMMON_OBJS) Logger_i.o Logging_Service.o Logging_Service_i.o
-TEST_OBJS = $(COMMON_OBJS) Logging_Test.o Logging_Test_i.o
-
-BIN2 = Logging_Service Logging_Test
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # LifeCycle
-endif # Naming
+BIN = server client mt_client
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -50,28 +39,29 @@ include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
 
-#### Local rules and variables...
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
 
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs \
-        -I$(TAO_ROOT) $(TSS_ORB_FLAG)
-TAO_IDLFLAGS +=  -I$(TAO_ROOT)/orbsvcs/orbsvcs
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS +=
 
-all: Logging_Service Logging_Test
+.PRECIOUS: ReactorC.h ReactorC.i ReactorC.cpp
+.PRECIOUS: ReactorS.h ReactorS.i ReactorS.cpp
 
-realclean: clean
-	-$(RM) *C.* *S.* *S_T.*
-
-.PRECIOUS: $(IDL_SRC)
+server: $(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-Logging_Service: $(addprefix $(VDIR),$(SERVICE_OBJS))
+client: $(addprefix $(VDIR),$(NESTEDUPCALLS_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
+mt_client: $(addprefix $(VDIR),$(NESTEDUPCALLS_MT_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+realclean: clean
+	-$(RM) ReactorS.* ReactorC.* ReactorS_T.*
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -80,7 +70,7 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp LoggerC.h \
+.obj/ReactorC.o .obj/ReactorC.so .shobj/ReactorC.o .shobj/ReactorC.so: ReactorC.cpp ReactorC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -189,25 +179,16 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -255,9 +236,13 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -337,8 +322,9 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- LoggerC.i
-.obj/LoggerS.o .obj/LoggerS.so .shobj/LoggerS.o .shobj/LoggerS.so: LoggerS.cpp LoggerS.h LoggerC.h \
+ ReactorC.i ReactorS.h ReactorS_T.h ReactorS_T.i ReactorS_T.cpp \
+ ReactorS.i
+.obj/ReactorS.o .obj/ReactorS.so .shobj/ReactorS.o .shobj/ReactorS.so: ReactorS.cpp ReactorS.h ReactorC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -447,25 +433,16 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -513,9 +490,13 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -595,9 +576,10 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- LoggerC.i LoggerS_T.h LoggerS_T.i LoggerS_T.cpp LoggerS.i
-.obj/Logger_i.o .obj/Logger_i.so .shobj/Logger_i.o .shobj/Logger_i.so: Logger_i.cpp LoggerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ ReactorC.i ReactorS_T.h ReactorS_T.i ReactorS_T.cpp ReactorS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -607,10 +589,11 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -705,25 +688,16 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -771,9 +745,13 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -853,15 +831,14 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- LoggerC.i Logger_i.h LoggerS.h LoggerS_T.h LoggerS_T.i LoggerS_T.cpp \
- LoggerS.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/Logging_Service.o .obj/Logging_Service.so .shobj/Logging_Service.o .shobj/Logging_Service.so: Logging_Service.cpp Logging_Service_i.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
+ reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
+ ReactorS_T.i ReactorS_T.cpp ReactorS.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ eh_i.h
+.obj/eh_i.o .obj/eh_i.so .shobj/eh_i.o .shobj/eh_i.so: eh_i.cpp \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -871,11 +848,10 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -929,30 +905,11 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -981,29 +938,27 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
@@ -1048,11 +1003,25 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
  $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1120,32 +1089,12 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- Logger_i.h LoggerS.h LoggerC.h LoggerC.i LoggerS_T.h LoggerS_T.i \
- LoggerS_T.cpp LoggerS.i
-.obj/Logging_Service_i.o .obj/Logging_Service_i.so .shobj/Logging_Service_i.o .shobj/Logging_Service_i.so: Logging_Service_i.cpp Logging_Service_i.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ eh_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h ReactorS_T.i \
+ ReactorS_T.cpp ReactorS.i
+.obj/mt_client.o .obj/mt_client.so .shobj/mt_client.o .shobj/mt_client.so: mt_client.cpp mt_client.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1159,15 +1108,13 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1175,13 +1122,18 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1189,11 +1141,6 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -1203,29 +1150,81 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ reactor_i.h ReactorS.h ReactorC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1233,62 +1232,20 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
@@ -1333,11 +1290,25 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.h \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
  $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1365,27 +1336,6 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -1405,33 +1355,14 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- Logger_i.h LoggerS.h LoggerC.h LoggerC.i LoggerS_T.h LoggerS_T.i \
- LoggerS_T.cpp LoggerS.i
-.obj/Logging_Test.o .obj/Logging_Test.so .shobj/Logging_Test.o .shobj/Logging_Test.so: Logging_Test.cpp Logging_Test_i.h \
+ ReactorC.i ReactorS_T.h ReactorS_T.i ReactorS_T.cpp ReactorS.i eh_i.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
+.obj/reactor_i.o .obj/reactor_i.so .shobj/reactor_i.o .shobj/reactor_i.so: reactor_i.cpp \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -1441,11 +1372,10 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1540,25 +1470,16 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1606,9 +1527,13 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1688,32 +1613,10 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- LoggerC.h LoggerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
-.obj/Logging_Test_i.o .obj/Logging_Test_i.so .shobj/Logging_Test_i.o .shobj/Logging_Test_i.so: Logging_Test_i.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
+ reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
+ ReactorS_T.i ReactorS_T.cpp ReactorS.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1727,19 +1630,8 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1793,11 +1685,30 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -1826,34 +1737,10 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
+ reactor_i.h ReactorS.h ReactorC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -1903,6 +1790,8 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1982,18 +1871,6 @@ Logging_Test: $(addprefix $(VDIR),$(TEST_OBJS))
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- LoggerC.h LoggerC.i Logging_Test_i.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i
+ ReactorC.i ReactorS_T.h ReactorS_T.i ReactorS_T.cpp ReactorS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
new file mode 100644
index 00000000000..8198739eff4
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
@@ -0,0 +1,99 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/IDL_Cubit
+//
+// = FILENAME
+//    NestedUpCalls_i.h
+//
+// = AUTHOR
+//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
+//
+// ============================================================================
+
+#ifndef _NESTEDUPCALLS_I_H
+#define _NESTEDUPCALLS_I_H
+
+//#include "cubitS.h"
+
+// Forward declarations.
+class NestedUpCalls_i;
+
+// Typedefs.
+typedef NestedUpCalls_i *NestedUpCalls_i_ptr;
+typedef NestedUpCalls_i_ptr NestedUpCalls_i_ref;
+
+class NestedUpCalls_i : public POA
+{
+  // = TITLE
+  //    Illustrates how to integrate a servant with the generated
+  //    skeleton.
+  //
+  // = DESCRIPTION
+  //    Implementation of the cubit example at the servant side.
+  //    Cubes an octet, short, long, struct and union.
+public:
+  NestedUpCalls_i (const char *obj_name = 0);
+  // Constructor
+
+  ~NestedUpCalls_i (void);
+  // Destructor
+
+/*  virtual CORBA::Octet cube_octet (CORBA::Octet o,
+                                   CORBA::Environment &env);
+  // Cube an octet
+
+  virtual CORBA::Short cube_short (CORBA::Short s,
+                                   CORBA::Environment &env);
+  // Cube a short
+
+  virtual CORBA::Long cube_long (CORBA::Long l,
+                                 CORBA::Environment &env);
+  // Cube a long
+
+  virtual Cubit::Many cube_struct (const Cubit::Many &values,
+                                   CORBA::Environment &env);
+  // Cube a struct.
+
+  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
+                                   CORBA::Environment &env);
+  // Cube a union.
+
+  virtual void cube_sequence (const Cubit::vector &input,
+                              Cubit::vector_out output,
+                              CORBA::Environment &env);
+  // Cube a sequence.
+*/
+  virtual void shutdown (CORBA::Environment &env);
+  // Shutdown routine.
+};
+
+class NestedUpCalls_Reactor_i;
+
+typedef NestedUpCalls_Reactor_i *NestedUpCalls_Reactor_i_ptr;
+
+class NestedUpCalls_Reactor_i: public POA_Cubit_Factory
+{
+  // = TITLE
+  //   NestedUpCalls_Reactor_i
+  //
+  // = DESCRIPTION
+  //   Factory object returning the cubit objrefs
+public:
+  NestedUpCalls_Reactor_i (void);
+  // Constructor.
+
+  ~NestedUpCalls_Reactor_i (void);
+  // Destructor.
+
+  virtual Cubit_ptr make_cubit (const char *key,
+                                CORBA::Environment &env);
+  // Make the cubit object whose key is "key".
+
+private:
+  NestedUpCalls_i my_cubit_;
+};
+
+#endif /* _NestedUpCalls_i_H */
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Simple.dsw b/TAO/tests/NestedUpcall/Reactor/NestedUpcall.dsw
index 72bd4e2617e..13ce3639e5e 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Simple.dsw
+++ b/TAO/tests/NestedUpcall/Reactor/NestedUpcall.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "EC_Simple_Consumer"=.\EC_Simple_Consumer.dsp - Package Owner=<4>

+Project: "Nested Upcall Reactor Client"=.\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "EC_Simple_Service"=.\EC_Simple_Service.dsp - Package Owner=<4>

+Project: "Nested Upcall Reactor MT Client files"=".\mt-client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -27,7 +27,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "EC_Simple_Supplier"=.\EC_Simple_Supplier.dsp - Package Owner=<4>

+Project: "Nested Upcall Reactor Server"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/NestedUpcall/Reactor/README b/TAO/tests/NestedUpcall/Reactor/README
new file mode 100644
index 00000000000..e6c349790f7
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/README
@@ -0,0 +1,94 @@
+-*- indented-text -*-
+
+$Id$
+
+			      BACKGROUND
+			      ==========
+
+This example tests the scenario of nested upcalls in TAO.  For
+example, a particular process may need to act in both the role of
+client and server.  This interaction is common in situations where the
+process makes a twoway invocation on a remote servant, passing a local
+object reference 'o' to that servant.  In the process of servicing
+that invocation, the servant makes a twoway invocation on 'o'.
+
+This example illustrates an interaction that should be familiar to
+anyone who's used ACE: the process of registering a handler with a
+Reactor.  The EventHandler is the local object reference, and the
+Reactor the remote servant.  NOTE: This example in no way should be
+construed as testimony that remote Reactors make sense or are in any
+way useful.  It is merely a motivating example!
+
+You can either run the server in the background in the same window as
+the client or open a separate window for the client and server.
+
+The client and server by default make use of the Naming Service.  The
+cubit server now has its own NamingServer implementation and hence you
+don't have to start the NamingService before starting the client and
+server.
+
+	You just have to use the -s flags on both the server and
+client if you don't want to use the naming service.
+
+			      EXECUTION
+			      =========
+
+server:
+-------
+
+% server [-d] [-o <ior_output_file>] 
+
+Options:
+-------
+-d       Debug flag (It is additive more -d flags will give debugging).
+
+-o      Outputs the ior file to the file
+
+Using -d turns on debugging messages.  It is additive, i.e., the more
+-d options provided, the more debugging you can get.  At the moment,
+only 2 levels of debugging are implemented, and more than 2 -d options
+are ignored.
+
+
+client:
+-------
+
+% client [-d] [-x] <-k ior | file://<ior_file>>  -n <iterations> 
+
+Options:
+-------
+	d	Debug flag
+	x 	Tells the server to shutdown.
+	k	Reads the ior from commandline
+	
+	There are 3 ways of giving the IOR to the client:
+
+	1. From a file using the -f option. (This file can be produced using 
+		the -o option of the server.)
+	
+	2. Directly on the commandline using the -k option.
+	
+	3. Get it from the Naming Service (which is the default client
+       	   behavior).  
+
+mt_client:
+-------
+
+% mt_client [-d] [-x] <-k ior | file://<ior_file>> [-n <iterations>] [-t threads] 
+
+Options:
+-------
+	d	Debug flag
+	x 	Tells the server to shutdown.
+	k	Reads the ior from commandline
+	n	Number of iterations on each thread
+	t	Number of concurrent threads
+	
+NestedUpCalls_Test:
+------------------
+
+        This is a simple test program which tests the server and
+client using the default options of the server and client. To test
+using this just run
+
+        % NestedUpCalls_Test       
diff --git a/TAO/tests/NestedUpcall/Reactor/Reactor.idl b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
new file mode 100644
index 00000000000..0ed94064d08
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
@@ -0,0 +1,52 @@
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/NestedUpcall
+//
+// = FILENAME
+//    Reactor.idl
+//
+// = DESCRIPTION
+//    A simple test of nested upcalls using a structure we likely all
+//    know and love.
+//
+//    Existence of this interface should not be taken as testimony that
+//    such a structure would work in ACE!  There is no such thing as an
+//    IDL interface to the Reactor (yet)!
+//
+// = AUTHORS
+//    Chris Cleeland
+//
+// ============================================================================
+
+interface Reactor;
+
+interface EventHandler 
+{
+  Long peer ();
+  // Returns an integer corresponding to the event handler's file
+  // descriptor.
+
+  UShort decrement (in Reactor r, in UShort num);
+  // Decrements <num> by invoking the <decrement> operation on <r>
+  // and returning that value, finally stopping when it gets to zero.
+};
+
+interface Reactor 
+{
+  Long register_handler (in EventHandler eh);
+  // Turns around and queries <eh> for the peer.
+
+  oneway void set_value ();
+  // do-nothing oneway to check for proper operation.
+
+  UShort decrement (in EventHandler eh, in UShort num);
+  // Decrements <num> by invoking the <decrement> operation on <eh>
+  // and returning that value, finally stopping when it gets to zero.
+
+  oneway void stop ();
+  // Stops the reactor.
+};
+
diff --git a/TAO/tests/NestedUpcall/Reactor/client.cpp b/TAO/tests/NestedUpcall/Reactor/client.cpp
new file mode 100644
index 00000000000..6abf0496471
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/client.cpp
@@ -0,0 +1,208 @@
+// $Id$
+
+#include "client.h"
+#include "eh_i.h"
+
+ACE_RCSID(Reactor, client, "$Id$")
+
+// Constructor.
+NestedUpCalls_Client::NestedUpCalls_Client (void)
+  : nested_up_calls_reactor_key_ ("file://test.ior"),
+    shutdown_ (0),
+    call_count_ (5),
+    quiet_ (0)
+{
+}
+
+int
+NestedUpCalls_Client::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "qdxn:k:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        this->quiet_ = 1;
+        break;
+
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+
+      case 'x':
+        this->shutdown_ = 1;
+        break;
+
+      case 'n':
+        this->call_count_ = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 'k': // read the nestedupcalls IOR from the command-line.
+        this->nested_up_calls_reactor_key_ = get_opts.optarg;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-k nestedupcalls-obj-ref-key]"
+                           " [-x]"
+                           "\n",
+                           this->argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+// Execute client example code.
+int
+NestedUpCalls_Client::run (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      // Create an EventHandler servant to hand to the other side...
+      auto_ptr<EventHandler_i> eh_impl (new EventHandler_i (this->quiet_));
+      EventHandler_var eh = eh_impl->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Now, we can invoke an operation on the remote side.
+      CORBA::Long r =
+        this->reactor_->register_handler (eh.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // We ought to have a result!
+      if (!this->quiet_)
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s: received %d as return from register_handler ()\n",
+                    argv_[0], r));
+
+      this->reactor_->set_value (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      this->reactor_->decrement (eh.in (),
+                                 this->call_count_,
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (this->shutdown_)
+        {
+          this->reactor_->stop (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Nestedupcalls::run ()");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+NestedUpCalls_Client::~NestedUpCalls_Client (void)
+{
+}
+
+int
+NestedUpCalls_Client::init (int argc, char **argv)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  ACE_TRY_NEW_ENV
+    {
+      // Retrieve the ORB.
+      this->orb_ = CORBA::ORB_init (this->argc_,
+                                    this->argv_,
+                                    "internet",
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Parse command line and verify parameters.
+      if (this->parse_args () == -1)
+        return -1;
+
+      if (this->nested_up_calls_reactor_key_ == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%s: no nested up calls reactor key specified\n",
+                           this->argv_[0]),
+                          -1);
+
+
+      CORBA::Object_var reactor_object =
+        this->orb_->string_to_object (this->nested_up_calls_reactor_key_,
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      this->reactor_ =
+        Reactor::_narrow (reactor_object.in(), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (this->reactor_.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid reactor key <%s>\n",
+                           this->nested_up_calls_reactor_key_),
+                          -1);
+
+      
+      ACE_DEBUG ((LM_DEBUG, "Reactor received OK\n"));
+
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NestedUpCalls::init");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// This function runs the test.
+int
+main (int argc, char **argv)
+{
+  NestedUpCalls_Client nestedupcalls_client;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n \t NestedUpCalls: client \n\n"));
+
+  if (nestedupcalls_client.init (argc, argv) == -1)
+    return 1;
+
+  return nestedupcalls_client.run ();
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class auto_ptr<EventHandler_i>;
+template class ACE_Auto_Basic_Ptr<EventHandler_i>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate auto_ptr<EventHandler_i>
+#pragma instantiate ACE_Auto_Basic_Ptr<EventHandler_i>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Faults/client.dsp b/TAO/tests/NestedUpcall/Reactor/client.dsp
index f002ca1ff4d..7d762b026bc 100644
--- a/TAO/tests/Faults/client.dsp
+++ b/TAO/tests/NestedUpcall/Reactor/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Faults Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Nested Upcall Reactor Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Faults Client - Win32 Debug

+CFG=Nested Upcall Reactor Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=Faults Client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="Faults Client - Win32 Debug"

+!MESSAGE NMAKE /f "client.mak" CFG="Nested Upcall Reactor Client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Faults Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Faults Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nested Upcall Reactor Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nested Upcall Reactor Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=Faults Client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Faults Client - Win32 Release"

+!IF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -42,17 +42,18 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ELSEIF  "$(CFG)" == "Faults Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,70 +67,83 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Faults Client - Win32 Release"

-# Name "Faults Client - Win32 Debug"

+# Name "Nested Upcall Reactor Client - Win32 Release"

+# Name "Nested Upcall Reactor Client - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\client.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\test_i.cpp

+SOURCE=.\eh_i.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.cpp

+SOURCE=.\ReactorC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.cpp

+SOURCE=.\ReactorS.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# PROP Default_Filter ".h"

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\client.h

 # End Source File

-# End Group

-# Begin Group "Resource Files"

+# Begin Source File

+

+SOURCE=.\eh_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorS.h

+# End Source File

+# Begin Source File

 

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+SOURCE=.\ReactorS_T.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\test.idl

+SOURCE=.\Reactor.idl

 

-!IF  "$(CFG)" == "Faults Client - Win32 Release"

+!IF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -159,15 +173,15 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Faults Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL Compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
new file mode 100644
index 00000000000..a54b2a0eb92
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -0,0 +1,94 @@
+// -*- c++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/NestedUpCalls
+//
+// = FILENAME
+//    client.h
+//
+// = DESCRIPTION
+//
+//
+// = AUTHORS
+//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
+//
+// ============================================================================
+
+#ifndef TAO_NUC_CLIENT_H
+#define TAO_NUC_CLIENT_H
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corba.h"
+#include "reactor_i.h"
+#include "ace/Auto_Ptr.h"
+
+class NestedUpCalls_Client
+{
+  // = TITLE
+  //    Defines a class that encapsulates behaviour of the NestedUpCalls client
+  //    example.  Provides a better understanding of the logic in an
+  //    object oriented way.
+  //
+  // = DESCRIPTION
+  //    This class declares an interface to run the example client for
+  //    NestedUpCalls CORBA server.  All the complexity for initializing the
+  //    server is hidden in the class.  Just the run() interface is needed.
+public:
+  // = Constructor and destructor.
+  NestedUpCalls_Client (void);
+  ~NestedUpCalls_Client (void);
+
+  int run (void);
+  // Execute client example code.
+
+  int init (int argc, char **argv);
+  // Initialize the client communication endpoint with server.
+
+private:
+  int parse_args (void);
+  // Parses the arguments passed on the command line.
+
+  int argc_;
+  // # of arguments on the command line.
+
+  char **argv_;
+  // arguments from command line.
+
+  char *nested_up_calls_reactor_key_;
+  // Key of reactor obj ref.
+
+  int shutdown_;
+  // Flag to tell server to shutdown.
+
+  u_int call_count_;
+  // # of calls made to functions.
+
+  int quiet_;
+  // The test is quiet...
+
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
+  Reactor_var reactor_;
+  // reactor pointer for NestedUpCalls.
+
+  FILE *nested_up_calls_reactor_ior_file_;
+  // File from which to obtain the IOR.
+
+  ACE_HANDLE f_handle_;
+  // File handle to read the IOR.
+
+  int use_naming_service_;
+  // Flag to tell client not to use Namingservice to find the NestedUpCalls
+  // reactor.
+};
+
+#endif /* TAO_NUC_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
new file mode 100644
index 00000000000..0ca6c479613
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
@@ -0,0 +1,72 @@
+// $Id$
+
+#include "tao/corba.h"
+#include "eh_i.h"
+
+ACE_RCSID(Reactor, eh_i, "$Id$")
+
+// CTOR
+EventHandler_i::EventHandler_i (int q)
+  :  quiet_ (q)
+{
+}
+
+// DTOR
+EventHandler_i::~EventHandler_i (void)
+{
+}
+
+// Return a long
+CORBA::Long
+EventHandler_i::peer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Doesn't matter what value we return!
+  CORBA::Long val = 6;
+
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "EventHandler_i::peer() returning %d\n",
+                val));
+
+  return val;
+}
+
+CORBA::UShort
+EventHandler_i::decrement (Reactor_ptr eh,
+                           CORBA::UShort num,
+                           CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->quiet_ == 0)
+    {
+      ACE_ASSERT (this->quiet_ == 0);
+      ACE_DEBUG ((LM_DEBUG,
+                  "%{%I(%P|%t) EventHandler::decrement (%d)%$",
+                  num, this->quiet_));
+    }
+
+  CORBA::UShort ret;
+  if (--num <= 0)
+    ret = 0;
+  else
+    {
+      if (!this->quiet_)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) EventHandler::decrement() "
+                    "invoking Reactor::decrement(%d) %d %$",
+                    num, this->quiet_));
+
+      ret = eh->decrement (_this (env), num, env);
+    }
+
+  if (this-quiet_ == 0)
+    {
+      ACE_ASSERT (this->quiet_ == 0);
+      ACE_DEBUG ((LM_DEBUG,
+                  "%}(%P|%t) EventHandler::decrement() "
+                  "returning %d%$", ret));
+    }
+
+  return ret;
+}
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
new file mode 100644
index 00000000000..66fec52232f
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -0,0 +1,36 @@
+// -*- c++ -*-
+// $Id$
+
+#ifndef EVENTHANDLER_I_H
+#  define EVENTHANDLER_I_H
+
+#include "ReactorS.h"
+
+class EventHandler_i : public POA_EventHandler
+{
+  // = TITLE
+  //     Servant implementation for the <EventHandler> IDL interface.
+public:
+  EventHandler_i (int quiet);
+  // Constructor.
+
+  virtual ~EventHandler_i (void);
+  // Destructor.
+
+  virtual CORBA::Long peer (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Return some value...doesn't matter what.
+
+  virtual CORBA::UShort decrement (Reactor_ptr eh,
+                                   CORBA::UShort num,
+                                   CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // decrement <num> by calling decrement thru <eh> until zero is
+  // reached, then return.
+
+private:
+  int quiet_;
+  // be quiet
+};
+
+#endif /* EVENTHANDLER_I_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/mt-client.dsp b/TAO/tests/NestedUpcall/Reactor/mt-client.dsp
new file mode 100644
index 00000000000..98b32a694bc
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/mt-client.dsp
@@ -0,0 +1,219 @@
+# Microsoft Developer Studio Project File - Name="Nested Upcall Reactor MT Client files" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Nested Upcall Reactor MT Client files - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Nested Upcall Reactor MT Client files.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Nested Upcall Reactor MT Client files.mak"\

+ CFG="Nested Upcall Reactor MT Client files - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Nested Upcall Reactor MT Client files - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Nested Upcall Reactor MT Client files - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Nested Upcall Reactor MT Client files - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor MT Client files - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo /o"mt_client.bsc"

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"mt-client.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Nested Upcall Reactor MT Client files - Win32 Release"

+# Name "Nested Upcall Reactor MT Client files - Win32 Debug"

+# Begin Group "IDL Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Reactor.idl

+

+!IF  "$(CFG)" == "Nested Upcall Reactor MT Client files - Win32 Release"

+

+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

+

+BuildCmds= \

+	tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor MT Client files - Win32 Debug"

+

+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL Compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

+

+BuildCmds= \

+	tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\eh_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\mt_client.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorS_T.h

+# End Source File

+# End Group

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\eh_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\mt_client.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ReactorS.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tests/NestedUpcall/Reactor/mt_client.cpp b/TAO/tests/NestedUpcall/Reactor/mt_client.cpp
new file mode 100644
index 00000000000..9b6b398082d
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/mt_client.cpp
@@ -0,0 +1,240 @@
+// $Id$
+
+#include "mt_client.h"
+#include "eh_i.h"
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+
+ACE_RCSID(Reactor, client, "$Id$")
+
+// Constructor.
+NestedUpCalls_MT_Client::NestedUpCalls_MT_Client (void)
+  : nested_up_calls_reactor_key_ ("file://test.ior"),
+    shutdown_ (0),
+    call_count_ (5),
+    nthreads_ (4),
+    quiet_ (0)
+{
+}
+
+int
+NestedUpCalls_MT_Client::parse_args (int argc, char* argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "qdxn:t:k:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        this->quiet_ = 1;
+        break;
+
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+
+      case 'x':
+        this->shutdown_ = 1;
+        break;
+
+      case 'n':
+        this->call_count_ = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 't':
+        this->nthreads_ = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 'k': // read the nestedupcalls IOR from the command-line.
+        this->nested_up_calls_reactor_key_ = get_opts.optarg;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-k nestedupcalls-obj-ref-key]"
+                           " [-n call count]"
+                           " [-t thread count]"
+                           " [-x]"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+NestedUpCalls_MT_Client::run (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "Activating <%d> threads (%P|%t)\n",
+                  this->nthreads_));
+      this->activate (THR_NEW_LWP|THR_JOINABLE,
+                      this->nthreads_);
+
+      ACE_Thread_Manager::instance ()->wait ();
+
+      if (this->shutdown_)
+        {
+          this->reactor_->stop (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Nestedupcalls::run ()");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+// Execute client example code.
+int
+NestedUpCalls_MT_Client::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "Running thread (%t) %d\n", this->quiet_));
+
+      // Create an EventHandler servant to hand to the other side...
+      EventHandler_i eh_impl (this->quiet_);
+      EventHandler_var eh = eh_impl._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Now, we can invoke an operation on the remote side.
+      CORBA::Long r =
+        this->reactor_->register_handler (eh.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // We ought to have a result!
+      ACE_DEBUG ((LM_DEBUG,
+                  "received %d as return from register_handler ()\n",
+                  r));
+
+      this->reactor_->set_value (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      this->reactor_->decrement (eh.in (),
+                                 this->call_count_,
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var poa =
+        eh_impl._default_POA (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::ObjectId_var oid =
+        poa->servant_to_id (&eh_impl, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Nestedupcalls::svc ()");
+      return -1;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+NestedUpCalls_MT_Client::~NestedUpCalls_MT_Client (void)
+{
+}
+
+int
+NestedUpCalls_MT_Client::init (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      // Retrieve the ORB.
+      this->orb_ = CORBA::ORB_init (argc, argv,
+                                    "",
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Parse command line and verify parameters.
+      if (this->parse_args (argc, argv) == -1)
+        return -1;
+
+      CORBA::Object_var reactor_object =
+        this->orb_->string_to_object (this->nested_up_calls_reactor_key_,
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      this->reactor_ =
+        Reactor::_narrow (reactor_object.in(), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (this->reactor_.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid reactor key <%s>\n",
+                           this->nested_up_calls_reactor_key_),
+                          -1);
+
+
+      ACE_DEBUG ((LM_DEBUG, "Reactor received OK\n"));
+
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NestedUpCalls::init");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// This function runs the test.
+int
+main (int argc, char *argv[])
+{
+  NestedUpCalls_MT_Client nestedupcalls_client;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n \t NestedUpCalls: client \n\n"));
+
+  if (nestedupcalls_client.init (argc, argv) == -1)
+    return 1;
+
+  return nestedupcalls_client.run ();
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class auto_ptr<EventHandler_i>;
+template class ACE_Auto_Basic_Ptr<EventHandler_i>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate auto_ptr<EventHandler_i>
+#pragma instantiate ACE_Auto_Basic_Ptr<EventHandler_i>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/NestedUpcall/Reactor/mt_client.h b/TAO/tests/NestedUpcall/Reactor/mt_client.h
new file mode 100644
index 00000000000..363d934c8f0
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/mt_client.h
@@ -0,0 +1,81 @@
+// -*- c++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//   TAO/tests/NestedUpCalls
+//
+// = FILENAME
+//   mt_client.h
+//
+// = AUTHORS
+//   Aniruddha Gokhale, Sumedh Mungee, Sergio Flores-Gaitan, Alexander
+//   Babu Arulanthu and Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef TAO_NUC_MT_CLIENT_H
+#define TAO_NUC_MT_CLIENT_H
+
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "reactor_i.h"
+
+class NestedUpCalls_MT_Client : public ACE_Task_Base
+{
+  // = TITLE
+  //    Defines a class that encapsulates behaviour of the NestedUpCalls client
+  //    example.  Provides a better understanding of the logic in an
+  //    object oriented way.
+  //
+  // = DESCRIPTION
+  //    This class declares an interface to run the example client for
+  //    NestedUpCalls CORBA server.  All the complexity for initializing the
+  //    server is hidden in the class.  Just the run() interface is needed.
+public:
+  // = Constructor and destructor.
+  NestedUpCalls_MT_Client (void);
+  ~NestedUpCalls_MT_Client (void);
+
+  int run (void);
+  // Execute client example code.
+
+  int init (int argc, char *argv[]);
+  // Initialize the client communication endpoint with server.
+
+  virtual int svc (void);
+  // The task entry point
+
+private:
+  int parse_args (int argc, char* argv[]);
+  // Parses the arguments passed on the command line.
+
+private:
+  char *nested_up_calls_reactor_key_;
+  // Key of reactor obj ref.
+
+  int shutdown_;
+  // Flag to tell server to shutdown.
+
+  u_int call_count_;
+  // # of calls made to functions.
+
+  int nthreads_;
+  // # of threads
+
+  int quiet_;
+  // be quiet
+
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
+  Reactor_var reactor_;
+  // reactor pointer for NestedUpCalls.
+};
+
+#endif /* TAO_NUC_MT_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
new file mode 100644
index 00000000000..b396d39789f
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
@@ -0,0 +1,107 @@
+// $Id$
+
+#include "tao/corba.h"
+#include "reactor_i.h"
+
+ACE_RCSID(Reactor, reactor_i, "$Id$")
+
+// CTOR
+Reactor_i::Reactor_i (void)
+  :  quiet_ (0)
+{
+}
+
+// DTOR
+Reactor_i::~Reactor_i (void)
+{
+}
+
+void
+Reactor_i::be_quiet (int quiet)
+{
+  this->quiet_ = quiet;
+}
+
+// register...with nothing
+CORBA::Long
+Reactor_i::register_handler (EventHandler_ptr eh,
+                             CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) BEGIN Reactor_i::register_handler ()\n"));
+
+  CORBA::Long r = 0;
+
+  TAO_TRY
+    {
+      r = eh->peer (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("getting peer");
+    }
+  TAO_ENDTRY;
+
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) got this value from peer: %d\n",
+                r));
+
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) END Reactor_i::register_handler ()\n"));
+
+  return 0;
+}
+
+void
+Reactor_i::set_value (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "(%P|%t) doing Reactor_i::set_value()\n"));
+}
+
+CORBA::UShort
+Reactor_i::decrement (EventHandler_ptr eh,
+                      CORBA::UShort num,
+                      CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num));
+
+  CORBA::UShort ret;
+  if (--num <= 0)
+    ret = 0;
+  else
+    {
+      if (!this->quiet_)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Reactor::decrement() "
+                    "invoking EventHandler::decrement(%d)%$", num));
+
+      Reactor_var me = _this (env);
+      ret = eh->decrement (me.in (), num, env);
+    }
+
+  if (!this->quiet_)
+    ACE_DEBUG ((LM_DEBUG,
+                "%}(%P|%t) Reactor::decrement() "
+                "returning %d\n", ret));
+
+  return ret;
+}
+
+void
+Reactor_i::stop (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // @@ TODO Keep an ORB pointer around...
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) stopping.\n"));
+  TAO_ORB_Core_instance ()->orb ()->shutdown ();
+}
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
new file mode 100644
index 00000000000..22efef2f87b
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -0,0 +1,47 @@
+// -*- c++ -*-
+// $Id$
+
+#ifndef REACTOR_I_H
+#  define REACTOR_I_H
+
+#include "ReactorS.h"
+
+class Reactor_i : public POA_Reactor
+{
+  // = TITLE
+  //     Implement the <Reactor> IDL interface.
+public:
+  Reactor_i (void);
+  // Constructor.
+
+  virtual ~Reactor_i (void);
+  // Destructor.
+
+  void be_quiet (int quiet);
+  // Set to 1 if the test should be quiet
+
+  virtual CORBA::Long register_handler(EventHandler_ptr eh,
+                                       CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Register (with nothing...it's an example!)
+
+  virtual void set_value (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual CORBA::UShort decrement (EventHandler_ptr eh,
+                                   CORBA::UShort num,
+                                   CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // deccrement <num> by calling decrement thru <eh> until zero is
+  // reached, then return.
+
+  virtual void stop (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Stops the reactor.
+
+private:
+  int quiet_;
+  // be quiet
+};
+
+#endif /* REACTOR_I_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl
new file mode 100755
index 00000000000..51195e984e5
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl
@@ -0,0 +1,83 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+
+$file="test.ior";
+$mtfile="mttest.ior";
+
+print STDERR "\n\n==== Single-threaded test\n";
+
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       " -q -o $file");
+if (ACE::waitforfile_timed ($file, 3) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
+
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+		       "-q -x -k file://$file");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
+
+if ($client == -1 || $server == -1) {
+  exit 1;
+}
+
+unlink $file;
+
+print STDERR "\n\n==== Multi-threaded test\n";
+
+print STDERR "Grace period, waiting for the system to stabilize....";
+sleep 5;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-q -o $mtfile");
+if (ACE::waitforfile_timed ($mtfile, 3) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
+
+$CL = Process::Create ($EXEPREFIX."mt_client".$EXE_EXT,
+		       "-ORBsvcconf svc.mt.conf"
+		       ." -q -x -k file://$mtfile -n 100 ");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
+
+unlink $mtfile;
+
+if ($client == -1 || $server == -1) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/NestedUpcall/Reactor/server.cpp b/TAO/tests/NestedUpcall/Reactor/server.cpp
new file mode 100644
index 00000000000..8e655980dd4
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/server.cpp
@@ -0,0 +1,143 @@
+// $Id$
+
+#include "server.h"
+
+ACE_RCSID(Reactor, server, "$Id$")
+
+NestedUpCalls_Server::NestedUpCalls_Server (void)
+  : ior_output_file_ (0),
+    quiet_ (0)
+{
+}
+
+int
+NestedUpCalls_Server::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "qdn:o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'q':
+        this->quiet_ = 1;
+        break;
+
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+
+      case 'o': // output the IOR to a file.
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
+        if (this->ior_output_file_ == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to open %s for writing: %p\n",
+                             get_opts.optarg), -1);
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-o] <ior_output_file>"
+                           " [-s]"
+                           "\n",
+                           argv_ [0]),
+                          1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+NestedUpCalls_Server::init (int argc,
+                            char* argv[],
+                            CORBA::Environment& ACE_TRY_ENV)
+{
+  // Call the init of TAO_ORB_Manager to create a child POA
+  // under the root POA.
+  this->orb_manager_.init_child_poa (argc,
+                                     argv,
+                                     "child_poa",
+                                     ACE_TRY_ENV);
+
+  ACE_CHECK_RETURN (-1);
+
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  this->parse_args ();
+  // ~~ check for the return value here
+
+  CORBA::String_var str  =
+    this->orb_manager_.activate_under_child_poa ("reactor",
+                                                 &this->reactor_impl_,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  ACE_DEBUG ((LM_DEBUG,
+              "The IOR is: <%s>\n",
+              str.in ()));
+
+  if (this->ior_output_file_)
+    {
+      ACE_OS::fprintf (this->ior_output_file_,
+                       "%s",
+                       str.in ());
+      ACE_OS::fclose (this->ior_output_file_);
+    }
+  
+  this->reactor_impl_.be_quiet (this->quiet_);
+
+  return 0;
+}
+
+int
+NestedUpCalls_Server::run (CORBA::Environment& ACE_TRY_ENV)
+{
+  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "NestedUpCalls_Server::run"),
+                      -1);
+  return 0;
+}
+
+NestedUpCalls_Server::~NestedUpCalls_Server (void)
+{
+}
+
+int
+main (int argc, char *argv[])
+{
+  NestedUpCalls_Server nested_up_calls_server;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n \t NestedUpCalls:SERVER \n \n"));
+
+  ACE_TRY_NEW_ENV
+    {
+      if (nested_up_calls_server.init (argc,argv,
+                                       ACE_TRY_ENV) == -1)
+        return 1;
+
+      ACE_TRY_CHECK;
+
+      nested_up_calls_server.run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      return 1;
+    }
+  ACE_CATCH (CORBA::UserException, userex)
+    {
+      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Latency/server.dsp b/TAO/tests/NestedUpcall/Reactor/server.dsp
index bc62e5435f0..2401ed85350 100644
--- a/TAO/performance-tests/Latency/server.dsp
+++ b/TAO/tests/NestedUpcall/Reactor/server.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="Latency Tests Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Nested Upcall Reactor Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Latency Tests Server - Win32 Debug

+CFG=Nested Upcall Reactor Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "server.mak" CFG="Latency Tests Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "server.mak" CFG="Nested Upcall Reactor Server - Win32 Debug"

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Latency Tests Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Latency Tests Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

+!MESSAGE "Nested Upcall Reactor Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nested Upcall Reactor Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -28,7 +28,7 @@ CFG=Latency Tests Server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Latency Tests Server - Win32 Release"

+!IF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -42,17 +42,18 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ELSEIF  "$(CFG)" == "Latency Tests Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,78 +67,83 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX /Yc /Yu

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

-# Name "Latency Tests Server - Win32 Release"

-# Name "Latency Tests Server - Win32 Debug"

+# Name "Nested Upcall Reactor Server - Win32 Release"

+# Name "Nested Upcall Reactor Server - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\server.cpp

+SOURCE=.\reactor_i.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\test_i.cpp

+SOURCE=.\ReactorC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.cpp

+SOURCE=.\ReactorS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.cpp

+SOURCE=.\server.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# PROP Default_Filter ".h"

 # Begin Source File

 

-SOURCE=.\test_i.h

+SOURCE=.\reactor_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\ReactorC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.h

+SOURCE=.\ReactorS.h

 # End Source File

-# End Group

-# Begin Group "Resource Files"

+# Begin Source File

 

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+SOURCE=.\ReactorS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\server.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\test.idl

+SOURCE=.\Reactor.idl

 

-!IF  "$(CFG)" == "Latency Tests Server - Win32 Release"

+!IF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,15 +173,15 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Latency Tests Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO IDL Compiler

+InputPath=.\Reactor.idl

+InputName=Reactor

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -205,7 +211,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
new file mode 100644
index 00000000000..a2d1125239b
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/server.h
@@ -0,0 +1,91 @@
+// -*- c++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/NestedUpCalls
+//
+// = FILENAME
+//    server.h
+//
+// = DESCRIPTION
+//      This class implements a simple NestedUpCalls CORBA server for
+//      the NestedUpCalls example using skeletons generated by the TAO
+//      ORB compiler.
+//
+// = AUTHORS
+//    Nagarajan Surendran (naga@cs.wustl.edu)
+//
+// ============================================================================
+
+#ifndef TAO_NUC_SERVER_H
+#define TAO_NUC_SERVER_H
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Log_Msg.h"
+#include "tao/TAO.h"
+#include "reactor_i.h"
+
+class NestedUpCalls_Server
+{
+  // = TITLE
+  //   Defines a NestedUpCalls Server class that implements the functionality
+  //   of a server process as an object.
+  //
+  // = DESCRIPTION
+  //   The interface is quite simple. A server program has to call
+  //   init to initialize the NestedUpCalls_Server's state and then call run
+  //   to run the orb.
+public:
+
+  NestedUpCalls_Server (void);
+  // Default constructor
+
+  ~NestedUpCalls_Server (void);
+  // Destructor
+
+  int init (int argc,
+            char *argv[],
+            CORBA::Environment& env);
+  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
+
+  int run (CORBA::Environment& env);
+  // Run the orb
+
+private:
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  int init_naming_service (CORBA::Environment &env);
+  // Initialises the name server and registers NestedUpCalls reactor with the
+  // name server.
+
+  FILE* ior_output_file_;
+  // File to output the NestedUpCalls reactor IOR.
+
+  int quiet_;
+  // be quiet
+
+  TAO_ORB_Manager orb_manager_;
+  // The ORB manager
+
+  Reactor_i reactor_impl_;
+  // Implementation object of the NestedUpCalls reactor.
+
+  Reactor_var reactor_;
+  // Reactor_var to register with NamingService.
+
+  int argc_;
+  // Number of commandline arguments.
+
+  char **argv_;
+  // commandline arguments.
+};
+
+#endif /* TAO_NUC_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.conf b/TAO/tests/NestedUpcall/Reactor/svc.conf
new file mode 100644
index 00000000000..40e55e3e868
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/svc.conf
@@ -0,0 +1,6 @@
+# $Id$
+#
+# Please see $TAO_ROOT/docs/Options.html for details on these options.
+#
+
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.mt.conf b/TAO/tests/NestedUpcall/Reactor/svc.mt.conf
new file mode 100644
index 00000000000..ebb9810b5ca
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/svc.mt.conf
@@ -0,0 +1,6 @@
+# $Id$
+#
+# Please see $TAO_ROOT/docs/Options.html for details on these options.
+#
+
+static Client_Strategy_Factory "-ORBclientconnectionhandler MT"
diff --git a/TAO/tests/NestedUpcall/Simple/README b/TAO/tests/NestedUpcall/Simple/README
deleted file mode 100644
index d373edf247f..00000000000
--- a/TAO/tests/NestedUpcall/Simple/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This is a test of the nested upcall feature in TAO.  The client will
-start off by calling the server and providing a callback object and a
-time-to-live number.  The server will callback the client (using the
-callback object) and decrement the time-to-live number. The client
-will turn around and call the server again.
-
-The above process of calling each other will continue until the
-time-to-live number reaches zero.
-
-Both client and server can be run in multi-threaded mode.  A
-multi-threaded client can be used to check the client side leader
-follower model, while the multi-threaded server can be used to check
-the integration of the leader follower model of the TP reactor and the
-client side leader follower model in the ORB.
-
-In addition, the server can be used with the thread-per-connection
-model.
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.dsw b/TAO/tests/NestedUpcall/Simple/Simple.dsw
deleted file mode 100644
index d17cf7c9604..00000000000
--- a/TAO/tests/NestedUpcall/Simple/Simple.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
deleted file mode 100644
index 5cdfba0d2bf..00000000000
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// $Id$
-
-#include "client_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(Simple, client, "$Id$")
-
-static const char *ior = "file://test.ior";
-// Server IOR.
-
-static int shutdown_server = 0;
-// Flag to tell server to shutdown.
-
-static CORBA::UShort call_count = 5;
-// # of nested calls to be made.
-
-static int quiet = 0;
-// The test is quiet...
-
-static int number_of_threads = 1;
-// Number of client threads.
-
-class Client_Task : public ACE_Task_Base
-{
-public:
-  Client_Task (client_ptr c,
-               server_ptr s);
-  int svc (void);
-
-private:
-  client_var client_;
-  server_var server_;
-};
-
-Client_Task::Client_Task (client_ptr c,
-                          server_ptr s)
-  : client_ (client::_duplicate (c)),
-    server_ (server::_duplicate (s))
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (!quiet)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) Client_Task::svc calling start -> time to live = %d\n",
-                    call_count));
-
-      // Now, we can invoke an operation on the remote side.
-      this->server_->start (this->client_.in (),
-                            call_count,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Task::svc");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static int
-parse_args (int argc,
-            char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "qxn:k:t:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'q':
-        quiet = 1;
-        break;
-
-      case 'x':
-        shutdown_server = 1;
-        break;
-
-      case 'n':
-        call_count = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 't':
-        number_of_threads = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-n number of nested calls]"
-                           " [-k ior]"
-                           " [-q (quite)]"
-                           " [-x (shutdown server)]"
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-
-  if (ior == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s: no nested up calls server ior specified\n",
-                       argv[0]),
-                      -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      int result = parse_args (argc,
-                               argv);
-      if (result != 0)
-        return result;
-
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
-                                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      object = orb->string_to_object (ior,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      server_var server = server::_narrow (object.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Create an client object to hand to the other side...
-      client_i client_servant (quiet,
-                               server.in ());
-
-      client_var client_object = client_servant._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Client_Task client_tasks (client_object.in (),
-                                server.in ());
-
-      result = client_tasks.activate (THR_BOUND,
-                                      number_of_threads);
-
-      if (result != 0)
-        return result;
-
-      result = ACE_Thread_Manager::instance ()->wait ();
-
-      if (result != 0)
-        return result;
-
-      if (shutdown_server)
-        {
-          server->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client::main");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Simple/client.dsp b/TAO/tests/NestedUpcall/Simple/client.dsp
deleted file mode 100644
index 8c460438092..00000000000
--- a/TAO/tests/NestedUpcall/Simple/client.dsp
+++ /dev/null
@@ -1,208 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Nested Upcall Simple Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Nested Upcall Simple Client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "client.mak" CFG="Nested Upcall Simple Client - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Nested Upcall Simple Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Nested Upcall Simple Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Nested Upcall Simple Client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

-

-!ELSEIF  "$(CFG)" == "Nested Upcall Simple Client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client___Win32_Debug"

-# PROP BASE Intermediate_Dir "client___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Nested Upcall Simple Client - Win32 Release"

-# Name "Nested Upcall Simple Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\client_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\client_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "Nested Upcall Simple Client - Win32 Release"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "Nested Upcall Simple Client - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
deleted file mode 100644
index 58aed897da2..00000000000
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-#include "client_i.h"
-
-client_i::client_i (int quiet,
-                    server_ptr s)
-  : quiet_ (quiet),
-    server_ (server::_duplicate (s))
-{
-}
-
-void
-client_i::ping (CORBA::UShort time_to_live,
-                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (!this->quiet_)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%t) client_i::ping -> time to live = %d\n",
-                time_to_live));
-
-  --time_to_live;
-
-  if (time_to_live > 0)
-    {
-      this->server_->ping (time_to_live,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
deleted file mode 100644
index 03ce86be834..00000000000
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "testS.h"
-
-class client_i : public POA_client
-{
-public:
-  client_i (int quiet,
-            server_ptr s);
-  // Constructor.
-
-  void ping (CORBA::UShort time_to_live,
-             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  int quiet_;
-  // Be quiet.
-
-  server_var server_;
-  // Pointer to server.
-};
diff --git a/TAO/tests/NestedUpcall/Simple/run_test.pl b/TAO/tests/NestedUpcall/Simple/run_test.pl
deleted file mode 100755
index 3f21bbd23f4..00000000000
--- a/TAO/tests/NestedUpcall/Simple/run_test.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../bin';
-require ACEutils;
-
-$iorfile = "test.ior";
-
-unlink $iorfile;
-
-print STDERR "\nrunning ST version of the client and the server\n\n";
-
-$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
-		       " -f $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-			" -k file://$iorfile -x");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$server = $SV->TimedWait (10);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
-
-unlink $iorfile;
-
-if ($client != 0 || server != 0) {
-  exit 1;
-}
-
-print STDERR "\nrunning MT version of the client and the server\n\n";
-
-$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
-		       " -f $iorfile -t 2");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-			" -k file://$iorfile -x -t 2");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$server = $SV->TimedWait (10);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
-
-exit 0;
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
deleted file mode 100644
index 1561c7f871a..00000000000
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-#include "server_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(Simple, server, "$Id$")
-
-static int quiet = 0;
-// The test is quiet...
-
-static char *ior_file = "test.ior";
-// File of file to which the ior is written
-
-static int number_of_threads = 1;
-// Number of server threads.
-
-class Server_Task : public ACE_Task_Base
-{
-public:
-  Server_Task (CORBA::ORB_ptr orb);
-  int svc (void);
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-Server_Task::Server_Task (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  return this->orb_->run ();
-}
-
-static int
-write_ior_to_file (const char *ior)
-{
-  FILE *output_file = ACE_OS::fopen (ior_file, "w");
-
-  if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
-                       ior_file),
-                      -1);
-
-  int result = 0;
-
-  result = ACE_OS::fprintf (output_file,
-                            "%s",
-                            ior);
-  if (result < 0 ||
-      ACE_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,
-                       ior_file),
-                      -1);
-
-  ACE_OS::fclose (output_file);
-
-  return 0;
-}
-
-static int
-parse_args (int argc,
-            char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "q:f:t:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'q':
-        quiet = 1;
-        break;
-
-      case 't':
-        number_of_threads = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'f':
-        ior_file = get_opts.optarg;
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-t number of threads]"
-                           " [-f ior file]"
-                           " [-q (quite)]"
-                           "\n",
-                           argv[0]),
-                          -1);
-      }
-
-  return 0;
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      int result = parse_args (argc,
-                               argv);
-      if (result != 0)
-        return result;
-
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
-                                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      server_i server_servant (quiet,
-                               orb.in ());
-
-      server_var server_object = server_servant._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior = orb->object_to_string (server_object.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      result = write_ior_to_file (ior.in ());
-      if (result != 0)
-        return result;
-
-      Server_Task server_tasks (orb.in ());
-
-      result = server_tasks.activate (THR_BOUND,
-                                      number_of_threads);
-
-      if (result != 0)
-        return result;
-
-      result = ACE_Thread_Manager::instance ()->wait ();
-
-      if (result != 0)
-        return result;
-
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server::main");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Simple/server.dsp b/TAO/tests/NestedUpcall/Simple/server.dsp
deleted file mode 100644
index c6645440979..00000000000
--- a/TAO/tests/NestedUpcall/Simple/server.dsp
+++ /dev/null
@@ -1,208 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Nested Upcall Simple Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Nested Upcall Simple Server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "server.mak" CFG="Nested Upcall Simple Server - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Nested Upcall Simple Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Nested Upcall Simple Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Nested Upcall Simple Server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

-

-!ELSEIF  "$(CFG)" == "Nested Upcall Simple Server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server___Win32_Debug"

-# PROP BASE Intermediate_Dir "server___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Nested Upcall Simple Server - Win32 Release"

-# Name "Nested Upcall Simple Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\server_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "Nested Upcall Simple Server - Win32 Release"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "Nested Upcall Simple Server - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
deleted file mode 100644
index e0b0b963208..00000000000
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-#include "server_i.h"
-
-server_i::server_i (int quiet,
-                    CORBA::ORB_ptr orb)
-  : quiet_ (quiet),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-server_i::start (client_ptr c,
-                 CORBA::UShort time_to_live,
-                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->client_ = client::_duplicate (c);
-  this->ping (time_to_live,
-              ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-server_i::ping (CORBA::UShort time_to_live,
-                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (!this->quiet_)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%t) server_i::ping -> time to live = %d\n",
-                time_to_live));
-
-  --time_to_live;
-
-  if (time_to_live > 0)
-    {
-      this->client_->ping (time_to_live,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
-}
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
deleted file mode 100644
index e1bd4802b1e..00000000000
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#include "testS.h"
-
-class server_i : public POA_server
-{
-public:
-  server_i (int quiet,
-            CORBA::ORB_ptr orb);
-
-  void ping (CORBA::UShort time_to_live,
-             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void start (client_ptr c,
-              CORBA::UShort time_to_live,
-              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  int quiet_;
-  // Be quiet.
-
-  client_var client_;
-  // Pointer to server.
-
-  CORBA::ORB_var orb_;
-  // Pointer to orb.
-};
diff --git a/TAO/tests/NestedUpcall/Simple/svc.conf b/TAO/tests/NestedUpcall/Simple/svc.conf
deleted file mode 100644
index abce93ca63f..00000000000
--- a/TAO/tests/NestedUpcall/Simple/svc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-#
-
-static Resource_Factory "-ORBReactorType tp"
-# static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/tests/NestedUpcall/Simple/test.idl b/TAO/tests/NestedUpcall/Simple/test.idl
deleted file mode 100644
index 5a2f8e4107b..00000000000
--- a/TAO/tests/NestedUpcall/Simple/test.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//    A simple test of nested upcalls.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-interface client
-{
-  void ping (in UShort time_to_live);
-  // Decrements <time_to_live>.  If <time_to_live> becomes zero, it
-  // stops. Otherwise, it pings the server.
-};
-
-interface server
-{
-  void start (in client c,
-              in UShort time_to_live);
-  // Turns around and starts pinging the client.
-
-  void ping (in UShort time_to_live);
-  // Decrements <time_to_live>.  If <time_to_live> becomes zero, it
-  // stops. Otherwise, it pings the client.
-
-  oneway void shutdown ();
-  // Shutdown the server.
-};
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 7cc49030b6b..3b3d4502647 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -9,7 +9,7 @@
 //    Object_A_i.cpp
 //
 // = DESCRIPTION
-//    This class implements the Object A  of the
+//    This class implements the Object A  of the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -36,26 +36,27 @@ Initiator_i::~Initiator_i (void)
 }
 
 void
-Initiator_i::foo_object_B (CORBA::Environment &ACE_TRY_ENV)
+Initiator_i::foo_object_B (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
-      this->object_B_var_->foo (this->object_A_var_.in (),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->object_B_var_->foo (this->object_A_var_.in (), 
+                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the server");
+      TAO_TRY_ENV.print_exception ("calling the server_");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) END Initiator_i::foo_object_B ()\n"));
 }
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 264f14450db..833aac14690 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
@@ -36,7 +36,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -186,25 +185,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -252,9 +242,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -334,7 +328,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- Triangle_TestC.i
+ Triangle_TestC.i Triangle_TestS.h Triangle_TestS_T.h \
+ Triangle_TestS_T.i Triangle_TestS_T.cpp Triangle_TestS.i
 .obj/Triangle_TestS.o .obj/Triangle_TestS.so .shobj/Triangle_TestS.o .shobj/Triangle_TestS.so: Triangle_TestS.cpp Triangle_TestS.h Triangle_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -444,25 +439,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -510,9 +496,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -717,13 +707,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Object_A_i.h Triangle_TestS.h Triangle_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -776,6 +759,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -980,13 +965,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Object_B_i.h Triangle_TestS.h Triangle_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1039,6 +1017,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1229,25 +1209,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1295,9 +1266,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1489,25 +1464,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1555,9 +1521,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1749,25 +1719,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1815,9 +1776,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2026,13 +1991,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  Initiator_i.h Triangle_TestS.h Triangle_TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2085,6 +2043,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 5fb8662e2df..7cd0173625f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -37,25 +37,25 @@ Object_A_i::~Object_A_i (void)
 
 void
 Object_A_i::foo (Initiator_ptr initiator_ptr,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Object_A_i::foo ()\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
-      initiator_ptr->foo_object_B (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      initiator_ptr->foo_object_B (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       while (!this->finish_two_way_call_)
         TAO_ORB_Core_instance ()->reactor ()->handle_events ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator");
+      TAO_TRY_ENV.print_exception ("calling the initiator");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) END Object_A_i::foo ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index b7efa50682b..6384013e7c6 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -9,7 +9,7 @@
 //    Object_B_i.cpp
 //
 // = DESCRIPTION
-//    This class implements the Object B  of the
+//    This class implements the Object B  of the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -36,20 +36,20 @@ Object_B_i::~Object_B_i (void)
 
 void
 Object_B_i::foo (Object_A_ptr object_A_ptr,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Object_B_i::foo ()\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
-
+      
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
-      object_A_ptr->finish (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      object_A_ptr->finish (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Start to wait on this variable, it is set to true
       // by the method finish ()
@@ -59,12 +59,13 @@ Object_B_i::foo (Object_A_ptr object_A_ptr,
       ACE_OS::sleep(pause);
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator");
+      TAO_TRY_ENV.print_exception ("calling the initiator");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) END Object_B_i::foo ()\n"));
 }
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index dc68312347b..7753ccd2d77 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -9,7 +9,7 @@
 //    initiator.cpp
 //
 // = DESCRIPTION
-//    This class implements a simple server for the
+//    This class implements a simple server for the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -83,7 +83,7 @@ Initiator_Server::parse_args (void)
         TAO_debug_level++;
         break;
       case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg,0);
+        result = this->read_ior (get_opts.optarg,0); 
         // read IOR for Object A
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -92,7 +92,7 @@ Initiator_Server::parse_args (void)
                             -1);
             break;
       case 'g': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg,1);
+        result = this->read_ior (get_opts.optarg,1); 
         // read IOR for Object A
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -119,16 +119,16 @@ Initiator_Server::parse_args (void)
 int
 Initiator_Server::init (int argc,
                        char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                     env);
 
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -141,78 +141,82 @@ Initiator_Server::init (int argc,
                       this->argv_[0]),
                       -1);
 
-  ACE_TRY
-    {
-      // Get Object A
 
-      CORBA::Object_var object_A_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_A_key_,
-                                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  TAO_TRY
+  {
+    // Get Object A
 
-      this->object_A_var_ =
-        Object_A::_narrow (object_A_obj_var.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+    CORBA::Object_var object_A_obj_var =
+      this->orb_manager_.orb()->string_to_object (this->object_A_key_,
+                                  TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
-      if (CORBA::is_nil (this->object_A_var_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "invalid object A key <%s>\n",
-                           object_A_key_),
-                          -1);
+    this->object_A_var_ =
+      Object_A::_narrow (object_A_obj_var.in(), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Object A IOR: %s\n",
-                  this->object_A_key_));
-      ACE_DEBUG ((LM_DEBUG, "Object A received OK\n"));
+    if (CORBA::is_nil (this->object_A_var_.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "invalid object A key <%s>\n",
+                         object_A_key_),
+                         -1);
 
-      // Get Object B
+    ACE_DEBUG ((LM_DEBUG, 
+                "Object A IOR: %s\n", 
+                this->object_A_key_));
+    ACE_DEBUG ((LM_DEBUG, "Object A received OK\n"));
 
-      CORBA::Object_var object_B_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_B_key_,
-                                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
 
-      this->object_B_var_ =
-        Object_B::_narrow (object_B_obj_var.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+    // Get Object B
 
-      if (CORBA::is_nil (this->object_B_var_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "invalid object b key <%s>\n",
-                           object_B_key_),
-                          -1);
+    CORBA::Object_var object_B_obj_var =
+      this->orb_manager_.orb()->string_to_object (this->object_B_key_,
+                                    TAO_TRY_ENV);
+    TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Object A IOR: %s\n",
-                  this->object_A_key_));
-      ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
+    this->object_B_var_ =
+      Object_B::_narrow (object_B_obj_var.in(), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    if (CORBA::is_nil (this->object_B_var_.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "invalid object b key <%s>\n",
+                         object_B_key_),
+                         -1);
+
+    ACE_DEBUG ((LM_DEBUG, 
+                "Object A IOR: %s\n", 
+                this->object_A_key_));
+    ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
+
+  }
+  TAO_CATCH (CORBA::SystemException, sysex)
+  {
+    ACE_UNUSED_ARG (sysex);
+    TAO_TRY_ENV.print_exception ("System Exception");
+    return -1;
+  }
+  TAO_CATCH (CORBA::UserException, userex)
+  {
+    ACE_UNUSED_ARG (userex);
+    TAO_TRY_ENV.print_exception ("User Exception");
+    return -1;
+  }
+  TAO_ENDTRY;
 
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
 
-  ACE_NEW_RETURN (this->initiator_i_ptr_,
+  ACE_NEW_RETURN (this->initiator_i_ptr_, 
                   Initiator_i(this->object_A_var_.in(),
-                              this->object_B_var_.in()),
+                                 this->object_B_var_.in()),
                   -1);
 
-  this->str_ =
-    this->orb_manager_.activate (this->initiator_i_ptr_,
-                                 ACE_TRY_ENV);
+  CORBA::String_var str  =
+    this->orb_manager_.activate_under_child_poa ("initiator",
+                                                 this->initiator_i_ptr_,
+                                                 env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
-              this->str_.in ()));
+              str.in ()));
 
 
   return 0;
@@ -220,35 +224,32 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Initiator_Server::run (CORBA::Environment &)
 {
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Initiator_Server::run: Trying to invoke "
-                  "foo on Object A\n"));
-
-      Initiator_var initiator =
-        this->initiator_i_ptr_->_this(ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->object_A_var_->foo (initiator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Initiator_Server::run: Returned from invoke "
-                  "foo on Object A\n"));
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
+  TAO_TRY
+  {
+    ACE_DEBUG ((LM_DEBUG,
+              "Initiator_Server::run: Trying to invoke foo on Object A\n"));
+
+    this->object_A_var_->foo (this->initiator_i_ptr_->_this(TAO_TRY_ENV), 
+                              TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+    ACE_DEBUG ((LM_DEBUG,
+              "Initiator_Server::run: Returned from invoke foo on Object A\n"));
+  }
+  TAO_CATCH (CORBA::SystemException, sysex)
+  {
+    ACE_UNUSED_ARG (sysex);
+    TAO_TRY_ENV.print_exception ("System Exception");
+    return -1;
+  }
+  TAO_CATCH (CORBA::UserException, userex)
+  {
+    ACE_UNUSED_ARG (userex);
+    TAO_TRY_ENV.print_exception ("User Exception");
+    return -1;
+  }
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -259,21 +260,8 @@ Initiator_Server::~Initiator_Server (void)
     ACE_OS::free (this->object_A_key_);
   if (this->object_B_key_ != 0)
     ACE_OS::free (this->object_B_key_);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_manager_.deactivate (this->str_.in (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Initiator_Server::~Initiator_Server");
-    }
-  ACE_ENDTRY;
-
-  delete this->initiator_i_ptr_;
+  if (this->initiator_i_ptr_ != 0)
+    delete initiator_i_ptr_;
 }
 
 int
@@ -283,28 +271,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (initiator_Server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (initiator_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          initiator_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          initiator_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index ad408fa328e..89c9d5e4ccc 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -85,9 +85,6 @@ private:
 
   char **argv_;
   // commandline arguments.
-
-  CORBA::String_var str_;
-  // IOR of my servant.
 };
 
 #endif /* _TRIANGLE_TEST_INITITATOR_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index a50f480156c..bf102c41d97 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -19,7 +19,7 @@ unlink $ior2file;
 $SV1 = Process::Create ($EXEPREFIX."server_A".$EXE_EXT,
                         "-o $ior1file");
 
-if (ACE::waitforfile_timed ($ior1file, 15) == -1) {
+if (ACE::waitforfile_timed ($ior1file, 5) == -1) {
     print STDERR "ERROR: cannot find file <$ior1file>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 9be44b25f7c..baf1fb58ed1 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -9,7 +9,7 @@
 //    server_A.cpp
 //
 // = DESCRIPTION
-//    This class implements a simple server for the
+//    This class implements a simple server for the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -63,16 +63,16 @@ Object_A_Server::parse_args (void)
 int
 Object_A_Server::init (int argc,
                        char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     ACE_TRY_ENV);
+                                     env);
 
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -82,9 +82,7 @@ Object_A_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_A",
                                                  &this->object_A_i_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                                 env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -103,17 +101,14 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (CORBA::Environment& ACE_TRY_ENV)
+Object_A_Server::run (CORBA::Environment& env)
 {
-  int r = this->orb_manager_.run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (r == -1)
+  if (this->orb_manager_.run (env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
-  return 0;}
-
+  return 0;
+}
 
 Object_A_Server::~Object_A_Server (void)
 {
@@ -126,28 +121,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (object_A_Server.init (argc,argv, ACE_TRY_ENV) == -1)
+      if (object_A_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          object_A_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          object_A_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index e96e580adb6..a2346d5e254 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -9,7 +9,7 @@
 //    server_B.cpp
 //
 // = DESCRIPTION
-//    This class implements a simple server for the
+//    This class implements a simple server for the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -63,16 +63,16 @@ Object_B_Server::parse_args (void)
 int
 Object_B_Server::init (int argc,
                        char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     ACE_TRY_ENV);
+                                     env);
 
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -82,9 +82,7 @@ Object_B_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_B",
                                                  &this->object_B_i_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                                 env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -97,6 +95,7 @@ Object_B_Server::init (int argc,
       ACE_OS::fclose (this->ior_output_file_);
     }
 
+
   return 0;
 }
 
@@ -122,28 +121,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (object_B_Server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (object_B_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          object_B_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          object_B_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index c23e85d54c3..86d48785833 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -27,7 +27,6 @@ BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -174,25 +173,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -240,9 +230,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -435,25 +429,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -501,9 +486,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -696,25 +685,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -762,9 +742,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -954,25 +938,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1020,9 +995,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1212,25 +1191,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1278,9 +1248,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1470,25 +1444,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1536,9 +1501,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index a2092e66301..baf7a2cd319 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -41,7 +41,7 @@ test_write_octet (TAO_OutputCDR &cdr,
 static int
 test_read_octet (TAO_InputCDR &cdr,
                  char* /* buf */,
-                 size_t /* bufsize */)
+                 size_t bufsize)
 {
   Test::OctetSeq os;
 
@@ -65,7 +65,7 @@ test_write_char (TAO_OutputCDR &cdr,
 static int
 test_read_char (TAO_InputCDR &cdr,
                 char* /* buf */,
-                size_t /* bufsize */)
+                size_t bufsize)
 {
   Test::CharSeq cs;
 
diff --git a/TAO/tests/OctetSeq/OctetSeq.dsp b/TAO/tests/OctetSeq/OctetSeq.dsp
index e6ec02e459a..7499816847b 100644
--- a/TAO/tests/OctetSeq/OctetSeq.dsp
+++ b/TAO/tests/OctetSeq/OctetSeq.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/TAO/tests/OctetSeq/OctetSeq.dsw b/TAO/tests/OctetSeq/OctetSeq.dsw
index 33e61a24c10..fec4109a5e9 100644
--- a/TAO/tests/OctetSeq/OctetSeq.dsw
+++ b/TAO/tests/OctetSeq/OctetSeq.dsw
@@ -15,30 +15,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>

diff --git a/TAO/tests/OctetSeq/client.dsp b/TAO/tests/OctetSeq/client.dsp
deleted file mode 100644
index 8ad358e95c4..00000000000
--- a/TAO/tests/OctetSeq/client.dsp
+++ /dev/null
@@ -1,177 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OctetSeq Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=OctetSeq Client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "client.mak" CFG="OctetSeq Client - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "OctetSeq Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "OctetSeq Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "OctetSeq Client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client___Win32_Release"

-# PROP BASE Intermediate_Dir "client___Win32_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "OctetSeq Client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client___Win32_Debug"

-# PROP BASE Intermediate_Dir "client___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "OctetSeq Client - Win32 Release"

-# Name "OctetSeq Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "OctetSeq Client - Win32 Release"

-

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "OctetSeq Client - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/OctetSeq/server.dsp b/TAO/tests/OctetSeq/server.dsp
deleted file mode 100644
index 27671de13f1..00000000000
--- a/TAO/tests/OctetSeq/server.dsp
+++ /dev/null
@@ -1,189 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OctetSeq Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=OctetSeq Server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "server.mak" CFG="OctetSeq Server - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "OctetSeq Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "OctetSeq Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "OctetSeq Server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server___Win32_Release"

-# PROP BASE Intermediate_Dir "server___Win32_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "OctetSeq Server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server___Win32_Debug"

-# PROP BASE Intermediate_Dir "server___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD   /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "OctetSeq Server - Win32 Release"

-# Name "OctetSeq Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\test_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\test_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "OctetSeq Server - Win32 Release"

-

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "OctetSeq Server - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Deactivation/Deactivation.cpp b/TAO/tests/POA/Deactivation/Deactivation.cpp
deleted file mode 100644
index 7ad1cc18c93..00000000000
--- a/TAO/tests/POA/Deactivation/Deactivation.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Deactivation
-//
-// = FILENAME
-//     Deactivation.cpp
-//
-// = DESCRIPTION
-//     This program tests the reactivation of a servant that has been
-//     deactivated but not removed from the Active Object Map yet.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
-
-#include "testS.h"
-#include "ace/Task.h"
-
-class test_i : public POA_test
-{
-public:
-  test_i (ACE_Auto_Event &event);
-
-  void deactivate_self (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  ACE_Auto_Event &event_;
-};
-
-test_i::test_i (ACE_Auto_Event &event)
-  : event_ (event)
-{
-}
-
-void
-test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n"));
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n"));
-  int result = this->event_.signal ();
-  ACE_ASSERT (result == 0);
-
-  ACE_OS::sleep (3);
-  ACE_DEBUG ((LM_DEBUG, "(%t) test_i::deactivate_self complete\n"));
-}
-
-class Activator : public ACE_Task_Base
-{
-public:
-  Activator (test_ptr t,
-             ACE_Auto_Event &event,
-             PortableServer::POA_ptr poa,
-             PortableServer::Servant servant,
-             const ACE_CString &task_id,
-             const PortableServer::ObjectId &id);
-  int svc (void);
-
-private:
-  test_var test_;
-  ACE_Auto_Event &event_;
-  PortableServer::POA_var poa_;
-  PortableServer::Servant servant_;
-  ACE_CString task_id_;
-  PortableServer::ObjectId id_;
-};
-
-Activator::Activator (test_ptr t,
-                      ACE_Auto_Event &event,
-                      PortableServer::POA_ptr poa,
-                      PortableServer::Servant servant,
-                      const ACE_CString &task_id,
-                      const PortableServer::ObjectId &id)
-  : test_ (test::_duplicate (t)),
-    event_ (event),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    servant_ (servant),
-    task_id_ (task_id),
-    id_ (id)
-{
-}
-
-int
-Activator::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for deactivation to complete\n"));
-
-  int result = this->event_.wait ();
-  ACE_ASSERT (result == 0);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete, trying to activate\n"));
-
-  ACE_TRY_NEW_ENV
-    {
-      if (this->task_id_ == "first thread")
-        {
-          PortableServer::ObjectId_var id =
-            this->poa_->activate_object (this->servant_,
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          this->poa_->activate_object_with_id (this->id_,
-                                               this->servant_,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) Activation complete\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Activator::svc");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-class Deactivator : public ACE_Task_Base
-{
-public:
-  Deactivator (test_ptr t);
-  int svc (void);
-
-private:
-  test_var test_;
-};
-
-Deactivator::Deactivator (test_ptr t)
-  : test_ (test::_duplicate (t))
-{
-}
-
-int
-Deactivator::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->test_->deactivate_self (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Deactivator::svc");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_Auto_Event event1;
-      test_i servant1 (event1);
-
-      ACE_Auto_Event event2;
-      test_i servant2 (event2);
-
-      test_var test_object1 = servant1._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_var test_object2 = servant2._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var id1 =
-        root_poa->reference_to_id (test_object1.in ());
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var id2 =
-        root_poa->reference_to_id (test_object2.in ());
-      ACE_TRY_CHECK;
-
-      Activator activator1 (test_object1.in (),
-                            event1,
-                            root_poa.in (),
-                            &servant1,
-                            "first thread",
-                            id1.in ());
-
-      Activator activator2 (test_object2.in (),
-                            event2,
-                            root_poa.in (),
-                            &servant2,
-                            "second thread",
-                            id2.in ());
-
-      Deactivator deactivator1 (test_object1.in ());
-
-      Deactivator deactivator2 (test_object2.in ());
-
-      if (activator1.activate (THR_BOUND) != 0 ||
-          activator2.activate (THR_BOUND) != 0 ||
-          deactivator1.activate (THR_BOUND) != 0 ||
-          deactivator2.activate (THR_BOUND) != 0)
-        return -1;
-
-      int result = ACE_Thread_Manager::instance ()->wait ();
-
-      if (result != 0)
-        return result;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Deactivation/Deactivation.dsp b/TAO/tests/POA/Deactivation/Deactivation.dsp
deleted file mode 100644
index 9fefded390f..00000000000
--- a/TAO/tests/POA/Deactivation/Deactivation.dsp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Deactivation" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Deactivation - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "Deactivation.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "Deactivation.mak" CFG="POA Deactivation - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "POA Deactivation - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Deactivation - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "POA Deactivation - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "POA Deactivation - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "POA Deactivation - Win32 Release"

-# Name "POA Deactivation - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Deactivation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "POA Deactivation - Win32 Release"

-

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "POA Deactivation - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Deactivation/Deactivation.dsw b/TAO/tests/POA/Deactivation/Deactivation.dsw
deleted file mode 100644
index f937b183406..00000000000
--- a/TAO/tests/POA/Deactivation/Deactivation.dsw
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Deactivation"=.\Deactivation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

diff --git a/TAO/tests/POA/Deactivation/run_test.pl b/TAO/tests/POA/Deactivation/run_test.pl
deleted file mode 100755
index 4e96e5f2230..00000000000
--- a/TAO/tests/POA/Deactivation/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../bin';
-require Process;
-require ACEutils;
-
-$T = Process::Create ($EXEPREFIX."Deactivation".$EXE_EXT);
-
-$client = $T->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $T->Kill (); $T->TimedWait (1);
-}
-
-if ($client == -1) {
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/POA/Deactivation/test.idl b/TAO/tests/POA/Deactivation/test.idl
deleted file mode 100644
index c7d0b23d96e..00000000000
--- a/TAO/tests/POA/Deactivation/test.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-interface test
-{
-  void deactivate_self ();
-};
diff --git a/TAO/tests/POA/Destruction/Destruction.cpp b/TAO/tests/POA/Destruction/Destruction.cpp
deleted file mode 100644
index 13f0d2c34b0..00000000000
--- a/TAO/tests/POA/Destruction/Destruction.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/Destruction
-//
-// = FILENAME
-//     Destruction.cpp
-//
-// = DESCRIPTION
-//     This program tests the destruction of a POA while there is an
-//     upcall in progress.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
-
-#include "testS.h"
-
-class test_i : public POA_test
-{
-public:
-  void destroy_poa (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-void
-test_i::destroy_poa (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean etherealize_objects = 1;
-  CORBA::Boolean wait_for_completion = 0;
-  poa->destroy (etherealize_objects,
-                wait_for_completion,
-                ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_i servant;
-
-      test_var test_object = servant._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_object->destroy_poa (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Destruction/Destruction.dsp b/TAO/tests/POA/Destruction/Destruction.dsp
deleted file mode 100644
index 91229796573..00000000000
--- a/TAO/tests/POA/Destruction/Destruction.dsp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Destruction" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Destruction - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Destruction.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Destruction.mak" CFG="POA Destruction - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "POA Destruction - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Destruction - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "POA Destruction - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "POA Destruction - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "POA Destruction - Win32 Release"

-# Name "POA Destruction - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Destruction.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\testC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "POA Destruction - Win32 Release"

-

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "POA Destruction - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Destruction/Destruction.dsw b/TAO/tests/POA/Destruction/Destruction.dsw
deleted file mode 100644
index 3bce381d9d5..00000000000
--- a/TAO/tests/POA/Destruction/Destruction.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Destruction"=.\Destruction.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/Destruction/run_test.pl b/TAO/tests/POA/Destruction/run_test.pl
deleted file mode 100755
index 6f2424b2053..00000000000
--- a/TAO/tests/POA/Destruction/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../../bin';
-require Process;
-require ACEutils;
-
-$T = Process::Create ($EXEPREFIX."Destruction".$EXE_EXT);
-
-$client = $T->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $T->Kill (); $T->TimedWait (1);
-}
-
-if ($client == -1) {
-  exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/POA/Destruction/test.idl b/TAO/tests/POA/Destruction/test.idl
deleted file mode 100644
index 098546eb56e..00000000000
--- a/TAO/tests/POA/Destruction/test.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-interface test
-{
-  void destroy_poa ();
-};
diff --git a/TAO/tests/POA/Makefile b/TAO/tests/POA/Makefile
deleted file mode 100644
index d567397e01a..00000000000
--- a/TAO/tests/POA/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-# Makefile for the POA tests
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Destruction \
-	Deactivation \
-	Identity
-
-# The following test hasn't been updated yet
-# Demux_Test
-
-#### Does not compile on UNIX:	Forwarding \
-
-#----------------------------------------------------------------------------
-#	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.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/tests/POA/README b/TAO/tests/POA/README
deleted file mode 100644
index 2634b528409..00000000000
--- a/TAO/tests/POA/README
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-The following TAO applications test and illustate various Portable
-Object Adapter (POA) interfaces and their usage scenarios.
-
-        . Identity
-
-                The example shows the identity between servants, ids,
-                and references.
-
-        . Destruction
-
-                The program tests the destruction of a POA during an
-                upcall.
-
-        . Deactivation
-
-                This program tests the reactivation of a servant that
-                has been deactivated but not removed from the Active
-                Object Map yet.
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index bbc3771b021..758e74acd47 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -94,8 +94,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 override TAO_IDLFLAGS += -hc Cli.h -cs Cli.cpp -ci Cli.i \
 			 -hs Ser.h -ss Ser.cpp -si Ser.i \
-		         -hT Ser_T.h -sT Ser_T.cpp -st Ser_T.i \
-			 -Ge 1
+		         -hT Ser_T.h -sT Ser_T.cpp -st Ser_T.i
 
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
@@ -225,25 +224,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -291,9 +281,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -373,7 +367,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- param_testCli.i
+ param_testCli.i param_testSer.h param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
 .obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -483,25 +478,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -549,9 +535,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -745,25 +735,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -811,9 +792,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1004,25 +989,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1070,9 +1046,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1264,25 +1244,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1330,9 +1301,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1522,25 +1497,270 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/MessagingS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ param_testCli.i param_testSer.h param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
+.obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1588,9 +1808,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -1670,7 +1894,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- param_testCli.i
+ param_testCli.i param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
 .obj/driver.o .obj/driver.so .shobj/driver.o .shobj/driver.so: driver.cpp driver.h options.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1783,25 +2008,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1846,9 +2062,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2055,25 +2275,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2118,9 +2329,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2324,25 +2539,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2387,9 +2593,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2579,25 +2789,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2645,9 +2846,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -2841,25 +3046,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -2907,9 +3103,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3099,25 +3299,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3165,9 +3356,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3357,25 +3552,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3423,9 +3609,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3615,25 +3805,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3681,9 +3862,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3873,25 +4058,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -3939,9 +4115,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4131,25 +4311,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4197,9 +4368,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4389,25 +4564,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4455,9 +4621,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4647,25 +4817,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4713,9 +4874,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4905,25 +5070,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -4971,9 +5127,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5163,25 +5323,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5229,9 +5380,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5421,25 +5576,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5487,9 +5633,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5679,25 +5829,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -5745,9 +5886,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -5937,25 +6082,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6003,9 +6139,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6195,25 +6335,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6261,9 +6392,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6453,25 +6588,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6519,9 +6645,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6711,25 +6841,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6777,9 +6898,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -6969,25 +7094,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7035,9 +7151,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7227,25 +7347,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7293,9 +7404,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7485,25 +7600,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7551,9 +7657,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -7743,25 +7853,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -7809,9 +7910,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8001,25 +8106,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8067,9 +8163,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8259,25 +8359,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8325,9 +8416,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8517,25 +8612,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8583,9 +8669,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -8775,25 +8865,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -8841,9 +8922,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9033,25 +9118,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9099,9 +9175,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9292,25 +9372,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9358,9 +9429,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9550,25 +9625,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9616,9 +9682,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -9808,25 +9878,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -9874,9 +9935,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -10067,25 +10132,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -10133,9 +10189,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index c709002f44b..600113401c2 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -77,15 +77,19 @@ Test_Any::init_parameters (Param_Test_ptr objref,
       this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      this->reset_parameters ();
-      return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      //ACE_UNUSED_ARG (sysex);
+
       ACE_PRINT_EXCEPTION (sysex, "System Exception doing make_coffee");
+      return -1;
     }
   ACE_ENDTRY;
-  return -1;
+  ACE_CHECK_RETURN (-1);
+
+  this->reset_parameters ();
+  return 0;
 }
 
 int
@@ -244,60 +248,40 @@ Test_Any::add_args (CORBA::NVList_ptr param_list,
                     CORBA::NVList_ptr retval,
                     CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (CORBA::_tc_any,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_any,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_any,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("o1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("o2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("o3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_any,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Any::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (CORBA::_tc_any,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_any,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_any,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("o1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("o2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("o3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_any,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 6ba7a04d4ad..d48cbe24c4e 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -87,25 +87,12 @@ int
 Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref,
                                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
-      this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
-                                                       this->inout_.inout (),
-                                                       out,
-                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Long_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
+  this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
+                                                   this->inout_.inout (),
+                                                   out,
+                                                   ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -113,60 +100,40 @@ Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
                                        CORBA::NVList_ptr retval,
                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Bounded_Long_Seq,
-                        (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Bounded_Long_Seq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Bounded_Long_Seq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Long_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Bounded_Long_Seq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Bounded_Long_Seq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Bounded_Long_Seq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 8412b139fdc..0d097f31acb 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -89,26 +89,12 @@ int
 Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref,
                                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Bounded_Short_Seq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
-                                                        this->inout_.inout (),
-                                                        out,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Short_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Bounded_Short_Seq_out out (this->out_.out ());
+  this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
+                                                    this->inout_.inout (),
+                                                    out,
+                                                    ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -116,60 +102,40 @@ Test_Bounded_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
                                        CORBA::NVList_ptr retval,
                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Bounded_Short_Seq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Bounded_Short_Seq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Bounded_Short_Seq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Bounded_Short_Seq,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Short_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Bounded_Short_Seq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Bounded_Short_Seq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Bounded_Short_Seq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_Short_Seq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 20cd5679d16..954934c4dca 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -91,26 +91,12 @@ int
 Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref,
                                             CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Bounded_StrSeq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_bounded_strseq (this->in_.in (),
-                                                this->inout_.inout (),
-                                                out,
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Bounded_StrSeq_out out (this->out_.out ());
+  this->ret_ = objref->test_bounded_strseq (this->in_.in (),
+                                            this->inout_.inout (),
+                                            out,
+                                            ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -118,60 +104,40 @@ Test_Bounded_String_Sequence::add_args (CORBA::NVList_ptr param_list,
                                         CORBA::NVList_ptr retval,
                                         CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Bounded_StrSeq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Bounded_StrSeq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Bounded_StrSeq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Bounded_StrSeq,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Bounded_StrSeq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Bounded_StrSeq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Bounded_StrSeq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_StrSeq,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 10456150be1..0dc6df8e141 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -100,26 +100,12 @@ int
 Test_Bounded_String::run_sii_test (Param_Test_ptr objref,
 				   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::String_out str_out (this->out_);
-
-      this->ret_ = objref->test_unbounded_string (this->in_,
-                                                  this->inout_,
-                                                  str_out,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::String_out str_out (this->out_);
+  this->ret_ = objref->test_unbounded_string (this->in_,
+                                              this->inout_,
+                                              str_out,
+                                              ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -127,61 +113,41 @@ Test_Bounded_String::add_args (CORBA::NVList_ptr param_list,
 			       CORBA::NVList_ptr retval,
 			       CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // create the parameters
-      CORBA::Any in_arg (CORBA::_tc_string,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_string,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_string,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_string,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // create the parameters
+  CORBA::Any in_arg (CORBA::_tc_string,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_string,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_string,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_string,
+                                            &this->ret_,
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 11bbb0654ee..9a53167389e 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -90,26 +90,12 @@ int
 Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
                                             CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Bounded_StructSeq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_bounded_struct_sequence (this->in_,
-                                                         this->inout_.inout (),
-                                                         out,
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Bounded_StructSeq_out out (this->out_.out ());
+  this->ret_ = objref->test_bounded_struct_sequence (this->in_,
+                                                     this->inout_.inout (),
+                                                     out,
+                                                     ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -117,60 +103,40 @@ Test_Bounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
                                         CORBA::NVList_ptr retval,
                                         CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Bounded_StructSeq,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Bounded_StructSeq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Bounded_StructSeq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Bounded_StructSeq,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Struct_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Bounded_StructSeq,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Bounded_StructSeq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Bounded_StructSeq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_StructSeq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index ee26fe2d964..52bb0afc62b 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -60,20 +60,23 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref,
       // get access to a Coffee Object
       this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      this->reset_parameters ();
-      return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
+      //ACE_UNUSED_ARG (sysex);
       ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
+      return -1;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee");
+      return -1;
     }
   ACE_ENDTRY;
-  return -1;
+  ACE_CHECK_RETURN (-1);
+
+  this->reset_parameters ();
+  return 0;
 }
 
 int
@@ -195,8 +198,6 @@ Test_Big_Union::reset_parameters (void)
       }
       break;
     }
-  this->out_ = new Param_Test::Big_Union (this->in_);
-  this->ret_ = new Param_Test::Big_Union (this->in_);
   return 0;
 }
 
@@ -204,24 +205,11 @@ int
 Test_Big_Union::run_sii_test (Param_Test_ptr objref,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_big_union (this->in_,
-                                           this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Big_Union::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_big_union (this->in_,
+                                       this->inout_,
+                                       this->out_,
+                                       ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -229,60 +217,40 @@ Test_Big_Union::add_args (CORBA::NVList_ptr param_list,
                           CORBA::NVList_ptr retval,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Big_Union,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Big_Union,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Big_Union,
-                          &this->out_.inout (),
-                          0);
-
-      // add parameters
-      param_list->add_value ("u1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("u2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("u3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Big_Union,
-                               &this->ret_.inout (),
-                               0,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Big_Union::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Big_Union,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Big_Union,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Big_Union,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("u1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("u2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("u3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Big_Union,
+                                            &this->ret_,
+                                            0,
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index e4f090486cb..5b1c6702540 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -64,18 +64,11 @@ Param_Test_Client<T>::run_sii_test (void)
   // Declare the Env
   ACE_DECLARE_NEW_CORBA_ENV;
   // Initialize parameters for the test.
-  int check = this->test_object_->init_parameters (this->param_test_, 
-                                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (check == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) client.cpp - run_sii_test:"
-                         "init_parameters failed for opname - %s",
-                         opname), 
-                        -1);
-    }
+  if (this->test_object_->init_parameters (this->param_test_, ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%N:%l) client.cpp - run_sii_test:"
+                       "init_parameters failed for opname - %s",
+                       opname), -1);
 
 
   // Make the calls in a loop.
@@ -91,8 +84,7 @@ Param_Test_Client<T>::run_sii_test (void)
           this->results_.start_timer ();
 
           // make the call
-          this->test_object_->run_sii_test (this->param_test_, 
-                                            ACE_TRY_ENV);
+          this->test_object_->run_sii_test (this->param_test_, ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // stop the timer.
@@ -172,18 +164,11 @@ Param_Test_Client<T>::run_dii_test (void)
   // Environment variable
   ACE_DECLARE_NEW_CORBA_ENV;
   // initialize parameters for the test
-  int check = this->test_object_->init_parameters (this->param_test_, 
-                                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (check == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) client.cpp - run_dii_test:"
-                         "init_parameters failed for opname - %s",
-                         opname), 
-                        -1);
-    }
+  if (this->test_object_->init_parameters (this->param_test_, ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%N:%l) client.cpp - run_dii_test:"
+                       "init_parameters failed for opname - %s",
+                       opname), -1);
 
       // Make the calls in a loop.
   for (CORBA::ULong i = 0; i < opt->loop_count (); i++)
@@ -210,13 +195,12 @@ Param_Test_Client<T>::run_dii_test (void)
         {
           // add arguments and typecode for return valueto the NVList
           this->test_object_->add_args (nvlist,
-					                              retval.in (),
-					                              ACE_TRY_ENV);
+					retval.in (),
+					ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           CORBA::NamedValue_ptr result =
-            CORBA::NamedValue::_duplicate (retval->item (0, 
-                                                         ACE_TRY_ENV));
+            CORBA::NamedValue::_duplicate (retval->item (0, ACE_TRY_ENV));
           ACE_TRY_CHECK;
 
           this->param_test_->_create_request (CORBA_Context::_nil (),
@@ -236,16 +220,13 @@ Param_Test_Client<T>::run_dii_test (void)
             ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
 
           // Make the invocation, verify the result.
-          this->test_object_->dii_req_invoke (req, 
-                                              ACE_TRY_ENV);
+          this->test_object_->dii_req_invoke (req, ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
           this->results_.error_count (this->results_.error_count () + 1);
-
-          ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                                opname);
+          ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,opname);
           goto loop_around;
         }
       ACE_ENDTRY;
@@ -261,9 +242,8 @@ Param_Test_Client<T>::run_dii_test (void)
           this->results_.error_count (this->results_.error_count () + 1);
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) client.cpp - "
-                      "Invalid results in run_dii_test in iteration %d\n",
+                      "Invalid results in run_dii_test in iteration %d",
                       i));
-
           continue;
         }
 
@@ -290,7 +270,7 @@ Param_Test_Client<T>::run_dii_test (void)
 		  "********** Finished running %s DII *********\n",
 		  opname));
     }
-  return this->results_.error_count () ? -1 : 0;
+  return this->results_.error_count ()? -1:0;
 }
 
 
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index e17f19319ae..ad08e91145e 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -57,8 +57,8 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req,
 }
 
 int
-Test_Complex_Any::init_parameters (Param_Test_ptr,
-                                   CORBA::Environment &)
+Test_Complex_Any::init_parameters (Param_Test_ptr objref,
+                                   CORBA::Environment &ACE_TRY_ENV)
 {
   return this->reset_parameters ();
 }
@@ -167,60 +167,40 @@ Test_Complex_Any::add_args (CORBA::NVList_ptr param_list,
                             CORBA::NVList_ptr retval,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (CORBA::_tc_any,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_any,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_any,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("ca1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("ca2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("ca3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_any,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Complex_Any::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (CORBA::_tc_any,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_any,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_any,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("ca1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("ca2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("ca3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_any,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 09d7cd82cc8..2dde40d092a 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -52,44 +52,26 @@ Test_Exception::dii_req_invoke (CORBA::Request *req,
       req->invoke (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::UnknownUserException, user_ex)
+  ACE_CATCH (Param_Test::Ooops, ex)
     {
-      Param_Test::Ooops* oops;
-      Param_Test::BadBoy* bad_boy;
-
-      if (user_ex.exception () >>= oops)
-        {
-          if (TAO_debug_level > 0)
-            {
-              const char *reason = oops->reason.in ();
-              if (reason == 0)
-                reason = "nil";
-              ACE_DEBUG ((LM_DEBUG,
-                          "Test_Exception::dii_req_invoke - "
-                          "expected user exception"
-                          " (%s,%d)\n", reason, oops->input));
-            }
-          this->inout_ = this->in_ * 2;
-          this->out_ = this->in_ * 3;
-          this->ret_ = this->in_ * 4;
-          return;
-        }
-      else if (user_ex.exception () >>= bad_boy)
-        {
-          ACE_PRINT_EXCEPTION ((*bad_boy),
-                               "Test_Exception::dii_req_invoke - "
-                               "unexpected (but known) user exception\n");
-          this->inout_ = this->in_ * 5;
-          this->out_ = this->in_ * 5;
-          this->ret_ = this->in_ * 5;
-        }
-      else
+      if (TAO_debug_level > 0)
         {
+          const char *reason = ex.reason.in ();
+          if (reason == 0)
+            reason = "nil";
           ACE_DEBUG ((LM_DEBUG,
-                      "Test_Exception::dii_req_invoke - "
-                      "unexpected (and unknown) user exception\n"));
+                      "Test_Exception::run_sii_test - "
+                      "expected user exception"
+                      " (%s,%d)\n", reason, ex.input));
         }
+      this->inout_ = this->in_ * 3;
+      this->out_ = this->in_ * 4;
+      this->ret_ = this->in_ * 5;
+
+      // Why should we use clear ?????
+      //TAO_TRY_ENV.clear ();
 
+      return;
     }
   ACE_CATCH (CORBA::UNKNOWN, ex)
     {
@@ -98,12 +80,20 @@ Test_Exception::dii_req_invoke (CORBA::Request *req,
           ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - "
                                "expected system exception\n");
         }
-      this->inout_ = this->in_ * 2;
-      this->out_ = this->in_ * 3;
-      this->ret_ = this->in_ * 4;
+      this->inout_ = this->in_ * 4;
+      this->out_ = this->in_ * 5;
+      this->ret_ = this->in_ * 6;
+
+      // TAO_TRY_ENV.clear ();
 
       return;
     }
+  ACE_CATCH (Param_Test::BadBoy, ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "Test_Exception::run_sii_test - "
+                           " unexpected exception\n");
+      ACE_TRY_THROW (Param_Test::BadBoy ());
+    }
   ACE_ENDTRY;
   ACE_CHECK;
 }
@@ -134,7 +124,6 @@ Test_Exception::run_sii_test (Param_Test_ptr objref,
 {
   ACE_TRY
     {
-      this->in_++;
       this->ret_ = objref->test_exception (this->in_,
                                            this->inout_,
                                            this->out_,
@@ -153,31 +142,31 @@ Test_Exception::run_sii_test (Param_Test_ptr objref,
                       "expected user exception"
                       " (%s,%d)\n", reason, ex.input));
         }
-      this->inout_ = this->in_ * 2;
-      this->out_ = this->in_ * 3;
-      this->ret_ = this->in_ * 4;
+      this->inout_ = this->in_ * 3;
+      this->out_ = this->in_ * 4;
+      this->ret_ = this->in_ * 5;
       return -1;
     }
   ACE_CATCH (CORBA::UNKNOWN, ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - "
-                               "expected system exception\n");
+          ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - expected system exception\n");
         }
-      this->inout_ = this->in_ * 2;
-      this->out_ = this->in_ * 3;
-      this->ret_ = this->in_ * 4;
-      return 0;
+      this->inout_ = this->in_ * 4;
+      this->out_ = this->in_ * 5;
+      this->ret_ = this->in_ * 6;
+      return -1;
     }
   ACE_CATCH (Param_Test::BadBoy, ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Test_Exception::run_sii_test - "
-                           "unexpected user exception\n");
+      ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - unexpected system exception\n");
+      return -1;
     }
   ACE_ENDTRY;
-  return -1;
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -185,70 +174,51 @@ Test_Exception::add_args (CORBA::NVList_ptr param_list,
                           CORBA::NVList_ptr retval,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // we provide top level memory to the ORB to retrieve the data
-      CORBA::Any in_arg (CORBA::_tc_ulong,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_ulong,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_ulong,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value. Let the ORB allocate storage. We simply tell the ORB
-      // what type we are expecting.
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_ulong,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Exception::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // we provide top level memory to the ORB to retrieve the data
+  CORBA::Any in_arg (CORBA::_tc_ulong,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_ulong,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_ulong,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value. Let the ORB allocate storage. We simply tell the ORB
+  // what type we are expecting.
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_ulong,
+                                                    &this->ret_,
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
 Test_Exception::check_validity (void)
 {
-  if (this->inout_ == this->in_ * 2 &&
-      this->out_ == this->in_ * 3 &&
-      this->ret_ == this->in_ * 4)
+  CORBA::ULong n = (this->iterations_++) % 3;
+  if (this->inout_ == this->in_ * (n + 2) &&
+      this->out_ == this->in_ * (n + 3) &&
+      this->ret_ == this->in_ * (n + 4))
     return 1;
   return 0;
 }
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index 3a96fc3c5c7..9027af625e1 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -87,24 +87,11 @@ int
 Test_Fixed_Array::run_sii_test (Param_Test_ptr objref,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_fixed_array (this->in_,
-                                             this->inout_,
-                                             this->out_,
-                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Array::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_fixed_array (this->in_,
+                                         this->inout_,
+                                         this->out_,
+                                         ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -112,62 +99,42 @@ Test_Fixed_Array::add_args (CORBA::NVList_ptr param_list,
                             CORBA::NVList_ptr retval,
                             CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // We provide the top level memory
-      // the Any does not own any of these
-      CORBA::Any in_arg (Param_Test::_tc_Fixed_Array,
-                         this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Fixed_Array,
-                            this->inout_,
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Fixed_Array,
-                          this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("l1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("l2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("l3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Fixed_Array,
-                               this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Array::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // We provide the top level memory
+  // the Any does not own any of these
+  CORBA::Any in_arg (Param_Test::_tc_Fixed_Array,
+                     this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Fixed_Array,
+                        this->inout_,
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Fixed_Array,
+                      this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("l1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("l2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("l3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Fixed_Array,
+                                                    this->ret_.inout (),
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 3e234de1955..281ab6c72c1 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -87,24 +87,11 @@ int
 Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_fixed_struct (this->in_,
-                                              this->inout_,
-                                              this->out_,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Struct::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_fixed_struct (this->in_,
+                                          this->inout_,
+                                          this->out_,
+                                          ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -112,62 +99,42 @@ Test_Fixed_Struct::add_args (CORBA::NVList_ptr param_list,
                              CORBA::NVList_ptr retval,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // We provide the top level memory
-      // the Any does not own any of these
-      CORBA::Any in_arg (Param_Test::_tc_Fixed_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Fixed_Struct,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Fixed_Struct,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value type
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Fixed_Struct,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // We provide the top level memory
+  // the Any does not own any of these
+  CORBA::Any in_arg (Param_Test::_tc_Fixed_Struct,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Fixed_Struct,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Fixed_Struct,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Fixed_Struct,
+                                                    &this->ret_,
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 5cbf4765aa4..64a99a82741 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -91,25 +91,12 @@ int
 Test_Nested_Struct::run_sii_test (Param_Test_ptr objref,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Nested_Struct_out out (this->out_.out ());
-      this->ret_ = objref->test_nested_struct (this->in_,
-                                               this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Nested_Struct::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Nested_Struct_out out (this->out_.out ());
+  this->ret_ = objref->test_nested_struct (this->in_,
+                                           this->inout_.inout (),
+                                           out,
+                                           ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -117,60 +104,40 @@ Test_Nested_Struct::add_args (CORBA::NVList_ptr param_list,
 			      CORBA::NVList_ptr retval,
 			      CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Nested_Struct,
-                         (void *) &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Nested_Struct,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Nested_Struct,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Nested_Struct,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Nested_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Nested_Struct,
+                     (void *) &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Nested_Struct,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Nested_Struct,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Nested_Struct,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 65b20584a33..2c88a62c97c 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -93,28 +93,29 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref,
       ACE_OS::strcpy (msg_str, "set coffee attribute");
       this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object
       ACE_TRY_CHECK;
-
-      this->inout_ = Coffee::_nil ();
-      this->out_ = Coffee::_nil ();
-      this->ret_ = Coffee::_nil ();
-
-      // DII
-      *this->in_courier = ACE_dynamic_cast (CORBA::Object_ptr,
-                                            this->in_.in ());
-      *this->inout_courier = ACE_dynamic_cast (CORBA::Object_ptr,
-                                               this->inout_.in ());
-      *this->out_courier = ACE_dynamic_cast (CORBA::Object_ptr,
-                                             this->out_.in ());
-      *this->ret_courier = ACE_dynamic_cast (CORBA::Object_ptr,
-                                             this->ret_.in ());
-      return 0;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, msg_str);
+      return -1;
     }
   ACE_ENDTRY;
-  return -1;
+  ACE_CHECK_RETURN (-1);
+
+  this->inout_ = Coffee::_nil ();
+  this->out_ = Coffee::_nil ();
+  this->ret_ = Coffee::_nil ();
+
+  // DII
+  *this->in_courier = ACE_dynamic_cast (CORBA::Object_ptr,
+                                        this->in_.in ());
+  *this->inout_courier = ACE_dynamic_cast (CORBA::Object_ptr,
+                                           this->inout_.in ());
+  *this->out_courier = ACE_dynamic_cast (CORBA::Object_ptr,
+                                         this->out_.in ());
+  *this->ret_courier = ACE_dynamic_cast (CORBA::Object_ptr,
+                                         this->ret_.in ());
+  return 0;
 }
 
 int
@@ -142,6 +143,7 @@ Test_ObjRef::reset_parameters (void)
       return -1;
     }
   ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
 
   this->inout_ = Coffee::_nil ();
   this->out_ = Coffee::_nil ();
@@ -160,26 +162,12 @@ int
 Test_ObjRef::run_sii_test (Param_Test_ptr objref,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Coffee_out out (this->out_.out ());
-
-      this->ret_ = objref->test_objref (this->in_.in (),
-                                        this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Coffee_out out (this->out_.out ());
+  this->ret_ = objref->test_objref (this->in_.in (),
+                                    this->inout_.inout (),
+                                    out,
+                                    ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -187,60 +175,41 @@ Test_ObjRef::add_args (CORBA::NVList_ptr param_list,
 		       CORBA::NVList_ptr retval,
 		       CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (_tc_Coffee,
-                         this->in_courier,
-                         0);
-
-      CORBA::Any inout_arg (_tc_Coffee,
-                            this->inout_courier,
-                            0);
-
-      CORBA::Any out_arg (_tc_Coffee,
-                          this->out_courier,
-                          0);
-
-      // Add parameters.
-      param_list->add_value ("o1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("o2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("o3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Add return value.
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (_tc_Coffee,
-                               this->ret_courier,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef::add_args\n");
+  CORBA::Any in_arg (_tc_Coffee,
+                     this->in_courier,
+                     0);
+
+  CORBA::Any inout_arg (_tc_Coffee,
+                        this->inout_courier,
+                        0);
+
+  CORBA::Any out_arg (_tc_Coffee,
+                      this->out_courier,
+                      0);
+
+  // Add parameters.
+  param_list->add_value ("o1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("o2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("o3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // Add return value.
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (_tc_Coffee,
+                                            this->ret_courier,
+                                            0, // does not own
+                                            ACE_TRY_ENV);
 
-    }
-  ACE_ENDTRY;
-  return -1;
+  return 0;
 }
 
 CORBA::Boolean
@@ -309,26 +278,24 @@ Test_ObjRef::check_validity (CORBA::Request_ptr /*req*/)
 
   ACE_TRY
     {
-      this->inout_ = Coffee::_narrow (*this->inout_courier, 
-                                      ACE_TRY_ENV);
+      this->inout_ = Coffee::_narrow (*this->inout_courier, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      this->out_ = Coffee::_narrow (*this->out_courier, 
-                                    ACE_TRY_ENV);
+      this->out_ = Coffee::_narrow (*this->out_courier, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      this->ret_ = Coffee::_narrow (*this->ret_courier, 
-                                    ACE_TRY_ENV);
+      this->ret_ = Coffee::_narrow (*this->ret_courier, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      return this->check_validity ();
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "_narrow from DII result");
+      return 0;
     }
   ACE_ENDTRY;
-  return 0;
+  ACE_CHECK_RETURN (0);
+
+  return this->check_validity ();
 }
 
 void
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index c8298fad079..03d1b6e0c05 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -56,35 +56,20 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req,
 
 int
 Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
-				                             CORBA::Environment &ACE_TRY_ENV)
+				     CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Generator *gen = GENERATOR::instance (); // value generator
+  Generator *gen = GENERATOR::instance (); // value generator
 
-      // set the length of the sequence
-      this->in_.x = gen->gen_long ();
+  // set the length of the sequence
+  this->in_.x = gen->gen_long ();
+  this->in_.y = objref->make_coffee (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return -1;
+  Coffee::Desc d;
+  d.name = gen->gen_string ();
+  this->in_.y->description (d, ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return -1;
 
-      this->in_.y = objref->make_coffee (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Coffee::Desc d;
-      d.name = gen->gen_string ();
-
-      this->in_.y->description (d, 
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::init_parameters\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  return 0;
 }
 
 int
@@ -100,26 +85,12 @@ int
 Test_Objref_Struct::run_sii_test (Param_Test_ptr objref,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Objref_Struct_out out (this->out_.out ());
-
-      this->ret_ = objref->test_objref_struct (this->in_,
-                                               this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Objref_Struct_out out (this->out_.out ());
+  this->ret_ = objref->test_objref_struct (this->in_,
+                                           this->inout_.inout (),
+                                           out,
+                                           ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -127,59 +98,39 @@ Test_Objref_Struct::add_args (CORBA::NVList_ptr param_list,
                               CORBA::NVList_ptr retval,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Objref_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Objref_Struct,
-                            &this->inout_.inout (), // .out () causes crash
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Objref_Struct,
-                          &this->out_.inout (),
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Objref_Struct,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
+  CORBA::Any in_arg (Param_Test::_tc_Objref_Struct,
+                    &this->in_,
+                    0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Objref_Struct,
+                        &this->inout_.inout (), // .out () causes crash
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Objref_Struct,
+                      &this->out_.inout (),
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Objref_Struct,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
   return 0;
 }
 
@@ -192,47 +143,29 @@ Test_Objref_Struct::check_validity (void)
       || this->in_.x != this->ret_->x)
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    { 
-      if (CORBA::is_nil (this->in_.y.in ())
-          || CORBA::is_nil (this->out_->y.in ())
-          || CORBA::is_nil (this->ret_->y.in ())
-          | CORBA::is_nil (this->inout_->y.in ()) )
-        {
-          return 0;
-        }
+  //  CORBA::Environment env;
+ ACE_DECLARE_NEW_CORBA_ENV;
+ if (CORBA::is_nil (this->in_.y.in ())
+     || CORBA::is_nil (this->out_->y.in ())
+     || CORBA::is_nil (this->ret_->y.in ())
+     || CORBA::is_nil (this->inout_->y.in ()) )
+   return 0;
  
-      Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
-          || ACE_OS::strcmp (s_in->name, s_inout->name) != 0
-          || ACE_OS::strcmp (s_in->name, s_ret->name) != 0 )
-        {
-          return 0;
-        }
-
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::check_validity\n");
+  Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return 0;
+  Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return 0;
+  Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return 0;
+  Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return 0;
+
+  if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
+      || ACE_OS::strcmp (s_in->name, s_inout->name) != 0
+      || ACE_OS::strcmp (s_in->name, s_ret->name) != 0 )
+    return 0;
 
-    }
-  ACE_ENDTRY;
-  return 0;
+  return 1;
 }
 
 CORBA::Boolean
@@ -255,39 +188,27 @@ Test_Objref_Struct::print_values (void)
               this->out_->x,
               this->ret_->x ));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-
-      Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  //CORBA::Environment env;
 
-      Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+ ACE_DECLARE_NEW_CORBA_ENV;
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return;
+  Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return;
+  Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return;
+  Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
+  if (ACE_TRY_ENV.exception () != 0) return;
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n*=*=*=*=*=*=*=*=*=*=\n"
-                  "in_ name = %s\n"
-                  "inout_ name = %s\n"
-                  "out_ name = %s\n"
-                  "ret_ name = %s\n",
-                  s_in->name.in (),
-                  s_inout->name.in (),
-                  s_out->name.in (),
-                  s_ret->name.in () ));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::print_values\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  ACE_DEBUG ((LM_DEBUG,
+              "\n*=*=*=*=*=*=*=*=*=*=\n"
+              "in_ name = %s\n"
+              "inout_ name = %s\n"
+              "out_ name = %s\n"
+              "ret_ name = %s\n",
+              s_in->name.in (),
+              s_inout->name.in (),
+              s_out->name.in (),
+              s_ret->name.in () ));
 }
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index ac068c3b6af..41809a4ee50 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -795,7 +795,8 @@ Param_Test_i::test_exception (CORBA::ULong s1,
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops))
 {
-  int d = s1 % 3;
+  int d = this->test_exception_count_ % 3;
+  this->test_exception_count_++;
   if (d == 0)
     {
       s2 = s1 * 2;
@@ -804,7 +805,6 @@ Param_Test_i::test_exception (CORBA::ULong s1,
     }
   else if (d == 1)
       ACE_THROW_RETURN (Param_Test::Ooops (CORBA::string_dup (" % 3 == 1"), s1), 0);
-
   ACE_THROW_RETURN (Param_Test::BadBoy (), 0);
 }
 
@@ -825,7 +825,7 @@ CORBA::Any*
 Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
                                 CORBA::Any_out a3,
-                                CORBA::Environment &)
+                                CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index cdf667e8d9a..ce378a917b6 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -288,6 +288,10 @@ private:
 
   Coffee_i obj_;
   // the coffee object reference we maintain
+
+  int test_exception_count_;
+  // Count the number of calls to test_exception() so we can throw
+  // every 3 calls or so.
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 9e3d99db4c9..7550fffede8 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -96,26 +96,14 @@ int
 Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Recursive_Struct_out out (this->out_.out ());
-
-      this->ret_ = objref->test_recursive_struct (this->in_,
-                                                  this->inout_.inout (),
-                                                  out,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  Param_Test::Recursive_Struct_out out (this->out_.out ());
 
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Recursive_Struct::run_sii_test\n");
+  this->ret_ = objref->test_recursive_struct (this->in_,
+                                              this->inout_.inout (),
+                                              out,
+                                              ACE_TRY_ENV);
 
-    }
-  ACE_ENDTRY;
-  return -1;
+  return (ACE_TRY_ENV.exception () ? -1 : 0);
 }
 
 int
@@ -123,60 +111,40 @@ Test_Recursive_Struct::add_args (CORBA::NVList_ptr param_list,
 			                           CORBA::NVList_ptr retval,
 			                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Recursive_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Recursive_Struct,
-                            &this->inout_.inout (), // .out () causes crash
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Recursive_Struct,
-                          &this->out_.inout (),
-                          0);
-
-      // add parameters
-      param_list->add_value ("rs1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("rs2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("rs3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Recursive_Struct,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Recursive_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Recursive_Struct,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Recursive_Struct,
+                        &this->inout_.inout (), // .out () causes crash
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Recursive_Struct,
+                      &this->out_.inout (),
+                      0);
+
+  // add parameters
+  param_list->add_value ("rs1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("rs2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("rs3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Recursive_Struct,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 38055f79e32..c5055e1c5fb 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -100,8 +100,8 @@ Results::print_stats (void)
 }
 
 void
-Results::print_exception (const char * /* call_name */,
-                          CORBA::Environment &)
+Results::print_exception (const char *call_name,
+                          CORBA::Environment &ACE_TRY_ENV)
 {
   //ACE_PRINT_EXCEPTION (call_name);
 }
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index a234def7fb9..7b41a9f3a63 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -83,7 +83,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "-h                  -- prints this information\n";
       print "-t type             -- runs only one type of param test\n";
       print "-i (dii|sii)        -- Changes the type of invocation\n";
-      exit 0;
+      exit;
     }
     if ($ARGV[$i] eq "-n")
     {
@@ -133,5 +133,3 @@ foreach $type (@types) {
 }
 
 unlink $iorfile;
-
-exit 0;
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 704cf53718c..95bc8cb298e 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -73,24 +73,12 @@ int
 Test_Short::run_sii_test (Param_Test_ptr objref,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_short (this->in_,
-                                       this->inout_,
-                                       this->out_,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_short (this->in_,
+                                   this->inout_,
+                                   this->out_,
+                                   ACE_TRY_ENV);
+
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -98,62 +86,42 @@ Test_Short::add_args (CORBA::NVList_ptr param_list,
                       CORBA::NVList_ptr retval,
                       CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // we provide top level memory to the ORB to retrieve the data
-      CORBA::Any in_arg (CORBA::_tc_short,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_short,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_short,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value. Let the ORB allocate storage. We simply tell the ORB
-      // what type we are expecting.
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_short,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // we provide top level memory to the ORB to retrieve the data
+  CORBA::Any in_arg (CORBA::_tc_short,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_short,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_short,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value. Let the ORB allocate storage. We simply tell the ORB
+  // what type we are expecting.
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_short,
+                                                    &this->ret_,
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/tmplinst.cpp b/TAO/tests/Param_Test/tmplinst.cpp
index 67b5b0696a4..a911a0af3ee 100644
--- a/TAO/tests/Param_Test/tmplinst.cpp
+++ b/TAO/tests/Param_Test/tmplinst.cpp
@@ -17,6 +17,7 @@ template class TAO_Unbounded_Sequence<Param_Test::Fixed_Struct>;
 template class TAO_Bounded_Sequence<Param_Test::Fixed_Struct,32>;
 template class TAO_Unbounded_Object_Sequence<Coffee,Coffee_var>;
 template class TAO_Bounded_Object_Sequence<Coffee,Coffee_var,32>;
+template class TAO_Object_Manager<Coffee,Coffee_var>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::Any>
 #pragma instantiate TAO_Bounded_Sequence<CORBA::Long,32>
@@ -27,4 +28,5 @@ template class TAO_Bounded_Object_Sequence<Coffee,Coffee_var,32>;
 #pragma instantiate TAO_Bounded_Sequence<Param_Test::Fixed_Struct,32>
 #pragma instantiate TAO_Unbounded_Object_Sequence<Coffee,Coffee_var>
 #pragma instantiate TAO_Bounded_Object_Sequence<Coffee,Coffee_var,32>
+#pragma instantiate TAO_Object_Manager<Coffee,Coffee_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index f4e491f5a99..90f16ff0c32 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -50,8 +50,8 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req,
 }
 
 int
-Test_TypeCode::init_parameters (Param_Test_ptr,
-                                CORBA::Environment &)
+Test_TypeCode::init_parameters (Param_Test_ptr objref,
+                                CORBA::Environment &/*ACE_TRY_ENV*/)
 {
   static CORBA::TypeCode_ptr tc_table [] =
     {
@@ -93,26 +93,12 @@ int
 Test_TypeCode::run_sii_test (Param_Test_ptr objref,
                              CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::TypeCode_out out (this->out_);
-
-      this->ret_ = objref->test_typecode (this->in_.in (),
-                                          this->inout_.inout (),
-                                          out,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_TypeCode::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::TypeCode_out out (this->out_);
+  this->ret_ = objref->test_typecode (this->in_.in (),
+                                      this->inout_.inout (),
+                                      out,
+                                      ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -120,99 +106,57 @@ Test_TypeCode::add_args (CORBA::NVList_ptr param_list,
 			 CORBA::NVList_ptr retval,
 			 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (CORBA::_tc_TypeCode,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_TypeCode,
-                             &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_TypeCode,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_TypeCode,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_TypeCode::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (CORBA::_tc_TypeCode,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_TypeCode,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_TypeCode,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_TypeCode,
+                                                    &this->ret_,
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
 Test_TypeCode::check_validity (void)
 {
+  //CORBA::Environment env;
   ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean one, two, three;
-
-      one = this->in_.in ()->equal (this->inout_.in (), 
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      two = this->in_.in ()->equal (this->out_.in (), 
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      three = this->in_.in ()->equal (this->ret_.in (), 
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (one && two && three)
-        return 1;
-      else
-        return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_TypeCode::check_validity\n");
-    }
-  ACE_ENDTRY;
-  return 0;
+  if (this->in_.in ()->equal (this->inout_.in (), ACE_TRY_ENV) &&
+      this->in_.in ()->equal (this->out_.in (), ACE_TRY_ENV) &&
+      this->in_.in ()->equal (this->ret_.in (), ACE_TRY_ENV))
+    return 1;
+  else
+    return 0;
 }
 
 CORBA::Boolean
-Test_TypeCode::check_validity (CORBA::Request_ptr)
+Test_TypeCode::check_validity (CORBA::Request_ptr req)
 {
   return this->check_validity ();
 }
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index f49150089ff..b71f846c94e 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -176,26 +176,12 @@ int
 Test_AnySeq::run_sii_test (Param_Test_ptr objref,
                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::AnySeq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_anyseq (this->in_.in (),
-                                        this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_AnySeq::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::AnySeq_out out (this->out_.out ());
+  this->ret_ = objref->test_anyseq (this->in_.in (),
+                                    this->inout_.inout (),
+                                    out,
+                                    ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1 : 0);
 }
 
 int
@@ -203,59 +189,42 @@ Test_AnySeq::add_args (CORBA::NVList_ptr param_list,
                        CORBA::NVList_ptr retval,
                        CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_AnySeq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_AnySeq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_AnySeq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_AnySeq,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_AnySeq::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_AnySeq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_AnySeq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_AnySeq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_AnySeq,
+                                                    // see above
+                                                    &this->ret_.inout (),
+                                                    // does not own
+                                                    0, 
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
@@ -330,7 +299,7 @@ Test_AnySeq::check_validity (void)
 }
 
 CORBA::Boolean
-Test_AnySeq::check_validity (CORBA::Request_ptr)
+Test_AnySeq::check_validity (CORBA::Request_ptr req)
 {
   return this->check_validity ();
 }
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 318e56a6e9e..7eca8262399 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -55,7 +55,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req,
 
 int
 Test_Long_Sequence::init_parameters (Param_Test_ptr ,
-                                     CORBA::Environment &)
+                                     CORBA::Environment &/*ACE_TRY_ENV*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -87,26 +87,12 @@ int
 Test_Long_Sequence::run_sii_test (Param_Test_ptr objref,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Long_Seq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_long_sequence (this->in_.in (),
-                                               this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Long_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Long_Seq_out out (this->out_.out ());
+  this->ret_ = objref->test_long_sequence (this->in_.in (),
+                                           this->inout_.inout (),
+                                           out,
+                                           ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -114,59 +100,40 @@ Test_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
                                CORBA::NVList_ptr retval,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Long_Seq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Long_Seq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Long_Seq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Long_Seq,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Long_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Long_Seq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Long_Seq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Long_Seq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Long_Seq,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 35d5b789777..b996d463413 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -67,47 +67,39 @@ int
 Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Coffee::Desc desc;
-      Generator *gen = GENERATOR::instance (); // value generator
-
-      // get some sequence length (not more than 10)
-      CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 5) + 5;
+  Coffee::Desc desc;
+  Generator *gen = GENERATOR::instance (); // value generator
 
-      // set the length of the sequence
-      this->in_.length (len);
-      // now set each individual element
+  // get some sequence length (not more than 10)
+  CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 5) + 5;
 
-      for (CORBA::ULong i = 0; i < this->in_.length (); i++)
+  // set the length of the sequence
+  this->in_.length (len);
+  // now set each individual element
+  for (CORBA::ULong i = 0; i < this->in_.length (); i++)
+    {
+      // generate some arbitrary string to be filled into the ith location in
+      // the sequence
+      this->in_[i] = objref->make_coffee (ACE_TRY_ENV);
+      if (ACE_TRY_ENV.exception ())
         {
-          // generate some arbitrary string to be filled into the ith location in
-          // the sequence
-          this->in_[i] = objref->make_coffee (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // select a Coffee flavor at random
-          CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
-
-          desc.name = Coffee_Flavor [index];
-          // set the attribute for the in object
-          Coffee_ptr tmp = this->in_[i];
-
-          tmp->description (desc,
-                            ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "make cofee \n"), -1);
+        }
+      // select a Coffee flavor at random
+      CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
+      desc.name = Coffee_Flavor [index];
+      // set the attribute for the in object
+      Coffee_ptr tmp = this->in_[i];
+      tmp->description (desc, ACE_TRY_ENV);
+
+      if (ACE_TRY_ENV.exception ())
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "set cofee attribute \n"), -1);
         }
-
-        return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::init_parameters\n");
-
     }
-  ACE_ENDTRY;
-  return -1;
+  return 0;
 }
 
 int
@@ -123,26 +115,14 @@ int
 Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Coffee_Mix_out out (this->out_.out ());
-
-      this->ret_ = objref->test_coffe_mix (this->in_,
-                                           this->inout_.inout (),
-                                           out,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Coffee_Mix_out out (this->out_.out ());
+  // ACE_DEBUG ((LM_DEBUG, "test_coffe_mix (IN):\n"));
+  // this->print_sequence (this->in_);
+  this->ret_ = objref->test_coffe_mix (this->in_,
+                                       this->inout_.inout (),
+                                       out,
+                                       ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -150,68 +130,58 @@ Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Coffee_Mix,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Coffee_Mix,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Coffee_Mix,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Coffee_Mix,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Coffee_Mix,
+                     (void *) &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Coffee_Mix,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Coffee_Mix,
+                      &this->out_.inout (),
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Coffee_Mix,
+                                                    &this->ret_.inout (),
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-
+  
   ACE_TRY
     {
+      // ACE_DEBUG ((LM_DEBUG, "IN: \n"));
+      // this->print_sequence (this->in_);
+
+      // ACE_DEBUG ((LM_DEBUG, "INOUT: \n"));
+      // this->print_sequence (this->inout_.in ());
+
+      // ACE_DEBUG ((LM_DEBUG, "OUT: \n"));
+      // this->print_sequence (this->out_.in ());
+
       this->compare (this->in_,
                      this->inout_.in (),
                      ACE_TRY_ENV);
@@ -221,22 +191,20 @@ Test_ObjRef_Sequence::check_validity (void)
                      this->out_.in (),
                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       this->compare (this->in_,
                      this->ret_.in (),
                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      return 1;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::check_validity");
-
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
     }
   ACE_ENDTRY;
-  return 0;
+  ACE_CHECK_RETURN (0);
+
+ return 1; 
 }
 
 CORBA::Boolean
@@ -272,58 +240,39 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
                                const Param_Test::Coffee_Mix &s2,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      if (s1.maximum () != s2.maximum ())
-        {
-          return 0;
-        }
-      if (s1.length () != s2.length ())
-        {
-          return 0;
-        }
-
-      for (CORBA::ULong i=0; i < s1.length (); i++)
-        {
-          Coffee_ptr vs1 = s1[i];
-          Coffee_ptr vs2 = s2[i];
-
-          if (CORBA::is_nil (vs1) && CORBA::is_nil (vs2))
-            {
-              continue;
-            }
-
-          if (CORBA::is_nil (vs1) || CORBA::is_nil (vs2))
-            {
-              return 0;
-            }
-
-          Coffee::Desc *desc1 = vs1->description (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+  if (s1.maximum () != s2.maximum ())
+      return 0;
+  if (s1.length () != s2.length ())
+    return 0;
 
-          CORBA::String_var n1 = desc1->name.in ();
+  for (CORBA::ULong i=0; i < s1.length (); i++)
+    {
+      Coffee_ptr vs1 = s1[i];
+      Coffee_ptr vs2 = s2[i];
 
-          Coffee::Desc *desc2 = vs2->description (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      if (CORBA::is_nil (vs1) && CORBA::is_nil (vs2))
+        continue;
 
-          CORBA::String_var n2 = desc2->name.in ();
+      if (CORBA::is_nil (vs1) || CORBA::is_nil (vs2))
+        return 0;
 
-          if (ACE_OS::strcmp(n1.in (), n2.in ()) != 0)
-            {
-              return 0;
-            }
+      CORBA::String_var n1 = vs1->description (ACE_TRY_ENV)->name.in ();
+      if (ACE_TRY_ENV.exception ())
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "retrieving description for vs1"), 0);
         }
-
-      return 1; // success
+      CORBA::String_var n2 = vs2->description (ACE_TRY_ENV)->name.in ();
+      if (ACE_TRY_ENV.exception ())
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "retrieving description for vs2"), 0);
+        }
+      if (ACE_OS::strcmp(n1.in (), n2.in ()) != 0)
+        return 0;
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::compare");
 
-    }
-  ACE_ENDTRY;
-  return 0;
+  return 1; // success
 }
 
 void
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 30c50ed6870..6bea60fdb72 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -54,7 +54,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req,
 }
 
 int
-Test_Short_Sequence::init_parameters (Param_Test_ptr,
+Test_Short_Sequence::init_parameters (Param_Test_ptr objref,
                                       CORBA::Environment &)
 {
   Generator *gen = GENERATOR::instance (); // value generator
@@ -89,26 +89,12 @@ int
 Test_Short_Sequence::run_sii_test (Param_Test_ptr objref,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Short_Seq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_short_sequence (this->in_.in (),
-                                                this->inout_.inout (),
-                                                out,
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Short_Seq_out out (this->out_.out ());
+  this->ret_ = objref->test_short_sequence (this->in_.in (),
+                                            this->inout_.inout (),
+                                            out,
+                                            ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -116,59 +102,40 @@ Test_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
                                CORBA::NVList_ptr retval,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Short_Seq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Short_Seq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Short_Seq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Short_Seq,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Short_Seq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Short_Seq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Short_Seq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Short_Seq,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index c64107fb3bc..3d5f431d407 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -93,26 +93,12 @@ int
 Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::StrSeq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_strseq (this->in_.in (),
-                                        this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_String_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::StrSeq_out out (this->out_.out ());
+  this->ret_ = objref->test_strseq (this->in_.in (),
+                                    this->inout_.inout (),
+                                    out,
+                                    ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -120,59 +106,40 @@ Test_String_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_StrSeq,
-                         (void *) &this->in_.in (),
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_StrSeq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_StrSeq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_StrSeq,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_String_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_StrSeq,
+                     (void *) &this->in_.in (),
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_StrSeq,
+                        &this->inout_.inout (),
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_StrSeq,
+                      &this->out_.inout (), // out_.out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_StrSeq,
+                                                    &this->ret_.inout (), // see above
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index cb31381a237..fe076ce293f 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -99,26 +99,12 @@ int
 Test_Unbounded_String::run_sii_test (Param_Test_ptr objref,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::String_out str_out (this->out_);
-
-      this->ret_ = objref->test_unbounded_string (this->in_,
-                                                  this->inout_,
-                                                  str_out,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unbounded_String::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::String_out str_out (this->out_);
+  this->ret_ = objref->test_unbounded_string (this->in_,
+                                              this->inout_,
+                                              str_out,
+                                              ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -126,59 +112,41 @@ Test_Unbounded_String::add_args (CORBA::NVList_ptr param_list,
 				 CORBA::NVList_ptr retval,
 				 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (CORBA::_tc_string,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_string,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_string,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_string,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_String_Sequence::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // create the parmaters
+  CORBA::Any in_arg (CORBA::_tc_string,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_string,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_string,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_string,
+                                                    &this->ret_,
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 77ef82ea22c..d7511d6e6c5 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -90,26 +90,12 @@ int
 Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::StructSeq_out out (this->out_.out ());
-
-      this->ret_ = objref->test_struct_sequence (this->in_,
-                                                 this->inout_.inout (),
-                                                 out,
-                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Struct_Sequence::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::StructSeq_out out (this->out_.out ());
+  this->ret_ = objref->test_struct_sequence (this->in_,
+                                             this->inout_.inout (),
+                                             out,
+                                             ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -117,59 +103,40 @@ Test_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_StructSeq,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_StructSeq,
-                            &this->inout_.inout (),
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_StructSeq,
-                          &this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_StructSeq,
-                               &this->ret_.inout (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Any in_arg (Param_Test::_tc_StructSeq,
+                     &this->in_,
+                     0);
 
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Struct_Sequence::add_args\n");
+  CORBA::Any inout_arg (Param_Test::_tc_StructSeq,
+                        &this->inout_.inout (),
+                        0);
 
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any out_arg (Param_Test::_tc_StructSeq,
+                      &this->out_.inout (), // .out () causes crash
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_StructSeq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
@@ -340,9 +307,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
                                                        this->inout_.inout (),
                                                        out,
                                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index ae767374b25..7ff4fdea85f 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -47,7 +47,7 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req,
 
 int
 Test_ULongLong::init_parameters (Param_Test_ptr ,
-                                 CORBA::Environment &)
+                                CORBA::Environment &)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -69,25 +69,12 @@ int
 Test_ULongLong::run_sii_test (Param_Test_ptr objref,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_ulonglong (this->in_,
-                                           this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ULongLong::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  this->ret_ = objref->test_ulonglong (this->in_,
+                                       this->inout_,
+                                       this->out_,
+                                       ACE_TRY_ENV);
+
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -95,62 +82,42 @@ Test_ULongLong::add_args (CORBA::NVList_ptr param_list,
                           CORBA::NVList_ptr retval,
                           CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      // we provide top level memory to the ORB to retrieve the data
-      CORBA::Any in_arg (CORBA::_tc_ulonglong,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (CORBA::_tc_ulonglong,
-                            &this->inout_,
-                            0);
-
-      CORBA::Any out_arg (CORBA::_tc_ulonglong,
-                          &this->out_,
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value. Let the ORB allocate storage. We simply tell the ORB
-      // what type we are expecting.
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (CORBA::_tc_ulonglong,
-                               &this->ret_,
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ULongLong::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // we provide top level memory to the ORB to retrieve the data
+  CORBA::Any in_arg (CORBA::_tc_ulonglong,
+                     &this->in_,
+                     0);
+
+  CORBA::Any inout_arg (CORBA::_tc_ulonglong,
+                        &this->inout_,
+                        0);
+
+  CORBA::Any out_arg (CORBA::_tc_ulonglong,
+                      &this->out_,
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value. Let the ORB allocate storage. We simply tell the ORB
+  // what type we are expecting.
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_ulonglong,
+                                            &this->ret_,
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 235659d0e85..1b8025bb8f4 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -82,25 +82,12 @@ int
 Test_Var_Array::run_sii_test (Param_Test_ptr objref,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Var_Array_out out_arr (this->out_.out ());
-      this->ret_ = objref->test_var_array (this->in_,
-                                           this->inout_,
-                                           out_arr,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Array::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Var_Array_out out_arr (this->out_.out ());
+  this->ret_ = objref->test_var_array (this->in_,
+                                       this->inout_,
+                                       out_arr,
+                                       ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -108,59 +95,42 @@ Test_Var_Array::add_args (CORBA::NVList_ptr param_list,
 			  CORBA::NVList_ptr retval,
 			  CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Var_Array,
-                         this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Var_Array,
-                            this->inout_,
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Var_Array,
-                          this->out_.inout (), // .out () causes crash
-                          0);
-
-      // add parameters
-      param_list->add_value ("v1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("v2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("v3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Var_Array,
-                               this->ret_.in (),
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Array::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  // We provide the top level memory
+  // the Any does not own any of these
+  CORBA::Any in_arg (Param_Test::_tc_Var_Array,
+                     this->in_,
+                     0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Var_Array,
+                        this->inout_,
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Var_Array,
+                      this->out_.inout (),
+                      0);
+
+  // add parameters
+  param_list->add_value ("v1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("v2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("v3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value type
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Var_Array,
+                                                    this->ret_.in (),
+                                                    0, // does not own
+                                                    ACE_TRY_ENV);
+  return 0;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 18fa4936abe..25ea7fccd89 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -91,25 +91,12 @@ int
 Test_Var_Struct::run_sii_test (Param_Test_ptr objref,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      Param_Test::Var_Struct_out out (this->out_.out ());
-      this->ret_ = objref->test_var_struct (this->in_,
-                                            this->inout_.inout (),
-                                            out,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Struct::run_sii_test\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  Param_Test::Var_Struct_out out (this->out_.out ());
+  this->ret_ = objref->test_var_struct (this->in_,
+                                        this->inout_.inout (),
+                                        out,
+                                        ACE_TRY_ENV);
+  return (ACE_TRY_ENV.exception () ? -1:0);
 }
 
 int
@@ -117,60 +104,40 @@ Test_Var_Struct::add_args (CORBA::NVList_ptr param_list,
 			   CORBA::NVList_ptr retval,
 			   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      CORBA::Any in_arg (Param_Test::_tc_Var_Struct,
-                         &this->in_,
-                         0);
-
-      CORBA::Any inout_arg (Param_Test::_tc_Var_Struct,
-                            &this->inout_.inout (), // .out () causes crash
-                            0);
-
-      CORBA::Any out_arg (Param_Test::_tc_Var_Struct,
-                          &this->out_.inout (),
-                          0);
-
-      // add parameters
-      param_list->add_value ("s1",
-                             in_arg,
-                             CORBA::ARG_IN,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s2",
-                             inout_arg,
-                             CORBA::ARG_INOUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      param_list->add_value ("s3",
-                             out_arg,
-                             CORBA::ARG_OUT,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // add return value
-      CORBA::NamedValue *item = retval->item (0,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      item->value ()->replace (Param_Test::_tc_Var_Struct,
-                               &this->ret_.inout (), // see above
-                               0, // does not own
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return 0;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Struct::add_args\n");
-
-    }
-  ACE_ENDTRY;
-  return -1;
+  CORBA::Any in_arg (Param_Test::_tc_Var_Struct,
+                    &this->in_,
+                    0);
+
+  CORBA::Any inout_arg (Param_Test::_tc_Var_Struct,
+                        &this->inout_.inout (), // .out () causes crash
+                        0);
+
+  CORBA::Any out_arg (Param_Test::_tc_Var_Struct,
+                      &this->out_.inout (),
+                      0);
+
+  // add parameters
+  param_list->add_value ("s1",
+                         in_arg,
+                         CORBA::ARG_IN,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s2",
+                         inout_arg,
+                         CORBA::ARG_INOUT,
+                         ACE_TRY_ENV);
+
+  param_list->add_value ("s3",
+                         out_arg,
+                         CORBA::ARG_OUT,
+                         ACE_TRY_ENV);
+
+  // add return value
+  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Var_Struct,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            ACE_TRY_ENV);
+  return 0;
 }
 
 
diff --git a/TAO/tests/Quoter/FactoryFinder.exe b/TAO/tests/Quoter/FactoryFinder.exe
deleted file mode 100755
index 2d5a2b39e7a..00000000000
--- a/TAO/tests/Quoter/FactoryFinder.exe
+++ /dev/null
diff --git a/TAO/tests/Quoter/ns.btm b/TAO/tests/Quoter/ns.btm
deleted file mode 100644
index ebe5b49ad5d..00000000000
--- a/TAO/tests/Quoter/ns.btm
+++ /dev/null
@@ -1,4 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM Naming Service must have been built or else this will fail
-start "Naming Service" /K ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport 10042 -ORBobjrefstyle url -o %nsiorfile
-
diff --git a/TAO/tests/Quoter/run_test.btm b/TAO/tests/Quoter/run_test.btm
deleted file mode 100644
index a0e2ed1be86..00000000000
--- a/TAO/tests/Quoter/run_test.btm
+++ /dev/null
@@ -1,161 +0,0 @@
-@echo off
-
-REM This is a 4NT Batch file.  To use, just type run_test and it will start the 
-REM server, wait for a second, and then start the client.  At the end, it will
-REM clean up.  
-
-setlocal
-
-set nsiorfile=%temp%\qns_ior
-set del=2
-
-REM variables for parameters
-
-set nsport=20002
-set clport=20003
-set svport=20004
-set ffport=20005
-set lcport=20006
-set gfport=20007
-set n=1
-set leave=/C
-set ior=0
-set done=
-
-:get_args
-
-if %1 == /h goto is_h
-if %1 == /? goto is_h
-goto no_h
-:is_h
-echo run_test [/n num] [/leave] [/h] [/ns, /sv, /ff, /cl, /gf]
-echo.
-echo /n num              -- runs the client num times
-echo /leave              -- leaves the servers running and their windows open
-echo /h                  -- prints this information
-echo /ns /sv /ff /cl /gf -- Runs only one of the executables
-quit
-:no_h
-
-if not %1 == /ns goto no_ns
-set done=quit
-goto run_name_server
-:no_ns
-
-if not %1 == /sv goto no_sv
-set done=quit
-goto run_server
-:no_sv
-
-if not %1 == /ff goto no_ff
-set done=quit
-goto run_finder
-:no_ff
-
-if not %1 == /lc goto no_lc
-set done=quit
-goto run_lifecycle_service
-:no_lc
-
-if not %1 == /gf goto no_gf
-set done=quit
-goto run_generic_factory
-:no_gf
-
-
-if not %1 == /cl goto no_cl
-set done=quit
-goto run_client
-:no_cl
-
-if not %1 == /n goto no_n
-set n=%2
-shift
-shift
-goto get_args
-:no_n
-
-if not %1 == /leave goto no_leave
-set leave=/K
-shift
-goto get_args
-:no_leave
-
-:run_name_server
-REM Naming Service must have been built or else this will fail
-start "Naming Service" %leave ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport %nsport -ORBobjrefstyle url -o %nsiorfile
-rem -ORBnameserviceior %temp\qns_ior
-
-%done
-
-REM Delay some to let the Naming Service get set up
-DELAY %del
-
-:run_server
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-start "Quoter Server" %leave server.exe -ORBport %svport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
-
-%done
-
-REM Delay some to let the server get set up
-DELAY %del
-
-:run_finder
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the factory finder
-start "Quoter Factory Finder" %leave Factory_Finder.exe -ORBport %ffport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-%done
-
-REM Delay some to let the Factory Finder get set up
-DELAY %del
-
-:run_lifecycle_service
-REM read in the IOR from the file
-REM for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the Lifecycle Service
-REM start "Quoter LifeCycle Service" %leave LifeCycle_Service.exe -ORBport %lcport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-%done
-
-REM Delay some to let the LifeCycle Service get set up
-REM DELAY %del
-
-:run_generic_factory
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the factory finder
-start "Quoter Generic Factory" %leave Generic_Factory.exe -ORBport %gfport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-
-%done
-
-REM Delay some to let the Generic Factory get set up
-DELAY %del
-
-:run_client
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM And now start the client
-for /l %x in (1,1,%n) do client.exe -ORBobjrefstyle url -ORBport %clport -ORBnameserviceior %ior -ORBsvcconf client.conf
-
-%done
-
-REM We don't really need to delete this
-REM del %temp%\qns_ior
-
-REM Remove any running servers
-if %leave==/C activate "Naming Service" CLOSE
-if %leave==/C activate "Quoter Server" CLOSE
-if %leave==/C activate "Quoter Factory Finder" CLOSE
-if %leave==/C activate "Quoter Generic Factory" CLOSE
-
-endlocal
\ No newline at end of file
diff --git a/TAO/tests/Quoter/sv.btm b/TAO/tests/Quoter/sv.btm
deleted file mode 100644
index dff9cf19039..00000000000
--- a/TAO/tests/Quoter/sv.btm
+++ /dev/null
@@ -1,7 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-echo %ior
-start "Quoter Server" /k Quoter_Server.exe -ORBport 10041 -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw
index f6bd692b3b9..1dd50c9191c 100644
--- a/TAO/tests/TAO_Tests.dsw
+++ b/TAO/tests/TAO_Tests.dsw
@@ -111,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_Server Client"=.\MT_Server\client.dsp - Package Owner=<4>

+Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,7 +123,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_Server Server"=.\MT_Server\server.dsp - Package Owner=<4>

+Project: "Multiple Inheritance Server"=.\Multiple_Inheritance\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -135,7 +135,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>

+Project: "Native Exceptions Client"=.\Native_Exceptions\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -147,7 +147,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Multiple Inheritance Server"=.\Multiple_Inheritance\server.dsp - Package Owner=<4>

+Project: "Native Exceptions Server"=.\Native_Exceptions\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -183,7 +183,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Nested Upcall Simple Client"=.\NestedUpcall\Simple\client.dsp - Package Owner=<4>

+Project: "Nested Upcall Reactor Client"=.\NestedUpcall\Reactor\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -195,7 +195,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Nested Upcall Simple Server"=.\NestedUpcall\Simple\server.dsp - Package Owner=<4>

+Project: "Nested Upcall Reactor Server"=.\NestedUpcall\Reactor\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -255,66 +255,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "OctetSeq Client"=.\OctetSeq\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "OctetSeq Server"=.\OctetSeq\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "POA Deactivation"=.\POA\Deactivation\Deactivation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "POA Destruction"=.\POA\Destruction\Destruction.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Param_Test Client"=.\Param_Test\client.dsp - Package Owner=<4>

 

 Package=<5>

@@ -339,30 +279,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timeout Client"=.\Timeout\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Timeout Server"=.\Timeout\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>

diff --git a/TAO/tests/Timeout/Makefile b/TAO/tests/Timeout/Makefile
deleted file mode 100644
index f0bb165b98f..00000000000
--- a/TAO/tests/Timeout/Makefile
+++ /dev/null
@@ -1,1356 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
-
-CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES))
-SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: testC.h testC.i testC.cpp
-.PRECIOUS: testS.h testS.i testS.cpp
-.PRECIOUS: testS_T.h testS_T.i testS_T.cpp
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Timeout/README b/TAO/tests/Timeout/README
deleted file mode 100644
index 51172687346..00000000000
--- a/TAO/tests/Timeout/README
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Id$
-
-	A simple test for timeouts.  The client sets each one of the
-policy overrides (object, thread and ORB) and issues requests using
-those policies.  The requests take a client controlled amount of time
-on the server.
-	As the client increases the duration of the request the
-requests should start to timeout.
-
-	To run it do:
-
-$ server -o test.ior
-$ client -k file://test.ior -l 5 -h 15
-
-	or use the run_test.pl script.
diff --git a/TAO/tests/Timeout/Timeout.dsw b/TAO/tests/Timeout/Timeout.dsw
deleted file mode 100644
index 7810bfd4a08..00000000000
--- a/TAO/tests/Timeout/Timeout.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Timeout Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Timeout Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
deleted file mode 100644
index e6dcabc62ea..00000000000
--- a/TAO/tests/Timeout/client.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Timeout, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int min_timeout = 0;
-int max_timeout = 20;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-
-      case 'l':
-        min_timeout = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'h':
-        max_timeout = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-l <min_timeout> "
-                           "-h <max_timeout> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-void
-send_echo (Simple_Server_ptr server,
-           CORBA::Long t,
-           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      server->echo (0, t, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCH (CORBA::TIMEOUT, timeout)
-    {
-      // Trap this exception and continue...
-      ACE_DEBUG ((LM_DEBUG,
-                  "==> Trapped a TIMEOUT exception (expected)\n"));
-
-      // Sleep so the server can send the reply...
-      ACE_Time_Value tv (max_timeout / 1000,
-                         (max_timeout % 1000) * 1000);
-      ACE_OS::sleep (tv);
-    }
-  ACE_ENDTRY;
-}
-
-
-int main (int argc, char* argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      object =
-        orb->resolve_initial_references ("PolicyCurrent",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      TimeBase::TimeT mid_value =
-        10000 * (min_timeout + max_timeout) / 2;
-
-      CORBA::Any any_orb;
-      any_orb <<= mid_value;
-      CORBA::Any any_thread;
-      any_thread <<= mid_value + 10000;
-      CORBA::Any any_object;
-      any_object <<= mid_value + 20000;
-
-      CORBA::PolicyList policy_list (1);
-      policy_list.length (1);
-      policy_list[0] =
-        orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                            any_object,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      object =
-        server->_set_policy_overrides (policy_list,
-                                       CORBA::SET_OVERRIDE,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var timeout_server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      policy_list[0]->destroy (ACE_TRY_ENV);
-      policy_list[0] = CORBA::Policy::_nil ();
-
-      for (CORBA::Long t = min_timeout; t != max_timeout; ++t)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "\n================================\n"
-                      "Trying with timeout = %d\n", t));
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "Cleanup ORB/Thread/Object policies\n"));
-
-          policy_list.length (0);
-          policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          send_echo (server.in (), t, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "client(%P) Set the ORB policies\n"));
-
-          policy_list.length (1);
-          policy_list[0] =
-            orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_orb,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          send_echo (server.in (), t, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          policy_list[0]->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "client(%P) Set the thread policies\n"));
-
-          policy_list.length (1);
-          policy_list[0] =
-            orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_thread,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          send_echo (server.in (), t, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          policy_list[0]->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "client(%P) Use the object policies\n"));
-          send_echo (timeout_server.in (), t, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n\n\nclient(%P) Test completed, resynch with server\n"));
-      policy_list.length (0);
-      policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      send_echo (server.in (), 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      server->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Timeout/run_test.pl b/TAO/tests/Timeout/run_test.pl
deleted file mode 100755
index c8e485e77d6..00000000000
--- a/TAO/tests/Timeout/run_test.pl
+++ /dev/null
@@ -1,46 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-unshift @INC, '../../../bin';
-require ACEutils;
-
-$status = 0;
-
-$iorfile = "server.ior";
-unlink $iorfile;
-
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -o $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-                       " -ORBDebugLevel 0"
-                       ." -k file://$iorfile "
-                       . " -l 6 -h 14");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-  $status = 1;
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
deleted file mode 100644
index d7430caf857..00000000000
--- a/TAO/tests/Timeout/server.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Timeout, 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.optarg;
-	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
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Simple_Server_i server_impl (orb.in ());
-
-      Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      orb->run ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Timeout/test.idl b/TAO/tests/Timeout/test.idl
deleted file mode 100644
index d84cfa23a23..00000000000
--- a/TAO/tests/Timeout/test.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server {
-
-  long echo (in long x, in long msecs);
-  // Returns <x>, but sleep for <msecs> milliseconds before returning
-
-  oneway void shutdown ();
-  // Shutdown the ORB
-};
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
deleted file mode 100644
index 1383acf1de8..00000000000
--- a/TAO/tests/Timeout/test_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Timeout, test_i, "$Id$")
-
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-
-}
-
-CORBA::Long
-Simple_Server_i::echo (CORBA::Long x,
-                       CORBA::Long msecs,
-                       CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
-
-  ACE_DEBUG ((LM_DEBUG, "server (%P) Sleeping for %d msecs\n",
-              tv.msec ()));
-  ACE_OS::sleep (tv);
-
-  return x;
-}
-
-void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Received shutdown request from client\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
-}
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/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
deleted file mode 100644
index 2115fad1a8c..00000000000
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_client
-//
-// = FILENAME
-//   Client.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-#ifndef CLIENT_H
-#define CLIENT_H
-
-#include "testC.h"
-
-class Control;
-
-class Client  
-{
- public:
-  
-  Client (CORBA::ORB_ptr orb);
-  // ctor
-
-  ~Client (void);
-  //Dtor..
-
-  static void start_callback (Widget w,
-                              XtPointer client_data,
-                              XtPointer call_data);
-  static void stop_callback  (Widget w,
-                              XtPointer client_data,
-                              XtPointer call_data);
-  // The callbacks
-
-  void start_hook (void);
-  void stop_hook (void);
-  // The hooks...
-
-  void add_callback (Control &);
-  // Adds the callbacks to the GUI underneath.....
-
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
- private:
-
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  Stopwatch_var server_;
-  // The server.
-};
-#endif
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
deleted file mode 100644
index f4380b3aa3a..00000000000
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-#include "Control.h"
-
-Control::Control (Widget &parent )
-{
-  // Instantiate the  sub-components of the Control
-  this->frame_ = XmCreateFrame (parent, "frame",
-                                0, 0 );
-
-  this->rowcolumn_ = XmCreateRowColumn (this->frame_,"rwc",
-                                        0, 0 );
-
-  this->startwidget_ = XmCreatePushButton (this->rowcolumn_, "Start",
-                                           0,0);
-
-  this->stopwidget_ = XmCreatePushButton (this->rowcolumn_, "Stop",
-                                          0,0);
-}
-
-Control::~Control ( )
-{
-  //delete _face;
-  //delete _timer;
-  // delete _control;
-}
-
-void 
-Control::manage (void)
-{
-  XtManageChild (frame_);
-  XtManageChild (rowcolumn_);
-  XtManageChild (startwidget_);
-  XtManageChild (stopwidget_);
-}
-
-Widget &
-Control::startwidget (void)
-{
-  return this->startwidget_;
-}
-
-Widget &
-Control::stopwidget (void)
-{
-  return this->stopwidget_;
-}
-/*void Control::timerStarted()
-{
-    // Empty
-}
-
-void Control::timerStopped()
-{
-    // Empty
-}
-*/
-
-
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
deleted file mode 100644
index 49823821b7a..00000000000
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_client
-//
-// = FILENAME
-//   Control.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-#ifndef CONTROL_H
-#define CONTROL_H
-#include <Xm/Xm.h>
-#include <Xm/PushB.h>
-#include <Xm/Label.h>
-#include <Xm/RowColumn.h>
-#include <Xm/Frame.h>
-#include "Client.h"
-
-class Control  
-{
- public:
-  Control (Widget &parent);
-  // Stopwatch constructor
-  
-  virtual ~Control ();
-  // Destructor
-
-  virtual void manage();   
-  // Manage the widget
-
-  Widget& startwidget (void);
-  // Return the start widget
-
-  Widget& stopwidget (void);
-  // Return the stop widget.. 
-
- private:
-  
-  Widget frame_;
-  // A frame widget...
-
-  Widget rowcolumn_;
-  // A row column widget..
-  
-  Widget startwidget_;
-  // Pushbutton  Widget that is used to start the  timer..
-  
-  Widget stopwidget_;
-  // Pushbutton widget that is used to stop the timer..
-
- protected:
-    
-  //  virtual void timerStarted();   // Subclass hooks called when
-  //virtual void timerStopped();   // timer starts and stops
-  //float elapsedTime() { return _timer->elapsedTime(); }
-};
-#endif
diff --git a/TAO/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile
deleted file mode 100644
index 14335494739..00000000000
--- a/TAO/tests/Xt_Stopwatch/Makefile
+++ /dev/null
@@ -1,1613 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i Stopwatch_display Control)
-
-CLIENT_OBJS = client.o Control.o testC.o
-SERVER_OBJS = server.o test_i.o Stopwatch_display.o $(addsuffix .o, $(IDLFILES))
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: testC.h testC.i testC.cpp
-.PRECIOUS: testS.h testS.i testS.cpp
-.PRECIOUS: testS_T.h testS_T.i testS_T.cpp
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i Control.h Client.h
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i \
- testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i Stopwatch_display.h
-.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i
-.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i \
- testS_T.h testS_T.i testS_T.cpp testS.i
-.obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i \
- testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
-.obj/Stopwatch_display.o .obj/Stopwatch_display.so .shobj/Stopwatch_display.o .shobj/Stopwatch_display.so: Stopwatch_display.cpp Stopwatch_display.h
-.obj/Control.o .obj/Control.so .shobj/Control.o .shobj/Control.so: Control.cpp Control.h Client.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h testC.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
deleted file mode 100644
index 7219350b73c..00000000000
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-#include "Stopwatch_display.h"
-
-Stopwatch_display::Stopwatch_display (Widget &parent )
-{
-  // Instantiate the  sub-components of the Stopwatch_display
-  this->frame_ = XtCreateWidget ("frame", xmFrameWidgetClass,
-                                 parent, 0, 0 );
-  this->label_ = XtCreateWidget ("label", xmLabelWidgetClass,
-                                 this->frame_, 0, 0 );
-  //_timer = new Stopwatch_displayTimer ( XtWidgetToApplicationContext ( parent ), 
-  //                            _face, 
-  //                            1000 );
-}
-
-Stopwatch_display::~Stopwatch_display ( )
-{
-  //delete _face;
-  //delete _timer;
-  // delete _control;
-}
-
-void 
-Stopwatch_display::manage (void)
-{
-  XtManageChild (this->frame_);
-  XtManageChild (this->label_);
-}
-
-/*void Stopwatch_display::timerStarted()
-{
-    // Empty
-}
-
-void Stopwatch_display::timerStopped()
-{
-    // Empty
-}
-*/
-
-
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
deleted file mode 100644
index 283eb7fc14c..00000000000
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch/Stopwatch_server
-//
-// = FILENAME
-//   Stopwatch.h
-//
-// = AUTHOR
-//   Balachandran  Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-#ifndef STOPWATCH_H
-#define STOPWATCH_H
-#include <Xm/Xm.h>
-#include <Xm/Frame.h>
-#include <Xm/Label.h>
-
-class Stopwatch_display
-{
-  //  friend Control; // Let Control call protected Stopwatch_display functions
-
-  public:
-  
-  Stopwatch_display (Widget &parent);
-  // Stopwatch_display constructor
-  
-  virtual ~Stopwatch_display();
-  // Destructor
-
-  virtual void manage();   
-  // Manage the widget
-
-  //virtual void unmanage();
-  // Unmanage the widget
-    
- private:
-  Widget frame_;
-  // A frame widget...
-  Widget label_;
-  // Label Widget that is used to display time..
-  
- protected:
-    
-  //  virtual void timerStarted();   // Subclass hooks called when
-  //virtual void timerStopped();   // timer starts and stops
-  //float elapsedTime() { return _timer->elapsedTime(); }
-};
-#endif
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
deleted file mode 100644
index 999f288ab15..00000000000
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "ace/Get_Opt.h"
-
-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"
-#include "tao/xt_resource.h"
-
-int
-main (int argc,
-      char* argv[])
-{
-  XtAppContext  app;
-  Widget        toplevel = XtAppInitialize ( &app, "Start & Stop", NULL, 0,
-                                             &argc, argv, NULL, NULL, 0 );
-
-  TAO_XT_Resource_Factory::set_context (app);
-
-  Control control (toplevel);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Client client (orb.in ());
-
-      client.parse_args (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      client.add_callback (control);
-
-      // Manage the widgets
-      control.manage ();
-      XtRealizeWidget (toplevel);
-      XtAppMainLoop (app);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-Client::Client (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Client::~Client (void)
-{
-}
-void
-Client::parse_args (int argc, char *argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  const char *ior = "file://test.ior";
-
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case '?':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    "usage:  %s "
-                    "-k <ior> "
-                    "\n",
-                    argv [0]));
-      }
-
-  CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->server_ =
-    Stopwatch::_narrow (object.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (CORBA::is_nil(this->server_.in ()))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n The server value is nil "));
-    }
-}
-
-void
-Client::add_callback (Control &ctrl)
-{
-  XtPointer client_data = ACE_static_cast (XtPointer, this);
-  // Register callbacks, specifying the object's instance
-  // pointer as client data.
-  XtAddCallback ( ctrl.startwidget (),
-                  XmNactivateCallback,
-                  &Client::start_callback,
-                  client_data);
-
-  XtAddCallback ( ctrl.stopwidget (),
-                  XmNactivateCallback,
-                  &Client::stop_callback,
-                  client_data);
-}
-
-
-void
-Client::start_callback (Widget widget,
-                        XtPointer client_data,
-                        XtPointer )
-{
-  cout << "I am here "<<endl;
-  Client *self = ACE_static_cast(Client*,client_data);
-  self->start_hook ();
-}
-
-void
-Client::stop_callback (Widget widget,
-                       XtPointer client_data,
-                       XtPointer )
-{
-  cout << "I am here "<<endl;
-  Client *self = ACE_static_cast(Client*,client_data);
-  self->stop_hook ();
-}
-
-void
-Client::start_hook (void)
-{
-  cout << "I am here 1"<<endl;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->server_->start (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      cout <<"I am here 2"<<endl;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception in the start button callback");
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Client::stop_hook (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->server_->stop (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception in the stop button callback");
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
deleted file mode 100644
index 49248c80b47..00000000000
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-
-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 <Xm/Xm.h>
-#include "Stopwatch_display.h"
-#include "tao/xt_resource.h"
-
-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.optarg;
-	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[])
-{
-  // We do the command line parsing first
-  if (parse_args (argc, argv) != 0)
-    return 1;
-
-  XtAppContext  app;
-  Widget        toplevel = XtAppInitialize ( &app, "Stopwatch", NULL, 0,
-                                             &argc, argv, NULL, NULL, 0 );
-
-  TAO_XT_Resource_Factory::set_context (app);
-
-  Stopwatch_display stopwatch (toplevel);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      stopwatch.manage ();
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Stopwatch_imp server_impl (orb.in ());
-
-      Stopwatch_var server =
-        server_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-      {
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-      }
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      XtRealizeWidget (toplevel );
-      XtAppMainLoop ( app );
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  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/test.idl b/TAO/tests/Xt_Stopwatch/test.idl
deleted file mode 100644
index 7203e30f2ad..00000000000
--- a/TAO/tests/Xt_Stopwatch/test.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-interface Stopwatch 
-{
-   void start ();
-   // Start the Stop watch
-
-   void stop ();
-   // Stop the watch
-
-  void shutdown ();
-  // Shutdown the ORB
-};
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
deleted file mode 100644
index 77861b4f7cd..00000000000
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#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$")
-
-Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-
-}
-
-void
-Stopwatch_imp::start (CORBA::Environment&)
-{
-  cout <<"Start button pressed "<<endl;
-}
-
-void
-Stopwatch_imp::stop (CORBA::Environment&)
-{
-  cout << "Stop button pressed "<< endl;
-}
-
-void
-Stopwatch_imp::shutdown (CORBA::Environment&)
-{
-  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
deleted file mode 100644
index 23ed9e2b94b..00000000000
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Xt_Stopwatch
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Bala
-//
-// ============================================================================
-
-#ifndef SERVER_TEST_I_H
-#define SERVER_TEST_I_H
-
-#include "testS.h"
-
-#if defined(ACE_HAS_XT)
-
-class Stopwatch_imp : public POA_Stopwatch
-{
-  // = TITLE
-  //   Stopwatch implementation class
-  //
-  // = DESCRIPTION
-  //   Implements the Stopwatch interface in test.idl
-  //
-public:
-  Stopwatch_imp (CORBA::ORB_ptr);
-  // ctor
-
-  // = The Simple_Server methods.
-  void start (CORBA::Environment&);
-  void stop (CORBA::Environment&);
-  void shutdown (CORBA::Environment&);
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-};
-
-#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/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/utils/IOR-parser/Makefile b/TAO/utils/IOR-parser/Makefile
index cc079ef9b76..1586594e6e6 100644
--- a/TAO/utils/IOR-parser/Makefile
+++ b/TAO/utils/IOR-parser/Makefile
@@ -17,7 +17,6 @@ OBJ	= $(addsuffix .o,$(FILES))
 
 BUILD	= $(VBIN)
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/utils/IOR-parser/Makefile.bor b/TAO/utils/IOR-parser/Makefile.bor
deleted file mode 100644
index 64bb2b2a5ea..00000000000
--- a/TAO/utils/IOR-parser/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for building the ior-parser executable
-#
-
-NAME = ior-parser
-
-OBJFILES = \
-	$(OBJDIR)\ior-parser.obj \
-	$(OBJDIR)\ior-handler.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 35ecd73391e..68a9af5f412 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -20,7 +20,6 @@ SRC= catior.cpp
 
 BUILD	= $(VBIN)
 
-TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -156,25 +155,16 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -222,9 +212,13 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -354,8 +348,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/LSOCK.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
  $(TAO_ROOT)/tao/UIOP_Profile.i
 
diff --git a/TAO/utils/catior/Makefile.bor b/TAO/utils/catior/Makefile.bor
deleted file mode 100644
index ae9c4ea571c..00000000000
--- a/TAO/utils/catior/Makefile.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the catior executable
-#
-
-NAME = catior
-
-OBJFILES = $(OBJDIR)\catior.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index b46e1287fb9..f6e8b294ca1 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -24,7 +24,7 @@
 
 static CORBA::Boolean
 catiiop (CORBA::String string,
-         CORBA::Environment &ACE_TRY_ENV)
+         CORBA::Environment &env)
 {
   // NIL objref encodes as just "iiop:" ... which has already been
   // removed, so we see it as an empty string.
@@ -71,7 +71,8 @@ catiiop (CORBA::String string,
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA_DATA_CONVERSION (), 0);
+      env.exception (new CORBA_DATA_CONVERSION ());
+      return 0;
     }
 
   hostname = CORBA::string_alloc (1 + cp - string);
@@ -88,8 +89,9 @@ catiiop (CORBA::String string,
 
   if (cp == 0)
     {
+      env.exception (new CORBA_DATA_CONVERSION ());
       CORBA::string_free (hostname);
-      ACE_THROW_RETURN (CORBA_DATA_CONVERSION (), 0);
+      return 0;
     }
 
   port_number = (short) ACE_OS::atoi ((char *) string);
@@ -276,7 +278,7 @@ catior (CORBA::String str,
 
 static CORBA::Boolean
 catpoop (CORBA::String string,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::Environment &env)
 {
   if (!string || !*string)
     return 0;
@@ -291,7 +293,8 @@ catpoop (CORBA::String string,
 
   if (cp == 0)
     {
-      ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
+      env.exception (new CORBA_DATA_CONVERSION ());
+      return 0;
     }
 
   // Read the hostname.
@@ -559,13 +562,7 @@ cat_octet_seq (const char *object_name,
               object_name));
 
   for (i = 0; i < length; i++)
-    {
-      char c = objKey[i];
-      if (isprint (c))
-        ACE_DEBUG ((LM_DEBUG, "%c", c));
-      else
-        ACE_DEBUG ((LM_DEBUG, "."));
-    }
+    ACE_DEBUG ((LM_DEBUG, "%c", objKey[i]));
 
   CORBA::string_free (objKey);
   ACE_DEBUG ((LM_DEBUG, "\n"));
diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile
index 3c6a59441b4..4fc9c3da98d 100644
--- a/TAO/utils/nslist/Makefile
+++ b/TAO/utils/nslist/Makefile
@@ -21,10 +21,9 @@ SRC	= nslist.cpp
 
 BUILD	= $(VBIN)
 
-TAO_IDLFLAGS += -Ge 1
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Time
@@ -174,13 +173,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -233,6 +225,8 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
  $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
diff --git a/TAO/utils/nslist/Makefile.bor b/TAO/utils/nslist/Makefile.bor
deleted file mode 100644
index 4c5b01ea2d3..00000000000
--- a/TAO/utils/nslist/Makefile.bor
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for building the nslist executable
-#
-
-NAME = nslist
-
-OBJFILES = \
-	$(OBJDIR)\nslist.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/version_tests.dsw b/TAO/version_tests.dsw
deleted file mode 100644
index 95e2016c17d..00000000000
--- a/TAO/version_tests.dsw
+++ /dev/null
@@ -1,3557 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "ACE DLL"=..\ace\ace_dll.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ACE_Init_Test"=..\tests\ACE_Init_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Atomic_Op_Test"=..\tests\Atomic_Op_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "BCast"=.\orbsvcs\tests\Event\Basic\BCast.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Barrier_Test"=..\tests\Barrier_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Basic_Types_Test"=..\tests\Basic_Types_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Buffer_Stream_Test"=..\tests\Buffer_Stream_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "CDR Basic Types"=.\tests\CDR\basic_types.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "CDR Growth"=.\tests\CDR\growth.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "CDR TC"=.\tests\CDR\tc.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "CDR_Test"=..\tests\CDR_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Cache_Map_Manager_Test"=..\tests\Cache_Map_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Callback Quoter Consumer"=.\examples\Callback_Quoter\Consumer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Callback Quoter Notifier"=.\examples\Callback_Quoter\Notifier.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Callback Quoter Supplier"=.\examples\Callback_Quoter\Supplier.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Collection_Test"=..\tests\Collection_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Colocated_Test"=.\orbsvcs\tests\Trading\Colocated_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TradingLib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Conn_Test"=..\tests\Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Connect"=.\orbsvcs\tests\Event\Performance\Connect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "DII_Cubit Client"=".\performance-tests\Cubit\TAO\DII_Cubit\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name IDL_Cubit Client

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "DLL_Test"=..\tests\DLL_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "DLList_Test"=..\tests\DLList_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "DynAny Basics"=.\tests\DynAny_Test\basic_test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Dynamic_Priority_Test"=..\tests\Dynamic_Priority_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ECT_Consumer"=.\orbsvcs\tests\EC_Throughput\ECT_Consumer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ECT_Supplier"=.\orbsvcs\tests\EC_Throughput\ECT_Supplier.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ECT_Throughput"=.\orbsvcs\tests\EC_Throughput\ECT_Throughput.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ECTest"=.\orbsvcs\tests\Event\lib\ECTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "EC_Mcast"=.\orbsvcs\tests\EC_Mcast\EC_Mcast.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "EC_Multiple"=.\orbsvcs\tests\EC_Multiple\EC_Multiple.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Enum_Interfaces_Test"=..\tests\Enum_Interfaces_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Env_Value_Test"=..\tests\Env_Value_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Event_Comm Consumer"=.\examples\Event_Comm\Consumer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Event_Comm Notifier"=.\examples\Event_Comm\Notifier.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Event_Comm Supplier"=.\examples\Event_Comm\Supplier.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Event_Latency"=.\orbsvcs\tests\Event_Latency\Event_Latency.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Export_Test"=.\orbsvcs\tests\Trading\Export_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TradingLib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Faults Client"=.\tests\Faults\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Faults Server"=.\tests\Faults\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Future_Set_Test"=..\tests\Future_Set_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Future_Test"=..\tests\Future_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Handle_Set_Test"=..\tests\Handle_Set_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Hash_Map_Manager_Test"=..\tests\Hash_Map_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "High_Res_Timer_Test"=..\tests\High_Res_Timer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IDL_Cubit Client"=".\performance-tests\Cubit\TAO\IDL_Cubit\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IDL_Cubit Collocation Test"=".\performance-tests\Cubit\TAO\IDL_Cubit\collocation_test.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IDL_Cubit Server"=".\performance-tests\Cubit\TAO\IDL_Cubit\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IORTest"=.\tests\IORManipulation\IORTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IOStream_Test"=..\tests\IOStream_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Import_Test"=.\orbsvcs\tests\Trading\Import_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TradingLib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "InterOp Naming Client"=".\tests\InterOp-Naming\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "InterOp Naming Server"=".\tests\InterOp-Naming\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Latency Tests Client"=".\performance-tests\Latency\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Latency Tests Server"=".\performance-tests\Latency\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MM_Shared_Memory_Test"=..\tests\MM_Shared_Memory_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Client Client"=.\tests\MT_Client\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Client ORB Creation"=.\tests\MT_Client\orb_creation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Client Server"=.\tests\MT_Client\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Cubit Client"=".\performance-tests\Cubit\TAO\MT_Cubit\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Cubit Server"=".\performance-tests\Cubit\TAO\MT_Cubit\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Reactor_Timer_Test"=..\tests\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_SOCK_Test"=..\tests\MT_SOCK_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Server Client"=.\tests\MT_Server\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MT_Server Server"=.\tests\MT_Server\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Map_Manager_Test"=..\tests\Map_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Map_Test"=..\tests\Map_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Mem_Map_Test"=..\tests\Mem_Map_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Message_Block_Test"=..\tests\Message_Block_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Message_Queue_Notifications_Test"=..\tests\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Message_Queue_Test"=..\tests\Message_Queue_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Multiple Inheritance Client"=.\tests\Multiple_Inheritance\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Multiple Inheritance Server"=.\tests\Multiple_Inheritance\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Naming_Service"=.\orbsvcs\Naming_Service\Naming_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Naming_Test"=..\tests\Naming_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall MT_Client Client"=.\tests\NestedUpcall\MT_Client_Test\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall MT_Client Server"=.\tests\NestedUpcall\MT_Client_Test\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall Triangle Initiator"=.\tests\NestedUpcall\Triangle_Test\initiator.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall Triangle Server_A"=.\tests\NestedUpcall\Triangle_Test\server_A.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Nested Upcall Triangle Server_B"=.\tests\NestedUpcall\Triangle_Test\server_B.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "New_Fail_Test"=..\tests\New_Fail_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Notify_Performance_Test"=..\tests\Notify_Performance_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OBV Typed Events Client"=.\examples\OBV\Typed_Events\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OBV Typed Events Server"=.\examples\OBV\Typed_Events\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ORB Services DLL"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Observer"=.\orbsvcs\tests\Event\Basic\Observer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OctetSeq"=.\tests\OctetSeq\OctetSeq.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OctetSeq Client"=.\tests\OctetSeq\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OctetSeq Server"=.\tests\OctetSeq\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "OrdMultiSet_Test"=..\tests\OrdMultiSet_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Adapter Activator Server"=.\examples\POA\Adapter_Activator\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA DSI Client"=.\examples\POA\DSI\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA DSI Server"=.\examples\POA\DSI\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Deactivation"=.\POA\Deactivation\Deactivation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Default Servant Client"=.\examples\POA\Default_Servant\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Default Servant Server"=.\examples\POA\Default_Servant\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Destruction"=.\tests\POA\Destruction\Destruction.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Explicit Activation Server"=.\examples\POA\Explicit_Activation\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA FindPOA"=.\examples\POA\FindPOA\FindPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Forwarding Client"=.\examples\POA\Forwarding\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Forwarding Server"=.\examples\POA\Forwarding\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Generic Servant Client"=.\examples\POA\Generic_Servant\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Generic Servant DLL"=.\examples\POA\Generic_Servant\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Identity"=.\tests\POA\Identity\Identity.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Loader Server"=.\examples\POA\Loader\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA NewPOA"=.\examples\POA\NewPOA\NewPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA On Demand Activation Server"=.\examples\POA\On_Demand_Activation\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA On Demand Loading Server"=.\examples\POA\On_Demand_Loading\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Reference Counted Servant Server"=.\examples\POA\Reference_Counted_Servant\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA Registration"=".\performance-tests\POA\Object_Creation_And_Registration\registration.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA RootPOA"=.\examples\POA\RootPOA\RootPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA TIE Client"=.\examples\POA\TIE\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "POA TIE Server"=.\examples\POA\TIE\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Param_Test Client"=.\tests\Param_Test\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Param_Test Server"=.\tests\Param_Test\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Pipe_Test"=..\tests\Pipe_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Pluggable Client"=".\performance-tests\Pluggable\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Pluggable Server"=".\performance-tests\Pluggable\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Priority_Buffer_Test"=..\tests\Priority_Buffer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Priority_Reactor_Test"=..\tests\Priority_Reactor_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Priority_Task_Test"=..\tests\Priority_Task_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Process_Mutex_Test"=..\tests\Process_Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Process_Strategy_Test"=..\tests\Process_Strategy_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Quoter Client"=.\examples\Quoter\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Quoter Factory Finder"=.\examples\Quoter\Factory_Finder.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Quoter Generic Factory"=.\examples\Quoter\Generic_Factory.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Quoter Server"=.\examples\Quoter\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "RB_Tree_Test"=..\tests\RB_Tree_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reactor_Exceptions_Test"=..\tests\Reactor_Exceptions_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reactor_Notify_Test"=..\tests\Reactor_Notify_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reactor_Performance_Test"=..\tests\Reactor_Performance_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reactor_Timer_Test"=..\tests\Reactor_Timer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reactors_Test"=..\tests\Reactors_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reader_Writer_Test"=..\tests\Reader_Writer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reconnect"=.\orbsvcs\tests\Event\Basic\Reconnect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Recursive_Mutex_Test"=..\tests\Recursive_Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reverse_Lock_Test"=..\tests\Reverse_Lock_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SOCK_Connector_Test"=..\tests\SOCK_Connector_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SOCK_Send_Recv_Test"=..\tests\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SOCK_Test"=..\tests\SOCK_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SPIPE_Test"=..\tests\SPIPE_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SString_Test"=..\tests\SString_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "SV_Shared_Memory_Test"=..\tests\SV_Shared_Memory_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Sched_Conf"=.\orbsvcs\tests\Sched_Conf\Sched_Conf.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Schedule"=.\orbsvcs\tests\Event\Basic\Schedule.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Semaphore_Test"=..\tests\Semaphore_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Service_Config_Test"=..\tests\Service_Config_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Shutdown"=.\orbsvcs\tests\Event\Basic\Shutdown.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Sigset_Ops_Test"=..\tests\Sigset_Ops_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Bank Client"=.\examples\Simple\bank\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Bank Server"=.\examples\Simple\bank\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Chat Client"=.\examples\Simple\chat\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Chat Server"=.\examples\Simple\chat\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Echo Client"=.\examples\Simple\echo\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Echo Server"=.\examples\Simple\echo\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Grid Client"=.\examples\Simple\grid\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Grid Server"=.\examples\Simple\grid\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Naming Client"=.\orbsvcs\tests\Simple_Naming\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Time Client"=.\examples\Simple\time\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Time Date Client"=".\examples\Simple\time-date\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name Simple Time Date Library

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Time Date Library"=".\examples\Simple\time-date\Time_Date.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Time Date Server"=".\examples\Simple\time-date\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name Simple Time Date Library

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Time Server"=.\examples\Simple\time\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple_Message_Block_Test"=..\tests\Simple_Message_Block_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Svc_Handler_Test"=..\tests\Svc_Handler_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "TAO DLL"=.\tao\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "TSS_Test"=..\tests\TSS_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Task_Test"=..\tests\Task_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Thread_Manager_Test"=..\tests\Thread_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Thread_Mutex_Test"=..\tests\Thread_Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Thread_Pool_Reactor_Test"=..\tests\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Thread_Pool_Test"=..\tests\Thread_Pool_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Throughput"=.\orbsvcs\tests\Event\Performance\Throughput.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Time_Service_Test"=..\tests\Time_Service_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Time_Value_Test"=..\tests\Time_Value_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Timeout Client"=.\tests\Timeout\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Timeout Server"=.\tests\Timeout\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Timeprobe_Test"=..\tests\Timeprobe_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Timer_Queue_Test"=..\tests\Timer_Queue_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Tokens_Test"=..\tests\Tokens_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "TradingLib"=.\orbsvcs\tests\Trading\TradingLib.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL Compiler

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ORB Services DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "UPIPE_SAP_Test"=..\tests\UPIPE_SAP_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Upgradable_RW_Test"=..\tests\Upgradable_RW_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name gperf_lib

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/THANKS b/THANKS
deleted file mode 100644
index c451da83003..00000000000
--- a/THANKS
+++ /dev/null
@@ -1,694 +0,0 @@
-ACKNOWLEDGEMENTS
-
-ACE and TAO have been deeply influenced and improved by the following
-members of my research group at Washington University:
-
-Everett Anderson <eea1@cec.wustl.edu>
-Alexander Babu Arulanthu <alex@cs.wustl.edu>
-Shawn Atkins <sma1@cs.wustl.edu>
-Matt Braun <mjb2@cs.wustl.edu>
-Darrell Brunsch <brunsch@cs.wustl.edu>
-Chris Cleeland <chris@cs.wustl.edu>
-Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-Chris Gill <cdgill@cs.wustl.edu>
-Aniruddha Gokhale <gokhale@cs.wustl.edu>
-Pradeep Gore <pradeep@cs.wustl.edu>
-Tim Harrison <harrison@cs.wustl.edu>
-John Heitmann  <jwh1@cs.wustl.edu>
-James Hu <jxh@cs.wustl.edu>
-Prashant Jain <pjain@cs.wustl.edu>
-Vishal Kachroo <vishal@cs.wustl.edu>
-Michael Kircher <mlkirche@trick.informatik.uni-stuttgart.de>
-Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-Fred Kuhns <fredk@cs.wustl.edu>
-David Levine <levine@cs.wustl.edu>
-Mike Moran <mm4@cs.wustl.edu>
-Balachandran Natarajan <bala@cs.wustl.edu>
-Kirthika Parameswaran <kirthika@cs.wustl.edu>
-Carlos O'Ryan <coryan@cs.wustl.edu>
-Ossama Othman <othman@cs.wustl.edu>
-Jeff Parsons <parsons@cs.wustl.edu>
-Irfan Pyarali <irfan@cs.wustl.edu>
-Marina Spivak <marina@cs.wustl.edu>
-Nagarajan Surendran <naga@cs.wustl.edu>
-Nanbor Wang <nanbor@cs.wustl.edu>
-Seth Widoff <sbw1@cs.wustl.edu>
-Torben Worm <tworm@cs.wustl.edu>
-
-I would also like to thank all the following people who have also
-contributed to ACE and TAO over the years:
-
-Paul Stephenson <pstephenson@objectspace.com>
-Olaf Kruger <okruger@cssc-melb.tansu.com.au>
-Ed Brown <eebrown@netcom.com>
-Lee Baker <baker@ctis.af.mil>
-Alex Ranous <ranous@nsa.hp.com>
-Mark Patton <mark_patton@tx72.mot.com>
-Steffen Winther Sorensen <sts@dad.stibo.dk> for
-Troy Warner <tnw1@core01.osi.com>
-Stacy Mahlon <mcs@contour.mayo.edu>
-Charles Eads <eads@synoptics.com>
-Mark Frutig <mfrutig@fnbc.com>
-Todd Hoff <thm@ictv.com>
-George <george@truffula.fp.trw.com>
-Brad Needham <bneedham@ix.netcom.com>
-Leslee Xu <lxu@ics.uci.edu>
-Detlef Becker <detlef.becker@med.siemens.de>
-Bruce Worden <bruce@betsy.gps.caltech.edu>
-Chris Tarr <ctarr@objectspace.co>
-Bill Sears <wsears@world.std.com>
-Greg Lavendar <g.lavender@isode.com>
-Steve Warwick <sjw@aesthetic.com>
-Mats Sundvall <sundvall@perrier.embnet.se>
-Andreas Ueltschi <Andreas.Ueltschi@ska.com>
-Nigel Hooke <n.hooke@trl.oz.au>
-Medhi Tabatabai <Mehdi.Tabatabai@ed.nce.sita.int>
-Stuart Powell <stuartp@ot.com.au>
-Bin Mu <mubin@wfg.com>
-Andrew McGowan <mcgowan@wg2.waii.com>
-Ken Konecki <kenk@wfg.com>
-John P. Hearn <jph@ccrl.nj.nec.com>
-Giang Hoang Nguyen <yang@titan.com>
-Carlos Garcia Braschi <cgarcia@caramba.tid.es>
-Jam Hamidi <jh1@osi.com>
-Eric Vaughan <evaughan@arinc.com>
-Karl-Heinz Dorn <karlheinz.dorn@med.siemens.de>
-Steve Ritter <ritter@titan.com>
-Chandra Venkatapathy <cvenkat@develop.bsis.com>
-Matt Stevens <mstevens@kirk.softeng.infonautics.com>
-Bob Vistica <robertv@ims.com>
-David Trumble <trumble@cvg.enet.dec.com>
-John Morey <jmorey@crl.com>
-George Reynolds <george@dvcorp.com>
-Hans Rohnert <hans.rohnert@mchp.siemens.de>
-Alex V. Maclinovsky <alexm@teltrunk1.tait.co.nz>
-Todd Blanchard <tblancha@evolving.com>
-Rob Clairmont <rclairmo@bnr.ca>
-Christian Millour <chris@etca.fr>
-Neil B. Cohen <nbc@cisco.com>
-Dieter Quehl <dieter.quehl@med.siemens.de>
-Reginald S. Perry <perry@zso.dec.com>
-James Morris <jmorris@aurora.apana.org.au>
-Mark Seaborn <mseaborn@itthp1.comm.mot.com>
-Phil Brooks <phil_brooks@mentorg.com>
-E. Jason Scheck <jasons@ims.com>
-Daniel Proulx <daproulx@qc.bell.ca>
-Bill Tang <tang@tekats.com>
-John Huchinson <hutchiso@epi.syr.ge.com>
-Jack Erickson <JErickson@exchange.ml.com>
-Byron Walton <bwalton@hughes.scg.hac.com>
-Bill Lear <rael@anarchy.cybercom.net>
-Mark Zusman <marklz@topaz.technion.ac.il>
-Aurelio Nocerino <aurelio@irsipcs2-27-le0.irsip.na.cnr.it>
-Walt Akers <akers@cebaf.gov>
-Greg Baker <GBaker@p01.az15m.iac.honeywell.com>
-Alexandre Karev <karev@vxcern.cern.ch>
-Pramod Kumar Singh <pramod@saturn.miel.mot.com>
-Bryon Rigg <bryon_rigg@mail.telecorpsys.com>
-Brad Brown <bbrown@rdxsunhost.aud.alcatel.com>
-Patty Genualdi <genualdp@agcs.com>
-Eshel Liran <liran@bimacs.cs.biu.ac.il>
-Mick Adams <eeimas@eei.ericsson.se>
-Chris Eich <Chris_Eich@optilink.optilink.dsccc.com>
-Mike Flinn <mike.flinn@smtpgate.aws.waii.com>
-Audun Tornquist <Audun.Tornquist@iu.hioslo.no>
-Sandeep Joshi <sandeepj@emailbox.att.com>
-Bernd Hofner <hofner@pd.et-inf.uni-siegen.de>
-Craig Perras <craigp@wolfenet.com>
-Kirk Sinnard <kirk.sinnard@lawson.com>
-Matthew Newhook <matthew@ooc.com>
-Gerolf Wendland <wendland@hpp015.mch2.scn.de>
-Phil Mesnier <phil@envision.com>
-Ross Dargahi <rossd@krinfo.com>
-Richard Orr <rorr@costello.den.csci.csc.com>
-Rich Ryan <rryan@mseng.kla.com>
-Jan Rychter <jwr@icm.edu.pl>
-Tom Marrs <0002104588@mcimail.com>
-Bob Olson <olson@mcs.anl.gov>
-Jean-Francois Ripouteau <Jean-Francois.Ripouteau@netsurf.org>
-Ajit Sagar <asagar@spdmail.spd.dsccc.com>
-Ashish Singhai <singhai@delirius.cs.uiuc.edu>
-David Sames <David.L.Sames.1@gsfc.nasa.gov>
-Gonzalo Diethelm <gonzo@ing.puc.cl>
-Raj <raj@itd.ssb.com>
-Darrin <darrin@jeeves.net>
-Steve Weismuller <spweismu@rsoc.rockwell.com>
-Eric C. Newton <ecn@smart.net>
-Andres Kruse <kruse@cern.ch>
-Ramesh Nagabushnam <rcn@nynexst.com>
-Antonio Tortorici <antonio@rh0011.roma.tlsoft.it>
-Nigel Lowe <nigel@nt.com>
-Tom Leith <trl@icon-stl.net>
-Michael Fortinsky <mike@vocaltec.com>
-Marco Sommerau <sommerau@matisse.informatik.uni-stuttgart.de>
-Gary Salsbery <gsalsber@simsun.atsc.allied.com>
-Eric Beser <beser@simsun.atsc.allied.com>
-Alfred Keller <kellera@pop.eunet.ch>
-John Lu <johnlu@f1.telekurs.ch>
-James Mansion <james@wgold.demon.co.uk>
-Jesper S. M|ller <Jesper.Moller@ameridata.dk>
-Chris Lahey <clahey@cccis.com>
-Michael R"uger <m_rueger@syscomp.de>
-Istvan Buki <istvan.buki@euronet.be>
-Greg Wilson <gvwilson@vnet.ibm.com>
-Garrett Conaty <gconaty@outbackinc.com>
-Brad Flood <BFLOOD@slc.unisysgsg.com>
-Marius Kjeldahl <marius@funcom.com>
-Steve Huston <shuston@riverace.com>
-Eugene K. Plaude <jec@r-style.msk.su>
-Joseph DeAngelis <bytor@faxint.com>
-Kim Gillies <gillies@noao.edu>
-Luca Priorelli <lucapri@mbox.vol.it>
-Alan Stewart <axs2@osi.com>
-Hani Yakan <hani@i-online.com>
-William L. Gerecke <gerecke@rayva.org>
-Craig Johnston <johnston@tortilla.ds.boeing.com>
-Pierre-Yves Duval <duval@cppm.in2p3.fr>
-Rochi Febo Dommarco <rocky@alter.it>
-Jonathan Biggar <jon@biggar.org>
-Scott Shupe <shupes@mitre.org>
-Chuck Gehr <gehr@sweng.stortek.com>
-Avi Nash <anash@RedBrick.COM>
-Padhu Ramalingam <padhu@magicnet.net>
-Jay Denkberg <jay_denkberg@comverse.com>
-Ayman Farahat <afarahat@CCGATE.HAC.COM>
-Tilo Christ <christ@swl.fh-heilbronn.de>
-Ari Erev <Ari_Erev@icomverse.com>
-Hamutal Yanay <Hamutal_Yanay@icomverse.com>
-Vital Aza <va3@cs.wustl.edu>
-Alex Villazon <villazon@cui.unige.ch>
-David Artus <david.artus@sbil.co.uk>
-Todd Barkalow <todd_barkalow@stortek.com>
-Alexander Smundak <sasha@migration.com>
-Thilo Kielmann <kielmann@informatik.uni-siegen.de>
-Matthias Kerkhoff <make@cs.tu-berlin.de>
-Fred LaBar <flabar@fallschurch.esys.com>
-Hanan Herzog <hanan@wallenda.stanford.edu>
-Eric Parker <eparker@credence.com>
-James Michael Dwyer <jdwyer@knox.edu>
-Arun Katkere <katkere@praja.com>
-Bob Dunmire <bobd@titan.com>
-Sandro Doro <alex@aureus.sublink.org>
-Robert Lyng <rlyng@synertech.highmark.com>
-Phil Logan <phill@in.ot.com.au>
-John Cosby <John.D.Cosby@cpmx.saic.com>
-Wayne Vucenic <wvucenic@netgate.net>
-Harry Gunnarsson <hg@carmenta.se>
-James CE Johnson <jcej@lads.com>
-Samuel_Bercovici <Samuel_Bercovici_at_EFT__AD2@mail.icomverse.com>
-Per Andersson <Per.Andersson@hfera.ericsson.se>
-Anthony McConnell <Tonym@datel.demon.co.uk>
-Mark Rabotnikov <mark@usp.elscintcorp.co.il>
-John Bossom <John.Bossom@Cognos.COM>
-Rino Simioni <sir@necsy.it>
-Slawomir Kuzniar <kuzniar@Bear.COM>
-Rob Jordan <jordan@hursley.ibm.com>
-Michael Maxie <maxie@acm.org>
-John Cosby <John.D.Cosby@cpmx.saic.com>
-Nigel Owen <Nigel@voicelink.co.nz>
-Jorn Jensen <jornj@funcom.com>
-Paul Roman <proman@npac.syr.edu>
-Dave Mayerhoefer <davem@lynx.com>
-Bert Craytor  <Bert_Craytor@peoplesoft.com>
-Joey Zhu <joey.zhu@wcom.com>
-Arthur J. Lewis <hfdh99a@prodigy.com>
-Michael R. MacFaden <mrm@yagosys.com>
-Paul Han <phan@CCGATE.HAC.COM>
-Jeff Morgan <jeff@audioactive.com>
-Arturo Montes <mitosys@colomsat.net.co>
-Elliot Lau <eeklau@post1.com>
-Mark Wright <markw@odi.com.au>
-Michael Newton <michaeln@in.ot.com.au>
-Kumar Neelakantan <kneelaka@painewebber.com>
-Scott Halstead <scott.halstead@gs.com>
-Jean-Marc Strauss <jms97@club-internet.fr>
-Adam Porter <aporter@cs.umd.edu>
-Hakan Kallberg <hk@simulina.se>
-Eric Dean Russell <edrusse@somnet.sandia.gov>
-Daniel Montalibet <daniel_montalibet@stortek.com>
-Norbert Rapp <norbert.rapp@nexus-informatics.de>
-Ganesh Pai <gpai@voicetek.com>
-Berni Merkle <merkle@io.freinet.de>
-Tom Wright <twright@gem-net.demon.co.uk>
-Torbjorn Lindgren <tl@funcom.no>
-Mike Bernat <sagmb@sagus.com>
-Brian Mendel <brian.r.mendel@boeing.com>
-Jeremy Buch <davinci@nortel.ca>
-Kevin Boyle <kboyle@sanwafp.com>
-Kevin Martindale <kevin_martindale@stortek.com>
-Luis Lopes <llopes@tick.rcc.Ryerson.CA>
-Adrian Salt <acsalt@magi.com>
-Hongbo Xu <hxu@mas.co.nz>
-Michael Hartman <c62nt57@ibx.com>
-Tom Dobridge <dobridge@persimmon.com>
-Rich Christy <rchristy@cccis.com>
-Satoshi Ueno <satoshi.ueno@gs.com>
-Eugene R. Somdahl <gene@endo.com>
-Robert Head <rhead@mail.virtc.com>
-Ivan Murphy <Ivan.Murphy@med.siemens.de>
-Jan Perman <jan.perman@osd.uab.ericsson.se>
-Shankar Krishnamoorthy <kshankar@lucent.com>
-Reza Roodsari <reza@sprynet.com>
-Jim Crossley <jim@lads.com>
-Johannes Gutleber <Johannes.Gutleber@cern.ch>
-Marina Spivak <marina@cs.wustl.edu>
-Yigong Liu <ygl@emailbox.lucent.com>
-Erik Urdang <erik@bhi.com>
-Mike Schweiger <mikes@bmo.com>
-Anthony Mutiso <amutiso@hughes.cg.hac.com>
-Jeff R. Hayes <Jeff.Hayes@osi.com>
-David Brackman <dbrackman@OhioEE.com>
-Dave Moore <dave.moore@gecm.com>
-Joseph Cross <joseph.k.cross@lmco.com>
-Cherif Sleiman <sleiman@research.moore.com>
-Stefan Ericsson <Stefan.Ericsson@osd.uab.ericsson.se>
-Wei Chiang <wei.chiang@horizon.ntc.nokia.com>
-Thanh Ma <tma@encore.com>
-Oleg Krivosheev <kriol@fnal.gov>
-Stephen Coy <stevec@wsa.com.au>
-Bob Laferriere <laferrie@gsao.med.ge.com>
-Satheesh Kumar MG <satheesh@india.aspectdv.com>
-Karen Amestoy <kamestoy@CCGATE.HAC.COM>
-Jeff Richard <jrichard@OhioEE.com>
-Samuel Melamed <sam@vdo.net>
-Vladimir Schipunov <vlad@staff.prodigy.com>
-Felix Popp <fxpopp@immd9.informatik.uni-erlangen.de>
-Billy Quinn <bquinn@lads.com>
-Michael McKnight <mcknight@signalsoftcorp.com>
-Huiying Shen <shen@environ.org>
-Alex Chan <Alex.Chan@Aspect.com>
-Aaron Valdivia <avaldivia@hns.com>
-Edan Ayal <edana@vdo.net>
-Jeffrey Peterson <jpeterson@fallschurch.esys.com>
-Neil Lavelle <nlavelle@imcl.com>
-Steven Wohlever <wohlever@mitre.org>
-Manojkumar Acharya <mja@cvsf325.gpt.co.uk>
-Evgeny Beskrovny <evgeny_beskrovny@icomverse.com>
-Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
-Laura Paterno <lpaterno@d0chb.fnal.gov>
-Ben Eng <ben@jetpen.com>
-Mike Kamrad <J.M.KAMRAD.II@cdev.com>
-Marios Zikos <zikos@csi.forth.gr>
-Mark L Boriack <mboriack@std.saic.com>
-Mark Hyett <mhyett@std.saic.com>
-Caleb Epstein <epstein_caleb_unix@jpmorgan.com>
-Valik Solrzano Barboza <valik@xs4all.nl>
-John Connett <jrc@skylon.demon.co.uk>
-Tom Arbuckle <arbuckle@uran.informatik.uni-bonn.de>
-Stephen Henry <shenry@mdc.com>
-Dani Flexer <danif@ivory-sw.com>
-Michael Hoffman <Hoffman_Michael@mac-mailserver.atc.ll.mit.edu>
-John Lindal <jafl@cheshire-cat.caltech.edu>
-Dustin Laurence <laurence@alice.wonderland.caltech.edu>
-Ernie Makris <emakris@ziplink.net>
-Timothy A. Brown <tabrown@montana.com>
-Patrick J. McNerthney <pat@cartia.com>
-Lori Anderson <lori@probita.com>
-Erik Margraf <erik@asgard.gud.siemens.co.at>
-Bryan Doerr <Bryan.S.Doerr@boeing.com>
-Adam Miller <adam@royalblueny.com>
-Thomas Jordan <ace@programmer.net>
-Keith Nicewarner <knicewar@sanders.com>
-Frederic Andres <andres@rd.nacsis.ac.jp>
-Achint Sandhu <sandhu@nortel.ca>
-Mitch Kuninsky <Mitch_Kuninsky@avid.com>
-Alex Chan <Alex.Chan@Aspect.com>
-Jeff Hellzen <JHellzen@hwdcsaws.cahwnet.gov>
-Thomas Venturella <tventurell@mdc.com>
-Philippe O'Reilly <philippe@robot.ireq.ca>
-Stan Leeson <STANLEY.D.LEESON@cdev.com>
-Richard Keizer <RICHARD.L.KEIZER@cdev.com>
-Edgar Villanueva <edgarvil@ix.netcom.com>
-Oliver Kellogg <Oliver.Kellogg@vs.dasa.de>
-Dave Meyer <dmeyer@std.saic.com>
-Thomas Hampson <thomas.hampson@lmco.com>
-Jay Kistler <jjk@pa.dec.com>
-Scott Snyder <snyder@d0sgif.fnal.gov>
-Mark Evans <mark.evans@tandem.com>
-Todd Pack <todd@rwii.com>
-Mark Maris <maris@scgp.com>
-Jason Katz <Jason@email.rts-inc.com>
-Jim Penny <jpenny@universal-fasteners.com>
-Chris Ryan <cryan@qualcomm.com>
-J. Russell Noseworthy <rnosewor@objectsciences.com>
-Carol Sanders <Carol.Sanders@Boeing.com>
-Jerry Bickle <glbick@most.fw.hac.com>
-Paul von Behren <Paul_von_Behren@stortek.com>
-Sudish Joseph <sj@eng.mindspring.net>
-Loren Rittle <rittle@comm.mot.com>
-Alexander Ovsiankin <sasha@technologist.com>
-Fred Kuhns <fredk@arl.wustl.edu>
-Ravi Nagabhyru <ravi@future-minds.com>
-Tom Brusehaver <tgb@cozy.netco.com>
-Dave Tallman <tallman@acsys.com>
-Monish Rajpal <monish@cs.jhu.edu>
-Garry Brother <gmbroth@romulus.ncsc.mil>
-Andreas Schuelke <Andreas.Schuelke@med.siemens.de>
-Ganapathi <guns@fs.IConNet.NET>
-James Garrison <jhg@austx.tandem.com>
-Brad Walton <brad.walton@transnexus.com>
-Paul Motuzenko <p_motuzenko@hotmail.com>
-Kurt Sussman <kls@best.com>
-Rob Thornton <ret1@cec.wustl.edu>
-Chanaka Liyanaarachchi <chanakal@ittc.ukans.edu>
-Saneyasu <sane@sail.t.u-tokyo.ac.jp>
-Steve Kay <slk1@icore.ih.lucent.com>
-Greg White <gwhite@northlink.com>
-Ki-hyun Yoon <abird@nextware.co.kr>
-Umar Syyid <usyyid@hns.com>
-Bill Fulton <fultonb@pcnet1.ascs.aro.allied.com>
-Amancio Hasty <hasty@rah.star-gate.com>
-Zoran Ivanovic <zorani@pathcom.com>
-Sree Oggu <dharani@sutmyn.com>
-James Risinger <jrisinge@cgi.com>
-Leo Modica <lmodica@lucent.com>
-Bob Scott <bob_scott@broder.com>
-Mark Kettner <m.kettner@elsevier.nl>
-Kent Watsen <kent@watsen.net>
-Chris Healey <chealey@entera.com>
-Philippe Klein <Philippe_Klein@vocaltec.com>
-William S. Lear <rael@dejanews.com>
-John Geiss <jtgb@eci-esyst.com>
-Ernesto Guisado <eguisado@saincotrafico.com>
-Stuart Myles <smyles@wsj.dowjones.com>
-Lothar Werzinger <lwerzinger@krones.de>
-Andrew Harbick <aharbick@opentext.com>
-Pavel Motuzenko <p_motuzenko@hotmail.com>
-Ross J. Lillie <lillie@rsch.comm.mot.com>
-Sam Hauer <shauer@nmo.gtegsc.com>
-Frank. J. Hodum <fhdum@std.saic.com>
-David Miron <dxm@crapper.dsto.defence.gov.au>
-Anton van Straaten <anton@appsolutions.com>
-Joe Covalesky <joe@nowsol.com>
-Bill Backstrom <backstr@anubis.network.com>
-Jeff Franks <Jeffrey_Franks@i-o.com>
-John Mulhern <9107@mn3.lawson.lawson.com>
-Johan Lundin <johan@lundin.com>
-Eric Powers <powerg@deltanet.com>
-Zheng Han <zhan@glenvan.glenayre.com>
-Gabriel Lima <gali@enea.se>
-Doug Anderson <doug@clark.net>
-Hongyin Quan <hq1@arl.wustl.edu>
-Maximilian Hoferer <mhoferer@krones.de>
-Kevin Stanley <kstanley1@mdc.com>
-Jeff Greif <jmg@trivida.com>
-Jeff McDaniel <jsmcdani@gte.net>
-Andreas Geisler <andreas.geisler@erls.siemens.de>
-Bob McWhirter <bob@werken.com>
-Daniel Winder <Daniel.Winder@cern.ch>
-Zheng Han <zhan@glenvan.glenayre.com>
-Christa Schwanninger <christa.schwanninger@mchp.siemens.de>
-Byron Harris <harris_b@ociweb.com>
-Barney Dalton <barneyd@cyllene.uwa.edu.au>
-Peter Gorgia <Peter.Gorgia@libnet.com>
-Dirk Broer <Dirk.Broer@gsfc.nasa.gov>
-Joseph E. LaPrade <laprade@engw.ana.bna.boeing.com>
-Goran Lowkrantz <Goran.Lowkrantz@infologigruppen.se>
-Susan Liebeskind <susan.liebeskind@gtri.gatech.edu>
-Dana Hackman <upboms@network-one.com>
-Margherita Vittone Wiersma <vittone@fndaub.fnal.gov>
-Priya Narasimhan <priya@lambda.ece.ucsb.edu>
-Jeff Hopper <jhopper@nosc.mil>
-Mats Nilsson <mats.nilsson@xware.se>
-Dongwook Kim <baksoo@dbserver.kaist.ac.kr>
-Don Davis <ded@heart.jhuapl.edu>
-Alberto Villarica <Alberto.Villarica.rav@nt.com>
-XuYifeng <xuyf@pop.zg169.net>
-Ossama Othman <othman@astrosun.tn.cornell.edu>
-Tom Shields <Shields@MarsHotel.CMPU.NET>
-Krishna Padmasola <pkrishna@cybercash.co.in>
-Andre Folkers <folkers@informatik.mu-luebeck.de>
-Paul Sexton <pauls@ENTERPRISE.bt.co.uk>
-Marc Lehmann <pcg@goof.com>
-Anne Blankert <anne@geodan.nl>
-Raja Ati <rati@montereynets.com>
-Clinton Carr <ccarr@websocket.com>
-Peter Liqun Na <liqunna@cs.sunysb.edu>
-Frank Adcock <frank@bushlife.com.au>
-Xu Yifeng <xuyifeng@www.kali.com.cn>
-Valery Arkhangorodsky <valerya@servicesoft.com>
-Alan Scheinine <scheinin@crs4.it>
-Andrew G. Harvey <agh@cisco.com>
-Dann Corbit <DCorbit@SolutionsIQ.com>
-James <james@tsunami.com>
-Jason Milley <Jason.Milley.jcmilley@nt.com>
-Ulf Jaehrig <jaehrig@desys.com>
-Peter Nordlund <petern@nada.kth.se>
-Mark Weel <weel@lucent.com>
-Tres Seaver <tseaver@palladion.com>
-Erik Koerber <erik.koerber@siemens.at>
-Eric R. Medley <palantir@net56.net>
-David O'Farrell <dave@virgo.aersoft.ie>
-Amir Bahmanyari <abahmany@teknowledge.com>
-Ian Wright <I.Wright@elsevier.co.uk>
-David Janello <David.Janello@abnamro.com>
-Rich Wellner <rw2@wellner.org>
-Fernando D. Mato Mira <matomira@acm.org>
-Jonathan Reis <reis@minniemouse.cemax.com>
-Seung-Lee Hoon <tarjan@lgsoft.com>
-Russell L. Carter <rcarter@dnstoo.consys.com>
-Bill Hall <hts@gte.net>
-Brian Gilstrap <gilstrap_b@ociweb.com>
-Balaji Srinivasan <balaji@cplane.com>
-Anders W. Tell <anderst@toolsmiths.se>
-Larry Lachman <larry@paradigmsim.com>
-Terry Rosenbaum <Terry.Rosenbaum@Radiology.MSU.edu>
-Rainer Blome <rainer_blome@de.ibm.com>
-Kirk Ellett <kellett@mdc.com>
-Sunil Kumar <skumar@sutmyn.com>
-T Stach <t.stach@inobis.de>
-Ron Barack <r.barack@inobis.de>
-Daniel Nieten <dnieten@bellsouth.net>
-Paul K. Fisher <pfisher@plexware.com>
-Jim Buck <jim@nowsol.com>
-Olivier Lau <olivier_lau@srtelecom.com>
-Achim Stindt <stindt@inobis.de>
-Fredrik Lindahl <fredrik.lindahl@ausys.se>
-Joseph Weihs <joseph-w@Orbotech.Co.IL>
-Serge Kolgan <skolgan@cisco.com>
-James Megquier <jmegq@bbn.com>
-Martin Krumpolec <krumpo@pobox.sk>
-Michael Thomas <Michael.Thomas@Australia.Boeing.com>
-Vicentini Emanuele <arena.sci.univr.it>
-Bob Price <Bob_Price@tssdc.saic.com>
-Ramiro Penataro Blanco <penataro@ll.iac.es>
-Sigg Pascal <pascal.sigg@zkb.ch>
-Ivan Leong <ivanl@pacific.net.sg>
-Virginie Amar<vamar@amadeus.net>
-Tom Ziomek <tomz@cc.comm.mot.com>
-Hamish Friedlander <hamishf@usa.net>
-Mark De Jong <mdj@intervu.net>
-Knut Johannessen <knutj@funcom.com>
-Leif Jakobsmeier <leif@informatik.uni-frankfurt.de>
-Jon Lindgren <jlindgren@SLK.com>
-Steve Vinoski <vinoski@iona.com>
-Christian Mueffling <cvm@aiss.de>
-Victor Yu <victor.yu@computechnics.com.au>
-Jeff Donner's <JDonner@schedsys.com>
-Joe Loyall <jloyall@bbn.com>
-Stanislav Meduna <stanom@etm.co.at>
-Christian Korn <korn@gate.qaqa.com>
-Ron Barack <rab@terminal.cz>
-Steve Totten <totten_s@ociweb.com>
-Faron Dutton <fdutton@avxus.com>
-Gary York <gfyork@ix.netcom.com>
-Patty Hair <patty@Lynx.COM>
-Ivan Pascal <pascal@info.tsu.ru>
-William A. Hoffman <hoffman@crd.ge.com>
-Mark Lucovsky <markl@microsoft.com>
-Greg Holtmeyer <greg.a.holtmeyer@boeing.com>
-Jody Hagins <jody@atdesk.com>
-Patrice Bensoussan <pbensoussan@amadeus.net>
-Keith Brown <kalbrown@ix.netcom.com>
-Barry Hoggard <hoggard@cfx.com>
-Peter J. Mason <peterm@fl.net.au>
-Jerry De Master <jdemaste@ipdinc.com>
-Greg Gallant <greg.gallant@jhuapl.edu>
-wym <wym@dekang.com>
-Karel Zuiderveld <kzuiderveld@vitalimages.com>
-Mike Goldman <whig@by.net>
-Peter Gross <pgross@signalsoftcorp.com>
-Greg Ross <gwross@west.raytheon.com>
-Stanford S. Guillory <sguillory@vignette.com>
-Peter Weat <weatp@syntron.com>
-Magnus Karlsson <magnus.karlsson@syncom.se>
-Andreas Tobler <toa@pop.agri.ch>
-John Aughey <jha@FreeBSD.ORG>
-Knut-Havard Aksnes <knut@orion.no>
-Eric Mitchell <emitchell@altaira.com>
-Tommy Andreasen <tommy.andreasen@radiometer.dk>
-Slava Galperin <galperin@teknowledge.com>
-Jeff Olszewski <jolszewski@std.saic.com>
-Sudhanshu Garg <sg2@ladybug.cec.wustl.edu>
-Mike Preradovic <michael_preradovic@epicdata.com>
-Greg Harrison <harrisog@erinet.com>
-Sangwoo Jin <swjinjin@sei.co.kr>
-Jacques Salerian <Jacques.Salerian@era.ericsson.se>
-Steve Coleman <Steve.Coleman@jhuapl.edu>
-Diethard Ohrt <Diethard.Ohrt@siemens.at>
-Jacob Jones <Jacob.J.Jones@notesmta.gd-is.com>
-Phil Ruelle <Phil.Ruelle@adv.sonybpe.com>
-Sush Bankapura <Sush.Bankapura@sylantro.com>
-Eric Covington <eric@nowsol.com>
-Darren Whobrey <whobrey@fecit.co.uk>
-Mason Taube <taube@westcon.prc.com>
-Rod Joseph <rodjoseph@adt.com>
-Hans Horsmann <Hans.Horsmann@icn.siemens.de>
-Kevin Royalty <kevin.l.royalty@boeing.com>
-Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca>
-Mark Little <M.C.Little@ncl.ac.uk>
-Tim Stack <stack@cs.utah.edu>
-Marc Engel <engelm@tlse.sofreavia.fr>
-Uma Markandu <umam@nortelnetworks.com>
-Henrik Nordberg <hnordberg@lbl.gov>
-Tad Jarosinski <tadj@qualcomm.com>
-Andy Marchewka <AndyM@who.net>
-Neal Norwitz <nnorwitz@arinc.com>
-Frederic Maria <fmaria@lucent.com>
-David Hooker <DHooker@uniview.net>
-Christian.Destor <Christian.Destor@alcatel.fr>
-Andrew Hobson <ahobson@eng.mindspring.net>
-Andre Folkers <folkers@informatik.mu-leubeck.de>
-Torsten Kuepper <kuepper2@uni-wuppertal.de>
-Hao Ruan <hruan@lucent.com>
-Alexander Davidovich <sasha@ms.com>
-Cristian Ferretti <cfs@mat.puc.cl>
-N Becker <nbecker@fred.net>
-Yaolong Lan <lyaolong@cs.sunysb.edu>
-Elias Sreih <sealstd1@nortelnetworks.com>
-Liang Chen <chenl@nortelnetworks.com>
-Mark Laffoon <mark.laffoon@centraxcorp.com>
-Ti Z <tiz@cisco.com>
-Brian Dance <Brian_Dance@UECCS.co.uk>
-Alexey Gadzhiev <alg@null.ru>
-Francois Bernier <fbernier@gel.ulaval.ca>
-Bill Rizzi <rizzi@softserv.com>
-Peter Windle <peterw@ugsolutions.com>
-Andy Alvarez <axab@eci.esys.com>
-Jaepil Kim <jpkim@lgsoft.com>
-Goldshtain Dmitry <goldshtain.dmitry@usa.net>
-Carl Grinstead <grinstea@tsunami.com>
-Henric Jungheim <junghelh@pe-nelson.com>
-Konstantinos Margaritis <kmargar@cc.uoa.gr>
-Michael Preobrazhensky <mikep@xpedite.com>
-Gregory D. Fee <gdf2@cec.wustl.edu>
-Roland Gigler <roland@mch.pn.siemens.de>
-Frank Buschmann <Frank.Buschmann@mchp.siemens.de>
-Eric Eide <eeide@cs.utah.edu>
-Don Busch <busch_d@ociweb.com>
-Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
-David Hauck <davidh@realtimeint.com>
-Joe Hoffert  <joeh@tango.cs.wustl.edu>
-Keith Rohrer <KRohrer@hnv.com>
-Tim Rose <trose@bridgewatersys.com>
-Sam Rhine <rmsolution20@earchlink.net>
-Chris Schleicher <chrissch@cnd.hp.com>
-Margaret Reitz <margaret@veritas.com>
-Thomas Mehrkam <Thomas_Mehrkam@i-o.com>
-Erik Ivanenko <erik.ivanenko@utoronto.ca>
-Sarmeesha Reddy <sreddy@tr.comm.mot.com>
-Steven Tine <stevent@tr.comm.mot.com>
-Dave Steele <Dave_Steele@Mitel.COM>
-Simeon Simeonov <simeons@allaire.com>
-David H. Whittington <david.h.whittington@boeing.com>
-Ian MacDonald <ianmacd@bg.com>
-Rene Matteau <matteau@ca.ibm.com>
-Hans Ridder <ridder@veritas.com>
-Todd Mullanix <Todd.Mullanix@sylantro.com>
-Hai Vu <Hai_Vu@Mitel.Com>
-Paul Francis <pfrancis@dkl.com>
-Kristopher Johnson <kjohnson@gardnersys.com>
-Dave Butenhof <butenhof@zko.dec.com>
-Dominic Williams <dom@connected-place.co.uk>
-Srikumar Kareti <skareti@htc.honeywell.com>
-Ian Pepper <ian@aptest.ie>
-Kevin Lyda <kevin.lyda@trintech.com>
-James D. Rucker <jdrucker@huey.jpl.nasa.gov>
-Brian Wallis <Brian.Wallis@sr.com.au>
-Sandeep Goyal <sagoyal@hss.hns.com>
-englishmalc@my-dejanew.com
-Frank O'Dwyer <fod@brd.ie>
-Long Hoang <LHoang@hwdcsaws.cahwnet.gov>
-Steven D. Chen <sdc2951@aw101.iasl.ca.boeing.com>
-Alain Magloire <alain@qnx.com>
-Jim Rogers <jrogers@viasoft.com>
-Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com>
-David Brownell <david-b@pacbell.net>
-Richard Stallman <rms@gnu.org>
-Casey Lucas <clucas@sabre.com>
-Brian C. Olson <bolson@rtlogic.com>
-Joseph A. Condlin <jac@slpmbo.ed.ray.com>
-Serge Du <du@lal.in2p3.fr>
-Mike Mazurek <mmazurek@std.saic.com>
-Christian Schuderer <Christian.Schuderer@erl9.siemens.de>
-John R. Taylor <jrtaylor@george.lbl.gov>
-Bill Tovrea <gwtovrea@west.raytheon.com>
-Wallace Owen <owen@visicom.com>
-Vyacheslav A. Batenin <slavikb@iname.com>
-Edwin D. Windes <ewindes@usa.net>
-Christopher Kohlhoff <chris@kohlhoff.com>
-Andreas Terstegge <andreas.terstegge@nokia.com>
-Stefaan Kiebooms <stefaan@ghs.com>
-Keith Nichol <knichol@syscorp.com.au>
-Rebecca Sanford <Rebecca.A.Sanford@gd-is.com>
-Ram Vishnuvajjala <rvishnuvajjala@lucent.com>
-Tom Bradley <thomas.bradley@maisel-gw.enst-bretagne.fr>
-Shaun Ohagan <jk13@dial.pipex.com>
-Dale Wood <dale_wood@Mitel.com>
-Robert Flanders <rdfa@eci.esys.com>
-Gul Onural <Gul_Onural@Mitel.COM>
-Stephen E Blake <stephen_e_blake@email.moore.com>
-Eric S Rosenthal <esr@netcom.com>
-Sridevi Subramanian <subrams@erols.com>
-Bruce Trask <BTRASK@contactsystems.com>
-Jake Hamby <jehamby@anobject.com>
-Rick Weisner <Rick.Weisner@East.Sun.COM>
-Dennis C. De Mars <demars@mminternet.com>
-V. Lakshmanan <lakshman@doplight.nssl.noaa.gov>
-Hata Yoshiaki <hatay@alpha.co.jp>
-Vidya Narayanan <CVN065@lmpsil02.comm.mot.com>
-Sean Landis <seanl@rsch.comm.mot.com>
-Youzhong Liu <yoliu@cise.ufl.edu>
-John Weald <John.Weald@sylantro.com>
-Gilbert Roulot <gilbert.roulot@tts.thomson-csf.com>
-Gildo Medeiros Junior <gildo@siemens.com.br>
-Brian Peterson <bpeterson@globalmt.com>
-Fabrice Podlyski <podlyski@clrhp04.in2p3.fr>
-Darren DeRidder <darren.deridder@bridgewatersys.com>
-John Tucker <jtucker@infoglide.com>
-Oleg Orlov <orlov@diasoft.ru>
-Timothy Canham <Timothy.Canham@jpl.nasa.gov>
-Chris Uzdavinis <chris@uzdavinis.com>
-Randy Heiland <heiland@ncsa.uiuc.edu>
-Joyce Fu <fu@gsao.med.ge.com>
-Kumar Surender <csk037@lmpsil02.comm.mot.com>
-Pradeep Avasthi <Pradeep.Avasthi@motorola.com>
-Guicheney Christophe <guichene@clrhp04.in2p3.fr>
-Madhu Konety <madhu.konety@stdc.com>
-Isaac Stoddard <i_stoddard@hso.link.com>
-Alvarez <alvarez@nagra-kudelski.ch>
-Peter Brandstrom <peter.brandstrom@ericsson.com>
-Eugene Surovegin <ebs@glasnet.ru>
-Thaddeus Olczyk <olczyk@interaccess.com>
-John Chludzinski <john_chludzinski@jsims.com>
-Pedro Alves Ferreira <pedro.ferreira@inescn.pt>
-
-I would particularly like to thank Paul Stephenson, who worked with me
-at Ericsson and is now at ObjectSpace.  Paul devised the recursive
-Makefile scheme that underlies this distribution and also spent
-countless hours with me discussing object-oriented techniques for
-developing distributed application frameworks.
-
-Finally, I'd also like to thank Todd L. Montgomery <tmont@cs.wvu.edu>,
-fellow heavy metal head, for fulfilling his quest to get ACE to
-compile with GCC!
-
-In conclusion, my goal is to see ACE continue to evolve and become a
-more comprehensive, robust, and well-documented C++ class library that
-is freely available to researchers and developers.  If you have any
-improvements, suggestions, and or comments, I'd like to hear about it.
-
-        Thanks,
-
-                Douglas C. Schmidt
-                schmidt@cs.wustl.edu
diff --git a/VERSION b/VERSION
index 48da0b2902d..dafeee9ad17 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 4.6.43, released Thu Jul 01 21:07:22 1999.
+This is ACE version 4.6.42, released Fri Jun 18 19:30:09 1999.
 
 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/acconfig.h b/acconfig.h
index 28969dfc40b..51d5b84cc84 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -410,10 +410,6 @@
    prototype. */
 #undef ACE_HAS_BROKEN_SETRLIMIT
 
-/* Compiler/platform has the wrong prototype for t_error(), i.e.,
-   t_error(char *) rather than t_error(const char *). */
-#undef ACE_HAS_BROKEN_T_ERROR
-
 /* platform define struct timespec members as ts_sec and ts_nsec instead of
    tv_sec and tv_nsec.  This is highly non-portable.  Currently only
    FreeBSD 2.1.x uses it. */
@@ -470,9 +466,6 @@
 /* Compiler supports C++ exception handling */
 #undef ACE_HAS_EXCEPTIONS
 
-/* Platform has Fast-Light (FL) toolkit installed */
-#undef ACE_HAS_FL
-
 /* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be
    defined, except on Win32) */
 #undef ACE_HAS_GETPAGESIZE
@@ -539,9 +532,6 @@
 /* Enabled malloc statistics collection. */
 #undef ACE_HAS_MALLOC_STATS
 
-/* Use native implementation of memchr(). */
-#undef ACE_HAS_MEMCHR
-
 /* Avoid #including ace/streams.h in OS.h.  Users must include ace/streams.h,
    <iostream>, or <iostream.h> explicitly in their code.  Some platforms, such
    as g++/VxWorks, have trouble compiling templates and iostreams header
diff --git a/TAO/examples/Borland/Chat.bpg b/ace/ACE.bpg
index c15bb672ae1..7a32b122e67 100644
--- a/TAO/examples/Borland/Chat.bpg
+++ b/ace/ACE.bpg
@@ -9,15 +9,13 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = build_idl ChatClient.exe
+PROJECTS = ACER ACED
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
-ChatClient.exe: ChatClient.bpr
+ACER: ACER.bpr
   $(MAKE)
 
-build_idl: build_idl.bat
-  call $**
-
-
+ACED: ACED.bpr
+  $(MAKE)
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 0c6921c5b74..b1f02e5a883 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -123,10 +123,7 @@ ACE::compiler_beta_version (void)
 int
 ACE::terminate_process (pid_t pid)
 {
-#if defined (ACE_HAS_PHARLAP)
-  ACE_UNUSED_ARG (pid);
-  ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   // Create a handle for the given process id.
   ACE_HANDLE process_handle =
     ::OpenProcess (PROCESS_TERMINATE,
@@ -134,7 +131,7 @@ ACE::terminate_process (pid_t pid)
                    pid);
 
   if (process_handle == ACE_INVALID_HANDLE
-      || process_handle == 0)
+      || process_handle == NULL)
     return -1;
   else
     {
@@ -175,7 +172,7 @@ ACE::process_active (pid_t pid)
   ACE_HANDLE process_handle =
     ::OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, pid);
   if (process_handle == ACE_INVALID_HANDLE
-      || process_handle == 0)
+      || process_handle == NULL)
     return 0;
   else
     {
@@ -591,8 +588,8 @@ ACE::strrepl (char *s, char search, char replace)
 }
 
 #if !defined (ACE_HAS_WINCE)
-ASYS_TCHAR *
-ACE::strenvdup (const ASYS_TCHAR *str)
+char *
+ACE::strenvdup (const char *str)
 {
   ACE_TRACE ("ACE::strenvdup");
 
@@ -626,20 +623,13 @@ ACE::ldfind (const ASYS_TCHAR filename[],
 {
   ACE_TRACE ("ACE::ldfind");
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \
-    !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ASYS_TCHAR expanded_filename[MAXPATHLEN];
-#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
   if (::ExpandEnvironmentStringsA (filename,
                                    expanded_filename,
                                    sizeof expanded_filename))
-#else
-  if (::ExpandEnvironmentStringsW (filename,
-                                   expanded_filename,
-                                   sizeof expanded_filename))
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
     filename = expanded_filename;
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 */
 
   ASYS_TCHAR tempcopy[MAXPATHLEN + 1];
   ASYS_TCHAR searchpathname[MAXPATHLEN + 1];
@@ -687,7 +677,11 @@ ACE::ldfind (const ASYS_TCHAR filename[],
   ASYS_TCHAR *s = ACE_OS::strrchr (searchfilename, '.');
 
   const ASYS_TCHAR *dll_suffix =
-    ASYS_TEXT (ACE_DLL_SUFFIX);
+#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+    ACE_DLL_SUFFIX;
+#else
+    _TEXT (ACE_DLL_SUFFIX);
+#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
   if (s != 0)
     {
@@ -1048,9 +1042,7 @@ ACE::send (ACE_HANDLE handle, size_t n, ...)
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -1086,9 +1078,7 @@ ACE::recv (ACE_HANDLE handle, size_t n, ...)
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -1843,7 +1833,7 @@ ACE::handle_timed_open (ACE_Time_Value *timeout,
           && (errno == EWOULDBLOCK
               && (timeout->sec () > 0 || timeout->usec () > 0)))
         // This expression checks if we were polling.
-        errno = ETIMEDOUT;
+        errno = ETIME;
 
       return handle;
     }
@@ -1905,7 +1895,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
               && timeout->usec () == 0)
             errno = EWOULDBLOCK;
           else
-            errno = ETIMEDOUT;
+            errno = ETIME;
           return -1;
           /* NOTREACHED */
         case 1:
@@ -2665,8 +2655,6 @@ const ASYS_TCHAR *
 ACE::sock_error (int error)
 {
 #if defined (ACE_WIN32)
-  static ASYS_TCHAR unknown_msg[64];
-
   switch (error)
     {
     case WSAVERNOTSUPPORTED:
@@ -2758,8 +2746,7 @@ ACE::sock_error (int error)
       return ASYS_TEXT ("address not available");
       /* NOTREACHED */
     default:
-      ACE_OS::sprintf (unknown_msg, ASYS_TEXT ("unknown error: %d"), error);
-      return unknown_msg;
+      return ASYS_TEXT ("unknown error");
       /* NOTREACHED */
     }
 #else
@@ -3128,8 +3115,8 @@ ACE::get_ip_interfaces (size_t &count,
                     0, 0,
                     info, sizeof(info),
                     &bytes,
-                    0,
-                    0);
+                    NULL,
+                    NULL);
   closesocket (sock);
   if (status == SOCKET_ERROR)
       return -1;
@@ -3138,9 +3125,7 @@ ACE::get_ip_interfaces (size_t &count,
   if (n_interfaces == 0)
     return 0;
 
-  ACE_NEW_RETURN (addrs,
-                  ACE_INET_Addr[n_interfaces],
-                  -1);
+  ACE_NEW_RETURN (addrs, ACE_INET_Addr[n_interfaces], -1);
 
   // Now go through the list and transfer the good ones to the list of
   // because they're down or don't have an IP address.
@@ -3172,89 +3157,6 @@ ACE::get_ip_interfaces (size_t &count,
 
 #else /* Winsock 2 && MSVC 5 or later */
 
-  // PharLap ETS has kernel routines to rummage through the device
-  // configs and extract the interface info. Sort of a pain in the
-  // butt, but better than trying to figure out where it moved to in
-  // the registry... :-|
-#  if defined (ACE_HAS_PHARLAP)
-#    if !defined (ACE_HAS_PHARLAP_RT)
-  ACE_NOTSUP_RETURN (-1);
-#    endif /* ACE_HAS_PHARLAP_RT */
-
-  // Locate all of the IP devices in the system, saving a DEVHANDLE
-  // for each. Then allocate the ACE_INET_Addrs needed and fetch all
-  // the IP addresses.  To locate the devices, try the available
-  // device name roots and increment the device number until the
-  // kernel says there are no more of that type.
-  const size_t ACE_MAX_ETS_DEVICES = 64;  // Arbitrary, but should be enough.
-  DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES];
-  EK_TCPIPCFG *devp;
-  size_t i, j;
-  char dev_name[16];
-
-  count = 0;
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // Ethernet.
-      ACE_OS::sprintf (dev_name,
-                       "ether%d",
-                       i);    
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // SLIP.
-      ACE_OS::sprintf (dev_name,
-                       "sl%d",
-                       i); 
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-  for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count)
-    {
-      // PPP.
-      ACE_OS::sprintf (dev_name,
-                       "ppp%d",
-                       i);
-      ip_dev[count] = EtsTCPGetDeviceHandle (dev_name);
-      if (ip_dev[count] == 0)
-        break;
-    }
-
-  if (count > 0)
-    ACE_NEW_RETURN (addrs,
-                    ACE_INET_Addr[count],
-                    -1);
-  else
-    addrs = 0;
-
-  for (i = 0, j = 0; i < count; i++)
-    {
-      devp = EtsTCPGetDeviceCfg (ip_dev[i]);
-      if (devp != 0)
-        {
-          addrs[j].set (0,
-                        devp->nwIPAddress,
-                        0); // Already in net order.
-          j++;
-        }
-      // There's no call to close the DEVHANDLE.
-    }
-
-  count = j;
-  if (count == 0 && addrs != 0)
-    {
-      delete [] addrs;
-      addrs = 0;
-    }
-
-  return 0;
-
-#  else /* ACE_HAS_PHARLAP */
-
   const TCHAR *SVCS_KEY1 =
     ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\");
   const TCHAR *LINKAGE_KEY1 =
@@ -3274,14 +3176,14 @@ ACE::get_ip_interfaces (size_t &count,
                        raw_buffer,
                        raw_buflen))
     return -1;
-  // return buffer contains 0 delimited strings
+  // return buffer contains NULL delimited strings
 
   ACE_Tokenizer dev_names (raw_buffer);
   dev_names.delimiter (ACE_TEXT('\0'));
   int n_interfaces = 0;
 
   // Count the number of interfaces
-  while (dev_names.next () != 0)
+  while (dev_names.next () != NULL)
     n_interfaces ++;
 
   // case 1. no interfaces present, empty string? OS version change?
@@ -3328,7 +3230,6 @@ ACE::get_ip_interfaces (size_t &count,
         }
     }
   return 0;
-#  endif /* ACE_HAS_PHARLAP */
 # endif /* Winsock 2 && MSVC 5 or later */
 
 #elif defined (__unix) || defined (__Lynx__) || defined (_AIX)
diff --git a/ace/ACE.h b/ace/ACE.h
index 7ff95db5d77..665afe8ffcf 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -43,11 +43,9 @@ class ACE_Export ACE
 public:
   // Initialize ACE library services.
   static int init (void);
-  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
 
   // Shut down ACE library services.
   static int fini (void);
-  // Returns 0 on success, -1 on failure, and 1 if it had already been called.
 
   // = ACE version information.
   static u_int major_version (void);
@@ -442,7 +440,7 @@ public:
 
   // = String functions
 #if !defined (ACE_HAS_WINCE)
-  static ASYS_TCHAR *strenvdup (const ASYS_TCHAR *str);
+  static char *strenvdup (const char *str);
   // Return a dynamically allocated duplicate of <str>, substituting
   // the environment variable if <str[0] == '$'>.  Note that the
   // pointer is allocated with <ACE_OS::malloc> and must be freed by
diff --git a/ace/ACED.bpr b/ace/ACED.bpr
new file mode 100644
index 00000000000..87ecf2c146b
--- /dev/null
+++ b/ace/ACED.bpr
@@ -0,0 +1,234 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = ACED.dll
+OBJFILES = obj\ACED.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \
+  obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \
+  obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \
+  obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \
+  obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \
+  obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \
+  obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \
+  obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \
+  obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \
+  obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \
+  obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \
+  obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \
+  obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \
+  obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \
+  obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \
+  obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \
+  obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \
+  obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \
+  obj\Method_Request.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \
+  obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \
+  obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \
+  obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \
+  obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \
+  obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \
+  obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \
+  obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \
+  obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \
+  obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \
+  obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \
+  obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \
+  obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \
+  obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
+  obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
+  obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
+  obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
+  obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
+  obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
+  obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \
+  obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \
+  obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \
+  obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \
+  obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \
+  obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \
+  obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \
+  obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \
+  obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \
+  obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \
+  obj\WFMO_Reactor.obj obj\XtReactor.obj
+RESFILES =
+DEFFILE =
+RESDEPEN = $(RESFILES)
+LIBFILES =
+LIBRARIES = VCL35.lib
+SPARELIBS = VCL35.lib
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -WD -Od -Hc -w-par -w-inl -Ve -r- -k -y -v -vi- -c -b- -Vx
+CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \
+  -H=ace.csm
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_RTLDLL -N2obj -N0obj \
+  -U.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include;$(BCB)\include\vcl -$Y -$W \
+  -$O- -v -JPHN -M
+RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \
+  /d_RTLDLL /mx /w2 /zi
+LFLAGS = -L.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+  -aa -Tpd -x -Gn -Gi -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=1
+Item0=..;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=.;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_RTLDLL
+Item1=_RTLDLL;USEPACKAGES
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/ace/ACER.bpr b/ace/ACER.bpr
new file mode 100644
index 00000000000..5b1c7ca3e7c
--- /dev/null
+++ b/ace/ACER.bpr
@@ -0,0 +1,234 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = ACER.dll
+OBJFILES = obj\ACER.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \
+  obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \
+  obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \
+  obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \
+  obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \
+  obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \
+  obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \
+  obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \
+  obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \
+  obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \
+  obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \
+  obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \
+  obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \
+  obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \
+  obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \
+  obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \
+  obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \
+  obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \
+  obj\Method_Request.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \
+  obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \
+  obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \
+  obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \
+  obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \
+  obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \
+  obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \
+  obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \
+  obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \
+  obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \
+  obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \
+  obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \
+  obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \
+  obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
+  obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
+  obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
+  obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
+  obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
+  obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
+  obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \
+  obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \
+  obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \
+  obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \
+  obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \
+  obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \
+  obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \
+  obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \
+  obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \
+  obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \
+  obj\WFMO_Reactor.obj obj\XtReactor.obj
+RESFILES =
+DEFFILE =
+RESDEPEN = $(RESFILES)
+LIBFILES =
+LIBRARIES = VCL35.lib
+SPARELIBS = VCL35.lib
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -WD -O2 -Hc -w-par -w-inl -Ve -k- -vi -c -b- -Vx
+CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \
+  -H=obj\ace.csm
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_RTLDLL -N2obj -N0obj \
+  -U..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -I..;$(BCB)\include;$(BCB)\include\vcl -$L- -$D- \
+  -v -JPHN -M
+RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \
+  /d_RTLDLL /mx /w2 /zn
+LFLAGS = -L..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -aa -Tpd -x -Gn -Gi
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=1
+Item0=..;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=..\ace;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_RTLDLL
+Item1=_RTLDLL;USEPACKAGES
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index f01f3e87689..73460c87b44 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -59,8 +59,7 @@ ACE_ARGV::ACE_ARGV (const ASYS_TCHAR buf[],
     argc_ (0),
     argv_ (0),
     buf_ (0),
-    length_ (0),
-    queue_ ()
+    length_ (0)
 {
   ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR[] to ASYS_TCHAR *[]");
 
@@ -86,8 +85,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *argv[],
     argc_ (0),
     argv_ (0),
     buf_ (0),
-    length_ (0),
-    queue_ ()
+    length_ (0)
 {
   ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR*[] to ASYS_TCHAR[]");
 
@@ -117,8 +115,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *argv[],
   // Step through all argv params and copy each one into buf; separate
   // each param with white space.
 
-  ACE_NEW (this->buf_,
-           ASYS_TCHAR[buf_len + 1]);
+  ACE_NEW (this->buf_, ASYS_TCHAR[buf_len + 1]);
 
   ASYS_TCHAR *end = this->buf_;
   int j;
@@ -155,8 +152,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *first_argv[],
     argc_ (0),
     argv_ (0),
     buf_ (0),
-    length_ (0),
-    queue_ ()
+    length_ (0)
 {
   ACE_TRACE ("ACE_ARGV::ACE_ARGV ASYS_TCHAR*[] + ASYS_TCHAR *[] to ASYS_TCHAR[]");
 
@@ -178,8 +174,7 @@ ACE_ARGV::ACE_ARGV (ASYS_TCHAR *first_argv[],
   int buf_len = ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1;
 
   // Allocate memory to the lenght of the combined argv string.
-  ACE_NEW (this->buf_,
-           ASYS_TCHAR[buf_len + 1]);
+  ACE_NEW (this->buf_, ASYS_TCHAR[buf_len + 1]);
 
   // copy the first argv string to the buffer
   ACE_OS::strcpy (this->buf_,first_buf);
@@ -201,8 +196,7 @@ ACE_ARGV::ACE_ARGV (int substitute_env_args)
     argc_ (0),
     argv_ (0),
     buf_ (0),
-    length_ (0),
-    queue_ ()
+    length_ (0)
 {
   ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative");
 
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index eda8383dc2c..e0cb4f4fa8c 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -142,10 +142,10 @@ public:
   // the map resizes or when this slot is reused.  Therefore, the user
   // should use the pointer immediately and not hold on to it.
 
-  size_t current_size (void) const;
+  size_t current_size (void);
   // Return the current size of the map.
 
-  size_t total_size (void) const;
+  size_t total_size (void);
   // Return the total size of the map.
 
   static const ACE_Active_Map_Manager_Key npos (void);
diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.i
index 29197057d0c..54388cd354d 100644
--- a/ace/Active_Map_Manager_T.i
+++ b/ace/Active_Map_Manager_T.i
@@ -238,13 +238,13 @@ ACE_Active_Map_Manager<T>::close (void)
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Active_Map_Manager<T>::current_size (void) const
+ACE_Active_Map_Manager<T>::current_size (void)
 {
   return ACE_AMM_BASE::current_size ();
 }
 
 template <class T> ACE_INLINE size_t
-ACE_Active_Map_Manager<T>::total_size (void) const
+ACE_Active_Map_Manager<T>::total_size (void)
 {
   return ACE_AMM_BASE::total_size ();
 }
diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp
index 938ecde49dc..dce44bcab60 100644
--- a/ace/Arg_Shifter.cpp
+++ b/ace/Arg_Shifter.cpp
@@ -6,9 +6,7 @@
 
 ACE_RCSID(ace, Arg_Shifter, "$Id$")
 
-ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc,
-                                  char **argv,
-                                  char **temp)
+ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc, char **argv, char **temp)
   : argc_ (argc),
     total_size_ (argc),
     temp_ (temp),
@@ -19,8 +17,7 @@ ACE_Arg_Shifter::ACE_Arg_Shifter (int &argc,
 {
   // If not provided with one, allocate a temporary array.
   if (this->temp_ == 0)
-    ACE_NEW (this->temp_,
-             char *[this->total_size_]);
+    this->temp_ = new char *[this->total_size_];
   
   if (this->temp_ != 0)
     {
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 13c3153915c..5a07b53c72f 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -301,13 +301,11 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void)
   // All I/O operations that are canceled will complete with the error
   // 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 (__BORLANDC__) && (__BORLANDC__ >= 0x530)))
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
   return (int) ::CancelIo (this->listen_handle_);
 #else
   ACE_NOTSUP_RETURN (-1);
-#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) && (_MSC_VER > 1020)) */
 }
 
 template <class HANDLER> void
@@ -411,9 +409,7 @@ ACE_Asynch_Acceptor<HANDLER>::make_handler (void)
 {
   // Default behavior
   HANDLER *handler = 0;
-  ACE_NEW_RETURN (handler,
-                  HANDLER,
-                  0);
+  ACE_NEW_RETURN (handler, HANDLER, 0);
   return handler;
 }
 
diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i
index 805ead114e8..28f1bab5d89 100644
--- a/ace/Atomic_Op.i
+++ b/ace/Atomic_Op.i
@@ -149,21 +149,18 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const TYPE &i)
 
 #if defined (ACE_WIN32)
 
-ACE_TEMPLATE_SPECIALIZATION
 inline long
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator++ (void)
 {
   return ::InterlockedIncrement (&this->value_);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 inline long
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-- (void)
 {
   return ::InterlockedDecrement (&this->value_);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 inline void
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const long &i)
 {
@@ -171,7 +168,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const long &i)
                          i);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 inline void
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs)
 {
@@ -181,14 +177,12 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const ACE_Atomic_Op<ACE_Thread
 
 #if defined (ACE_HAS_INTERLOCKED_EXCHANGEADD)
 
-ACE_TEMPLATE_SPECIALIZATION
 inline long
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator+= (const long &i)
 {
   return ::InterlockedExchangeAdd (&this->value_, i);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 inline long
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-= (const long &i)
 {
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 1fb575c8c12..fdf00e2cdbc 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -54,8 +54,7 @@ protected:
   X *p_;
 };
 
-#if !defined (ACE_LACKS_AUTO_PTR) && \
-     defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
+#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
             (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 #include <memory>
 #if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index dae25bdf271..74281c2dc88 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -67,8 +67,7 @@ ACE_Auto_Basic_Ptr<X>::operator *() const
   return *this->get ();
 }
 
-#if defined (ACE_LACKS_AUTO_PTR) || \
-    !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
+#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
              (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
 
 template<class X> ACE_INLINE
diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp
deleted file mode 100644
index cf2f54d61f4..00000000000
--- a/ace/Based_Pointer_Repository.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_DLL
-#include  "ace/Based_Pointer_Repository.h"
-
-ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository (void)
-{
-}
-
-ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void)
-{
-}
-
-// Search for appropriate base address in repository
-
-int
-ACE_Based_Pointer_Repository::find (void *addr,
-                                    void *&base_addr)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1);
-  MAP_ITERATOR iter = addr_map_;
-
-  for (MAP_ENTRY *ce = 0;
-       iter.next (ce) != 0;
-       iter.advance ())
-    // Check to see if <addr> is within any of the regions.
-    if (addr >= ce->ext_id_
-        && addr < ((char *) ce->ext_id_ + *(ce->int_id_)))
-      {
-        // Assign the base address.
-        base_addr = ce->ext_id_;
-        return 1;
-      }
-
-  // Assume base address 0 (e.g. if new'ed).
-  base_addr = 0;
-  return 0;
-}
-
-// Bind a new entry to the repository or update the size of an
-// existing entry.
-
-int
-ACE_Based_Pointer_Repository::bind (void *addr, size_t size)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1);
-
-  size_t *sizep;
-
-  if (addr_map_.find (addr, sizep) != -1)
-    {
-      // Store new size.
-      *sizep = size;
-      return 0;
-    }
-  else
-    {
-      ACE_NEW_RETURN (sizep,
-                      size_t,
-                      -1);
-      *sizep = size;
-      return addr_map_.bind (addr, sizep);
-    }
-}
-
-// Unbind a base from the repository.
-
-int
-ACE_Based_Pointer_Repository::unbind (void *addr)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1);
-  MAP_ITERATOR iter = addr_map_;
-
-  // Search for service handlers that requested notification.
-
-  for (MAP_ENTRY *ce = 0;
-       iter.next (ce) != 0;
-       iter.advance ())
-    {
-      // Check to see if <addr> is within any of the regions.
-      if (addr >= ce->ext_id_
-          && addr < ((char *) ce->ext_id_ + * (ce->int_id_)))
-        delete ce->int_id_;
-
-      // Unbind base address.
-      return addr_map_.unbind (ce->ext_id_);
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<void *, size_t *>;
-template class ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<void *, size_t *>
-#pragma instantiate ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h
deleted file mode 100644
index b3180c008b9..00000000000
--- a/ace/Based_Pointer_Repository.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Based_Pointer_Repository.h
-//
-// = AUTHOR
-//    Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and
-//    Douglas C. Schmidt <schmidt@.cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_BASED_POINTER_REPOSITORY_H
-#define ACE_BASED_POINTER_REPOSITORY_H
-
-#include "ace/Singleton.h"
-#include "ace/Map_Manager.h"
-
-class ACE_Export ACE_Based_Pointer_Repository 
-{
-  // = TITLE
-  //   Maps pointers to the base address of the region to which each
-  //   pointer belongs.
-  // 
-  // = DESCRIPTION
-  //   Every memory pool in ACE binds it's mapping base address and
-  //   the mapped size to this repository every time it maps/remaps a
-  //   new chunk of memory successfully.
-public:
-  // = Use <ACE_Null_Mutex> to allow locking while iterating.
-  typedef ACE_Map_Manager <void *, size_t *, ACE_Null_Mutex> 
-          MAP_MANAGER;
-  typedef ACE_Map_Iterator < void *, size_t *, ACE_Null_Mutex> 
-          MAP_ITERATOR;
-  typedef ACE_Map_Entry <void *, size_t *> 
-          MAP_ENTRY; 
-
-  // = Initialization and termination methods.
-  ACE_Based_Pointer_Repository (void);
-  ~ACE_Based_Pointer_Repository (void);
-
-  // = Search structure methods.
-  int find (void *addr, 
-            void *&base_addr);
-  // Return the appropriate <base_addr> region that contains <addr>.
-  // Returns 1 on success and 0 if the <addr> isn't contained in any
-  // <base_addr> region.
-
-  int bind (void *addr,
-            size_t size);
-  // Bind a new entry to the repository or update the size of an
-  // existing entry.  Returns 0 on success and -1 on failure.
-
-  int unbind (void *addr);
-  // Unbind from the repository the <base_addr> that <addr> is
-  // contained within.
-
-private:
-  MAP_MANAGER addr_map_;
-  // Keeps track of the mapping between addresses and their associated
-  // values.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Synchronize concurrent access to the map.
-};
-
-// Provide a Singleton access point to the based pointer repository.
-typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
-        ACE_BASED_POINTER_REPOSITORY;
-
-#endif /* ACE_BASED_POINTER_REPOSITORY_H */
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
deleted file mode 100644
index 6a01f656f8c..00000000000
--- a/ace/Based_Pointer_T.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#ifndef ACE_BASED_POINTER_T_CPP
-#define ACE_BASED_POINTER_T_CPP
-
-#include "ace/Based_Pointer_Repository.h"
-#include "ace/Based_Pointer_T.h"
-
-template <class CONCRETE>
-ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
-  : target_ (0),
-    base_offset_ (0)
-{
-  void *base_addr = 0;
-
-  // Find the base address associated with our <this> pointer.  Note
-  // that it's ok for <find> to return 0, which simply indicates that
-  // the address is not in memory-mapped virtual address space.
-  ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, 
-                                                   base_addr);
-  this->base_offset_ = (char *) this - (char *) base_addr;
-}
-
-template <class CONCRETE> CONCRETE * 
-ACE_Based_Pointer<CONCRETE>::operator->(void)
-{
-  char *base_addr = (char *) this - this->base_offset_;
-
-  return (CONCRETE *)(base_addr + (long) this->target_);
-}
-
-template <class CONCRETE> CONCRETE *
-ACE_Based_Pointer<CONCRETE>::operator =(CONCRETE *from)
-{
-  char *base_addr = (char *) this - this->base_offset_;
-  this->target_ = (CONCRETE *)((char *) from - (char *) base_addr);
-  return from;
-}
-
-template <class CONCRETE> CONCRETE 
-ACE_Based_Pointer<CONCRETE>::operator *(void)
-{
-  char *base_addr = (char *) this - this->base_offset_;
-  return *(CONCRETE *)(base_addr + (long) this->target_);
-}
-
-template <class CONCRETE> CONCRETE 
-ACE_Based_Pointer<CONCRETE>::operator [] (int index)
-{
-  char *base_addr = (char *) this - this->base_offset_;
-  return *((CONCRETE *)(base_addr + (long) this->target_) + index);
-}
-
-#endif/* ACE_BASED_POINTER_T_CPP */
-
diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h
deleted file mode 100644
index 31f4547776b..00000000000
--- a/ace/Based_Pointer_T.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Based_Pointer_T.h
-//
-// = AUTHOR
-//    Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and
-//    Douglas C. Schmidt <schmidt@.cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_BASED_POINTER_T_H
-#define ACE_BASED_POINTER_T_H
-
-#if defined (_MSC_VER)
-// Suppress warning e.g. "return type for
-// 'ACE_Based_Pointer<long>::operator ->' is 'long *' (i.e., not a UDT
-// or reference to a UDT.  Will produce errors if applied using infix
-// notation)"
-#pragma warning(disable: 4284)  
-#endif /* _MSC_VER */
-
-template <class CONCRETE> 
-class ACE_Based_Pointer
-{
-  // = TITLE
-  //   A proxy that keeps track of the relative offset of a "pointer"
-  //   from its base address. 
-  //
-  // = DESCRIPTION
-  //   This class makes it possible to transparently use "pointers" in
-  //   shared memory as easily as programming with pointers to local
-  //   memory.  In particular, we don't need to ensure that the base
-  //   addresses of all the pointers are mapped into separate
-  //   processes at the same absolute memory base address.
-public:
-  // = Initialization method.
-  ACE_Based_Pointer (void);
-  // This constructor initializes the <base_offset_> by asking the
-  // <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of
-  // the memory region within which it is instantiated.  Two results
-  // are possible:
-  // 
-  // 1. An <ACE_*_Memory_Pool> has stored a base address/size pair and the
-  //    new based-pointer instance is located between the base address and
-  //    the base address + size - 1.  In this case, the repository
-  //    returns the base address.
-  //
-  // 2. No suitable address/size pair was found.  The repository
-  //    assumes an address in the regular (not mapped) virtual address
-  //    space of the process and returns 0.  In this case, the
-  //    based-pointer uses its address as an offset to it's base
-  //    address 0.
-
-  CONCRETE *operator->(void);
-  // The C++ "delegation operator".
-
-  CONCRETE *operator =(CONCRETE *from);
-  // Pseudo-assignment operator.
-
-  CONCRETE operator *(void);
-  // Dereference operator.
-
-  CONCRETE operator [](int index);
-  // Subscript operator.
-
-private:
-  CONCRETE *target_;
-
-  long base_offset_;
-  // Keep track of our offset from the base pointer.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Based_Pointer_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Based_Pointer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_BASED_POINTER_T_H */
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index c9a14474b19..367710a3c1f 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -355,13 +355,8 @@ typedef ACE_UINT16 ACE_USHORT16;
 
 // 64-bit literals require special marking on some platforms.
 # if defined (ACE_WIN32)
-#   if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#     define ACE_UINT64_LITERAL(n) n ## LL
-#     define ACE_INT64_LITERAL(n) n ## LL
-#else
 #   define ACE_UINT64_LITERAL(n) n ## ui64
 #   define ACE_INT64_LITERAL(n) n ## i64
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
 # elif defined (ACE_LACKS_LONGLONG_T)
     // Can only specify 32-bit arguments.
 #   define ACE_UINT64_LITERAL(n) (ACE_U_LongLong (n))
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 9220778588b..aa026c9b1bc 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -117,29 +117,6 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
 }
 #endif /* NONNATIVE_LONGDOUBLE */
 
-#if defined(_UNICOS)
-// placeholders to get things compiling
-ACE_CDR::Float::Float()
-{
-}
-
-ACE_CDR::Float::Float(const float & init))
-{
-}
-
-float
-ACE_CDR::Float::operator= (const ACE_CDR::Float &rhs) const
-{
-    return 0.0f;
-}
-
-int
-ACE_CDR::Float::operator!= (const ACE_CDR::Float &rhs) const
-{
-    return 0;
-}
-#endif /* _UNICOS */
-
 // ****************************************************************
 
 ACE_OutputCDR::ACE_OutputCDR (size_t size,
@@ -736,9 +713,7 @@ ACE_InputCDR::read_string (char *&x)
   this->read_ulong (len);
   if (len > 0)
     {
-      ACE_NEW_RETURN (x,
-                      ACE_CDR::Char[len],
-                      0);
+      ACE_NEW_RETURN (x, ACE_CDR::Char[len], 0);
       if (this->read_char_array (x, len))
         return 1;
       delete [] x;
@@ -776,9 +751,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
   this->read_ulong (len);
   if (this->good_bit())
     {
-      ACE_NEW_RETURN (x,
-                      ACE_CDR::WChar[len],
-                      0);
+      ACE_NEW_RETURN (x, ACE_CDR::WChar[len], 0);
       if (this->read_wchar_array (x, len))
         return 1;
 
@@ -1049,9 +1022,3 @@ ACE_InputCDR::steal_contents (void)
 
   return block;
 }
-
-void
-ACE_InputCDR::reset_contents (void)
-{
-  this->start_.data_block (this->start_.data_block ()->clone ());
-}
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index bc01de7015f..5c773d7e810 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -154,8 +154,7 @@ public:
   typedef ACE_UINT32 ULong;
   typedef ACE_UINT64 ULongLong;
 
-  # if    (defined (_MSC_VER) && (_MSC_VER >= 900)) \
-          || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))
+  # if defined (_MSC_VER) && _MSC_VER >= 900
       typedef __int64 LongLong;
   # elif ACE_SIZEOF_LONG == 8
       typedef long LongLong;
@@ -193,12 +192,6 @@ public:
   #     else  /* ACE_SIZEOF_INT != 4 */
           // Applications will probably have trouble with this.
           char f[4];
-  #       if defined(_UNICOS)
-        Float (void);
-        Float (const float &init);
-        float operator= (const Float &rhs) const;
-        int operator!= (const Float &rhs) const;
-  #       endif /* _UNICOS */
   #     endif /* ACE_SIZEOF_INT != 4 */
       };
   # endif /* ACE_SIZEOF_FLOAT != 4 */
@@ -729,13 +722,8 @@ public:
   // Re-initialize the CDR stream, copying the contents of the chain
   // of message_blocks starting from <data>.
 
-  ACE_Message_Block * steal_contents (void);
-  // Re-initialize the CDR stream, copying the contents of the chain
-  // of message_blocks starting from <data>.
-
-  void reset_contents (void);
-  // Re-initialize the CDR stream, forgetting about the old contents
-  // of the stream and allocating a new buffer (from the allocators).
+  ACE_Message_Block *steal_contents (void);
+  // Steal the contents from the currect CDR.
 
   char* rd_ptr (void);
   // Returns the current position for the rd_ptr....
@@ -753,6 +741,10 @@ public:
   // If non-zero then this stream is writing in non-native byte order,
   // this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined.
 
+  int byte_order (void) const;
+  // If <do_byte_swap> returns 1, this returns ACE_CDR_BYTE_ORDER else
+  // it returns ~ACE_CDR_BYTE_ORDER.
+
   ACE_Char_Codeset_Translator *char_translator (void) const;
   ACE_WChar_Codeset_Translator *wchar_translator (void) const;
   // Access the codeset translators. They can be nil!
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index 3b98423e2fa..3227976db1c 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -1227,6 +1227,15 @@ ACE_InputCDR::do_byte_swap (void) const
 }
 
 ACE_INLINE int
+ACE_InputCDR::byte_order (void) const
+{
+  if (this->do_byte_swap ())
+    return !ACE_CDR_BYTE_ORDER;
+  else
+    return ACE_CDR_BYTE_ORDER;
+}
+
+ACE_INLINE int
 ACE_InputCDR::align_read_ptr (size_t alignment)
 {
   char *buf = ptr_align_binary (this->rd_ptr (),
diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp
index 5ae478cc84e..1e74d6c21c5 100644
--- a/ace/CORBA_Handler.cpp
+++ b/ace/CORBA_Handler.cpp
@@ -306,9 +306,7 @@ ACE_ST_CORBA_Handler::instance (void)
 
   if (ACE_ST_CORBA_Handler::instance_ == 0)
     {
-      ACE_NEW_RETURN (ACE_ST_CORBA_Handler::instance_,
-                      ACE_ST_CORBA_Handler,
-                      0);
+      ACE_NEW_RETURN (ACE_ST_CORBA_Handler::instance_, ACE_ST_CORBA_Handler, 0);
       ACE_ST_CORBA_Handler::instance_->get_orbix_descriptors ();
     }
 
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index e41d7dee878..b59c55ab285 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -80,35 +80,21 @@
 # define ACE_CHECK_RETURN(RETV)
 
 // ACE_THROW_INT should not be used by the user.
-# define ACE_THROW_INT(EXCEPTION) \
-    do { \
-      ACE_UNUSED_ARG(ACE_TRY_ENV); \
-      throw EXCEPTION; \
-    } while (0)
+# define ACE_THROW_INT(EXCEPTION) throw EXCEPTION
 
 // Throwing an exception is easy. These two macros should _NOT_ be
 // used within try blocks.
-# define ACE_THROW(EXCEPTION) \
-    do { \
-      ACE_UNUSED_ARG(ACE_TRY_ENV); \
-      throw EXCEPTION; \
-    } while (0)
-
+# define ACE_THROW(EXCEPTION) throw EXCEPTION
 // Throwing an exception when the function reqires a return value.
-# if defined (WIN32) || defined (__HP_aCC)
+# if defined (WIN32)
 #   define ACE_THROW_RETURN(EXCEPTION, RETV) \
       do \
         { \
-          ACE_UNUSED_ARG(ACE_TRY_ENV); \
           throw EXCEPTION; \
           return RETV; \
         } while (0)
 # else /* WIN32 */
-#   define ACE_THROW_RETURN(EXCEPTION,RETV) \
-      do { \
-        ACE_UNUSED_ARG(ACE_TRY_ENV); \
-        throw EXCEPTION; \
-      } while (0)
+#   define ACE_THROW_RETURN(EXCEPTION,RETV) throw EXCEPTION
 # endif /* WIN32 */
 
 // For compilers with native exceptions, we can simply use
@@ -332,8 +318,8 @@
      do { try { POINTER = new CONSTRUCTOR; } \
        catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
      } while (0)
-// The following ACE_NEW_THROW* macros are to be deprecated soon.
-// -------------------- Start Deprecated --------------------
+// The following ACE_NEW_THROW* macros are to be depricated soon.
+// -------------------- Start Depricated --------------------
 #   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
      do { try { POINTER = new CONSTRUCTOR; } \
        catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
@@ -346,7 +332,7 @@
   do { try { POINTER = new CONSTRUCTOR; } \
        catch (ACE_bad_alloc) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
      } while (0)
-// -------------------- End Deprecated --------------------
+// -------------------- End Depricated --------------------
 
 #else
 
@@ -354,8 +340,8 @@
      do { POINTER = new CONSTRUCTOR; \
        if (POINTER == 0) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
      } while (0)
-// The following ACE_NEW_THROW* macros are to be deprecated soon.
-// -------------------- Start Deprecated --------------------
+// The following ACE_NEW_THROW* macros are to be depricated soon.
+// -------------------- Start Depricated --------------------
 #   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
      do { POINTER = new CONSTRUCTOR; \
        if (POINTER == 0) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
@@ -369,7 +355,7 @@
      do { POINTER = new CONSTRUCTOR; \
        if (POINTER == 0) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
      } while (0)
-// -------------------- End Deprecated --------------------
+// -------------------- End Depricated --------------------
 
 #endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
@@ -385,15 +371,15 @@
   ACE_Write_Guard< MUTEX > OBJ (LOCK); \
     if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
 
-// The following ACE_GUARD_THROW* macros are to be deprecated soon.
-// -------------------- Start Deprecated --------------------
+// The following ACE_GUARD_THROW* macros are to be depricated soon.
+// -------------------- Start Depricated --------------------
 # define ACE_GUARD_THROW(MUTEX,OBJ,LOCK,EXCEPTION) \
   ACE_Guard< MUTEX > OBJ (LOCK); \
     if (OBJ.locked () == 0) TAO_THROW (EXCEPTION);
 # define ACE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,EXCEPTION,RETURN) \
   ACE_Guard< MUTEX > OBJ (LOCK); \
     if (OBJ.locked () == 0) TAO_THROW_RETURN (EXCEPTION, RETURN);
-// -------------------- End Deprecation --------------------
+// -------------------- End Deprication --------------------
 
 // ============================================================
 
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index 376f981e5e4..0a7cc36ec46 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -20,7 +20,7 @@
 ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager)
-
+  
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator)
@@ -28,36 +28,78 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator)
 #define T_1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES
 #define T_2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES
 
-  template <T_1>
-ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
-                                                   size_t size,
-                                                   ACE_Allocator *alloc)
-  : caching_strategy_ (caching_s)
+template <T_1> 
+ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (size_t size,
+                                                   ACE_Allocator *alloc,
+                                                   CACHING_STRATEGY *caching_s,
+                                                   int delete_caching_strategy)
+  : caching_strategy_ (0)
 {
-  if (this->open (size, alloc) == -1)
+  if (this->open (size, alloc, caching_s, delete_caching_strategy) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager")));
-
+  
 }
 
 template <T_1>
 ACE_Cache_Map_Manager<T_2>::~ACE_Cache_Map_Manager (void)
 {
-  this->close ();
 }
 
 template <T_1> int
 ACE_Cache_Map_Manager<T_2>::open (size_t length,
-                                  ACE_Allocator *alloc)
+                                  ACE_Allocator *alloc,
+                                  CACHING_STRATEGY *caching_s,
+                                  int delete_caching_strategy)  
 {
-  return this->map_.open (length,
-                          alloc);
+  // Create the map.
+  if (this->map_.open (length,
+                       alloc) == -1)
+    return -1;
+
+  // Initialise the caching strategy.
+
+  // First we decide whether we need to clean up.
+  if (this->caching_strategy_ != 0 &&
+      this->delete_caching_strategy_ == 1 &&
+      caching_s != 0)
+    {
+
+      delete this->caching_strategy_;
+
+      this->caching_strategy_ = 0;
+
+      this->delete_caching_strategy_ = delete_caching_strategy;
+
+    }
+
+  if (caching_s != 0)
+    this->caching_strategy_ = caching_s;
+  else if (this->caching_strategy_ == 0)
+    {
+
+      ACE_NEW_RETURN (this->caching_strategy_,
+                      CACHING_STRATEGY,
+                      -1);
+
+      this->delete_caching_strategy_ = delete_caching_strategy;
+    
+    }
+    
+  return 0;
 }
 
 template <T_1> int
 ACE_Cache_Map_Manager<T_2>::close (void)
 {
+  if (this->delete_caching_strategy_ == 1)
+    delete this->caching_strategy_;
+
+  this->delete_caching_strategy_ = 0;
+
+  this->caching_strategy_ = 0;
+
   return this->map_.close ();
 }
 
@@ -69,7 +111,7 @@ ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
   // is the combination of the <value> and the attributes of the
   // caching strategy.
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int bind_result = this->map_.bind (key,
                                      cache_value);
@@ -77,8 +119,8 @@ ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
   if (bind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_bind (bind_result,
-                                                        cache_value.second ());
+      int result = this->caching_strategy_->notify_bind (bind_result,
+                                                         cache_value.second ());
 
       if (result == -1)
         {
@@ -102,7 +144,7 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                     const VALUE &value)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int rebind_result = this->map_.rebind (key,
                                          cache_value);
@@ -110,8 +152,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   if (rebind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
+      int result = this->caching_strategy_->notify_rebind (rebind_result,
+                                                           cache_value.second ());
 
       if (result == -1)
         {
@@ -140,10 +182,10 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                     VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   CACHE_VALUE old_cache_value (old_value,
-                               this->caching_strategy_.attributes ());
+                               this->caching_strategy_->attributes ());
 
   int rebind_result = this->map_.rebind (key,
                                          cache_value,
@@ -152,8 +194,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   if (rebind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
+      int result = this->caching_strategy_->notify_rebind (rebind_result,
+                                                           cache_value.second ());
 
       if (result == -1)
         {
@@ -188,10 +230,10 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                     VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   CACHE_VALUE old_cache_value (old_value,
-                               this->caching_strategy_.attributes ());
+                               this->caching_strategy_->attributes ());
 
   int rebind_result = this->map_.rebind (key,
                                          cache_value,
@@ -201,8 +243,8 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   if (rebind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
+      int result = this->caching_strategy_->notify_rebind (rebind_result,
+                                                           cache_value.second ());
 
       if (result == -1)
         {
@@ -235,17 +277,17 @@ ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
                                      VALUE &value)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int trybind_result = this->map_.trybind (key,
                                            cache_value);
 
   if (trybind_result != -1)
     {
-
-      int result = this->caching_strategy_.notify_trybind (trybind_result,
-                                                           cache_value.second ());
-
+    
+      int result = this->caching_strategy_->notify_trybind (trybind_result,
+                                                            cache_value.second ());
+      
       if (result == -1)
         {
 
@@ -259,14 +301,14 @@ ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
         }
       else
         {
-
+   
           // If an attempt is made to bind an existing entry the value
           // is overwritten with the value from the map.
           if (trybind_result == 1)
             value = cache_value.first ();
-
+        
         }
-
+    
     }
 
   return trybind_result;
@@ -285,8 +327,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
   if (find_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_find (find_result,
-                                                        cache_value.second ());
+      int result = this->caching_strategy_->notify_find (find_result,
+                                                         cache_value.second ());
 
       // Unless the find and notification operations go thru, this
       // method is not successful.
@@ -294,7 +336,7 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
         find_result = -1;
       else
         {
-
+          
           // Since the <cache_value> has now changed after the
           // notification, we need to bind to the map again.
           int rebind_result = this->map_.rebind (key,
@@ -303,9 +345,9 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
             find_result = -1;
           else
             value = cache_value.first ();
-
+        
         }
-
+    
     }
 
   return find_result;
@@ -323,8 +365,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
   if (find_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_find (find_result,
-                                                        cache_value.second ());
+      int result = this->caching_strategy_->notify_find (find_result,
+                                                         cache_value.second ());
 
       // Unless the find and notification operations go thru, this
       // method is not successful.
@@ -332,15 +374,15 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
         find_result = -1;
       else
         {
-
+    
           // Since the <cache_value> has now changed after the
           // notification, we need to bind to the map again.
           int rebind_result = this->map_.rebind (key,
                                                  cache_value);
-
+        
           if (rebind_result == -1)
             find_result = -1;
-
+      
         }
 
     }
@@ -360,13 +402,13 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key)
 
   if (unbind_result != -1)
     {
-
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          cache_value.second ());
+      
+      int result = this->caching_strategy_->notify_unbind (unbind_result,
+                                                           cache_value.second ());
 
       if (result == -1)
         unbind_result = -1;
-
+    
     }
 
   return unbind_result;
@@ -384,15 +426,15 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key,
 
   if (unbind_result != -1)
     {
-
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          cache_value.second ());
-
+      
+      int result = this->caching_strategy_->notify_unbind (unbind_result,
+                                                           cache_value.second ());
+      
       if (result == -1)
         unbind_result = -1;
       else
         value = cache_value.first ();
-
+    
     }
 
   return unbind_result;
@@ -403,8 +445,8 @@ template <T_1> void
 ACE_Cache_Map_Manager<T_2>::dump (void) const
 {
   this->map_.dump ();
-
-  this->caching_strategy_.dump ();
+  
+  this->caching_strategy_->dump ();
 }
 
 #undef T_1
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 20dfb3b9e1d..6d1c29f52fd 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -65,36 +65,42 @@ public:
   // are used by the strategy and is transparent to the user of this
   // class.
 
-  friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
-  friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>;
+  friend class ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION,  CACHING_STRATEGY, ATTRIBUTES>;
+  friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION,  CACHING_STRATEGY, ATTRIBUTES>;
 
   // = ACE-style iterator typedefs.
-  typedef ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+  typedef ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> 
           ITERATOR;
-  typedef ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+  typedef ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> 
           REVERSE_ITERATOR;
 
    // = STL-style iterator typedefs.
-  typedef ITERATOR
+  typedef ITERATOR 
           iterator;
-  typedef REVERSE_ITERATOR
+  typedef REVERSE_ITERATOR 
           reverse_iterator;
 
   // = Initialization and termination methods.
 
-  ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy,
-                         size_t size = ACE_DEFAULT_MAP_SIZE,
-                         ACE_Allocator *alloc = 0);
-  // Initialize a <Cache_Map_Manager> with <caching_strategy> and
-  // <size> entries.
+  ACE_Cache_Map_Manager (size_t size = ACE_DEFAULT_MAP_SIZE,
+                         ACE_Allocator *alloc = 0,
+                         CACHING_STRATEGY *caching_s = 0,
+                         int delete_caching_strategy = 1);
+  // Initialize a <Cache_Map_Manager> with <size> entries.
+  // By default the caching strategy is allocated and deallocated by
+  // the class but if needed it can be changed as per the users need.
+  // The <delete_on_destruction> flag simply tells the class whether
+  // the ownership is given to the class or not.
 
   virtual ~ACE_Cache_Map_Manager (void);
   // Close down a <Cache_Map_Manager> and release dynamically allocated
   // resources.
 
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-            ACE_Allocator *alloc = 0);
-  // Initialize a cache with size <length>.
+            ACE_Allocator *alloc = 0,
+            CACHING_STRATEGY *caching_s = 0,
+            int delete_caching_strategy = 1);
+  // Initialise a cache with size <length> and set the caching_strategy.
 
   int close (void);
   // Close down a cache and release dynamically allocated resources.
@@ -159,10 +165,10 @@ public:
   int purge (void);
   // Remove entries from the cache depending upon the strategy.
 
-  size_t current_size (void) const;
+  size_t current_size (void);
   // Return the current size of the cache.
 
-  size_t total_size (void) const;
+  size_t total_size (void);
   // Return the total size of the cache.
 
   void dump (void) const;
@@ -181,7 +187,7 @@ public:
   MAP &map (void);
   // The map managed by the Cache_Map_Manager.
 
-  CACHING_STRATEGY &caching_strategy (void);
+  CACHING_STRATEGY *caching_strategy (void);
   // The caching strategy used on the cache.
 
 protected:
@@ -189,15 +195,12 @@ protected:
   MAP map_;
   // The underlying map which needs to be cached.
 
-  CACHING_STRATEGY &caching_strategy_;
+  CACHING_STRATEGY *caching_strategy_;
   // The strategy to be followed for caching entries in the map.
 
-private:
-
-  // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager<KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES> &))
-
+  int delete_caching_strategy_;
+  // This flag denotes whether the ownership lies in the hands of the
+  // class or not. Is yes, then it deletes the strategy.
 };
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
@@ -213,9 +216,9 @@ class ACE_Cache_Map_Iterator
 public:
 
   // = Traits.
-  typedef ACE_Reference_Pair<KEY, VALUE>
+  typedef ACE_Reference_Pair<KEY, VALUE> 
           value_type;
-  typedef ACE_Pair <VALUE, ATTRIBUTES>
+  typedef ACE_Pair <VALUE, ATTRIBUTES> 
           CACHE_VALUE;
   // The actual value mapped to the key in the cache. The <attributes>
   // are used by the strategy and is transperant to the cache user.
@@ -231,7 +234,7 @@ public:
 
   // = Iteration methods.
 
-  ACE_Cache_Map_Iterator <KEY, VALUE, IMPLEMENTATION,
+  ACE_Cache_Map_Iterator <KEY, VALUE, IMPLEMENTATION, 
                           CACHING_STRATEGY, ATTRIBUTES> &operator=
       (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION,
                                     CACHING_STRATEGY, ATTRIBUTES> &rhs);
@@ -356,7 +359,7 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cache_Map_Manager_T.cpp")
+#pragma implementation ("ace/Cache_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* CACHE_MAP_MANAGER_T_H */
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i
index 1a199e8bc53..67fe9a3c19b 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.i
@@ -7,17 +7,17 @@
 template <T_1> ACE_INLINE int
 ACE_Cache_Map_Manager<T_2>::purge (void)
 {
-  return this->caching_strategy ().clear_cache (this->map_);
+  return this->caching_strategy ()->clear_cache (this->map_);
 }
 
 template <T_1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<T_2>::current_size (void) const
+ACE_Cache_Map_Manager<T_2>::current_size (void)
 {
   return this->map_.current_size ();
 }
 
 template <T_1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<T_2>::total_size (void) const
+ACE_Cache_Map_Manager<T_2>::total_size (void)
 {
   return this->map_.total_size ();
 }
@@ -28,7 +28,7 @@ ACE_Cache_Map_Manager<T_2>::map (void)
   return this->map_;
 }
 
-template <T_1> ACE_INLINE CACHING_STRATEGY &
+template <T_1> ACE_INLINE CACHING_STRATEGY *
 ACE_Cache_Map_Manager<T_2>::caching_strategy (void)
 {
   return this->caching_strategy_;
@@ -92,13 +92,13 @@ ACE_Cache_Map_Iterator<T_2>::operator== (const ACE_Cache_Map_Iterator<T_2> &rhs)
 template <T_1> ACE_INLINE int
 ACE_Cache_Map_Iterator<T_2>::operator!= (const ACE_Cache_Map_Iterator<T_2> &rhs) const
 {
-  return this->iterator_implementation_ != rhs.iterator_implementation_;
+  return this->iterator_implementation_ != rhs.iterator_implementation_; 
 }
 
 template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
 ACE_Cache_Map_Iterator<T_2>::operator* (void) const
 {
-  value_type retn ((*this->iterator_implementation_).ext_id_,
+  value_type retn ((*this->iterator_implementation_).ext_id_, 
                    (*this->iterator_implementation_).int_id_.first ());
   return retn;
 }
@@ -151,7 +151,7 @@ ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &itera
 }
 
 template <T_1> ACE_INLINE IMPLEMENTATION &
-ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void)
+ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void) 
 {
   return this->iterator_implementation_;
 }
@@ -197,7 +197,7 @@ ACE_Cache_Map_Reverse_Iterator<T_2>::operator!= (const ACE_Cache_Map_Reverse_Ite
 template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
 ACE_Cache_Map_Reverse_Iterator<T_2>::operator* (void) const
 {
-  value_type retv ((*this->reverse_iterator_implementation_).ext_id_,
+  value_type retv ((*this->reverse_iterator_implementation_).ext_id_, 
                    (*this->reverse_iterator_implementation_).int_id_.first ());
   return retv;
 }
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index 92bb8accd6f..548cbe846b8 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -3,15 +3,12 @@
 #ifndef CACHED_CONNECT_STRATEGY_T_C
 #define CACHED_CONNECT_STRATEGY_T_C
 
-#define ACE_BUILD_DLL
-
-#include "ace/Cached_Connect_Strategy_T.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/ACE.h"
+#include "ace/Cached_Connect_Strategy_T.h"
 #include "ace/Service_Repository.h"
 #include "ace/Synch.h"
 #include "ace/Service_Types.h"
@@ -25,26 +22,48 @@
 
 ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$")
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::ACE_Cached_Connect_Strategy_Ex
-(CACHING_STRATEGY &caching_s,
- ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
+(ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
- MUTEX *lock,
- int delete_lock)
-  : CCSBASE (cre_s, con_s, rec_s, lock, delete_lock),
-    connection_cache_ (caching_s)
+ MUTEX *mutex,
+ int delete_mutex)
+  : ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> (cre_s, 
+                                                                           con_s,
+                                                                           rec_s,
+                                                                           mutex,
+                                                                           delete_mutex)
 {
-  if (this->open (cre_s, con_s, rec_s) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n")));
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
 {
+  if (this->delete_lock_)
+    delete this->lock_;
+
+  if (this->delete_creation_strategy_)
+    delete this->creation_strategy_;
+  this->delete_creation_strategy_ = 0;
+  this->creation_strategy_ = 0;
+
+  if (this->delete_concurrency_strategy_)
+    delete this->concurrency_strategy_;
+  this->delete_concurrency_strategy_ = 0;
+  this->concurrency_strategy_ = 0;
+
+  if (this->delete_recycling_strategy_)
+    delete this->recycling_strategy_;
+  this->delete_recycling_strategy_ = 0;
+  this->recycling_strategy_ = 0;
+
+  delete this->svc_cleanup_strategy_;
+  this->svc_cleanup_strategy_ = 0;
+
+  delete this->caching_strategy_;
+  this->caching_strategy_ = 0;
+
   // Close down all cached service handlers.
   for (CONNECTION_CACHE_ITERATOR iter = this->connection_cache_.begin ();
        iter != this->connection_cache_.end ();
@@ -58,27 +77,91 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
     }
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::open
 (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
 {
-  int result = this->CCSBASE::open (cre_s, con_s, rec_s);
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("Base initialisation failed\n")),
-                      -1);
-
-  if (this->caching_strategy ().open (&this->svc_cleanup_strategy_,
-                                      0) == -1)
+  // Set up the cleanup strategy for the svc_handler and give it to
+  // the caching_strategy for use.
+  ACE_NEW_RETURN (this->svc_cleanup_strategy_,
+                  SVC_CLEANUP_STRATEGY, -1);
+  
+  ACE_NEW_RETURN (this->caching_strategy_,
+                  CACHING_STRATEGY (this->svc_cleanup_strategy_,
+                                    0),
+                  -1);
+
+  if (this->connection_cache_.open (ACE_DEFAULT_MAP_SIZE,
+                                    0,
+                                    this->caching_strategy_,
+                                    0) == -1)
     return -1;
 
+  // Initialize the creation strategy.
+  // First we decide if we need to clean up.
+  if (this->creation_strategy_ != 0 &&
+      this->delete_creation_strategy_ != 0 &&
+      cre_s != 0)
+    {
+      delete this->creation_strategy_;
+      this->creation_strategy_ = 0;
+      this->delete_creation_strategy_ = 0;
+    }
+
+  if (cre_s != 0)
+    this->creation_strategy_ = cre_s;
+  else if (this->creation_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->creation_strategy_,
+                      CREATION_STRATEGY, -1);
+      this->delete_creation_strategy_ = 1;
+    }
+
+  // Initialize the concurrency strategy.
+  if (this->concurrency_strategy_ != 0 &&
+      this->delete_concurrency_strategy_ != 0 &&
+      con_s != 0)
+    {
+      delete this->concurrency_strategy_;
+      this->concurrency_strategy_ = 0;
+      this->delete_concurrency_strategy_ = 0;
+    }
+
+  if (con_s != 0)
+    this->concurrency_strategy_ = con_s;
+  else if (this->concurrency_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->concurrency_strategy_,
+                      CONCURRENCY_STRATEGY, -1);
+      this->delete_concurrency_strategy_ = 1;
+    }
+
+  // Initialize the recycling strategy.
+
+  if (this->recycling_strategy_ != 0 &&
+      this->delete_recycling_strategy_ != 0 &&
+      rec_s != 0)
+    {
+      delete this->recycling_strategy_;
+      this->recycling_strategy_ = 0;
+      this->delete_recycling_strategy_ = 0;
+    }
+
+  if (rec_s != 0)
+    this->recycling_strategy_ = rec_s;
+  else if (this->recycling_strategy_ == 0)
+    {
+      ACE_NEW_RETURN (this->recycling_strategy_,
+                      RECYCLING_STRATEGY, -1);
+      this->delete_recycling_strategy_ = 1;
+    }
+
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::check_hint_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
@@ -151,7 +234,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::find_or_create_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
@@ -175,9 +258,9 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
       // Create a new svc_handler
       if (this->make_svc_handler (sh) == -1)
         return -1;
-
+      
       // Connect using the svc_handler.
-      if (this->cached_connect (sh,
+      if (this->connect (sh,
                          remote_addr,
                          timeout,
                          local_addr,
@@ -216,8 +299,8 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cached_connect (SVC_HANDLER *&sh,
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect (SVC_HANDLER *&sh,
                                                                                                                  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                                                                                                  ACE_Time_Value *timeout,
                                                                                                                  const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -240,7 +323,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
       // there is no way for the non-blocking connects to complete and
       // for the <Connector> to notify the cache of the completion of
       // connect().
-
       if (errno == EWOULDBLOCK)
         errno = ENOTSUP;
       else if (errno == EMFILE)
@@ -250,7 +332,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
           // are done from the CONNECTION_CACHE. This frees the
           // descriptors which get used in the connect process and
           // hence the same method is called again!
-          if (this->purge_connections (this->caching_strategy ().purge_percent ()) == -1)
+          if (this->connection_cache_.purge () == -1)
             return -1;
 
           // Try connecting again.
@@ -272,13 +354,13 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
           return -1;
         }
     }
-
+  
   return 0;
-
+ 
 }
 
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::connect_svc_handler_i
 (SVC_HANDLER *&sh,
  const ACE_PEER_CONNECTOR_ADDR &remote_addr,
@@ -337,7 +419,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cache_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
@@ -351,7 +433,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
@@ -361,7 +443,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::mark_as_closed_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
@@ -373,7 +455,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
+template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
 ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup_hint_i (const void *recycling_act)
 {
   // The wonders and perils of ACT
@@ -395,20 +477,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (double percentage)
-{
-  // Set the percentage of entries to remove and then call purge on the cache.
-  this->caching_strategy_ ().purge_percent (percentage);
-  return this->connection_cache_.purge ();
-}
-
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY &
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void)
-{
-  return this->connection_cache_.caching_strategy ();
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex)
 
 #endif /* CACHED_CONNECT_STRATEGY_T_C */
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index 59f070c9a46..dea83658ee3 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -17,8 +17,6 @@
 #ifndef CACHED_CONNECT_STRATEGY_T_H
 #define CACHED_CONNECT_STRATEGY_T_H
 
-#include "ace/OS.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -31,7 +29,7 @@
 #include "ace/Synch.h"
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
-class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>
+class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy< SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>
 {
   // = TITLE
   //     A connection strategy which caches connections to peers
@@ -43,33 +41,33 @@ class ACE_Cached_Connect_Strategy_Ex : public ACE_Cached_Connect_Strategy<SVC_HA
   //     plug-in connection strategy for <ACE_Strategy_Connector>.
   //     It's added value is re-use of established connections and
   //     tweaking the role of the cache as per the caching strategy.
-
+ 
 public:
 
-  ACE_Cached_Connect_Strategy_Ex (CACHING_STRATEGY &caching_s,
-                                  ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
+  ACE_Cached_Connect_Strategy_Ex (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
                                   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0,
                                   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0,
-                                  MUTEX *lock = 0,
-                                  int delete_lock = 0);
+                                  MUTEX *mutex = 0,
+                                  int delete_mutex = 0);
   // Constructor
 
   virtual ~ACE_Cached_Connect_Strategy_Ex (void);
   // Destructor
 
+
   virtual int open (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
                     ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
                     ACE_Recycling_Strategy<SVC_HANDLER> *rec_s);
   // This methods allow you to change the strategies used by the
   // cached connector.
 
-  virtual int cached_connect (SVC_HANDLER *&sh,
-                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                              ACE_Time_Value *timeout,
-                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                              int reuse_addr,
-                              int flags,
-                              int perms);
+  virtual int connect (SVC_HANDLER *&sh,
+                       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                       ACE_Time_Value *timeout,
+                       const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                       int reuse_addr,
+                       int flags,
+                       int perms);
   // Connection of the svc_handler with the remote host.
   // This method also encapsulates the connection done with
   // auto_purging under the hood. If the connect failed due to the
@@ -78,32 +76,23 @@ public:
   // the descriptors which get used in the connect process and hence
   // the connect operation can succeed.
 
-  virtual int purge_connections (double percentage = 10);
-  // Explicit purging of connection entries from the connection cache.
-
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
   typedef ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY, ATTRIBUTES>
           CONNECTION_CACHE;
-  typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY
+  typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY 
           CONNECTION_CACHE_ENTRY;
   typedef ACE_TYPENAME CONNECTION_CACHE::key_type
           KEY;
-  typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type
+  typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type 
           VALUE;
-  typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR
+  typedef ACE_TYPENAME CONNECTION_CACHE::ITERATOR 
           CONNECTION_CACHE_ITERATOR;
 
   // = Cleanup of the svc_handler.
   typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, MUTEX> >
-          SVC_CLEANUP_STRATEGY;
-
-  typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>
-          CCSBASE;
-
-  // = Accessor.
-  CACHING_STRATEGY &caching_strategy (void);
+          SVC_CLEANUP_STRATEGY; 
 
 protected:
 
@@ -121,7 +110,7 @@ protected:
 
   // = Helpers
 
-  virtual int check_hint_i (SVC_HANDLER *&sh,
+  int check_hint_i (SVC_HANDLER *&sh,
                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                     ACE_Time_Value *timeout,
                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -131,8 +120,8 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
                     int &found);
 
-
-  virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
+ 
+  int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
                                     const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -142,7 +131,7 @@ protected:
                                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
                                     int &found);
 
-  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
+  int connect_svc_handler_i (SVC_HANDLER *&sh,
                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                              ACE_Time_Value *timeout,
                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
@@ -154,9 +143,14 @@ protected:
   CONNECTION_CACHE connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
 
-  SVC_CLEANUP_STRATEGY svc_cleanup_strategy_;
+  SVC_CLEANUP_STRATEGY *svc_cleanup_strategy_;
   // The strategy which controls the destruction and closing of the
   // svc_handler.
+
+  CACHING_STRATEGY *caching_strategy_;
+  // The strategy which decides how and when entries are to be removed
+  // from the connection_cache.
+
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
@@ -168,7 +162,7 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cached_Connect_Strategy_T.cpp")
+#pragma implementation ("ace/Cached_Connect_Strategy_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* CACHED_CONNECT_STRATEGY_T_H */
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index 532064ae23e..72d5e1ab953 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -16,13 +16,6 @@
 ACE_RCSID(ace, Caching_Strategies_T, "$Id$")
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Caching_Strategy (void)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
                                                                                                                  int delete_cleanup_strategy,
                                                                                                                  CACHING_STRATEGY_UTILITY *utility_s,
@@ -50,13 +43,9 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 {
   if (this->delete_cleanup_strategy_ == 1)
     delete this->cleanup_strategy_;
-  this->delete_cleanup_strategy_ = 0;
-  this->cleanup_strategy_ = 0;
 
   if (this->delete_caching_strategy_utility_ == 1)
     delete this->caching_strategy_utility_;
-  this->delete_caching_strategy_utility_ = 0;
-  this->caching_strategy_utility_ = 0;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
@@ -68,27 +57,24 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
   // Initialise the cleanup strategy.
 
   // First we decide whether we need to clean up.
-   if (this->cleanup_strategy_ != 0 &&
+  if (this->cleanup_strategy_ != 0 &&
       this->delete_cleanup_strategy_ == 1 &&
       cleanup_s != 0)
     {
       delete this->cleanup_strategy_;
       this->cleanup_strategy_ = 0;
-      this->delete_cleanup_strategy_ = 0;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
     }
 
   if (cleanup_s != 0)
-    {
-      this->cleanup_strategy_ = cleanup_s;
-      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
-    }
+    this->cleanup_strategy_ = cleanup_s;
   else if (this->cleanup_strategy_ == 0)
     {
       ACE_NEW_RETURN (this->cleanup_strategy_,
                       CLEANUP_STRATEGY,
                       -1);
 
-      this->delete_cleanup_strategy_ = 1;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
     }
 
   // Initialise the caching strategy utility.
@@ -100,21 +86,18 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
     {
       delete this->caching_strategy_utility_;
       this->caching_strategy_utility_ = 0;
-      this->delete_caching_strategy_utility_ = 0;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
 
   if (utility_s != 0)
-    {
-      this->caching_strategy_utility_ = utility_s;
-      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
-    }
+    this->caching_strategy_utility_ = utility_s;
   else if (this->caching_strategy_utility_ == 0)
     {
       ACE_NEW_RETURN (this->caching_strategy_utility_,
                       CACHING_STRATEGY_UTILITY,
                       -1);
 
-      this->delete_caching_strategy_utility_ = 1;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
 
   return 0;
@@ -125,7 +108,19 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 {
   return this->caching_strategy_utility_->clear_cache (container,
                                                        this->cleanup_strategy_,
-                                                       this->purge_percent_);
+                                                       this->purge_percent_,
+                                                       this->entries_);
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container,
+                                                                                                    unsigned int &total_container_entries)
+{
+
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_,
+                                                       total_container_entries);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -155,15 +150,6 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_LFU_Caching_Strategy (void)
 {
-  if (this->delete_cleanup_strategy_ == 1)
-    delete this->cleanup_strategy_;
-  this->delete_cleanup_strategy_ = 0;
-  this->cleanup_strategy_ = 0;
-
-  if (this->delete_caching_strategy_utility_ == 1)
-    delete this->caching_strategy_utility_;
-  this->delete_caching_strategy_utility_ = 0;
-  this->caching_strategy_utility_ = 0;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
@@ -192,7 +178,7 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
                       CLEANUP_STRATEGY,
                       -1);
 
-      this->delete_cleanup_strategy_ = 1;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
     }
 
   // Initialise the caching strategy utility.
@@ -215,7 +201,7 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
                       CACHING_STRATEGY_UTILITY,
                       -1);
 
-      this->delete_caching_strategy_utility_ = 1;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
 
   return 0;
@@ -226,9 +212,19 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 {
   return this->caching_strategy_utility_->clear_cache (container,
                                                        this->cleanup_strategy_,
-                                                       this->purge_percent_);
+                                                       this->purge_percent_,
+                                                       this->entries_);
 }
 
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container,
+                                                                                                    unsigned int &total_container_entries)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_,
+                                                       total_container_entries);
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -258,15 +254,6 @@ template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHIN
 ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_FIFO_Caching_Strategy (void)
 
 {
-  if (this->delete_cleanup_strategy_ == 1)
-    delete this->cleanup_strategy_;
-  this->delete_cleanup_strategy_ = 0;
-  this->cleanup_strategy_ = 0;
-
-  if (this->delete_caching_strategy_utility_ == 1)
-    delete this->caching_strategy_utility_;
-  this->delete_caching_strategy_utility_ = 0;
-  this->caching_strategy_utility_ = 0;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
@@ -295,7 +282,7 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
                       CLEANUP_STRATEGY,
                       -1);
 
-      this->delete_cleanup_strategy_ = 1;
+      this->delete_cleanup_strategy_ = delete_cleanup_strategy;
     }
 
   // Initialise the caching strategy utility.
@@ -318,7 +305,7 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
                       CACHING_STRATEGY_UTILITY,
                       -1);
 
-      this->delete_caching_strategy_utility_ = 1;
+      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
 
   return 0;
@@ -329,7 +316,18 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
 {
   return this->caching_strategy_utility_->clear_cache (container,
                                                        this->cleanup_strategy_,
-                                                       this->purge_percent_);
+                                                       this->purge_percent_,
+                                                       this->entries_);
+}
+
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container,
+                                                                                                    unsigned int &total_container_entries)
+{
+  return this->caching_strategy_utility_->clear_cache (container,
+                                                       this->cleanup_strategy_,
+                                                       this->purge_percent_,
+                                                       total_container_entries);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -357,7 +355,7 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
   ACE_UNUSED_ARG (delete_cleanup_strategy);
   ACE_UNUSED_ARG (utility_s);
   ACE_UNUSED_ARG (delete_caching_strategy_utility);
-
+  
   return 0;
 }
 
@@ -374,6 +372,16 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
   return 0;
 }
 
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> int
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::clear_cache (CONTAINER &container,
+                                                                                                     unsigned int &total_container_entries)
+{
+  ACE_UNUSED_ARG (container);
+  ACE_UNUSED_ARG (total_container_entries);
+
+  return 0;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy)
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index 44b5e31f096..3b219015e02 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -19,7 +19,7 @@
 
 #include "ace/OS.h"
 
-#include "ace/Caching_Utility_T.h"
+#include "ace/Caching_Strategy_Utility_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #define  ACE_LACKS_PRAGMA_ONCE
@@ -28,154 +28,6 @@
 #include "ace/Cleanup_Strategies_T.h"
 
 template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-class ACE_Caching_Strategy
-{
-  // = TITLE
-  //     This class is an abstract base class for a caching strategy.
-  //
-  // = DESCRIPTION
-  //     This class consists of all the interfaces a caching strategy should have and
-  //   is used in association with the ACE_Caching_Strategy_Adaptor.
-
-public:
-
-  virtual ~ACE_Caching_Strategy (void);
-  // Destructor.
-
-  virtual int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
-                    int delete_cleanup_strategy = 1,
-                    CACHING_STRATEGY_UTILITY *utility_s = 0,
-                    int delete_caching_strategy_utility = 1) = 0;
-  // This method which does the actual initialisation.
-
-  virtual ATTRIBUTES attributes (void) = 0;
-  // Accessor method for the timer attributes.
-
-  // = Accessor methods for the percentage of entries to purge.
-  virtual double purge_percent (void) = 0;
-  virtual void purge_percent (double percentage) = 0;
-
-  // = Strategy related Operations
-
-  virtual int notify_bind (int result,
-                           const ATTRIBUTES &attr) = 0;
-  // This method acts as a notification about the CONTAINERs bind
-  // method call.
-
-  virtual int notify_find (int result,
-                           ATTRIBUTES &attr) = 0;
-  // This method acts as a notification about the CONTAINERs find
-  // method call
-
-  virtual int notify_unbind (int result,
-                             const ATTRIBUTES &attr) = 0;
-  // This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  virtual int notify_trybind (int result,
-                              ATTRIBUTES &attr) = 0;
-  // This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  virtual int notify_rebind (int result,
-                             const ATTRIBUTES &attr) = 0;
-  // This method acts as a notification about the CONTAINERs rebind
-  // method call
-
-  virtual int clear_cache (CONTAINER &container) = 0;
-  // This is the method which looks at each ITEM's attributes  and
-  // then decides on the one to remove.
-
-  virtual void dump (void) const = 0;
-  // Dumps the state of the object.
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION>
-class ACE_Caching_Strategy_Adapter : public ACE_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>
-{
-  // = TITLE
-  //     This class follows the Adaptor pattern and is used to provide
-  //     External Polymorphism by deriving from ACE_Caching_Strategy.
-  //
-  // = DESCRIPTION
-  //     This class simply delegates all requests to the
-  //     IMPLEMNETATION object within. This class should be passed in
-  //     place of the the abstract base ACE_Caching_Strategy class as
-  //     part of the External Polymorphism pattern.
-
-public:
-
-  ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation = 0,
-                                int delete_implementation = 0);
-  // Constructor.
-
-  ~ACE_Caching_Strategy_Adapter (void);
-  // Destructor.
-
-  int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
-            int delete_cleanup_strategy = 1,
-            CACHING_STRATEGY_UTILITY *utility_s = 0,
-            int delete_caching_strategy_utility = 1);
-  // This method which does the actual initialisation.
-
-  ATTRIBUTES attributes (void);
-  // Accessor method for the timer attributes.
-
-  // = Accessor methods for the percentage of entries to purge.
-  double purge_percent (void);
-  void purge_percent (double percentage);
-
-  // = Strategy related Operations
-
-  int notify_bind (int result,
-                   const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs bind
-  // method call.
-
-  int notify_find (int result,
-                   ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs find
-  // method call
-
-  int notify_unbind (int result,
-                     const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  int notify_trybind (int result,
-                      ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  int notify_rebind (int result,
-                     const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs rebind
-  // method call
-
-  int clear_cache (CONTAINER &container);
-  // This is the method which looks at each ITEM's attributes  and
-  // then decides on the one to remove.
-
-  IMPLEMENTATION &implementation (void);
-  // Accessor to the implementation.
-
-  void dump (void) const;
-  // Dumps the state of the object.
-
-private:
-
-  IMPLEMENTATION *implementation_;
-  // Implementation class.
-
-  int delete_implementation_;
-  // Do we need to delete the implementation?
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
 class ACE_LRU_Caching_Strategy
 {
   // = TITLE
@@ -187,7 +39,7 @@ class ACE_LRU_Caching_Strategy
   //     is updated whenever an item is inserted or looked up in the
   //     container. When the need of purging entries arises, the items
   //     with the lowest timer values are removed.
-  //
+  //     
   //     Explanation of the template parameter list:
   //     CONTAINER is any map with entries of type <KEY, VALUE>.
   //     The ATTRIBUTES are the deciding factor for purging of entries
@@ -195,14 +47,14 @@ class ACE_LRU_Caching_Strategy
   //     doing this are: As being a member of the VALUE or VALUE being
   //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
-  //     to purge.
+  //     to purge. 
 
 public:
 
   // Traits.
   typedef ATTRIBUTES CACHING_ATTRIBUTES;
   typedef CONTAINER CACHE;
-
+ 
   // = Initialisation and termination.
 
   ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
@@ -218,7 +70,7 @@ public:
   // in the cache which can be purged automagically and by default is
   // set to 10%. The ultility which helps the caching strategy in the
   // purging of entries needs to be specified. By default a new one
-  // will be created of type CACHING_STRATEGY_UTILITY and
+  // will be created of type CACHING_STRATEGY_UTILITY and 
   // <delete_caching_strategy_utility> decides whether to destroy the
   // utility object or not.
 
@@ -236,9 +88,9 @@ public:
   // Accessor method for the timer attributes.
 
   // = Accessor methods for the percentage of entries to purge.
-  double purge_percent (void);
-
-  void purge_percent (double percentage);
+  unsigned int purge_percent (void);
+  
+  void purge_percent (unsigned int percentage);
 
   // =  Strategy related Operations
 
@@ -249,29 +101,37 @@ public:
 
   int notify_find (int result,
                    ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs find
+  //This method acts as a notification about the CONTAINERs find
   // method call
 
   int notify_unbind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs unbind
+  //This method acts as a notification about the CONTAINERs unbind
   // method call
 
 
   int notify_trybind (int result,
                       ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs trybind
+  //This method acts as a notification about the CONTAINERs trybind
   // method call
 
   int notify_rebind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs rebind
+  //This method acts as a notification about the CONTAINERs rebind
   // method call
 
   int clear_cache (CONTAINER &container);
   // This is the method which looks at each ITEM's attributes  and
   // then decides on the one to remove.
 
+  int clear_cache (CONTAINER &container, 
+                   unsigned int &total_container_entries);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove. The <total_container_entries>
+  // can be specified explicitly and facilitates use of the caching
+  // strategy even when the <entries_> is not maintained by the
+  // strategy itself.
+
   void dump (void) const;
   // Dumps the state of the object.
 
@@ -283,12 +143,12 @@ private:
   // This element is the one which is the deciding factor for purging
   // of an ITEM.
 
-  double purge_percent_;
+  unsigned int purge_percent_;
   // The level about which the purging will happen automagically.
 
   unsigned int entries_;
   // The no of entries bound in the cache.
-
+  
   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
   // The cleanup strategy which can be used to destroy the entries of
   // the container.
@@ -300,7 +160,7 @@ private:
   CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
   // This is the helper class which will decide and expunge entries
   // from the cache.
-
+  
   int delete_caching_strategy_utility_;
   // The flag which denotes the ownership of the
   // caching_strategy_utility. If 1 then this class itself will
@@ -330,7 +190,7 @@ class ACE_LFU_Caching_Strategy
   //     doing this are: As being a member of the VALUE or VALUE being
   //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
-  //     to purge.
+  //     to purge. 
 
 public:
 
@@ -371,12 +231,12 @@ public:
   // Access the attributes.
 
   // = Accessor methods for the percentage of entries to purge.
-  double purge_percent (void);
-
-  void purge_percent (double percentage);
+  unsigned int purge_percent (void);
+  
+  void purge_percent (unsigned int percentage);
 
   // =  Strategy related Operations
-
+  
   int notify_bind (int result,
                    const ATTRIBUTES &attr);
   // This method acts as a notification about the CONTAINERs bind
@@ -388,17 +248,17 @@ public:
 
   int notify_unbind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs unbind
+  //This method acts as a notification about the CONTAINERs unbind
   // method call
 
   int notify_trybind (int result,
                       ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs trybind
+  //This method acts as a notification about the CONTAINERs trybind
   // method call
 
   int notify_rebind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs rebind
+  //This method acts as a notification about the CONTAINERs rebind
   // method call
 
 
@@ -406,14 +266,22 @@ public:
   // This is the method which looks at each ITEM's attributes  and
   // then decides on the one to remove.
 
+  int clear_cache (CONTAINER &container, 
+                   unsigned int &total_container_entries);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove. The <total_container_entries>
+  // can be specified explicitly and facilitates use of the caching
+  // strategy even when the <entries_> is not maintained by the
+  // strategy itself.
+
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
   typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-
-  double purge_percent_;
+ 
+  unsigned int purge_percent_;
   // The level about which the purging will happen automagically.
 
   unsigned int entries_;
@@ -457,7 +325,7 @@ class ACE_FIFO_Caching_Strategy
   //     doing this are: As being a member of the VALUE or VALUE being
   //     ACE_Pair<x, ATTRIBUTES>. The CACHING_STRATEGY_UTILITY is the
   //     class which can be plugged in and which decides the entries
-  //     to purge.
+  //     to purge. 
 
 public:
 
@@ -481,8 +349,8 @@ public:
   // purging of entries will be default be the
   // ACE_Caching_Strategy_Utility and the
   // <delete_caching_strategy_utility> decides whether to destroy the
-  // utility or not.
-
+  // utility or not. 
+  
   ~ACE_FIFO_Caching_Strategy (void);
 
   int open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s = 0,
@@ -497,9 +365,9 @@ public:
   // Accessor method.
 
   // = Accessor methods for the percentage of entries to purge.
-  double purge_percent (void);
-
-  void purge_percent (double percentage);
+  unsigned int purge_percent (void);
+  
+  void purge_percent (unsigned int percentage);
 
   // =  Strategy related Operations
 
@@ -509,17 +377,17 @@ public:
 
   int notify_find (int result,
                    ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs find
+  //This method acts as a notification about the CONTAINERs find
   // method call
 
   int notify_unbind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs unbind
+  //This method acts as a notification about the CONTAINERs unbind
   // method call
 
   int notify_trybind (int result,
                       ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs trybind
+  //This method acts as a notification about the CONTAINERs trybind
   // method call
 
   int notify_rebind (int result,
@@ -530,23 +398,31 @@ public:
   // This is the method which looks at each ITEM's attributes  and
   // then decides on the one to remove.
 
+  int clear_cache (CONTAINER &container, 
+                   unsigned int &total_container_entries);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove. The <total_container_entries>
+  // can be specified explicitly and facilitates use of the caching
+  // strategy even when the <entries_> is not maintained by the
+  // strategy itself.
+
   void dump (void) const;
   // Dumps the state of the object.
 
 private:
 
   typedef ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
-
+ 
   ATTRIBUTES order_;
   // The order is the deciding factor for the item to be removed from
   // the cache.
 
-  double purge_percent_;
+  unsigned int purge_percent_;
   // The level about which the purging will happen automagically.
 
   unsigned int entries_;
   // The no of entries bound in the cache.
-
+ 
   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
   // The cleanup strategy which can be used to destroy the entries of
   // the container.
@@ -605,9 +481,9 @@ public:
   // Accessor method.
 
  // = Accessor methods for the percentage of entries to purge.
-  double purge_percent (void);
-
-  void purge_percent (double percentage);
+  unsigned int purge_percent (void);
+  
+  void purge_percent (unsigned int percentage);
 
   // =  Strategy related Operations
 
@@ -617,17 +493,17 @@ public:
 
   int notify_find (int result,
                    ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs find
+  //This method acts as a notification about the CONTAINERs find
   // method call
 
   int notify_unbind (int result,
                      const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs unbind
+  //This method acts as a notification about the CONTAINERs unbind
   // method call
 
   int notify_trybind (int result,
                       ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs trybind
+  //This method acts as a notification about the CONTAINERs trybind
   // method call
 
   int notify_rebind (int result,
@@ -638,9 +514,17 @@ public:
   // This is the method which looks at each ITEM's attributes  and
   // then decides on the one to remove.
 
+  int clear_cache (CONTAINER &container, 
+                   unsigned int &total_container_entries);
+  // This is the method which looks at each ITEM's attributes  and
+  // then decides on the one to remove. The <total_container_entries>
+  // can be specified explicitly and facilitates use of the caching
+  // strategy even when the <entries_> is not maintained by the
+  // strategy itself.
+
   void dump (void) const;
   // Dumps the state of the object.
-
+  
 };
 
 #if defined (__ACE_INLINE__)
@@ -652,7 +536,7 @@ public:
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Caching_Strategies_T.cpp")
+#pragma implementation ("ace/Caching_Strategies_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* CACHING_STRATEGIES_H */
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i
index 8e114434cf2..eacd2bfcf59 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.i
@@ -1,160 +1,41 @@
 /* -*-C++-*- */
 //$Id$
 
-//////////////////////////////////////////////////////////////////////////////////
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
-                                                                                                                                         int delete_implementation)
-  : implementation_ (implementation),
-    delete_implementation_ (delete_implementation)
-{
-  if (this->implementation_ == 0)
-    {
-      ACE_NEW (this->implementation_,
-               IMPLEMENTATION);
-      this->delete_implementation_ = 1;
-    }
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE 
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::~ACE_Caching_Strategy_Adapter (void)
-{
-  if (this->delete_implementation_)
-    delete this->implementation_;
-  this->delete_implementation_ = 0;
-  this->implementation_ = 0;
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                                                 int delete_cleanup_strategy,
-                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                                                 int delete_caching_strategy_utility)
-{
-  return this->implementation_->open (cleanup_s,
-                                      delete_cleanup_strategy,
-                                      utility_s,
-                                      delete_caching_strategy_utility);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE ATTRIBUTES
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::attributes (void)
-{
-  return this->implementation_->attributes ();
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE double
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (void)
-{
-  return this->implementation_->purge_percent ();
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::purge_percent (double percentage)
-{
-  this->implementation_->purge_percent (percentage);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_bind (int result,
-                                                                                                                        const ATTRIBUTES &attr)
-{
-  return this->implementation_->notify_bind (result,
-                                             attr);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_find (int result,
-                                                                                                                        ATTRIBUTES &attr)
-{
-  return this->implementation_->notify_find (result,
-                                             attr);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_unbind (int result,
-                                                                                                                          const ATTRIBUTES &attr)
-{
-  return this->implementation_->notify_unbind (result,
-                                               attr);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_trybind (int result,
-                                                                                                                           ATTRIBUTES &attr)
-{
-  return this->implementation_->notify_trybind (result,
-                                                attr);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::notify_rebind (int result,
-                                                                                                                          const ATTRIBUTES &attr)
-{
-  return this->implementation_->notify_rebind (result,
-                                               attr);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE int
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::clear_cache (CONTAINER &container)
-{
-  return this->implementation_->clear_cache (container);
-}
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE IMPLEMENTATION &
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::implementation (void)
-{
-  return *this->implementation_;
-}
-
-
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY, class IMPLEMENTATION> ACE_INLINE void
-ACE_Caching_Strategy_Adapter<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY, IMPLEMENTATION>::dump (void) const
-{
-  ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE ATTRIBUTES
 ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
 {
   return this->timer_;
-}
+}   
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int
 ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, 
                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     {
       ++this->timer_;
       ++this->entries_;
     }
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, 
                                                                                                     ATTRIBUTES &attr)
 {
   if (result == 0)
@@ -166,29 +47,29 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, 
                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, 
                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, 
                                                                                                       const ATTRIBUTES &attr)
-{
+{ 
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     ++this->timer_;
 
@@ -196,10 +77,10 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
-ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
+ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const 
 {
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
-
+      
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("timer_ = %d "), this->timer_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
@@ -213,24 +94,24 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
   return 0;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int
 ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage)
 {
   this->purge_percent_ = percentage;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, 
                                                                                                     const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     ++this->entries_;
 
@@ -238,43 +119,43 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, 
                                                                                                     ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     ++attr;
 
-  return result;
+  return result;    
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, 
                                                                                                        ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, 
                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     ++this->entries_;
 
   return result;
 }
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, 
                                                                                                       const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
@@ -282,7 +163,7 @@ template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHIN
 ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
-
+      
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -294,24 +175,24 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
 {
   return this->order_;
 }
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int
 ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return this->purge_percent_;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage)
 {
   this->purge_percent_ = percentage;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, 
                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     {
       ++this->order_;
@@ -322,39 +203,39 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
 }
 
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, 
                                                                                                      ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, 
                                                                                                        const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, 
                                                                                                         ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
-                                                                                                       const ATTRIBUTES &attr)
+ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, 
+                                                                                                       const ATTRIBUTES &attr)  
 {
   ACE_UNUSED_ARG (attr);
-
+  
   if (result == 0)
     {
       ++this->order_;
@@ -362,14 +243,14 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
     }
 
   return result;
-}
+}    
 
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
 ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
-
+      
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("order_ = %d "), this->order_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
@@ -383,68 +264,68 @@ ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
   return 0;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE double
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE unsigned int
 ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (void)
 {
   return 0;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (double percentage)
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::purge_percent (unsigned int percentage)
 {
   ACE_UNUSED_ARG (percentage);
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result,
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_bind (int result, 
                                                                                                      const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_find (int result, 
                                                                                                      ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_unbind (int result, 
                                                                                                        const ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result,
+template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int 
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_trybind (int result, 
                                                                                                         ATTRIBUTES &attr)
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
 }
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE int
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result,
-                                                                                                       const ATTRIBUTES &attr)
+ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::notify_rebind (int result, 
+                                                                                                       const ATTRIBUTES &attr)  
 {
   ACE_UNUSED_ARG (attr);
-
+  
   return result;
-}
+}    
 
 
 template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY> ACE_INLINE void
 ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
 {
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
-
+      
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
diff --git a/ace/Caching_Strategy_Utility_T.cpp b/ace/Caching_Strategy_Utility_T.cpp
new file mode 100644
index 00000000000..7acbcad8c0a
--- /dev/null
+++ b/ace/Caching_Strategy_Utility_T.cpp
@@ -0,0 +1,190 @@
+//$Id$
+
+#ifndef CACHING_STRATEGY_UTILITY_T_C
+#define CACHING_STRATEGY_UTILITY_T_C
+
+#include "ace/Caching_Strategy_Utility_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#define ACE_LACKS_PRAGMA_ONCE
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Cleanup_Strategies_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Caching_Strategy_Utility_T.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(ace, Caching_Strategy_Utility_T, "$Id$")
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES>
+ACE_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::~ACE_Caching_Strategy_Utility (void)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int
+ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                  const unsigned int purge_percent,
+                                                                                  unsigned int &entries)
+{
+  // Check that the purge_percent is non-zero.
+  if (purge_percent == 0)
+    return 0;
+
+  // Also whether the number of entries in the cache is just one!
+  // Oops! then thers no way out but exiting. So return an error.
+  if (entries == 1)
+    return -1;
+
+  // Calculate the no of entries to remove from the cache depending
+  // upon the <purge_percent>.
+  double val = (double) purge_percent / 100;
+  int no_of_entries = (int) (val * entries + 0.5);
+
+  KEY *key_to_remove = 0;
+  VALUE *value_to_remove = 0;
+
+  for (int i = 0; i < no_of_entries ; ++i)
+    {
+      this->minimum (container,
+                     key_to_remove,
+                     value_to_remove);
+
+      if (cleanup_s->cleanup (container, key_to_remove, value_to_remove) == -1)
+        return -1;
+
+      --entries;
+
+    }
+
+  return 0;
+}
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void
+ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container,
+                                                                              KEY *&key,
+                                                                              VALUE *&value)
+{
+  typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR;
+  typedef ACE_TYPENAME CONTAINER::ENTRY ITEM;
+
+  ITERATOR iter (container);
+  ATTRIBUTES  min = 0;
+  ITEM *item = 0;
+
+  // The iterator moves thru the container searching for the entry with the
+  // lowest ATTRIBUTES.
+  for (min = (*iter).int_id_.second (), key = &(*iter).ext_id_, value = &(*iter).int_id_;
+       iter.next (item) != 0;
+       ++iter)
+    {
+      // Ah! an item with lower ATTTRIBUTES...
+      if (min > (*iter).int_id_.second ())
+        {
+          min = (*iter).int_id_.second ();
+          key = &(*iter).ext_id_;
+          value = &(*iter).int_id_;
+
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int
+ACE_Handler_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                      ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                      const unsigned int purge_percent,
+                                                                                      unsigned int &entries)
+{
+  // Check that the purge_percent is non-zero.
+  if (purge_percent == 0)
+    return 0;
+
+  // Also whether the number of entries in the cache is just one!
+  // Oops! then thers no way out but exiting. So return an error.
+  if (entries == 1)
+    return -1;
+
+  // Calculate the no of entries to remove from the cache depending
+  // upon the <purge_percent>.
+  double val = (double) purge_percent / 100;
+  int no_of_entries = (int) (val * entries + 0.5);
+
+  KEY *key_to_remove = 0;
+  VALUE *value_to_remove = 0;
+
+  for (int i = 0; i < no_of_entries ; ++i)
+    {
+      this->minimum (container,
+                     key_to_remove,
+                     value_to_remove);
+
+      if (cleanup_s->cleanup (container, key_to_remove, value_to_remove) == -1)
+        return -1;
+
+      --entries;
+    }
+
+  return 0;
+}
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void
+ACE_Handler_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container,
+                                                                                  KEY *&key,
+                                                                                  VALUE *&value)
+{
+  typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR;
+  typedef ACE_TYPENAME CONTAINER::ENTRY ITEM;
+
+  ITERATOR iter (container);
+  ATTRIBUTES  min = 0;
+  ITEM *item = 0;
+
+  for (min = (*iter).int_id_->caching_attributes (), key = &(*iter).ext_id_, value = &(*iter).int_id_;
+       iter.next (item) != 0;
+       ++iter)
+    {
+      // Ah! an item with lower ATTTRIBUTES...
+      if ((min.attributes () > (*iter).int_id_->caching_attributes ().attributes ()) && ((*iter).int_id_->active () != 1))
+        {
+          min = (*iter).int_id_->caching_attributes ();
+
+          key = &(*iter).ext_id_;
+
+          value = &(*iter).int_id_;
+        }
+    }
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> int
+ACE_Null_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container,
+                                                                                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                                                                                   const unsigned int purge_percent,
+                                                                                   unsigned int &entries)
+{
+  ACE_UNUSED_ARG (container);
+  ACE_UNUSED_ARG (cleanup_s);
+  ACE_UNUSED_ARG (purge_percent);
+  ACE_UNUSED_ARG (entries);
+                
+  return 0;
+}
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES> void
+ACE_Null_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CONTAINER &container,
+                                                                               KEY *&key,
+                                                                               VALUE *&value)
+{
+ ACE_UNUSED_ARG (container);
+ ACE_UNUSED_ARG (key);
+ ACE_UNUSED_ARG (value);
+}
+
+#endif /* CACHING_STRATEGY_UTILITY_T_C */
diff --git a/ace/Caching_Strategy_Utility_T.h b/ace/Caching_Strategy_Utility_T.h
new file mode 100644
index 00000000000..a04ea4e9f12
--- /dev/null
+++ b/ace/Caching_Strategy_Utility_T.h
@@ -0,0 +1,179 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    Caching_Strategy_Utility_T.h
+//
+// = AUTHOR
+//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef CACHING_STRATEGY_UTILITY_H
+#define CACHING_STRATEGY_UTILITY_H
+
+#include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#define  ACE_LACKS_PRAGMA_ONCE
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// Forward declaration
+template <class KEY, class VALUE, class CONTAINER>
+class ACE_Cleanup_Strategy;
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES>
+class ACE_Caching_Strategy_Utility
+{
+  // = TITLE
+  //    Defines a abstract helper class for the Caching Strategies.
+  // 
+  // = DESCRIPTION
+  //    This class defines the methods commonly used by the 
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+
+ public:
+  
+  virtual ~ACE_Caching_Strategy_Utility (void);
+  // Destructor.
+
+  virtual int clear_cache (CONTAINER &container, 
+                           ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                           const unsigned int purge_percent,
+                           unsigned int &entries)  = 0;
+  // This method will remove the entries from the cache.
+  
+  virtual void minimum (CONTAINER &container, 
+                        KEY *&key,
+                        VALUE *&value) = 0;
+  // Find the entry with minimum caching attributes.
+
+};
+
+
+////////////////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES>
+class ACE_Svc_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>
+{
+  // = TITLE
+  //    Defines a helper class for the Caching Strategies.
+  // 
+  // = DESCRIPTION
+  //    This class defines the methods commonly used by the 
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, ACE_Pair<VALUE,
+  //    attributes>> kind. The attributes helps in deciding the
+  //    entries to be purged.
+
+ public:
+  
+  virtual int clear_cache (CONTAINER &container, 
+                           ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                           const unsigned int purge_percent,
+                           unsigned int &entries);
+  // Purge entries from the <container>. The Cleanup_Strategy will do
+  // the actual job of cleanup once the entries to be cleaned up are
+  // decided.
+  
+  virtual void minimum (CONTAINER &container, 
+                        KEY *&key,
+                        VALUE *&value);
+  // Find the entry with minimum caching attributes.
+
+};
+
+
+////////////////////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES>
+class ACE_Handler_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility <KEY, VALUE, CONTAINER, ATTRIBUTES>
+{
+  // = TITLE
+  //    Defines a helper class for the Caching Strategies.
+  // 
+  // = DESCRIPTION
+  //    This class defines the methods commonly used by the 
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class helps in the caching_strategies using a
+  //    container containing entries of <KEY, HANDLER> kind where the 
+  //    HANDLER contains the caching attributes which help in deciding
+  //    the entries to be purged.
+
+public:
+
+  virtual int clear_cache (CONTAINER &container, 
+                           ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                           const unsigned int purge_percent,
+                           unsigned int &entries);
+  // Purge entries from the <container>. The Cleanup_Strategy will do
+  // the actual job of cleanup once the entries to be cleaned up are
+  // decided.
+  
+  virtual void minimum (CONTAINER &container, 
+                        KEY *&key,
+                        VALUE *&value);
+  // Find the entry with minimum caching attributes.
+  // This is handler specific since this utility is to be used very
+  // specifically for handler who have caching_attributes for server
+  // side acched connection management.
+
+};
+
+///////////////////////////////////////////////////////////////////////////
+
+template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES>
+class ACE_Null_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility <KEY, VALUE, CONTAINER, ATTRIBUTES>
+{
+  // = TITLE
+  //    Defines a dummy helper class for the Caching Strategies.
+  // 
+  // = DESCRIPTION
+  //    This class defines the methods commonly used by the 
+  //    different caching strategies. For instance: clear_cache ()
+  //    method which decides and purges the entry from the container.
+  //    Note: This class is be used with the Null_Caching_Strategy.
+
+public:
+
+  virtual int clear_cache (CONTAINER &container, 
+                           ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
+                           const unsigned int purge_percent,
+                           unsigned int &entries);
+  // Purge entries from the <container>. The Cleanup_Strategy will do
+  // the actual job of cleanup once the entries to be cleaned up are
+  // decided. NOte: Here it is a no-op.
+  
+  virtual void minimum (CONTAINER &container, 
+                        KEY *&key,
+                        VALUE *&value);
+  // Find the entry with minimum caching attributes.
+  // This is handler specific since this utility is to be used very
+  // specifically for handler who have caching_attributes for server
+  // side acched connection management.Note: Here it is a no-op.
+
+};
+
+///////////////////////////////////////////////////////////////////////////
+
+#if defined (__ACE_INLINE__)
+#include "ace/Caching_Strategy_Utility_T.i"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Caching_Strategy_Utility_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("ace/Caching_Strategy_Utility_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* CACHING_STRATEGY_UTILITY_H */
diff --git a/ace/Caching_Utility_T.i b/ace/Caching_Strategy_Utility_T.i
index acecbfb986d..0b4fb4c956b 100644
--- a/ace/Caching_Utility_T.i
+++ b/ace/Caching_Strategy_Utility_T.i
@@ -1,2 +1,4 @@
 /* -*-C++-*- */
-// $Id$
+//$Id$
+
+
diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp
deleted file mode 100644
index 455f336fa7f..00000000000
--- a/ace/Caching_Utility_T.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//$Id$
-
-#ifndef CACHING_UTILITY_T_C
-#define CACHING_UTILITY_T_C
-
-#include "ace/Caching_Utility_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Cleanup_Strategies_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Caching_Utility_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, Caching_Utility_T, "$Id$")
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
-                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                    double purge_percent)
-{
-  // Check that the purge_percent is non-zero.
-  if (purge_percent == 0)
-    return 0;
-
-  // Get the number of entries in the container.
-  size_t current_map_size = container.current_size ();
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then there is no way out but exiting. So return an error.
-  if (current_map_size <= 1)
-    return 0;
-
-  // Calculate the no of entries to remove from the cache depending
-  // upon the <purge_percent>.
-  size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5);
-
-  KEY *key_to_remove = 0;
-  VALUE *value_to_remove = 0;
-
-  for (size_t i = 0; i < entries_to_remove ; ++i)
-    {
-      this->minimum (container,
-                     key_to_remove,
-                     value_to_remove);
-
-      if (cleanup_s->cleanup (container,
-                              key_to_remove,
-                              value_to_remove) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void
-ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container,
-                                                                                KEY *&key_to_remove,
-                                                                                VALUE *&value_to_remove)
-{
-  // Starting values.
-  ITERATOR iter = container.begin ();
-  ITERATOR end = container.end ();
-  ATTRIBUTES min = (*iter).int_id_.second ();
-  key_to_remove = &(*iter).ext_id_;
-  value_to_remove = &(*iter).int_id_;
-
-  // The iterator moves thru the container searching for the entry
-  // with the lowest ATTRIBUTES.
-  for (++iter;
-       iter != end;
-       ++iter)
-    {
-      if (min > (*iter).int_id_.second ())
-        {
-          // Ah! an item with lower ATTTRIBUTES...
-          min = (*iter).int_id_.second ();
-          key_to_remove = &(*iter).ext_id_;
-          value_to_remove = &(*iter).int_id_;
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
-                                                                                       ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                       double purge_percent)
-{
-  // Check that the purge_percent is non-zero.
-  if (purge_percent == 0)
-    return 0;
-
-  // Get the number of entries in the container.
-  size_t current_map_size = container.current_size ();
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then there is no way out but exiting. So return an error.
-  if (current_map_size <= 1)
-    return 0;
-
-  // Calculate the no of entries to remove from the cache depending
-  // upon the <purge_percent>.
-  size_t entries_to_remove = (purge_percent / 100 * current_map_size) + 0.5;
-
-  KEY *key_to_remove = 0;
-  VALUE *value_to_remove = 0;
-
-  for (size_t i = 0; i < entries_to_remove ; ++i)
-    {
-      this->minimum (container,
-                     key_to_remove,
-                     value_to_remove);
-
-      if (cleanup_s->cleanup (container,
-                              key_to_remove,
-                              value_to_remove) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void
-ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container,
-                                                                                   KEY *&key_to_remove,
-                                                                                   VALUE *&value_to_remove)
-{
-  // Starting values.
-  ITERATOR iter = container.begin ();
-  ITERATOR end = container.end ();
-  ATTRIBUTES min = (*iter).int_id_->caching_attributes ();
-  key_to_remove = &(*iter).ext_id_;
-  value_to_remove = &(*iter).int_id_;
-
-  // The iterator moves thru the container searching for the entry
-  // with the lowest ATTRIBUTES.
-  for (++iter;
-       iter != end;
-       ++iter)
-    {
-      if (min > (*iter).int_id_->caching_attributes () &&
-          (*iter).int_id_->active () != 1)
-        {
-          // Ah! an item with lower ATTTRIBUTES...
-          min = (*iter).int_id_->caching_attributes ();
-          key_to_remove = &(*iter).ext_id_;
-          value_to_remove = &(*iter).int_id_;
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> int
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cache (CONTAINER &container,
-                                                                                    ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                    double purge_percent)
-{
-  ACE_UNUSED_ARG (container);
-  ACE_UNUSED_ARG (cleanup_s);
-  ACE_UNUSED_ARG (purge_percent);
-
-  return 0;
-}
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> void
-ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (CONTAINER &container,
-                                                                                KEY *&key_to_remove,
-                                                                                VALUE *&value_to_remove)
-{
-  ACE_UNUSED_ARG (container);
-  ACE_UNUSED_ARG (key_to_remove);
-  ACE_UNUSED_ARG (value_to_remove);
-}
-
-#endif /* CACHING_UTILITY_T_C */
diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h
deleted file mode 100644
index b3264f8841c..00000000000
--- a/ace/Caching_Utility_T.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Caching_Utility_T.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef CACHING_UTILITY_H
-#define CACHING_UTILITY_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define  ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declaration
-template <class KEY, class VALUE, class CONTAINER>
-class ACE_Cleanup_Strategy;
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-class ACE_Pair_Caching_Utility
-{
-  // = TITLE
-  //    Defines a helper class for the Caching Strategies.
-  //
-  // = DESCRIPTION
-  //    This class defines the methods commonly used by the
-  //    different caching strategies. For instance: clear_cache ()
-  //    method which decides and purges the entry from the container.
-  //    Note: This class helps in the caching_strategies using a
-  //    container containing entries of <KEY, ACE_Pair<VALUE,
-  //    attributes>> kind. The attributes helps in deciding the
-  //    entries to be purged.
-public:
-
-  int clear_cache (CONTAINER &container,
-                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                   double purge_percent);
-  // Purge entries from the <container>. The Cleanup_Strategy will do
-  // the actual job of cleanup once the entries to be cleaned up are
-  // decided.
-
-protected:
-
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
-  // Find the entry with minimum caching attributes.
-};
-
-
-////////////////////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
-class ACE_Handler_Caching_Utility
-{
-  // = TITLE
-  //    Defines a helper class for the Caching Strategies.
-  //
-  // = DESCRIPTION
-  //    This class defines the methods commonly used by the
-  //    different caching strategies. For instance: clear_cache ()
-  //    method which decides and purges the entry from the container.
-  //    Note: This class helps in the caching_strategies using a
-  //    container containing entries of <KEY, HANDLER> kind where the
-  //    HANDLER contains the caching attributes which help in deciding
-  //    the entries to be purged.
-public:
-
-  int clear_cache (CONTAINER &container,
-                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                   double purge_percent);
-  // Purge entries from the <container>. The Cleanup_Strategy will do
-  // the actual job of cleanup once the entries to be cleaned up are
-  // decided.
-
-protected:
-
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
-  // Find the entry with minimum caching attributes.  This is handler
-  // specific since this utility is to be used very specifically for
-  // handler who have caching_attributes for server side acched
-  // connection management.
-};
-
-///////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class CONTAINER,  class ITERATOR, class ATTRIBUTES>
-class ACE_Null_Caching_Utility
-{
-  // = TITLE
-  //    Defines a dummy helper class for the Caching Strategies.
-  //
-  // = DESCRIPTION
-  //    This class defines the methods commonly used by the
-  //    different caching strategies. For instance: clear_cache ()
-  //    method which decides and purges the entry from the container.
-  //    Note: This class is be used with the Null_Caching_Strategy.
-public:
-
-  int clear_cache (CONTAINER &container,
-                   ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                   double purge_percent);
-  // Purge entries from the <container>. The Cleanup_Strategy will do
-  // the actual job of cleanup once the entries to be cleaned up are
-  // decided. NOte: Here it is a no-op.
-
-protected:
-
-  void minimum (CONTAINER &container,
-                KEY *&key_to_remove,
-                VALUE *&value_to_remove);
-  // Find the entry with minimum caching attributes.  This is handler
-  // specific since this utility is to be used very specifically for
-  // handler who have caching_attributes for server side acched
-  // connection management.Note: Here it is a no-op.
-};
-
-///////////////////////////////////////////////////////////////////////////
-
-#if defined (__ACE_INLINE__)
-#include "ace/Caching_Utility_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Caching_Utility_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Caching_Utility_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* CACHING_UTILITY_H */
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 6c266ffc1c5..09f85cf3a05 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -141,7 +141,7 @@ public:
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cleanup_Strategies_T.cpp")
+#pragma implementation ("ace/Cleanup_Strategies_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* CLEANUP_STRATEGIES_H */
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 02d3e1d54b8..b77fe99f276 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -747,8 +747,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open
   else if (this->creation_strategy_ == 0)
     {
       ACE_NEW_RETURN (this->creation_strategy_,
-                      CREATION_STRATEGY,
-                      -1);
+                      CREATION_STRATEGY, -1);
       this->delete_creation_strategy_ = 1;
     }
 
@@ -769,11 +768,11 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open
     else if (this->connect_strategy_ == 0)
       {
         ACE_NEW_RETURN (this->connect_strategy_,
-                        CONNECT_STRATEGY,
-                        -1);
+                        CONNECT_STRATEGY, -1);
         this->delete_connect_strategy_ = 1;
       }
 
+
   // Initialize the concurrency strategy.
 
   if (this->concurrency_strategy_ != 0 &&
@@ -790,8 +789,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open
   else if (this->concurrency_strategy_ == 0)
     {
       ACE_NEW_RETURN (this->concurrency_strategy_,
-                      CONCURRENCY_STRATEGY,
-                      -1);
+                      CONCURRENCY_STRATEGY, -1);
       this->delete_concurrency_strategy_ = 1;
     }
 
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 9956bdcdb52..bf85900e970 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -32,8 +32,7 @@ ACE_Bounded_Stack<T>::ACE_Bounded_Stack (size_t size)
   : top_ (0),
     size_ (size)
 {
-  ACE_NEW (this->stack_,
-           T[size]);
+  ACE_NEW (this->stack_, T[size]);
   ACE_TRACE ("ACE_Bounded_Stack<T>::ACE_Bounded_Stack");
 }
 
@@ -42,8 +41,7 @@ ACE_Bounded_Stack<T>::ACE_Bounded_Stack (const ACE_Bounded_Stack<T> &s)
   : top_ (s.top_),
     size_ (s.size_)
 {
-  ACE_NEW (this->stack_,
-           T[s.size_]);
+  ACE_NEW (this->stack_, T[s.size_]);
 
   ACE_TRACE ("ACE_Bounded_Stack<T>::ACE_Bounded_Stack");
 
@@ -799,15 +797,6 @@ ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_
   // the list
 }
 
-template <class T> void
-ACE_Double_Linked_List_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll)
-{
-  this->ACE_Double_Linked_List_Iterator_Base <T>::reset (dll);
-  this->current_ = ACE_static_cast (T*, dll.head_->next_);
-  // Advance current_ out of the null area and onto the first item in
-  // the list
-}
-
 template <class T> int
 ACE_Double_Linked_List_Iterator<T>::first (void)
 {
@@ -899,15 +888,6 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::ACE_Double_Linked_List_Reverse_Itera
   // the list
 }
 
-template <class T> void
-ACE_Double_Linked_List_Reverse_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll)
-{
-  this->ACE_Double_Linked_List_Iterator_Base <T>::reset (dll);
-  this->current_ = ACE_static_cast (T*, dll.head_->prev_);
-  // Advance current_ out of the null area and onto the last item in
-  // the list
-}
-
 template <class T> int
 ACE_Double_Linked_List_Reverse_Iterator<T>::first (void)
 {
@@ -1488,8 +1468,8 @@ ACE_Bounded_Set<T>::operator= (const ACE_Bounded_Set<T> &bs)
       if (this->max_size_ < bs.cur_size_)
         {
           delete [] this->search_structure_;
-          ACE_NEW (this->search_structure_,
-                   ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]);
+          ACE_NEW (this->search_structure_, ACE_TYPENAME
+                   ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]);
           this->max_size_ = bs.cur_size_;
         }
 
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index acfadb4c9b5..eca8af5e6df 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -620,15 +620,6 @@ public:
   // = Initialization method.
   ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &);
 
-  void reset (ACE_Double_Linked_List<T> &);
-  // Retasks the iterator to iterate over a new
-  // Double_Linked_List. This allows clients to reuse an iterator
-  // without incurring the constructor overhead. If you do use this,
-  // be aware that if there are more than one reference to this
-  // iterator, the other "clients" may be very bothered when their
-  // iterator changes.
-  // @@ Here be dragons. Comments?
-
   int first (void);
   // Move to the first element in the list.  Returns 0 if the
   // list is empty, else 1.
@@ -683,15 +674,6 @@ public:
   // = Initialization method.
   ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List<T> &);
 
-  void reset (ACE_Double_Linked_List<T> &);
-  // Retasks the iterator to iterate over a new
-  // Double_Linked_List. This allows clients to reuse an iterator
-  // without incurring the constructor overhead. If you do use this,
-  // be aware that if there are more than one reference to this
-  // iterator, the other "clients" may be very bothered when their
-  // iterator changes.
-  // @@ Here be dragons. Comments?
-
   int first (void);
   // Move to the first element in the list.  Returns 0 if the
   // list is empty, else 1.
@@ -882,7 +864,6 @@ class ACE_DLList : public ACE_DLList_Base
   friend class ACE_DLList_Reverse_Iterator<T>;
 
 public:
-
   void operator= (ACE_DLList<T> &l);
   // Delegates to ACE_Double_Linked_List.
 
@@ -945,30 +926,16 @@ public:
   // = Initialization method.
   ACE_DLList_Iterator (ACE_DLList<T> &l);
 
-  void reset (ACE_DLList<T> &l);
-  // Retasks the iterator to iterate over a new
-  // Double_Linked_List. This allows clients to reuse an iterator
-  // without incurring the constructor overhead. If you do use this,
-  // be aware that if there are more than one reference to this
-  // iterator, the other "clients" may be very bothered when their
-  // iterator changes.
-  // @@ Here be dragons. Comments?
-
   // = Iteration methods.
   int advance (void);
   // Move forward by one element in the set.  Returns 0 when all the
   // items in the set have been seen, else 1.
 
-  int next (T *&);
-  // Pass back the <next_item> that hasn't been seen in the Stack.
-  // Returns 0 when all items have been seen, else 1.
-
   T *next (void) const;
   // Delegates to ACE_Double_Linked_List_Iterator, except that whereas 
   // the Double_Linked_List version of next returns the node, this next
   // returns the contents of the node
-  // DEPRECATED
-
+  
   int remove (void);
   // Removes the current item (i.e., this->next()) from the list.
   
@@ -998,27 +965,13 @@ public:
   // = Initialization method.
   ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l);
 
-  void reset (ACE_DLList<T> &l);
-  // Retasks the iterator to iterate over a new
-  // Double_Linked_List. This allows clients to reuse an iterator
-  // without incurring the constructor overhead. If you do use this,
-  // be aware that if there are more than one reference to this
-  // iterator, the other "clients" may be very bothered when their
-  // iterator changes.
-  // @@ Here be dragons. Comments?
-
   // = Iteration methods.
   int advance (void);
   // Move forward by one element in the set.  Returns 0 when all the
   // items in the set have been seen, else 1.
 
-  int next (T *&);
-  // Pass back the <next_item> that hasn't been seen in the Stack.
-  // Returns 0 when all items have been seen, else 1.
-
   T *next (void) const;
   // Delegates to ACE_Double_Linked_List_Iterator.
-  // DEPRECATED 
 
   int remove (void);
   // Removes the current item (i.e., this->next()) from the list.
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index b9ef057be2c..78cfdb03dfe 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -495,23 +495,6 @@ ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
 {
 }
 
-template <class T> ACE_INLINE void
-ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l)
-{
-  list_ = l;
-  this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); 
-}
-
-template <class T> ACE_INLINE int
-ACE_DLList_Iterator<T>::next (T *&ptr)
-{
-  ACE_DLList_Node *temp = 
-    ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
-  if (temp)
-    ptr = (T *) temp->item_;
-  return temp ? 1 : 0;
-}
-
 template <class T> ACE_INLINE T *
 ACE_DLList_Iterator<T>::next (void) const
 {
@@ -547,28 +530,12 @@ ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l)
 {
 }
 
-template <class T> ACE_INLINE void
-ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l)
-{
-  list_ = l;
-  this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l);
-}
-
 template <class T> ACE_INLINE int
 ACE_DLList_Reverse_Iterator<T>::advance (void)
 {
   return ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
 }
 
-template <class T> ACE_INLINE int
-ACE_DLList_Reverse_Iterator<T>::next (T *&ptr)
-{
-  ACE_DLList_Node *temp = 
-    ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next ();
-  ptr = (T *) temp->item_;
-  return ptr ? 1 : 0;
-}
-
 template <class T> ACE_INLINE T *
 ACE_DLList_Reverse_Iterator<T>::next (void) const
 {
diff --git a/ace/Containers_bad.i b/ace/Containers_bad.i
deleted file mode 100644
index 471a9d559d5..00000000000
--- a/ace/Containers_bad.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void)
-  : item_ (0),
-    next_ (0),
-    prev_ (0)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::ACE_DLList_Node (void *&i,
-                                  ACE_DLList_Node *n,
-                                  ACE_DLList_Node *p)
-  : item_ (i),
-    next_ (n),
-    prev_ (p)
-{
-}
-
-ACE_INLINE
-ACE_DLList_Node::~ACE_DLList_Node (void) 
-{
-}
diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp
index 2b9e86f370e..de00433333d 100644
--- a/ace/DEV_IO.cpp
+++ b/ace/DEV_IO.cpp
@@ -66,9 +66,7 @@ ACE_DEV_IO::send (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -103,9 +101,7 @@ ACE_DEV_IO::recv (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else 
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index 4e4e81858df..7d84ff9705f 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -76,8 +76,7 @@ ACE_DLL::open (const char *dll_filename,
     return result;
 
   // The ACE_SHLIB_HANDLE object is obtained.
-  this->handle_ = ACE_OS::dlopen (ASYS_ONLY_MULTIBYTE_STRING (dll_pathname),
-                                  open_mode);
+  this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode);
 
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -118,7 +117,7 @@ ACE_DLL::close (void)
 
 // This method is used on error in an library operation.
 
-ASYS_TCHAR *
+char *
 ACE_DLL::error (void)
 {
   return ACE_OS::dlerror ();
diff --git a/ace/DLL.h b/ace/DLL.h
index 361214fd551..d2f0594de3e 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -77,7 +77,7 @@ public:
   // If <symbol_name> is in the symbol table of the DLL a pointer to
   // the <symbol_name> is returned.  Otherwise, returns 0.
 
-  ASYS_TCHAR *error (void);
+  char *error (void);
   // Returns a pointer to a string explaining why <symbol> or <open>
   // failed.
 
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index 7479f2489e1..6e578547bd3 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -63,9 +63,7 @@ ACE_ODB::instance (void)
         ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0));
 
       if (ACE_ODB::instance_ == 0)
-        ACE_NEW_RETURN (ACE_ODB::instance_,
-                        ACE_ODB,
-                        0);
+        ACE_NEW_RETURN (ACE_ODB::instance_, ACE_ODB, 0);
     }
 
   return ACE_ODB::instance_;
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 726d1c7b4bb..3921321985f 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -42,7 +42,7 @@ public:
   // variable name or a default value.  Before being useful it must
   // <open()>ed.
 
-  ACE_Env_Value (const ASYS_TCHAR *varname,
+  ACE_Env_Value (const char *varname,
                  const T &vardefault);
   // Constructor that calls <open>.
 
@@ -52,11 +52,11 @@ public:
   operator T (void);
   // Returns the value as type T.
 
-  void open (const ASYS_TCHAR *varname, const T &defval);
+  void open (const char *varname, const T &defval);
   // The constructor, read <varname> from the enviroment, using
   // <vardefault> as its value if it is not defined.
 
-  const ASYS_TCHAR *varname (void) const;
+  const char *varname (void) const;
   // Returns the name of the variable being tracked.
 
 private:
@@ -66,11 +66,11 @@ private:
 
   void fetch_value (void);
 
-  const ASYS_TCHAR *varname_;
+  const char *varname_;
   T value_;
 };
 
-template <class T> void ACE_Convert (const ASYS_TCHAR *s, T &t);
+template <class T> void ACE_Convert (const char *s, T &t);
 // Function to convert a string <s> into type <T>.
 
 #if defined (__ACE_INLINE__)
@@ -89,62 +89,62 @@ template <class T> void ACE_Convert (const ASYS_TCHAR *s, T &t);
 // conversion will be necessary.
 
 template <class T> inline void
-ACE_Convert (const ASYS_TCHAR *s, T &t)
+ACE_Convert (const char *s, T &t)
 {
   t = T (s);
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, ASYS_TCHAR *&v)
+ACE_Convert (const char *s, char *&v)
 {
-  v = (ASYS_TCHAR *) s;
+  v = (char *) s;
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, const ASYS_TCHAR *&v)
+ACE_Convert (const char *s, const char *&v)
 {
-  v = (const ASYS_TCHAR *) s;
+  v = (const char *) s;
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, short &si)
+ACE_Convert (const char *s, short &si)
 {
   si = ACE_static_cast (short, ACE_OS::strtol (s, 0, 10));
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, u_short &us)
+ACE_Convert (const char *s, u_short &us)
 {
   us = ACE_static_cast (u_short, ACE_OS::strtol (s, 0, 10));
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, u_int &i)
+ACE_Convert (const char *s, u_int &i)
 {
   i = ACE_static_cast (u_int,
                        ACE_OS::strtol (s, 0, 10));
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, long &l)
+ACE_Convert (const char *s, long &l)
 {
   l = ACE_OS::strtol (s, 0, 10);
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, int &i)
+ACE_Convert (const char *s, int &i)
 {
   i = ACE_static_cast (int, ACE_OS::strtol (s, 0, 10));
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, u_long &ul)
+ACE_Convert (const char *s, u_long &ul)
 {
   ul = ACE_OS::strtoul (s, 0, 10);
 }
 
 inline void
-ACE_Convert (const ASYS_TCHAR *s, double &d)
+ACE_Convert (const char *s, double &d)
 {
   d = ACE_OS::strtod (s, 0);
 }
diff --git a/ace/Env_Value_T.i b/ace/Env_Value_T.i
index 25598c8dad5..b01f9920110 100644
--- a/ace/Env_Value_T.i
+++ b/ace/Env_Value_T.i
@@ -13,7 +13,7 @@ ACE_Env_Value<T>::ACE_Env_Value (void)
 }
 
 template <class T> ACE_INLINE
-ACE_Env_Value<T>::ACE_Env_Value (const ASYS_TCHAR *varname,
+ACE_Env_Value<T>::ACE_Env_Value (const char *varname,
                                  const T &defval)
   : varname_ (varname),
     value_(defval)
@@ -22,7 +22,7 @@ ACE_Env_Value<T>::ACE_Env_Value (const ASYS_TCHAR *varname,
 }
 
 template <class T> ACE_INLINE void
-ACE_Env_Value<T>::open (const ASYS_TCHAR *varname,
+ACE_Env_Value<T>::open (const char *varname,
                         const T &defval)
 {
   varname_ = varname;
@@ -33,13 +33,13 @@ ACE_Env_Value<T>::open (const ASYS_TCHAR *varname,
 template <class T> ACE_INLINE void
 ACE_Env_Value<T>::fetch_value (void)
 {
-  const ASYS_TCHAR *env = ACE_OS::getenv (varname_);
+  const char *env = ACE_OS::getenv (varname_);
 
   if (env != 0)
     ACE_Convert (env, value_);
 }
 
-template <class T> ACE_INLINE const ASYS_TCHAR*
+template <class T> ACE_INLINE const char*
 ACE_Env_Value<T>::varname (void) const
 {
   return varname_;
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 572337e5e36..f32a110d011 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -26,7 +26,7 @@
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
 
 template <class T>
-class ACE_Event_Handler_T : public ACE_Event_Handler
+class ACE_Export ACE_Event_Handler_T : public ACE_Event_Handler
 {
   // = TITLE
   //     Enable a class that doesn't inherit from the
diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i
index e048e45931d..160eac4e5e3 100644
--- a/ace/Event_Handler_T.i
+++ b/ace/Event_Handler_T.i
@@ -1,28 +1,30 @@
 /* -*- C++ -*- */
 // $Id$
 
-template<class T> ACE_INLINE void
+// Event_Handler_T.i
+
+template<class T> void ACE_INLINE
 ACE_Event_Handler_T<T>::op_handler (T *op)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::op_handler");
   this->op_handler_ = op;
 }
 
-template<class T> ACE_INLINE T *
+template<class T> ACE_INLINE T * 
 ACE_Event_Handler_T<T>::op_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::op_handler");
   return this->op_handler_;
 }
 
-template<class T> ACE_INLINE ACE_HANDLE
+template<class T> ACE_HANDLE ACE_INLINE
 ACE_Event_Handler_T<T>::get_handle (void) const
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::get_handle");
   return this->get_handle_ == 0 ? -1 : (this->op_handler_->*get_handle_) ();
 }
 
-template<class T> ACE_INLINE void
+template<class T> void ACE_INLINE
 ACE_Event_Handler_T<T>::set_handle (ACE_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::set_handle");
@@ -30,21 +32,21 @@ ACE_Event_Handler_T<T>::set_handle (ACE_HANDLE h)
     (this->op_handler_->*set_handle_) (h);
 }
 
-template<class T> ACE_INLINE int
+template<class T> int ACE_INLINE
 ACE_Event_Handler_T<T>::handle_input (ACE_HANDLE fd)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_input");
   return this->input_handler_ == 0 ? 0 : (this->op_handler_->*input_handler_) (fd);
 }
 
-template<class T> ACE_INLINE int
+template<class T> int ACE_INLINE
 ACE_Event_Handler_T<T>::handle_output (ACE_HANDLE fd)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_output");
   return this->output_handler_ == 0 ? 0 : (this->op_handler_->*output_handler_) (fd);
 }
 
-template<class T> ACE_INLINE int
+template<class T> ACE_INLINE int 
 ACE_Event_Handler_T<T>::handle_exception (ACE_HANDLE fd)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_exception");
@@ -79,7 +81,7 @@ ACE_Event_Handler_T<T>::handle_get (void)
   return this->get_handle_;
 }
 
-template<class T> ACE_INLINE void
+template<class T> ACE_INLINE void 
 ACE_Event_Handler_T<T>::handle_get (ACE_Event_Handler_T<T>::GET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
@@ -114,7 +116,7 @@ ACE_Event_Handler_T<T>::input_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
   this->input_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER 
 ACE_Event_Handler_T<T>::output_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
@@ -128,7 +130,7 @@ ACE_Event_Handler_T<T>::output_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
   this->output_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER 
 ACE_Event_Handler_T<T>::except_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
@@ -142,7 +144,7 @@ ACE_Event_Handler_T<T>::except_handler (ACE_Event_Handler_T<T>::IO_HANDLER h)
   this->except_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER
+template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER 
 ACE_Event_Handler_T<T>::to_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
@@ -156,7 +158,7 @@ ACE_Event_Handler_T<T>::to_handler (ACE_Event_Handler_T<T>::TO_HANDLER h)
   this->to_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER
+template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER 
 ACE_Event_Handler_T<T>::cl_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
@@ -170,7 +172,7 @@ ACE_Event_Handler_T<T>::cl_handler (ACE_Event_Handler_T<T>::CL_HANDLER h)
   this->cl_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER
+template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER 
 ACE_Event_Handler_T<T>::sig_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp
index 6bca0a8d62e..7301dae0df9 100644
--- a/ace/FIFO.cpp
+++ b/ace/FIFO.cpp
@@ -25,7 +25,7 @@ ACE_FIFO::dump (void) const
 }
 
 int
-ACE_FIFO::open (const ASYS_TCHAR *r, int flags, int perms,
+ACE_FIFO::open (const char *r, int flags, int perms,
                 LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO::open");
@@ -46,7 +46,7 @@ ACE_FIFO::open (const ASYS_TCHAR *r, int flags, int perms,
   return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
-ACE_FIFO::ACE_FIFO (const ASYS_TCHAR *fifo_name,
+ACE_FIFO::ACE_FIFO (const char *fifo_name,
 		    int flags,
 		    int perms,
                     LPSECURITY_ATTRIBUTES sa)
diff --git a/ace/FIFO.h b/ace/FIFO.h
index a671a1a50f6..1e5b20392a0 100644
--- a/ace/FIFO.h
+++ b/ace/FIFO.h
@@ -34,7 +34,7 @@ class ACE_Export ACE_FIFO : public ACE_IPC_SAP
   //    IPC mechanism that will be portable to both UNIX and Win32,
   //    take a look at the <ACE_SPIPE_*> classes.
 public:
-  int open (const ASYS_TCHAR *rendezvous, int flags, int perms,
+  int open (const char *rendezvous, int flags, int perms,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up the named pipe on the <rendezvous> in accordance with the
   // flags.
@@ -46,7 +46,7 @@ public:
   // Close down the ACE_FIFO and remove the rendezvous point from the
   // file system.
 
-  int get_local_addr (const ASYS_TCHAR *&rendezvous) const;
+  int get_local_addr (const char *&rendezvous) const;
   // Return the local address of this endpoint.
 
   void dump (void) const;
@@ -60,13 +60,13 @@ protected:
   ACE_FIFO (void);
   // Default constructor.
 
-  ACE_FIFO (const ASYS_TCHAR *rendezvous, int flags, int perms,
+  ACE_FIFO (const char *rendezvous, int flags, int perms,
             LPSECURITY_ATTRIBUTES sa = 0);
   // Open up the named pipe on the <rendezvous> in accordance with the
   // flags.
 
 private:
-  ASYS_TCHAR rendezvous_[MAXPATHLEN + 1];
+  char rendezvous_[MAXPATHLEN + 1];
   // Rendezvous point in the file system.
 };
 
diff --git a/ace/FIFO.i b/ace/FIFO.i
index 52f3555495a..d5aa8fb1943 100644
--- a/ace/FIFO.i
+++ b/ace/FIFO.i
@@ -3,8 +3,8 @@
 
 // FIFO.i
 
-ACE_INLINE int
-ACE_FIFO::get_local_addr (const ASYS_TCHAR *&r) const
+ACE_INLINE int 
+ACE_FIFO::get_local_addr (const char *&r) const
 {
   ACE_TRACE ("ACE_FIFO::get_local_addr");
   r = this->rendezvous_;
@@ -18,3 +18,4 @@ ACE_FIFO::remove (void)
   int result = this->close ();
   return ACE_OS::unlink (this->rendezvous_) == -1 || result == -1 ? -1 : 0;
 }
+
diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp
index bbdb3bb6672..ad9e57d09e4 100644
--- a/ace/FIFO_Recv.cpp
+++ b/ace/FIFO_Recv.cpp
@@ -41,7 +41,7 @@ ACE_FIFO_Recv::close (void)
 // aren't any writers at the moment!
 
 int
-ACE_FIFO_Recv::open (const ASYS_TCHAR *fifo_name,
+ACE_FIFO_Recv::open (const char *fifo_name,
 		     int flags,
 		     int perms,
 		     int persistent,
@@ -66,7 +66,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (void)
   ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv");
 }
 
-ACE_FIFO_Recv::ACE_FIFO_Recv (const ASYS_TCHAR *fifo_name,
+ACE_FIFO_Recv::ACE_FIFO_Recv (const char *fifo_name,
 			      int flags,
 			      int perms,
 			      int persistent,
@@ -82,3 +82,4 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ASYS_TCHAR *fifo_name,
                                  sa) == -1)
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_FIFO_Recv")));
 }
+
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index f5de468e91f..c1f9d0aad9c 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -33,14 +33,14 @@ public:
   ACE_FIFO_Recv (void);
   // Default constructor.
 
-  ACE_FIFO_Recv (const ASYS_TCHAR *rendezvous,
+  ACE_FIFO_Recv (const char *rendezvous,
                  int flags = O_CREAT | O_RDONLY,
                  int perms = ACE_DEFAULT_FILE_PERMS,
                  int persistent = 1,
                  LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for reading.
 
-  int open (const ASYS_TCHAR *rendezvous,
+  int open (const char *rendezvous,
             int flags = O_CREAT | O_RDONLY,
             int perms = ACE_DEFAULT_FILE_PERMS,
             int persistent = 1,
diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp
index c4c9e2cf529..d9131331e44 100644
--- a/ace/FIFO_Recv_Msg.cpp
+++ b/ace/FIFO_Recv_Msg.cpp
@@ -25,8 +25,8 @@ ACE_FIFO_Recv_Msg::dump (void) const
 // reading."  This ensures that the FIFO never gets EOF, even if there
 // aren't any writers at the moment!
 
-int
-ACE_FIFO_Recv_Msg::open (const ASYS_TCHAR *fifo_name,
+int 
+ACE_FIFO_Recv_Msg::open (const char *fifo_name,
 			 int flags,
 			 int perms,
 			 int persistent,
@@ -46,7 +46,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (void)
   ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg");
 }
 
-ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ASYS_TCHAR *fifo_name,
+ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const char *fifo_name,
 				      int flags,
 				      int perms,
 				      int persistent,
@@ -56,7 +56,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ASYS_TCHAR *fifo_name,
 
   if (this->ACE_FIFO_Recv_Msg::open (fifo_name,
 				     flags,
-				     perms,
+				     perms, 
 				     persistent,
                                      sa) == -1)
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_FIFO_Recv_Msg")));
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 57a0697b5a2..7f5cabcfb2d 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -32,14 +32,14 @@ public:
   ACE_FIFO_Recv_Msg (void);
   // Default constructor.
 
-  ACE_FIFO_Recv_Msg (const ASYS_TCHAR *rendezvous,
+  ACE_FIFO_Recv_Msg (const char *rendezvous,
                      int flags = O_CREAT | O_RDONLY,
                      int perms = ACE_DEFAULT_FILE_PERMS,
                      int persistent = 1,
                      LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for reading.
 
-  int open (const ASYS_TCHAR *rendezvous,
+  int open (const char *rendezvous,
             int flags = O_CREAT | O_RDONLY,
             int perms = ACE_DEFAULT_FILE_PERMS,
             int persistent = 1,
diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp
index 5906f6c8e69..b0b9ae74e57 100644
--- a/ace/FIFO_Send.cpp
+++ b/ace/FIFO_Send.cpp
@@ -27,29 +27,17 @@ ACE_FIFO_Send::ACE_FIFO_Send (void)
 }
 
 int
-ACE_FIFO_Send::open (const ASYS_TCHAR *rendezvous_name,
-                     int flags,
-                     int perms,
+ACE_FIFO_Send::open (const char *rendezvous_name, int flags, int perms,
                      LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send::open");
-  return ACE_FIFO::open (rendezvous_name,
-                         flags | O_WRONLY,
-                         perms,
-                         sa);
+  return ACE_FIFO::open (rendezvous_name, flags | O_WRONLY, perms, sa);
 }
 
-ACE_FIFO_Send::ACE_FIFO_Send (const ASYS_TCHAR *fifo_name,
-                              int flags,
-                              int perms,
+ACE_FIFO_Send::ACE_FIFO_Send (const char *fifo_name, int flags, int perms,
                               LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send");
-  if (this->ACE_FIFO_Send::open (fifo_name,
-                                 flags,
-                                 perms,
-                                 sa) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send")));
+  if (this->ACE_FIFO_Send::open (fifo_name, flags, perms, sa) == -1)
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send")));
 }
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 1a402f71746..65a36178071 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -32,13 +32,13 @@ public:
   ACE_FIFO_Send (void);
   // Default constructor.
 
-  ACE_FIFO_Send (const ASYS_TCHAR *rendezvous,
+  ACE_FIFO_Send (const char *rendezvous,
                  int flags = O_WRONLY,
                  int perms = ACE_DEFAULT_FILE_PERMS,
                  LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a bytestream named pipe for writing.
 
-  int open (const ASYS_TCHAR *rendezvous,
+  int open (const char *rendezvous,
             int flags = O_WRONLY,
             int perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
@@ -62,3 +62,4 @@ public:
 #endif
 
 #endif /* ACE_FIFO_SEND_H */
+
diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp
index 7691a16026c..e88c1243688 100644
--- a/ace/FIFO_Send_Msg.cpp
+++ b/ace/FIFO_Send_Msg.cpp
@@ -26,9 +26,9 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg)
 {
   // ACE_TRACE ("ACE_FIFO_Send_Msg::send");
 #if defined (ACE_HAS_STREAM_PIPES)
-  return ACE_OS::putmsg (this->get_handle (),
-			 (strbuf *) 0,
-			 (strbuf *) &send_msg,
+  return ACE_OS::putmsg (this->get_handle (), 
+			 (strbuf *) 0, 
+			 (strbuf *) &send_msg, 
 			 0);
 #else
   iovec iov[2];
@@ -49,8 +49,8 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (void)
 }
 
 int
-ACE_FIFO_Send_Msg::open (const ASYS_TCHAR *fifo_name,
-			 int flags,
+ACE_FIFO_Send_Msg::open (const char *fifo_name, 
+			 int flags, 
 			 int perms,
                          LPSECURITY_ATTRIBUTES sa)
 {
@@ -58,8 +58,8 @@ ACE_FIFO_Send_Msg::open (const ASYS_TCHAR *fifo_name,
   return ACE_FIFO_Send::open (fifo_name, flags | O_WRONLY, perms, sa);
 }
 
-ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ASYS_TCHAR *fifo_name,
-				      int flags,
+ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const char *fifo_name, 
+				      int flags, 
 				      int perms,
                                       LPSECURITY_ATTRIBUTES sa)
 {
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index 78b2f82ac4a..20dc659b880 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -33,13 +33,13 @@ public:
   ACE_FIFO_Send_Msg (void);
   // Default constructor.
 
-  ACE_FIFO_Send_Msg (const ASYS_TCHAR *rendezvous,
+  ACE_FIFO_Send_Msg (const char *rendezvous,
                      int flags = O_WRONLY,
                      int perms = ACE_DEFAULT_FILE_PERMS,
                      LPSECURITY_ATTRIBUTES sa = 0);
   // Open up a record-oriented named pipe for writing.
 
-  int open (const ASYS_TCHAR *rendezvous,
+  int open (const char *rendezvous,
             int flags = O_WRONLY,
             int perms = ACE_DEFAULT_FILE_PERMS,
             LPSECURITY_ATTRIBUTES sa = 0);
@@ -76,3 +76,4 @@ public:
 #endif
 
 #endif /* ACE_FIFO_SEND_MSG_H */
+
diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i
index 608ce4a9bdc..a05db9b8e3d 100644
--- a/ace/FILE_Connector.i
+++ b/ace/FILE_Connector.i
@@ -3,10 +3,10 @@
 
 // FILE_Connector.i
 
-// Creates a Local ACE_FILE.
+// Creates a Local ACE_FILE. 
 
 ASYS_INLINE
-ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
+ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, 
 					const ACE_FILE_Addr &remote_sap,
 					ACE_Time_Value *timeout,
 					const ACE_Addr &local_sap,
@@ -15,13 +15,11 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
 					int perms)
 {
   ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector");
-  if (this->connect (new_io, remote_sap, timeout, local_sap,
+  if (this->connect (new_io, remote_sap, timeout, local_sap, 
 		     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("address %s, %p\n"),
-                remote_sap.get_path_name (),
-                ASYS_TEXT ("ACE_FILE_IO")));
+    ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
+	       remote_sap.get_path_name (), "ACE_FILE_IO"));
 }
 
 ASYS_INLINE int
@@ -31,3 +29,4 @@ ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle)
   // Nothing to do here since the handle is not a socket
   return 0;
 }
+
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 353a8060672..9f5a848bcce 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -44,9 +44,7 @@ ACE_FILE_IO::send (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -83,9 +81,7 @@ ACE_FILE_IO::recv (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index e421ff78905..6d5379eee91 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -124,6 +124,7 @@ ACE_Filecache_Handle::size (void) const
     return this->file_->size ();
 }
 
+
 // ------------------
 // ACE_Filecache_Hash
 // ------------------
@@ -203,9 +204,7 @@ ACE_Filecache::instance (void)
       // @@ James, please check each of the ACE_NEW_RETURN calls to
       // make sure that it is safe to return if allocation fails.
       if (ACE_Filecache::cvf_ == 0)
-        ACE_NEW_RETURN (ACE_Filecache::cvf_,
-                        ACE_Filecache,
-                        0);
+        ACE_NEW_RETURN (ACE_Filecache::cvf_, ACE_Filecache, 0);
     }
 
   return ACE_Filecache::cvf_;
@@ -645,7 +644,7 @@ int
 ACE_Filecache_Object::error_i (int error_value, const char *s)
 {
   s = s;
-  ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p.\n"), s));
+  ACE_ERROR ((LM_ERROR, "%p.\n", s));
   this->error_ = error_value;
   return error_value;
 }
diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index 703e2f7f572..7bb41473bed 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -64,7 +64,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::alloc (size_t n)
 {
   for (; n > 0; n--)
     {
-      T *temp = 0;
+      T *temp;
       ACE_NEW (temp, T);
       temp->set_next (this->free_list_);
       this->free_list_ = temp;
diff --git a/ace/Functor.h b/ace/Functor.h
index a38ad2f120e..c119b86a493 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -115,6 +115,7 @@ public:
   // Simply returns t
 };
 
+
 // @@ ADD HASHES FOR ACE TYPES
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/ace/Functor.i b/ace/Functor.i
index 93759f5d176..abb2ca799a7 100644
--- a/ace/Functor.i
+++ b/ace/Functor.i
@@ -51,57 +51,48 @@ ACE_Command_Base::~ACE_Command_Base (void)
 // STL-style Functor Classes and Template Specializations //
 ////////////////////////////////////////////////////////////
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE 
-u_long
+ACE_INLINE u_long
 ACE_Hash<char>::operator () (char t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<signed char>::operator () (signed char t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<unsigned char>::operator () (unsigned char t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_UINT16>::operator () (ACE_UINT16 t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_INT32>::operator () (ACE_INT32 t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_UINT32>::operator () (ACE_UINT32 t) const
 {
   return t;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const
 {
@@ -109,14 +100,12 @@ ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const
 }
 
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<const char *>::operator () (const char *t) const
 {
   return ACE::hash_pjw (t);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<char *>::operator () (const char *t) const
 {
@@ -124,14 +113,12 @@ ACE_Hash<char *>::operator () (const char *t) const
 }
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<const wchar_t *>::operator () (const wchar_t *t) const
 {
   return ACE::hash_pjw (t);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<wchar_t *>::operator () (const wchar_t *t) const
 {
@@ -140,14 +127,12 @@ ACE_Hash<wchar_t *>::operator () (const wchar_t *t) const
 #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const
 {
   return ACE::hash_pjw (t);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE u_long
 ACE_Hash<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const
 {
@@ -155,14 +140,12 @@ ACE_Hash<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *t) const
 }
 #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_USHORT */
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<const char *>::operator () (const char *lhs, const char *rhs) const
 {
   return !ACE_OS::strcmp (lhs, rhs);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<char *>::operator () (const char *lhs, const char *rhs) const
 {
@@ -170,14 +153,12 @@ ACE_Equal_To<char *>::operator () (const char *lhs, const char *rhs) const
 }
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<const wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const
 {
   return !ACE_OS::strcmp (lhs, rhs);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const
 {
@@ -186,14 +167,12 @@ ACE_Equal_To<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) co
 #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const
 {
   return !ACE_OS::strcmp (lhs, rhs);
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const
 {
@@ -201,14 +180,12 @@ ACE_Equal_To<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_US
 }
 #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_USHORT */
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<const char *>::operator () (const char *lhs, const char *rhs) const
 {
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const
 {
@@ -216,14 +193,12 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const
 }
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<const wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const
 {
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) const
 {
@@ -232,14 +207,12 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c
 #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<const ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const
 {
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
-ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<ACE_USHORT16 *>::operator () (const ACE_USHORT16 *lhs, const ACE_USHORT16 *rhs) const
 {
diff --git a/ace/Functor_T.h b/ace/Functor_T.h
index 238cea27650..710a2a22218 100644
--- a/ace/Functor_T.h
+++ b/ace/Functor_T.h
@@ -10,9 +10,9 @@
 //    Functor_T.h
 //
 // = DESCRIPTION
-//     Templatized classes for implementing function objects that are used in
-//     various places in ACE.  There are currently two major categories of
-//     function objects in ACE: GOF Command Pattern objects, and STL-style
+//     Templatized classes for implementing function objects that are used in 
+//     various places in ACE.  There are currently two major categories of  
+//     function objects in ACE: GOF Command Pattern objects, and STL-style 
 //     functors for comparison of container elements.  The command objects
 //     are invoked via an execute () method, while the STL-style functors are
 //     invoked via an operator() () method.
@@ -91,33 +91,21 @@ class ACE_Hash
   //     Function object for hashing
   //
 public:
-  u_long operator () (const TYPE &t) const;
+  u_long operator () (const TYPE &t) const;  
   // Simply calls t.hash ()
 };
 
 template <class TYPE>
-class ACE_Pointer_Hash
-{
-  // = TITLE
-  //
-  //     Function object for hashing pointers
-  //
-public:
-  u_long operator () (TYPE t) const;
-  // Simply returns t.
-};
-
-template <class TYPE>
 class ACE_Equal_To
 {
   // = TITLE
   //
-  //     Function object for comparing two objects of
+  //     Function object for comparing two objects of 
   //     the given type for equality.
   //
 public:
   int operator () (const TYPE &lhs,
-                   const TYPE &rhs) const;
+                   const TYPE &rhs) const;  
   // Simply calls operator==
 };
 
@@ -135,6 +123,7 @@ public:
   // Simply calls operator<
 };
 
+
 #if defined (__ACE_INLINE__)
 #include "ace/Functor_T.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Functor_T.i b/ace/Functor_T.i
index 52e38166dac..0024cd3fd23 100644
--- a/ace/Functor_T.i
+++ b/ace/Functor_T.i
@@ -39,12 +39,6 @@ ACE_Hash<TYPE>::operator () (const TYPE &t) const
   return t.hash ();
 }
 
-template <class TYPE> ACE_INLINE u_long
-ACE_Pointer_Hash<TYPE>::operator () (TYPE t) const
-{
-  return u_long (t);
-}
-
 template <class TYPE> ACE_INLINE int
 ACE_Equal_To<TYPE>::operator () (const TYPE &lhs,
                                  const TYPE &rhs) const
@@ -58,3 +52,4 @@ ACE_Less_Than<TYPE>::operator () (const TYPE &lhs,
 {
   return (lhs < rhs) ? 1 : 0;
 }
+
diff --git a/ace/Future.cpp b/ace/Future.cpp
index eb54be3b2fa..236b2d681bf 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -1,3 +1,4 @@
+// Future.cpp
 // $Id$
 
 #define ACE_BUILD_DLL
@@ -11,36 +12,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_RCSID (ace, Future, "$Id$")
+ACE_RCSID(ace, Future, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
-template <class T>
-ACE_Future_Holder<T>::ACE_Future_Holder (void)
-{
-}
-
-template <class T>
-ACE_Future_Holder<T>::ACE_Future_Holder (const ACE_Future<T> &item)
-  : item_ (item)
-{
-}
-
-template <class T>
-ACE_Future_Holder<T>::~ACE_Future_Holder (void)
-{
-}
-
-template <class T>
-ACE_Future_Observer<T>::ACE_Future_Observer (void)
-{
-}
-
-template <class T>
-ACE_Future_Observer<T>::~ACE_Future_Observer (void)
-{
-}
-
 // Dump the state of an object.
 
 template <class T> void
@@ -67,11 +42,7 @@ template <class T> ACE_Future_Rep<T> *
 ACE_Future_Rep<T>::create (void)
 {
   // Yes set ref count to zero.
-  ACE_Future_Rep<T> *t = 0;
-  ACE_NEW_RETURN (t,
-                  ACE_Future_Rep<T>,
-                  0);
-  return t;
+  return new ACE_Future_Rep<T>();
 }
 
 template <class T> ACE_Future_Rep<T> *
@@ -79,7 +50,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep)
 {
   ACE_ASSERT (rep != 0);
   // Use value_ready_mutex_ for both condition and ref count management
-  ACE_MT (ACE_Guard<ACE_Thread_Mutex> r_mon (rep->value_ready_mutex_));
+  ACE_MT (ACE_Guard<ACE_Thread_Mutex> r_mon(rep->value_ready_mutex_));
   ++rep->ref_count_;
   return rep;
 }
@@ -87,7 +58,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep)
 template <class T> void
 ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep)
 {
-  ACE_ASSERT (rep != 0);
+  ACE_ASSERT(rep != 0);
   // Use value_ready_mutex_ for both condition and ref count management
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, r_mon, rep->value_ready_mutex_));
 
@@ -104,8 +75,8 @@ ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep)
 template <class T> void
 ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep)
 {
-  ACE_ASSERT (rep != 0);
-  ACE_ASSERT (new_rep != 0);
+  ACE_ASSERT(rep != 0);
+  ACE_ASSERT(new_rep != 0);
   // Use value_ready_mutex_ for both condition and ref count management
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, r_mon, rep->value_ready_mutex_));
 
@@ -144,8 +115,7 @@ ACE_Future_Rep<T>::ready (void)
 }
 
 template <class T> int
-ACE_Future_Rep<T>::set (const T &r,
-                        ACE_Future<T> &caller)
+ACE_Future_Rep<T>::set (const T &r)
 {
   // If the value is already produced, ignore it...
   if (this->value_ == 0)
@@ -155,24 +125,7 @@ ACE_Future_Rep<T>::set (const T &r,
       // Double-checked locking pattern to avoid multiple allocations.
 
       if (this->value_ == 0)
-        ACE_NEW_RETURN (this->value_,
-                        T (r),
-                        -1);
-
-      // Remove and notify all subscribed observers.
-      ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator =
-        this->observer_collection_.begin ();
-
-      ACE_TYPENAME OBSERVER_COLLECTION::iterator end =
-        this->observer_collection_.end ();
-
-      for (;
-           iterator != end;
-           ++iterator)
-        {
-          OBSERVER *observer = *iterator;
-          observer->update (caller);
-        }
+        ACE_NEW_RETURN (this->value_, T (r), -1);
 
       // Signal all the waiting threads.
       return this->value_ready_.broadcast ();
@@ -206,38 +159,6 @@ ACE_Future_Rep<T>::get (T &value,
   return 0;
 }
 
-template <class T> int
-ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer,
-                          ACE_Future<T> &caller)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1));
-
-  // Otherwise, create a new result value.  Note the use of the
-  // Double-checked locking pattern to avoid corrupting the list.
-
-  int result = 1;
-
-  // If the value is already produced, then notify observer
-  if (this->value_ == 0)
-    {
-      result = this->observer_collection_.insert (observer);
-    }
-  else
-      observer->update (caller);
-
-  return result;
-}
-
-template <class T> int
-ACE_Future_Rep<T>::detach (ACE_Future_Observer<T> *observer)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1));
-
-  // Remove all occurrences of the specified observer from this
-  // objects hash map.
-  return this->observer_collection_.remove (observer);
-}
-
 template <class T>
 ACE_Future_Rep<T>::operator T ()
 {
@@ -273,7 +194,7 @@ ACE_Future<T>::ACE_Future (void)
 
 template <class T>
 ACE_Future<T>::ACE_Future (const ACE_Future<T> &r)
-  : future_rep_ (FUTURE_REP::attach (( (ACE_Future<T> &) r).future_rep_))
+  : future_rep_ (FUTURE_REP::attach (((ACE_Future<T> &) r).future_rep_))
 {
 }
 
@@ -281,10 +202,8 @@ template <class T>
 ACE_Future<T>::ACE_Future (const T &r)
   : future_rep_ (FUTURE_REP::create ())
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%t) funny constructor\n")));
-  this->future_rep_->set (r,
-                          *this);
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) funny constructor\n")));
+  this->future_rep_->set (r);
 }
 
 template <class T>
@@ -309,8 +228,7 @@ template <class T> int
 ACE_Future<T>::cancel (const T &r)
 {
   this->cancel ();
-  return this->future_rep_->set (r,
-                                 *this);
+  return this->future_rep_->set (r);
 }
 
 template <class T> int
@@ -318,8 +236,7 @@ ACE_Future<T>::cancel (void)
 {
   // If this ACE_Future is already attached to a ACE_Future_Rep,
   // detach it (maybe delete the ACE_Future_Rep).
-  FUTURE_REP::assign (this->future_rep_,
-                      FUTURE_REP::create ());
+  FUTURE_REP::assign (this->future_rep_, FUTURE_REP::create ());
   return 0;
 }
 
@@ -327,10 +244,8 @@ template <class T> int
 ACE_Future<T>::set (const T &r)
 {
   // Give the pointer to the result to the ACE_Future_Rep.
-  return this->future_rep_->set (r,
-                                 *this);
+  return this->future_rep_->set (r);
 }
-
 template <class T> int
 ACE_Future<T>::ready (void)
 {
@@ -339,25 +254,12 @@ ACE_Future<T>::ready (void)
 }
 
 template <class T> int
-ACE_Future<T>::get (T &value,
-                    ACE_Time_Value *tv)
+ACE_Future<T>::get (T &value, ACE_Time_Value *tv)
 {
   // We return the ACE_Future_rep.
   return this->future_rep_->get (value, tv);
 }
 
-template <class T> int
-ACE_Future<T>::attach (ACE_Future_Observer<T> *observer)
-{
-  return this->future_rep_->attach (observer, *this);
-}
-
-template <class T> int
-ACE_Future<T>::detach (ACE_Future_Observer<T> *observer)
-{
-  return this->future_rep_->detach (observer);
-}
-
 template <class T>
 ACE_Future<T>::operator T ()
 {
@@ -384,7 +286,7 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs)
   //  bind <this> to the same <ACE_Future_Rep> as <r>.
 
   // This will work if &r == this, by first increasing the ref count
-  ACE_Future<T> &r = (ACE_Future<T> &) rhs;
+  ACE_Future<T> &r = ( ACE_Future<T> &) rhs;
   FUTURE_REP::assign (this->future_rep_,
                       FUTURE_REP::attach (r.future_rep_));
 }
@@ -392,20 +294,11 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs)
 template <class T> void
 ACE_Future<T>::dump (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   if (this->future_rep_)
     this->future_rep_->dump ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_END_DUMP));
-}
-
-template <class T> ACE_Future_Rep<T> *
-ACE_Future<T>::get_rep ()
-{
-  return this->future_rep_;
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class T> void *
@@ -420,7 +313,7 @@ ACE_Future<T>::operator delete (void *)
 }
 
 template <class T> void
-ACE_Future<T>::operator & ()
+ACE_Future<T>::operator &()
 {
 }
 
diff --git a/ace/Future.h b/ace/Future.h
index 6a001c677ee..e512f627f26 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -10,10 +10,9 @@
 //    Future.h
 //
 // = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch>,
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>,
-//    Per Andersson <Per.Andersson@hfera.ericsson.se>, and
-//    John Tucker <jtucker@infoglide.com>
+//    Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt
+//    <schmidt@cs.wustl.edu>, and Per Andersson
+//    <Per.Andersson@hfera.ericsson.se>.
 //
 // ============================================================================
 
@@ -21,7 +20,6 @@
 #define ACE_FUTURE_H
 
 #include "ace/Synch.h"
-#include "ace/Strategies_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,104 +28,54 @@
 #if defined (ACE_HAS_THREADS)
 
 // Forward decl.
-template <class T> class ACE_Future_Holder;
-template <class T> class ACE_Future_Observer;
-template <class T> class ACE_Future_Rep;
 template <class T> class ACE_Future;
 
 template <class T>
-class ACE_Export ACE_Future_Holder
-{
-  // = TITLE
-  //     Implementation of object which has holds ACE_Future.
-
-public:
-  ACE_Future_Holder (const ACE_Future<T> &future);
-  ~ACE_Future_Holder (void);
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  ACE_Future<T> item_;
-
-protected:
-  ACE_Future_Holder (void);
-};
-
-template <class T>
-class ACE_Future_Observer
-{
-  // = TITLE
-  //     ACE_Future_Observer<T>
-  //
-  // = DESCRIPTION
-  //     An ACE_Future_Observer<T> object implements an object that is
-  //     subscribed with an ACE_Future<T> object so that it may be
-  //     notified when the value of the ACE_Future<T> object is
-  //     written to by a writer thread.
-  //
-  //     It uses the Observer pattern
-public:
-  // = Destructor
-  virtual ~ACE_Future_Observer (void);
-
-  virtual void update(const ACE_Future<T> &future) = 0;
-  // Called by the ACE_Future<T> in which we are subscribed to when
-  // its value is written to.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-protected:
-
-  // = Constructor
-  ACE_Future_Observer (void);
-};
-
-template <class T>
 class ACE_Future_Rep
 {
   // = TITLE
   //     ACE_Future_Rep<T>
   //
   // = DESCRIPTION
-  //     An ACE_Future_Rep<T> object encapsules a pointer to an object
-  //     of class T which is the result of an asynchronous method
-  //     invocation. It is pointed to by ACE_Future<T> object[s] and
-  //     only accessible through them.
+  //     An ACE_Future_Rep<T> object encapsules a pointer to an
+  //     object of class T which is the result of an asynchronous
+  //     method invocation. It is pointed to by ACE_Future<T> object[s]
+  //     and only accessible through them.
 private:
   friend class ACE_Future<T>;
 
-  int set (const T &r,
-           ACE_Future<T> &caller);
-  // Set the result value.  The specified <caller> represents the
-  // future that invoked this <set> method, which is used to notify
-  // the list of future observers.
+  // Create, attach, detach and assign encapsulates the reference
+  // count handling and the object lifetime of ACE_Future_Rep<T>
+  // instances.
+
+  static ACE_Future_Rep<T> *create (void);
+  // Create a ACE_Future_Rep<T> and initialize the reference count
+
+  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
+  // Precondition(rep != 0)
+  // Increase the reference count and return argument. Uses
+  // the attribute "value_ready_mutex_" to synchronize reference
+  // count updating
+
+  static void detach (ACE_Future_Rep<T> *&rep);
+  // Precondition(rep != 0)
+  // Decreases the reference count and and deletes rep if
+  // there are no more references to rep.
+
+  static void assign (ACE_Future_Rep<T> *&rep,
+                      ACE_Future_Rep<T> *new_rep);
+  // Precondition(rep != 0 && new_rep != 0)
+  // Decreases the rep's reference count and and deletes rep if there
+  // are no more references to rep. Then assigns new_rep to rep
+
+  int set (const T &r);
+  // Set the result value.
 
   int get (T &value,
            ACE_Time_Value *tv);
   // Wait up to <tv> time to get the <value>.  Note that <tv> must be
   // specified in absolute time rather than relative time.
 
-  int attach (ACE_Future_Observer<T> *observer,
-               ACE_Future<T> &caller);
-  // Attaches the specified observer to a subject (i.e. the
-  // ACE_Future_Rep).  The update method of the specified subject will
-  // be invoked with a copy of the written-to ACE_Future as input when
-  // the result gets set.
-  //
-  // Returns 0 if the observer is successfully attached, 1 if the
-  // observer is already attached, and -1 if failures occur.
-
-  int detach (ACE_Future_Observer<T> *observer);
-  // Detaches the specified observer from a subject (i.e. the
-  // ACE_Future_Rep).  The update method of the specified subject will
-  // not be invoked when the ACE_Future_Reps result gets set.  Returns
-  // 1 if the specified observer was actually attached to the subject
-  // prior to this call and 0 if was not.
-  //
-  // Returns 0 if the observer was successfully detached, and -1 if the observer was
-  // not attached in the first place.
-
   operator T ();
   // Type conversion. will block forever until the result is
   // available.  Note that this method is going away in a subsequent
@@ -150,49 +98,12 @@ private:
   int ready (void);
   // Is result available?
 
-  // = Handle ref counting and object lifetime for ACE_Future_Rep<T>.
-
-  // These methods must go after the others to work around a bug with
-  // Borland's C++ Builder.
-
-  static ACE_Future_Rep<T> *create (void);
-  // Create a ACE_Future_Rep<T> and initialize the reference count.
-
-  static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep);
-  // Increase the reference count and return argument. Uses the
-  // attribute "value_ready_mutex_" to synchronize reference count
-  // updating.
-  //
-  // Precondition(rep != 0).
-
-  static void detach (ACE_Future_Rep<T> *&rep);
-  // Decreases the reference count and and deletes rep if there are no
-  // more references to rep.
-  //
-  // Precondition(rep != 0)
-
-  static void assign (ACE_Future_Rep<T> *&rep,
-                      ACE_Future_Rep<T> *new_rep);
-  // Decreases the rep's reference count and and deletes rep if there
-  // are no more references to rep. Then assigns new_rep to rep.
-  //
-  // Precondition(rep != 0 && new_rep != 0)
-
   T *value_;
   // Pointer to the result.
 
   int ref_count_;
   // Reference count.
 
-  typedef ACE_Future_Observer<T>
-	    OBSERVER;
-
-  typedef ACE_Unbounded_Set<OBSERVER *>
-        OBSERVER_COLLECTION;
-
-  OBSERVER_COLLECTION observer_collection_;
-  // Keep a list of ACE_Future_Observers unread by client's reader thread.
-
   // = Condition variable and mutex that protect the <value_>.
   ACE_Condition_Thread_Mutex value_ready_;
   ACE_Thread_Mutex value_ready_mutex_;
@@ -265,35 +176,9 @@ public:
   int ready (void);
   // Check if the result is available.
 
-  int attach (ACE_Future_Observer<T> *observer);
-  // Attaches the specified observer to a subject (i.e. the
-  // ACE_Future).  The update method of the specified subject will be
-  // invoked with a copy of the associated ACE_Future as input when
-  // the result gets set.  If the result is already set when this
-  // method gets invoked, then the update method of the specified
-  // subject will be invoked immediately.
-  //
-  // Returns 0 if the observer is successfully attached, 1 if the
-  // observer is already attached, and -1 if failures occur.
-
-  int detach (ACE_Future_Observer<T> *observer);
-  // Detaches the specified observer from a subject (i.e. the
-  // ACE_Future_Rep).  The update method of the specified subject will
-  // not be invoked when the ACE_Future_Reps result gets set.  Returns
-  // 1 if the specified observer was actually attached to the subject
-  // prior to this call and 0 if was not.
-  //
-  // Returns 0 if the observer was successfully detached, and -1 if the observer was
-  // not attached in the first place.
-
   void dump (void) const;
   // Dump the state of an object.
 
-  ACE_Future_Rep<T> *get_rep();
-  // Get the underlying ACE_Future_Rep<T>*. Note that this method should
-  // rarely, if ever, be used and that modifying the undlerlying ACE_Future_Rep<T>*
-  // should be done with extreme caution.
-
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
@@ -323,3 +208,4 @@ private:
 
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_FUTURE_H */
+
diff --git a/ace/Future_Node.cpp b/ace/Future_Node.cpp
deleted file mode 100644
index 79c8706dc7f..00000000000
--- a/ace/Future_Node.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Future.cpp
-// $Id$
-
-#define ACE_BUILD_DLL
-
-#ifndef ACE_FUTURE_NODE_CPP
-#define ACE_FUTURE_NODE_CPP
-
-#include "ace/OS.h"
-#include "ace/Future_Node.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_RCSID(ace, Future_Node, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-
-template <class T>
-ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (void)
-  : next_ (0),
-    prev_ (0)
-{
-}
-
-template <class T>
-ACE_DLList_Future_Node<T>::ACE_DLList_Future_Node (const ACE_Future<T> &item,
-                                                   ACE_DLList_Future_Node<T> *n,
-                                                   ACE_DLList_Future_Node<T> *p)
-: item_ (item),
-  next_ (n),
-  prev_ (p)
-{
-}
-
-template <class T>
-ACE_DLList_Future_Node<T>::~ACE_DLList_Future_Node (void)
-{
-}
-
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_FUTURE_NODE_CPP */
diff --git a/ace/Future_Node.h b/ace/Future_Node.h
deleted file mode 100644
index 8590cbaccca..00000000000
--- a/ace/Future_Node.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Future_Node.h
-//
-// = AUTHOR
-//    John Tucker <jtucker@infoglide.com>
-//
-// ============================================================================
-
-#ifndef ACE_FUTURE_NODE_H
-#define ACE_FUTURE_NODE_H
-
-#include "ace/Future.h"
-#include "ace/Thread.h"
-#include "ace/Containers_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_THREADS)
-
-// Forward decl.
-template <class T> class ACE_Future_Node;
-template <class T> class ACE_DLList_Future_Node;
-
-template <class T>
-class ACE_DLList_Future_Node
-{
-  // = TITLE
-  //     Implementation of element in a ACE_Future list.
-  //     Needed for ACE_Double_Linked_List.
-
-  friend class ACE_Double_Linked_List<ACE_DLList_Future_Node>;
-  friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Future_Node>;
-
-public:
-  // = Initialization
-  ACE_DLList_Future_Node (const ACE_Future<T> &future,
-                          ACE_DLList_Future_Node *n = 0,
-                          ACE_DLList_Future_Node *p = 0);
-  ~ACE_DLList_Future_Node (void);
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  ACE_Future<T> item_;
-  ACE_DLList_Future_Node *next_;
-  ACE_DLList_Future_Node *prev_;
-
-protected:
-  ACE_DLList_Future_Node (void);
-};
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Future_Node.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Future_Node.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_FUTURE_NODE_H */
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
deleted file mode 100644
index d2872a530a8..00000000000
--- a/ace/Future_Set.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// Future.cpp
-// $Id$
-
-#define ACE_BUILD_DLL
-
-#ifndef ACE_FUTURE_SET_CPP
-#define ACE_FUTURE_SET_CPP
-
-#include "ace/Future_Set.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_RCSID(ace, Future_Set, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-
-template <class T>
-ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue)
-  : delete_queue_ (0)
-{
-  if (new_queue)
-    this->future_notification_queue_ = new_queue;
-  else
-    {
-      ACE_NEW (this->future_notification_queue_,
-               ACE_Message_Queue<ACE_SYNCH>);
-      this->delete_queue_ = 1;
-    }
-}
-
-template <class T>
-ACE_Future_Set<T>::~ACE_Future_Set (void)
-{
-  // Detach ourselves from all remaining futures, if any, in our map.
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator iterator =
-    this->future_map_.begin ();
-
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator end =
-    this->future_map_.end ();
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      FUTURE_HOLDER *future_holder = (*iterator).int_id_;
-      future_holder->item_.detach (this);
-      delete future_holder;
-    }
-
-  if (this->delete_queue_ != 0)
-    delete this->future_notification_queue_;
-}
-
-template <class T> int
-ACE_Future_Set<T>::is_empty () const
-{
-  return ( ((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 );
-}
-
-template <class T> int
-ACE_Future_Set<T>::insert (ACE_Future<T> &future)
-{
-  FUTURE_HOLDER *future_holder;
-  ACE_NEW_RETURN (future_holder,
-                  FUTURE_HOLDER (future),
-                  -1);
-
-  FUTURE_REP *future_rep = future.get_rep ();
-  int result = this->future_map_.bind (future_rep,
-                                       future_holder);
-
-  // If a new map entry was created, then attach to the future, otherwise
-  // we were already attached to the future or some error occurred so just
-  // delete the future holder.
-  if ( result == 0 )
-    // Attach ourself to the ACE_Futures list of observer
-    future.attach (this);
-  else
-    delete future_holder;
-
-  return result;
-}
-
-template <class T> void
-ACE_Future_Set<T>::update (const ACE_Future<T> &future)
-{
-  ACE_Message_Block *mb;
-  FUTURE local_future = future;
-
-  ACE_NEW (mb,
-           ACE_Message_Block ((char *) local_future.get_rep (), 0));
-
-  // Enqueue in priority order.
-  this->future_notification_queue_->enqueue (mb, 0);
-}
-
-template <class T> int
-ACE_Future_Set<T>::next_readable (ACE_Future<T> &future,
-                                  ACE_Time_Value *tv)
-{
-  if (this->is_empty ())
-    return 0;
-
-  ACE_Message_Block *mb;
-  FUTURE_REP *future_rep = 0;
-
-  // Wait for a "readable future" signal from the message queue.
-  if (this->future_notification_queue_->dequeue_head (mb,
-                                                      tv) != -1)
-    {
-      // Extract future rep from the message block.
-      future_rep =
-        ACE_reinterpret_cast (FUTURE_REP *,
-                              mb->base ());
-
-      // Delete the message block.
-      mb->release ();
-    }
-  else
-    return 0;
-
-  // Remove the hash map entry with the specified future rep from our map.
-  FUTURE_HOLDER *future_holder;
-  if ( this->future_map_.find (future_rep,
-                               future_holder) != -1 )
-    {
-      future = future_holder->item_;
-      this->future_map_.unbind (future_rep);
-      delete future_holder;
-      return 1;
-    }
-
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_FUTURE_SET_CPP */
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
deleted file mode 100644
index bd029009a06..00000000000
--- a/ace/Future_Set.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Future_Set.h
-//
-// = AUTHOR
-//    John Tucker <jtucker@infoglide.com>
-//
-// ============================================================================
-
-#ifndef ACE_FUTURE_SET_H
-#define ACE_FUTURE_SET_H
-
-#include "ace/Thread.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_THREADS)
-
-template <class T>
-class ACE_Future_Set : public ACE_Future_Observer<T>
-{
-  // = TITLE
-  //     This class implements a mechanism which allows the values of
-  //     a collections of ACE_Future<T> objects to be accessed by
-  //     reader threads as they become available.
-public:
-  // = Initialization and termination methods.
-
-  ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_ = 0);
-  // Constructor.
-
-  ~ACE_Future_Set (void);
-  // Destructor.
-
-  int is_empty (void) const;
-  // Return 1 if their are no ACE_Future objects left on its queue and
-  // 0 otherwise
-
-  int insert (ACE_Future<T> &future);
-  // Enqueus the given ACE_Future into this objects queue when it is
-  // readable.
-  //
-  // Returns 0 if the future is successfully inserted, 1 if the
-  // future is already inserted, and -1 if failures occur.
-
-  int next_readable (ACE_Future<T> &result,
-                     ACE_Time_Value *tv = 0);
-  // Wait up to <tv> time to get the <value>.  Note that <tv> must be
-  // specified in absolute time rather than relative time.); get the
-  // next ACE_Future<T> that is readable.  If <tv> = 0, the will block
-  // forever.
-  //
-  // If a readable future becomes available, then the input result
-  // will be assigned with it and 1 will will be returned.  If the set
-  // is empty, then 0 is returned.
-
-  virtual void update (const ACE_Future<T> &future);
-  // Called by the ACE_Future<T> subject in which we are subscribed to
-  // when its value is written to.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-private:
-  // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Future_Set<T> &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Future_Set (const ACE_Future_Set<T> &))
-
-  typedef ACE_Future<T> FUTURE;
-
-  typedef ACE_Future_Rep<T> FUTURE_REP;
-
-  typedef ACE_Future_Holder<T> FUTURE_HOLDER;
-
-  typedef ACE_Pointer_Hash<FUTURE_REP *> FUTURE_REP_HASH;
-
-  typedef ACE_Equal_To<FUTURE_REP *> FUTURE_REP_COMPARE;
-
-  typedef ACE_Hash_Map_Manager_Ex<FUTURE_REP *,
-                                  FUTURE_HOLDER *,
-                                  FUTURE_REP_HASH,
-                                  FUTURE_REP_COMPARE,
-			          ACE_Null_Mutex> FUTURE_HASH_MAP;
-
-  FUTURE_HASH_MAP future_map_;
-  // Map of ACE_Futures, subjects, which have not been written to by
-  // client's writer thread.
-
-  ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_;
-  // Message queue for notifying the reader thread of ACE_Futures which
-  // have been written to by client's writer thread.
-
-  int delete_queue_;
-  // Keeps track of whether we need to delete the message queue.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Future_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Future_Set.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_FUTURE_SET_H */
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index 5c0d98476c6..ac21a57ad8f 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -45,14 +45,14 @@ ACE_RCSID(ace, Get_Opt, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Get_Opt)
 
-ACE_Get_Opt::ACE_Get_Opt (int argc,
+ACE_Get_Opt::ACE_Get_Opt (int argc, 
 			  ASYS_TCHAR **argv,
-			  const ASYS_TCHAR *optstring,
-			  int skip,
+			  const ASYS_TCHAR *optstring, 
+			  int skip, 
 			  int report_errors)
-  : optarg (0),
+  : optarg (0), 
     optind (skip),
-    opterr (report_errors),
+    opterr (report_errors), 
     argc_ (argc),
     argv_ (argv),
     nextchar_ (0),
@@ -87,30 +87,30 @@ ACE_Get_Opt::operator () (void)
   const ASYS_TCHAR *oli; // Option letter index.
 
   if (this->nextchar_ == 0 || *this->nextchar_ == '\0')
-    {
+    { 
       // Update scanning pointer.
 
-      if (this->optind >= this->argc_
-	  || *(this->nextchar_ = this->argv_[this->optind]) != '-')
+      if (this->optind >= this->argc_ 
+	  || *(this->nextchar_ = this->argv_[this->optind]) != '-') 
 	{
-	  this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
 	  return EOF;
 	}
 
       if (this->nextchar_[1] != 0
-	  && *++this->nextchar_ == '-')
-	{
+	  && *++this->nextchar_ == '-') 
+	{	
 	  // Found "--".
 	  ++this->optind;
-	  this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
 	  return EOF;
 	}
-    }
+    }			
 
-  // Option letter okay?
+  // Option letter okay? 
   opt = (int) *this->nextchar_++;
 
-  if (opt == (int) ':'
+  if (opt == (int) ':' 
       || ((oli = ACE_OS::strchr (this->optstring_, opt)) == 0))
     {
       // If the user didn't specify '-' as an option, assume it means
@@ -123,26 +123,26 @@ ACE_Get_Opt::operator () (void)
 
       if (this->opterr && *this->optstring_ != ':')
 	ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%s: illegal option -- %c\n"),
+                    ASYS_TEXT ("%s: illegal option -- %c\n"), 
 		    this->argv_[0],
                     opt));
       return '?';
     }
 
-  if (*++oli != ':')
+  if (*++oli != ':') 
     { // Don't need argument.
       this->optarg = 0;
       if (!*this->nextchar_)
 	++this->optind;
     }
-  else
+  else 
     { // Need an argument.
       if (*this->nextchar_) // No white space.
 	this->optarg = this->nextchar_;
-      else if (this->argc_ <= ++this->optind)
-	{
+      else if (this->argc_ <= ++this->optind) 
+	{ 
 	  // No arg.
-	  this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
 
 	  if (*this->optstring_ == ':')
 	    return ':';
@@ -155,7 +155,7 @@ ACE_Get_Opt::operator () (void)
       else // White space.
 	this->optarg = this->argv_[this->optind];
 
-      this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+      this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
       ++this->optind;
     }
 
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index 9abe0de904d..e09f09e3466 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -22,13 +22,15 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Cache_Map_Manager)
 #define T_1 class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES
 #define T_2 KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES
 
-  template <T_1>
-ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
-                                                             size_t size,
-                                                             ACE_Allocator *alloc)
-  : ACE_HCMM_BASE (caching_s,
-                   size,
-                   alloc)
+template <T_1> 
+ACE_Hash_Cache_Map_Manager<T_2>::ACE_Hash_Cache_Map_Manager (size_t size,
+                                                             ACE_Allocator *alloc,
+                                                             CACHING_STRATEGY *caching_s,
+                                                             int delete_caching_strategy)
+  : ACE_HCMM_BASE (size,
+                   alloc,
+                   caching_s,
+                   delete_caching_strategy)
 {
 }
 
@@ -46,7 +48,7 @@ ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key,
   // the combination of the <value> and the attributes of the caching
   // strategy.
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int bind_result = this->map_.bind (key,
                                      cache_value,
@@ -55,8 +57,8 @@ ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key,
   if (bind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_bind (bind_result,
-                                                        cache_value.second ());
+      int result = this->caching_strategy_->notify_bind (bind_result,
+                                                         cache_value.second ());
 
       if (result == -1)
         {
@@ -79,7 +81,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                          ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int rebind_result = this->map_.rebind (key,
                                          cache_value,
@@ -88,12 +90,12 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   if (rebind_result != -1)
     {
 
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
+      int result = this->caching_strategy_->notify_rebind (rebind_result,
+                                                           cache_value.second ());
 
       if (result == -1)
         {
-
+          
           // Make sure the unbind operation is done only when the
           // notification fails after a bind which is denoted by
           // rebind_result = 0
@@ -117,7 +119,7 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
                                           ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
 {
   CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
+                           this->caching_strategy_->attributes ());
 
   int trybind_result = this->map_.trybind (key,
                                            cache_value,
@@ -125,30 +127,30 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
 
   if (trybind_result != -1)
     {
-      int result = this->caching_strategy_.notify_trybind (trybind_result,
-                                                           cache_value.second ());
-
+      int result = this->caching_strategy_->notify_trybind (trybind_result,
+                                                            cache_value.second ());
+      
       if (result == -1)
         {
-
+      
           // If the entry has got inserted into the map, it is removed
           // due to failure.
           if (trybind_result == 0)
             this->map_.unbind (key);
 
           trybind_result = -1;
-
+        
         }
       else
         {
-
+        
           // If an attempt is made to bind an existing entry the value
           // is overwritten with the value from the map.
           if (trybind_result == 1)
             value = cache_value.first ();
-
+        
         }
-
+    
     }
 
   return trybind_result;
@@ -161,22 +163,22 @@ ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
   // Lookup the key and populate the <value>.
   int find_result = this->map_.find (key,
                                      entry);
-
+ 
   if (find_result != -1)
     {
-
-      int result = this->caching_strategy_.notify_find (find_result,
-                                                        entry->int_id_.second ());
-
+  
+      int result = this->caching_strategy_->notify_find (find_result,
+                                                         entry->int_id_.second ());
+      
       // Unless the find and notification operations go thru, this
       // method is not successful.
       if (result == -1)
         find_result = -1;
       else
         find_result = 0;
-
+        
     }
-
+  
   return find_result;
 }
 
@@ -188,13 +190,13 @@ ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE,
 
   if (unbind_result != -1)
     {
-
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          entry->int_id_.second ());
-
+  
+      int result = this->caching_strategy_->notify_unbind (unbind_result,
+                                                           entry->int_id_.second ());
+      
       if (result == -1)
         unbind_result = -1;
-
+    
     }
 
   return unbind_result;
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index cae1929c0c9..e8b3e6e6899 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -28,7 +28,7 @@
 class ACE_Allocator;
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES>
-class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
+class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE, 
                                    ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
                                    ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
                                    ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
@@ -64,11 +64,16 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
   // class.
 
   // = Initialization and termination methods.
-  ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s,
-                              size_t size = ACE_DEFAULT_MAP_SIZE,
-                              ACE_Allocator *alloc = 0);
+  ACE_Hash_Cache_Map_Manager (size_t size = ACE_DEFAULT_MAP_SIZE,
+                              ACE_Allocator *alloc = 0,
+                              CACHING_STRATEGY *caching_s = 0,
+                              int delete_caching_strategy = 1);
   // Initialize a <Hash_Cache_Map_Manager> with <size> entries.
-
+  // By default the caching strategy is allocated and deallocated by
+  // the class but if needed it can be changed as per the users need.
+  // The <delete_on_destruction> flag simply tells the class whether
+  // the ownership is given to the class or not.
+  
   ~ACE_Hash_Cache_Map_Manager (void);
   // Close down a <Cache_Map_Manager> and release dynamically allocated
   // resources.
@@ -160,7 +165,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
 
 protected:
 
-  typedef ACE_Cache_Map_Manager<KEY, VALUE,
+  typedef ACE_Cache_Map_Manager<KEY, VALUE, 
                                 ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
                                 ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
                                 ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
@@ -179,7 +184,7 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Cache_Map_Manager_T.cpp")
+#pragma implementation ("ace/Hash_Cache_Map_Manager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* HASH_CACHE_MAP_MANAGER_T_H */
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index 4752511f2d5..b963bedefae 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -98,24 +98,17 @@ public:
   friend class ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
   friend class ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>;
 
-  typedef EXT_ID 
-          KEY;
-  typedef INT_ID 
-          VALUE;
-  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> 
-          ENTRY;
+  typedef EXT_ID KEY;
+  typedef INT_ID VALUE;
+  typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID> ENTRY;
 
   // = ACE-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
-          ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
-          REVERSE_ITERATOR;
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> ITERATOR;
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> REVERSE_ITERATOR;
 
   // = STL-style iterator typedefs.
-  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
-          iterator;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> 
-          reverse_iterator;
+  typedef ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> iterator;
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> reverse_iterator;
 
   // = Initialization and termination methods.
 
@@ -245,10 +238,10 @@ public:
   int unbind (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry);
   // Remove entry from map.
 
-  size_t current_size (void) const;
+  size_t current_size (void);
   // Return the current size of the map.
 
-  size_t total_size (void) const;
+  size_t total_size (void);
   // Return the total size of the map.
 
   ACE_LOCK &mutex (void);
@@ -479,7 +472,9 @@ public:
   // = Initialization method.
   ACE_Hash_Map_Iterator_Ex (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
                             int tail = 0);
+
   // = Iteration methods.
+
   int advance (void);
   // Move forward by one element in the set.  Returns 0 when all the
   // items in the set have been seen, else 1.
@@ -522,7 +517,9 @@ public:
   // = Initialization method.
   ACE_Hash_Map_Reverse_Iterator_Ex (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &mm,
                                     int head = 0);
+
   // = Iteration methods.
+
   int advance (void);
   // Move forward by one element in the set.  Returns 0 when all the
   // items in the set have been seen, else 1.
diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i
index f4e86244358..1f5f8e015f2 100644
--- a/ace/Hash_Map_Manager_T.i
+++ b/ace/Hash_Map_Manager_T.i
@@ -40,13 +40,13 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void)
 {
   return this->cur_size_;
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) const
+ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void)
 {
   return this->total_size_;
 }
diff --git a/ace/Hash_Map_With_Allocator_T.cpp b/ace/Hash_Map_With_Allocator_T.cpp
deleted file mode 100644
index fa2a44ca06d..00000000000
--- a/ace/Hash_Map_With_Allocator_T.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Hash_Map_With_Allocator_T.cpp
-// $Id$
-
-#ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP
-#define ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP
-
-#include "ace/Hash_Map_With_Allocator_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
-#endif /* __ACE_INLINE__ */
-
-template <class EXT_ID, class INT_ID>
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator");
-}
-
-template <class EXT_ID, class INT_ID>
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (size_t size,
-                                                                          ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (size, alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator");
-}
-
-#endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP */
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
deleted file mode 100644
index e55c6209d21..00000000000
--- a/ace/Hash_Map_With_Allocator_T.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//   Hash_Map_With_Allocator_T.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> and
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_H
-#define ACE_HASH_MAP_WITH_ALLOCATOR_T_H
-
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <class EXT_ID, class INT_ID>
-class ACE_Hash_Map_With_Allocator :
-  public ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex>
-{
-  // = TITLE
-  //     This class is a thin wrapper around ACE_Hash_Map_Manager,
-  //     which comes handy when ACE_Hash_Map_Manager is to be used with a
-  //     non-nil ACE_Allocator.  This wrapper insures that the appropriate
-  //     allocator is in place for every operation that accesses or
-  //     updates the hash map.
-  //
-  // = DESCRIPTION
-  //     If we use ACE_Hash_Map_Manager with a shared memory allocator
-  //     (or memory-mapped file allocator, for example), the allocator
-  //     pointer used by ACE_Hash_Map_Manager gets stored with it, in
-  //     shared memory (or memory-mapped file).  Naturally, this will
-  //     cause horrible problems, since only the first process to set
-  //     that pointer will be guaranteed the address of the allocator
-  //     is meaningful!  That is why we need this wrapper, which
-  //     insures that appropriate allocator pointer is in place for
-  //     each call.
-  //
-public:
-  ACE_Hash_Map_With_Allocator (ACE_Allocator *alloc);
-  // Constructor.
-
-  ACE_Hash_Map_With_Allocator (size_t size,
-                               ACE_Allocator *alloc);
-  // Constructor that specifies hash table size.
-
-  // = The following methods are Proxies to the corresponding methods
-  // in <ACE_Hash_Map_Manager>.  Each method sets the allocator to
-  // the one specified by the invoking entity, and then calls the
-  // corresponding method in <ACE_Hash_Map_Manager> to do the
-  // actual work.
-
-  int bind (const EXT_ID &,
-            const INT_ID &,
-            ACE_Allocator *alloc);
-
-  int unbind (const EXT_ID &,
-              INT_ID &,
-              ACE_Allocator *alloc);
-
-  int rebind (const EXT_ID &,
-              const INT_ID &,
-              EXT_ID &,
-              INT_ID &,
-              ACE_Allocator *alloc);
-
-  int find (const EXT_ID &,
-            INT_ID &,
-            ACE_Allocator *alloc);
-
-  int close (ACE_Allocator *alloc);
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/Hash_Map_With_Allocator_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Hash_Map_With_Allocator_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Map_With_Allocator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */
diff --git a/ace/Hash_Map_With_Allocator_T.i b/ace/Hash_Map_With_Allocator_T.i
deleted file mode 100644
index 34476983b2b..00000000000
--- a/ace/Hash_Map_With_Allocator_T.i
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Hash_Map_With_Allocator_T.i
-
-
-template <class EXT_ID, class INT_ID> ACE_INLINE int
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::close (ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::close");
-  this->allocator_ = alloc;
-  return this->close_i ();
-}
-
-template <class EXT_ID, class INT_ID>  ACE_INLINE int
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::bind (const EXT_ID &ext_id,
-                                                   const INT_ID &int_id,
-                                                   ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::bind");
-  this->allocator_ = alloc;
-  return this->bind_i (ext_id, int_id);
-}
-
-template <class EXT_ID, class INT_ID>  ACE_INLINE int
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::unbind (const EXT_ID &ext_id,
-                                                     INT_ID &int_id,
-                                                     ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::unbind");
-  this->allocator_ = alloc;
-  return this->unbind_i (ext_id, int_id);
-}
-
-template <class EXT_ID, class INT_ID>  ACE_INLINE int
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::rebind (const EXT_ID &ext_id,
-                                                     const INT_ID &int_id,
-                                                     EXT_ID &old_ext_id,
-                                                     INT_ID &old_int_id,
-                                                     ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::rebind");
-  this->allocator_ = alloc;
-  return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id);
-}
-
-template <class EXT_ID, class INT_ID>  ACE_INLINE int
-ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::find (const EXT_ID &ext_id,
-                                                   INT_ID &int_id,
-                                                   ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::find");
-  this->allocator_ = alloc;
-  return this->find_i (ext_id, int_id);
-}
diff --git a/ace/Hash_Purgable_Map_Manager_T.cpp b/ace/Hash_Purgable_Map_Manager_T.cpp
new file mode 100644
index 00000000000..65ef645aaea
--- /dev/null
+++ b/ace/Hash_Purgable_Map_Manager_T.cpp
@@ -0,0 +1,182 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    Hash_Purgable_Map_Manager_T.cpp
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP
+#define ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP
+
+#include "ace/Hash_Purgable_Map_Manager_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (__ACE_INLINE__)
+# include "ace/Hash_Purgable_Map_Manager_T.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(ace, Hash_Purgable_Map_Manager_T, "$Id$")
+
+// Initialisation.
+template <class EXT_ID, class INT_ID> 
+ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Purgable_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
+                                                                          ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev,
+                                                                          int purge_tag)
+  : ACE_Hash_Map_Entry<EXT_ID, INT_ID> (next, 
+                                        prev),
+    purge_tag_ (purge_tag)
+{
+}
+
+template <class EXT_ID, class INT_ID>
+ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Purgable_Map_Entry (const EXT_ID &ext_id,
+                                                                          const INT_ID &int_id,
+                                                                          ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
+                                                                          ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev,
+                                                                          int purge_tag)
+  : ACE_Hash_Map_Entry<EXT_ID, INT_ID> (ext_id,
+                                        int_id,
+                                        next,
+                                        prev),
+    purge_tag_ (purge_tag)
+{
+}
+#if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
+template <class EXT_ID, class INT_ID> 
+ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Purgable_Map_Entry (void)
+{
+}
+#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_Hash_Map_Entry<EXT_ID, INT_ID>*
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: create_entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
+                                                                                                   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev)
+{
+  ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> *new_entry;
+  void *ptr;
+  
+  // Memory is  allocated for the entry.
+  ACE_ALLOCATOR_RETURN (ptr,
+                        this->allocator_->malloc (sizeof (ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>)),
+                        0);
+  
+  // A entry is created with its purge_tag value set to the current
+  // timer value.
+  new_entry = new (ptr) ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> (next,
+                                                                     prev,
+                                                                     this->timer_);
+                                                           
+  // The timer ticks on...;)
+  ++this->timer_;
+  
+  return new_entry;
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_Hash_Map_Entry<EXT_ID, INT_ID>*
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: create_entry (const EXT_ID &ext_id,
+                                                                                                   const INT_ID &int_id,
+                                                                                                   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
+                                                                                                   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev)
+{
+  ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> *new_entry;
+  void *ptr;
+
+  // Memory is  allocated for the entry.
+  ACE_ALLOCATOR_RETURN (ptr,
+                        this->allocator_->malloc (sizeof (ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>)),
+                        0);
+
+  // A entry is created with its purge_tag value set to the current
+  // timer value.
+  new_entry = new (ptr) ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> (ext_id,
+                                                                     int_id,
+                                                                     next,
+                                                                     prev,
+                                                                     this->timer_);
+  // The timer moves on.
+  ++this->timer_;
+  
+  return new_entry;
+}
+
+// This method finds the appropriate entry and also sets its purge_tag
+// to the current timer value. 
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::shared_find (const EXT_ID &ext_id,
+                                                                                                 ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry,
+                                                                                                 u_long &loc)
+{
+  // The entry is filled in depending upon the ext_id searched in the map.
+  int result = ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::shared_find (ext_id,
+                                                                                                       entry,
+                                                                                                       loc);
+  if (result == -1)
+    return -1;
+ 
+  // On a successful find ..
+  if (result == 0)
+    {
+      PURGABLE_ENTRY *purgable_entry = ACE_dynamic_cast (PURGABLE_ENTRY *&,
+                                                         entry);
+      
+       // Set the purge_tag to the current timer value showing the
+       // recent use of the entry. The timer is then incremented.
+       purgable_entry->set_purge_tag (this->timer_);
+       ++this->timer_;
+     }
+
+  return result;
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int 
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::purge (void)
+{
+  // The minimum value has to be large enough to be able to fall
+  // thru the loop to find lesser valued entries.
+  unsigned int min= ULONG_MAX;
+  
+  ENTRY *entry = 0;
+  PURGABLE_ENTRY *purgable_entry = 0;
+  PURGABLE_ENTRY *purgable_entry_to_remove = 0;
+  
+  // The iterator moves thru the map searching for the entry with the
+  // lowest purge_tag. Such an entry is stored and later removing by
+  // unbinding it from the map.
+  for (ITERATOR iter (*this);
+       iter.next (entry) !=0;
+       iter.advance ())
+    {
+      purgable_entry = ACE_dynamic_cast (PURGABLE_ENTRY *,
+                                         entry);
+
+      // Ah! an entry with a lower purge_tag...
+      if (min > purgable_entry->get_purge_tag ())
+        {
+          min = purgable_entry->get_purge_tag ();
+          purgable_entry_to_remove = purgable_entry;
+        }
+    }
+  
+  // The entry is removed from the map only if it is non-NULL.
+  if (purgable_entry_to_remove != 0) 
+    {
+      return this->unbind_i (purgable_entry_to_remove);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+#endif /* ACE_HASH_PURGABLE_MAP_MANAGER_T_CPP */
diff --git a/ace/Hash_Purgable_Map_Manager_T.h b/ace/Hash_Purgable_Map_Manager_T.h
new file mode 100644
index 00000000000..6c49da3f98c
--- /dev/null
+++ b/ace/Hash_Purgable_Map_Manager_T.h
@@ -0,0 +1,163 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    ace
+//
+// = FILENAME
+//    Hash_Purgable_Map_Manager_T.h
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef ACE_HASH_PURGABLE_MAP_MANAGER_T_H
+#define ACE_HASH_PURGABLE_MAP_MANAGER_T_H
+
+#include "ace/Hash_Map_Manager_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+template <class EXT_ID, class INT_ID>
+class ACE_Hash_Purgable_Map_Entry : public ACE_Hash_Map_Entry<EXT_ID, INT_ID>
+{
+  // = TITLE
+  //     Define an purgable entry in the hash table. A purge_tag field
+  //     helps in keeping track and deciding whether it has been used
+  //     recently.
+public:
+
+  // = Initialization and termination methods.
+  ACE_Hash_Purgable_Map_Entry (const EXT_ID &ext_id,
+                               const INT_ID &int_id,
+                               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0,
+                               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0,
+                               int purge_tag = 0);
+  // Constructor.
+  
+  ACE_Hash_Purgable_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
+                               ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev,
+                               int purge_tag = 0);
+  // Constructor.
+
+#if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
+  ~ACE_Hash_Purgable_Map_Entry (void);
+  // Destructor.
+#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ 
+
+  void set_purge_tag (u_long value);
+  // Used to change the purge_tag value.
+
+  u_long get_purge_tag (void);
+  // Obtain the purge_tag value.
+protected:
+  u_long purge_tag_;
+  // This is the purge_value which will decide the entry to be purged.  
+};
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
+class ACE_Hash_Purgable_Map_Manager_Ex : public ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
+{
+  // = TITLE
+  //     Define a purgable map abstraction that efficiently associates
+  //     <EXT_ID>s with <INT_ID>s.
+  //
+  // = DESCRIPTION
+  //
+  //     This implementation of a map uses a purgable hash table.  Key
+  //     hashing is achieved through the HASH_KEY object and key
+  //     comparison is achieved through the COMPARE_KEYS object.
+  //
+  //     This class provides the feature of purging the entries on
+  //     need based on the purging algorithm followed. By default the
+  //     Least Recently Used algorithm is applied for purging "k"
+  //     entires from the map.
+  //     
+  //     The Least Recently used algorithm is used to decide on the
+  //     entry to purge. For this a timesatmp is used per entry with a
+  //     virtual timer providing the timestamp-value. On a lookup or
+  //     use of an entry, its timestamp value is updated proving that
+  //     the entry has been used recently. When the map gets full and
+  //     some entries need to be purged, the "K" entries with minimum
+  //     timestamp are removed.
+public:
+  
+  typedef ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID> PURGABLE_ENTRY;
+  // The purgable_entry has an extra purge_tag field which will act as
+  // the timestamp in deciding the entry to be purged from the map.
+
+  // = Initialization and termination methods.
+
+  ACE_Hash_Purgable_Map_Manager_Ex (ACE_Allocator *alloc = 0);
+  // Initialize a <Hash_Purgable_Map_Manager_Ex> with default size.
+
+  ACE_Hash_Purgable_Map_Manager_Ex (size_t size,
+                                    ACE_Allocator *alloc = 0);
+  // Initialize a <Hash_Purgable_Map_Manager_Ex> with size <length>.
+  
+  ~ACE_Hash_Purgable_Map_Manager_Ex (void);
+  // Destruct a <Hash_Purgable_Map_Manager_Ex> with size <length>.
+  
+  int purge (int num);
+  // The <num> of entries specified are removed form the map based on
+  // the purging algorithm used. By default Least Recently Used
+  // algorithm is applied. Returns 0 on success and -1 on
+  // failure. This method is called with locks held.
+  
+protected:
+  int purge_i (int num);
+  // The <num> of entries specified are removed form the map based on the
+  // purging algorithm used. By default Least Recently Used algorithm is
+  // applied. Returns 0 on success and -1 on failure. This method is
+  // called w.o. locks being held.
+
+  int shared_find (const EXT_ID &ext_id,
+                   ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry,
+                   u_long &loc);
+  // Returns the <ACE_Hash_Map_Entry> that corresponds to
+  // <ext_id>. This method interface has been inherited form the base
+  // class,i.e. Hash_Map_Manager_Ex.
+
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *create_entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0,
+                                                    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0);
+  // Creates an entry. This method interface has been inherited form
+  // the base class, i.e. Hash_Map_Manager_Ex.
+
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *create_entry (const EXT_ID &ext_id,
+                                                    const INT_ID &int_id,
+                                                    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0,
+                                                    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0);
+  // Creates an entry.This method interface has been inherited form
+  // the base class, i.e. Hash_Map_Manager_Ex.
+
+  int purge (void);
+  // Removes the minimum element from the map. Selection Sort is used
+  // to find and remove the entry. This method purges a single entry.
+ 
+  u_long timer_;
+  // The virtual clock which provides the purge_value for the entries.
+};
+#if defined (__ACE_INLINE__)
+#include "ace/Hash_Purgable_Map_Manager_T.i"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Hash_Purgable_Map_Manager_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation "ace/Hash_Purgable_Map_Manager_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* ACE_HASH_PURGABLE_MAP_MANAGER_T_H */
+
+
+
+
+  
+
diff --git a/ace/Hash_Purgable_Map_Manager_T.i b/ace/Hash_Purgable_Map_Manager_T.i
new file mode 100644
index 00000000000..aff9839c2e3
--- /dev/null
+++ b/ace/Hash_Purgable_Map_Manager_T.i
@@ -0,0 +1,56 @@
+// $Id$
+
+template <class EXT_ID, class INT_ID> ACE_INLINE void 
+ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::set_purge_tag (u_long value)
+{
+  this->purge_tag_ = value;
+}
+
+template <class EXT_ID, class INT_ID> ACE_INLINE u_long
+ACE_Hash_Purgable_Map_Entry<EXT_ID, INT_ID>::get_purge_tag (void)
+{
+  return this->purge_tag_;
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Purgable_Map_Manager_Ex (size_t size,
+                                                                                                                      ACE_Allocator *alloc)
+  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> (size,
+                                                                               alloc),
+    timer_ (0)
+{
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Purgable_Map_Manager_Ex (ACE_Allocator *alloc)
+  : ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> (alloc),
+    timer_ (0)
+{
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Purgable_Map_Manager_Ex (void)
+{
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int 
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: purge_i (int num)
+{
+  for (int i = 0; i < num; ++i)
+    {
+      if (this->purge () != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Failure in removing minimum entry from cache\n"),
+                          -1);
+    }
+  
+  return 0; 
+}
+
+template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int 
+ACE_Hash_Purgable_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: purge (int num)
+{
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
+
+  return this->purge_i (num);
+}
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 24cbb2988cf..503e52dcdbb 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -94,8 +94,7 @@ ACE_INET_Addr::set (const ACE_INET_Addr &sa)
 {
   ACE_TRACE ("ACE_INET_Addr::set");
 
-  this->ACE_Addr::base_set (sa.get_type (),
-                            sa.get_size ());
+  this->ACE_Addr::base_set (sa.get_type (), sa.get_size ());
 
   if (sa.get_type () == AF_ANY)
     // Ugh, this is really a base class, so don't copy it.
@@ -127,7 +126,7 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[])
 
   if (ip_addr == 0) // Assume it's a port number.
     {
-      if (ACE_OS::strspn (t, ASYS_TEXT ("1234567890"))
+      if (ACE_OS::strspn (t, "1234567890") 
           == ACE_OS::strlen (t))
         { // port number
           u_short port = (u_short) ACE_OS::atoi (t);
@@ -135,7 +134,7 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[])
                               ACE_UINT32 (INADDR_ANY));
         }
       else // port name
-        result = this->set (t,
+        result = this->set (t, 
                             ACE_UINT32 (INADDR_ANY));
     }
   else
@@ -143,10 +142,10 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[])
       *ip_addr = '\0'; ++ip_addr; // skip over ':'
 
       if (ACE_OS::strspn (ip_addr,
-                          ASYS_TEXT ("1234567890")) ==
+                         "1234567890") ==          
           ACE_OS::strlen (ip_addr))
         {
-          u_short port =
+          u_short port = 
             (u_short) ACE_OS::atoi (ip_addr);
           result = this->set (port, t);
         }
@@ -233,11 +232,9 @@ ACE_INET_Addr::set (u_short port_number,
       errno = EINVAL;
       return -1;
     }
-  else if (ACE_OS::inet_aton (ASYS_ONLY_MULTIBYTE_STRING (host_name),
-                              (struct in_addr *) &addr) == 1)
-    return this->set (port_number,
-                      encode ? ntohl (addr) : addr,
-                      encode);
+  else if (ACE_OS::inet_aton (ASYS_ONLY_MULTIBYTE_STRING (host_name), (struct in_addr *) &addr) == 1)
+    return this->set (port_number, encode ? ntohl (addr) : addr, encode);
+
   else
     {
 #if defined (VXWORKS) || defined (CHORUS)
@@ -499,7 +496,7 @@ ACE_INET_Addr::get_host_name (void) const
 
   static ASYS_TCHAR name[MAXHOSTNAMELEN + 1];
   if (this->get_host_name (name, MAXHOSTNAMELEN + 1) == -1)
-    ACE_OS::strcpy (name, ASYS_TEXT ("<unknown>"));
+    ACE_OS::strcpy (name, "<unknown>");
   return name;
 }
 
diff --git a/ace/IOStream.cpp b/ace/IOStream.cpp
index b77fc6c57dd..0603f926060 100644
--- a/ace/IOStream.cpp
+++ b/ace/IOStream.cpp
@@ -559,9 +559,7 @@ ACE_Streambuf::reset_get_buffer (char *newBuffer,
       this->eback_saved_ = newBuffer;
     }
   else
-    ACE_NEW_RETURN (this->eback_saved_,
-                    char[streambuf_size_],
-                    0);
+    ACE_NEW_RETURN (this->eback_saved_, char[streambuf_size_], 0);
 
   this->gptr_saved_ = this->eback_saved_ + _gptr;
   this->egptr_saved_ = this->eback_saved_ + _egptr;
@@ -608,9 +606,7 @@ ACE_Streambuf::reset_put_buffer (char *newBuffer,
       this->pbase_saved_ = newBuffer;
     }
   else
-    ACE_NEW_RETURN (this->pbase_saved_,
-                    char[streambuf_size_],
-                    0);
+    ACE_NEW_RETURN (this->pbase_saved_, char[streambuf_size_], 0);
 
   this->pptr_saved_ = this->pbase_saved_ + _pptr;
   this->epptr_saved_ = this->pbase_saved_ + streambuf_size_;
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 06b992c046e..00f253ba81f 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -30,7 +30,7 @@
 #include "ace/streams.h"
 
 #if defined (ACE_HAS_STRING_CLASS)
-#if defined (ACE_WIN32) && defined (_MSC_VER)
+#if defined (ACE_WIN32)
 typedef CString ACE_IOStream_String;
 #else
 #if !defined (ACE_HAS_STDCPP_STL_INCLUDES)
@@ -45,7 +45,7 @@ typedef std::string ACE_IOStream_String;
 typedef string ACE_IOStream_String;
 #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 #endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */
-#endif /* ACE_WIN32 && defined (_MSC_VER) */
+#endif /* ACE_WIN32 */
 
 #if defined (__DECCXX_VER)
 # if __DECCXX_VER < 50700000
@@ -74,9 +74,9 @@ public:
   inline int operator < (const ACE_Quoted_String &s) const {
     return *(ACE_IOStream_String *) this < (ACE_IOStream_String) s;
   }
-#if defined (ACE_WIN32) && defined (_MSC_VER)
+#if defined (ACE_WIN32)
   inline int length (void) { return this->GetLength (); }
-#endif /* ACE_WIN32 && defined (_MSC_VER) */
+#endif /* ACE_WIN32 */
 };
 
 #endif /* ACE_HAS_STRING_CLASS */
diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp
index be25100cc08..a0b868a5513 100644
--- a/ace/IOStream_T.cpp
+++ b/ace/IOStream_T.cpp
@@ -145,11 +145,11 @@ ACE_IOStream<STREAM>::operator<< (ACE_IOStream_String &v)
 {
   if (opfx ())
     {
-#if defined (ACE_WIN32) && defined (_MSC_VER)
+#if defined (ACE_WIN32)
       for (int i = 0; i < v.GetLength (); ++i)
 #else
       for (u_int i = 0; i < (u_int) v.length (); ++i)
-#endif /* ACE_WIN32 && defined (_MSC_VER) */
+#endif /* ACE_WIN32 */
         this->put (v[i]);
     }
 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 11655934d25..37789a779a7 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -311,9 +311,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (const ACE_WString &na
       // Makes a copy here. Caller needs to call delete to free up
       // memory.
       char *new_type;
-      ACE_NEW_RETURN (new_type,
-                      char [len + 1],
-                      -1);
+      ACE_NEW_RETURN (new_type, char [len + 1], -1);
 
       ACE_OS::strncpy (new_type, temp, len);
       new_type[len] = '\0';  // Null terminate the string
@@ -439,19 +437,15 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
                              &options), -1);
 
   if (ACE_LOG_MSG->op_status ())
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("Allocator::Allocator\n")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "Allocator::Allocator\n"), -1);
 
-  ACE_NEW_RETURN (this->lock_,
-                  ACE_LOCK (lock_name_for_local_name_space),
-                  -1);
+  ACE_NEW_RETURN (this->lock_, ACE_LOCK (lock_name_for_local_name_space), -1);
 
 #if !defined (ACE_LACKS_ACCESS)
   // Now check if the backing store has been created successfully
   if (ACE_OS::access (this->context_file_, F_OK) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("create_manager\n")),
+                       "create_manager\n"),
                       -1);
 #endif /* ACE_LACKS_ACCESS */
 
@@ -493,8 +487,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
                           -1);
 
           if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("create_manager\n")), -1);
+            ACE_ERROR_RETURN ((LM_ERROR, "create_manager\n"), -1);
         }
 
       if (ACE::debug ())
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 041e1cf1045..a5c1260f0b8 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -40,6 +40,8 @@ ACE_Tokens::make_owner (ACE_TPQ_Entry *caller)
   this->waiters_.enqueue (caller, 0);
 }
 
+// ************************************************************
+
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 ACE_Null_Token::ACE_Null_Token (void)
 {
@@ -50,6 +52,10 @@ ACE_Null_Token::~ACE_Null_Token (void)
 }
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
+// ************************************************************
+// ************************************************************
+
+
 void
 ACE_TPQ_Entry::dump (void) const
 {
@@ -152,6 +158,10 @@ ACE_TPQ_Entry::client_id (const ASYS_TCHAR *id)
   this->client_id_[ACE_MAXCLIENTIDLEN - 1] = '\0';
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+
 void
 ACE_TSS_TPQ_Entry::dump (void) const
 {
@@ -185,10 +195,7 @@ ACE_TSS_TPQ_Entry::make_TSS_TYPE (void) const
   ACE_TRACE ("ACE_TSS_TPQ_Entry::make_TSS_TYPE");
   ACE_TPQ_Entry *temp;
 
-  ACE_NEW_RETURN (temp,
-                  ACE_TPQ_Entry (this->proxy_,
-                                 this->client_id_),
-                  0);
+  ACE_NEW_RETURN (temp, ACE_TPQ_Entry (this->proxy_, this->client_id_), 0);
   return temp;
 }
 
@@ -198,6 +205,10 @@ ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * (void)
   return  (ACE_TPQ_Entry *) (*((ACE_TSS<ACE_TPQ_Entry> *) this));
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+
 ACE_TPQ_Iterator::ACE_TPQ_Iterator (ACE_Token_Proxy_Queue &q)
 : current_ (q.head_)
 {
@@ -243,6 +254,10 @@ ACE_TPQ_Iterator::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+
 void
 ACE_Token_Proxy_Queue::dump (void) const
 {
@@ -399,6 +414,10 @@ ACE_Token_Proxy_Queue::remove (const ACE_TPQ_Entry *remove_me)
   return;
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+
 void
 ACE_Mutex_Token::dump (void) const
 {
@@ -634,6 +653,10 @@ ACE_Mutex_Token::is_owner (const ASYS_TCHAR *id)
     return 0;
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+
 void
 ACE_RW_Token::dump (void) const
 {
@@ -1012,6 +1035,11 @@ ACE_RW_Token::is_owner (const ASYS_TCHAR *id)
   return 0;
 }
 
+// ************************************************************
+// ************************************************************
+// ************************************************************
+// 7..
+
 void
 ACE_Token_Proxy::dump (void) const
 {
@@ -1363,6 +1391,8 @@ ACE_Token_Proxy::token_acquired (ACE_TPQ_Entry *e)
   return;
 }
 
+// ************************************************************
+
 ACE_Token_Name::ACE_Token_Name (const ASYS_TCHAR *token_name)
 {
   ACE_TRACE ("ACE_Token_Name::ACE_Token_Name");
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 70cf92c3d42..7114ce06675 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -96,9 +96,7 @@ ACE_Log_Msg_Manager::get_lock (void)
     {
       ACE_NO_HEAP_CHECK;
 
-      ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_,
-                        ACE_Recursive_Thread_Mutex,
-                        0);
+      ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_, ACE_Recursive_Thread_Mutex, 0);
 
       // Allocate the ACE_Log_Msg IPC instance.
       ACE_NEW_RETURN (ACE_Log_Msg_message_queue, ACE_LOG_MSG_IPC_STREAM, 0);
@@ -214,9 +212,7 @@ ACE_Log_Msg::instance (void)
       {
         ACE_NO_HEAP_CHECK;
 
-        ACE_NEW_RETURN_I (tss_log_msg,
-                          ACE_Log_Msg,
-                          0);
+        ACE_NEW_RETURN_I (tss_log_msg, ACE_Log_Msg, 0);
         // Store the dynamically allocated pointer in thread-specific
         // storage.  It gets deleted via the ACE_TSS_cleanup function
         // when the thread terminates.
@@ -236,9 +232,8 @@ ACE_Log_Msg::instance (void)
   // ACE_Log_Msg_Manager::get_lock() to initialize the message queue,
   // so instead we do it here.
   if (ACE_Log_Msg_message_queue == 0)
-    ACE_NEW_RETURN (ACE_Log_Msg_message_queue,
-                    ACE_LOG_MSG_IPC_STREAM,
-                    0);
+    ACE_NEW_RETURN (ACE_Log_Msg_message_queue, ACE_LOG_MSG_IPC_STREAM, 0);
+
   // Singleton implementation.
   static ACE_Cleanup_Adapter<ACE_Log_Msg> *log_msg = 0;
   if (log_msg == 0)
@@ -773,10 +768,6 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str,
 #if defined (ACE_WIN32)
                         LPTSTR lpMsgBuf = 0;
 
-     // PharLap can't do FormatMessage, so try for socket
-     // error.
-# if !defined (ACE_HAS_PHARLAP)
-
                         ::FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
                                          NULL,
                                          errno,
@@ -784,7 +775,6 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str,
                                          (LPTSTR) &lpMsgBuf,
                                          0,
                                          NULL);
-# endif /* ACE_HAS_PHARLAP */
 
                         // If we don't get a valid response from
                         // <FormatMessage>, we'll assume this is a
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index fd611eadb37..d3729cbe707 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -98,8 +98,8 @@ ACE_Log_Record::round_up (void)
 {
   // ACE_TRACE ("ACE_Log_Record::round_up");
   // Determine the length of the payload.
-  int len = (sizeof (*this) - sizeof (this->msg_data_))
-    + (sizeof (ASYS_TCHAR) * ((ACE_OS::strlen (this->msg_data_) + 1)));
+  int len = (sizeof *this - MAXLOGMSGLEN)
+    + (ACE_OS::strlen (this->msg_data_) + 1);
 
   // Round up to the alignment.
   this->length_ = 1 + ((len + ACE_Log_Record::ALIGN_WORDB - 1)
diff --git a/ace/Makefile b/ace/Makefile
index 9cfb79633d5..ea03c965ae0 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -55,24 +55,19 @@ THREADS_FILES = \
   Token
 DEMUX_FILES = \
   Event_Handler \
-  FlReactor \
   Handle_Set \
-  Msg_WFMO_Reactor \
   POSIX_Proactor \
   Priority_Reactor \
   Proactor \
   Reactor \
   Select_Reactor \
   Select_Reactor_Base \
-  TP_Reactor \
-  TkReactor \
-  WFMO_Reactor \
-  XtReactor
+  WFMO_Reactor
 CONNECTION_FILES = \
   Asynch_IO \
   Asynch_IO_Impl \
   POSIX_Asynch_IO \
-  Strategies
+  Strategies 
 SOCKETS_FILES = \
   IPC_SAP \
   LSOCK \
@@ -148,7 +143,6 @@ STREAMS_FILES = \
   Message_Queue \
   Task
 MEMORY_FILES = \
-  Based_Pointer_Repository \
   Malloc \
   Mem_Map \
   Memory_Pool \
@@ -168,25 +162,29 @@ OTHER_FILES = \
   CORBA_Handler \
   CORBA_Ref \
   Local_Name_Space \
+  Msg_WFMO_Reactor \
   Name_Proxy \
   Name_Request_Reply \
   Name_Space \
   Naming_Context \
   Registry_Name_Space \
-  Remote_Name_Space
+  Remote_Name_Space \
+  TP_Reactor \
+  XtReactor \
+  FlReactor \
+  TkReactor
 
 TEMPLATE_FILES = \
            Acceptor \
            Active_Map_Manager_T \
            Asynch_Acceptor \
            Auto_Ptr \
-	   Based_Pointer_T \
            Connector \
            Containers_T \
-           Cache_Map_Manager_T \
+	   Cache_Map_Manager_T \
            Cached_Connect_Strategy_T \
            Caching_Strategies_T \
-           Caching_Utility_T \
+           Caching_Strategy_Utility_T \
            Cleanup_Strategies_T \
            Dump_T \
            Dynamic_Service \
@@ -195,8 +193,6 @@ TEMPLATE_FILES = \
            Free_List \
            Functor_T \
            Future \
-           Future_Node \
-           Future_Set \
            Hash_Map_Manager_T \
            Hash_Cache_Map_Manager_T \
            IOStream_T \
@@ -364,10 +360,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 .PHONY: ACE_COMPONENTS
 ACE_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --ace --set ' $(ACE_COMPONENTS) '
+	@$(ACE_ROOT)/bin/ace_components --ace --set " $(ACE_COMPONENTS) "
 
 realclean:
-	@sh $(ACE_ROOT)/bin/ace_components --ace --remove
+	@$(ACE_ROOT)/bin/ace_components --ace --remove
 
 #### Setting ACELIB to null allows it to be used for building shared libraries,
 #### including libACE.$(SOEXT,) on certain platforms.
@@ -498,7 +494,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Template_Instantiations.cpp
-.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \
+.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -529,7 +526,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Sched_Params.i
-.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp $(ACE_ROOT)/ace/ACE.h \
+.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -1816,20 +1814,21 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.h \
- $(ACE_ROOT)/ace/SPIPE_Stream.h \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i
 .obj/Log_Record.o .obj/Log_Record.so .shobj/Log_Record.o .shobj/Log_Record.so: Log_Record.cpp \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -2186,10 +2185,7 @@ endif # GHS
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ $(ACE_ROOT)/ace/Dynamic.i
 .obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -2289,83 +2285,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \
- $(ACE_ROOT)/ace/FlReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
 .obj/Handle_Set.o .obj/Handle_Set.so .shobj/Handle_Set.o .shobj/Handle_Set.so: Handle_Set.cpp \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -2382,12 +2301,9 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i
-.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+.obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \
+ $(ACE_ROOT)/ace/POSIX_Proactor.h \
+ $(ACE_ROOT)/ace/Proactor_Impl.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -2397,9 +2313,17 @@ endif # GHS
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -2413,6 +2337,13 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -2422,9 +2353,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
@@ -2437,11 +2365,16 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \
+ $(ACE_ROOT)/ace/POSIX_Proactor.i \
+ $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
@@ -2462,10 +2395,6 @@ endif # GHS
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -2487,26 +2416,20 @@ endif # GHS
  $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i
-.obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \
- $(ACE_ROOT)/ace/POSIX_Proactor.h \
- $(ACE_ROOT)/ace/Proactor_Impl.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp
 .obj/Priority_Reactor.o .obj/Priority_Reactor.so .shobj/Priority_Reactor.o .shobj/Priority_Reactor.so: Priority_Reactor.cpp \
  $(ACE_ROOT)/ace/Priority_Reactor.h \
  $(ACE_ROOT)/ace/Containers.h \
@@ -2600,19 +2523,13 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Proactor_Impl.h \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2623,10 +2540,17 @@ endif # GHS
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2634,15 +2558,41 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i \
+ $(ACE_ROOT)/ace/Proactor_Impl.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -2661,20 +2611,9 @@ endif # GHS
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2704,7 +2643,13 @@ endif # GHS
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/POSIX_Proactor.h \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \
+ $(ACE_ROOT)/ace/POSIX_Proactor.i
 .obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2994,11 +2939,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Timer_Heap.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp
-.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \
- $(ACE_ROOT)/ace/TP_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -3055,27 +2997,60 @@ endif # GHS
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Timer_Heap.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/TP_Reactor.i
-.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp
+.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -3085,43 +3060,29 @@ endif # GHS
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/TkReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -3137,40 +3098,62 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
  $(ACE_ROOT)/ace/Timer_Heap.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
-.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
+.obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i
+.obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -3180,9 +3163,19 @@ endif # GHS
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -3196,6 +3189,13 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -3205,9 +3205,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
@@ -3220,23 +3217,29 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/POSIX_Asynch_IO.i \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -3245,15 +3248,21 @@ endif # GHS
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -3270,151 +3279,25 @@ endif # GHS
  $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp
-.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/XtReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/POSIX_Proactor.h \
+ $(ACE_ROOT)/ace/Proactor_Impl.h \
  $(ACE_ROOT)/ace/Pipe.h \
  $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
-.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Asynch_IO_Impl.h
-.obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \
- $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
+ $(ACE_ROOT)/ace/POSIX_Proactor.i
 .obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -4012,7 +3895,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/ATM_Addr.i
-.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp $(ACE_ROOT)/ace/DEV.h \
+.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp \
+ $(ACE_ROOT)/ace/DEV.h \
  $(ACE_ROOT)/ace/IO_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -4675,7 +4559,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Shared_Memory.i
-.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp $(ACE_ROOT)/ace/TLI.h \
+.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp \
+ $(ACE_ROOT)/ace/TLI.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -4692,8 +4577,7 @@ endif # GHS
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i
+ $(ACE_ROOT)/ace/Addr.i
 .obj/TLI_Acceptor.o .obj/TLI_Acceptor.so .shobj/TLI_Acceptor.o .shobj/TLI_Acceptor.so: TLI_Acceptor.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -4714,13 +4598,10 @@ endif # GHS
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Acceptor.i
+ $(ACE_ROOT)/ace/INET_Addr.i
 .obj/TLI_Connector.o .obj/TLI_Connector.so .shobj/TLI_Connector.o .shobj/TLI_Connector.so: TLI_Connector.cpp \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -4744,11 +4625,8 @@ endif # GHS
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Connector.i
+ $(ACE_ROOT)/ace/INET_Addr.i
 .obj/TLI_Stream.o .obj/TLI_Stream.so .shobj/TLI_Stream.o .shobj/TLI_Stream.so: TLI_Stream.cpp \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -4769,10 +4647,8 @@ endif # GHS
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/TLI_Stream.i
+ $(ACE_ROOT)/ace/INET_Addr.i
 .obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp \
  $(ACE_ROOT)/ace/TTY_IO.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5229,7 +5105,8 @@ endif # GHS
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/UPIPE_Addr.h \
  $(ACE_ROOT)/ace/UPIPE_Stream.i
-.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp $(ACE_ROOT)/ace/DLL.h \
+.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp \
+ $(ACE_ROOT)/ace/DLL.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -5468,8 +5345,24 @@ endif # GHS
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Asynch_IO.i \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.h \
+ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Proactor.i
 .obj/Service_Manager.o .obj/Service_Manager.so .shobj/Service_Manager.o .shobj/Service_Manager.so: Service_Manager.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -6425,84 +6318,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/Based_Pointer_Repository.o .obj/Based_Pointer_Repository.so .shobj/Based_Pointer_Repository.o .shobj/Based_Pointer_Repository.so: Based_Pointer_Repository.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -7508,6 +7323,115 @@ endif # GHS
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Local_Name_Space_T.cpp
+.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i
 .obj/Name_Proxy.o .obj/Name_Proxy.so .shobj/Name_Proxy.o .shobj/Name_Proxy.so: Name_Proxy.cpp \
  $(ACE_ROOT)/ace/Name_Proxy.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
@@ -7924,5 +7848,349 @@ endif # GHS
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Name_Request_Reply.h \
  $(ACE_ROOT)/ace/Name_Space.h
+.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \
+ $(ACE_ROOT)/ace/TP_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/TP_Reactor.i
+.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/XtReactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i
+.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \
+ $(ACE_ROOT)/ace/FlReactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/FlReactor.i
+.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/TkReactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 98677f3160e..36e938da735 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -187,19 +187,14 @@ libACE_Threads_la_SOURCES = \
 
 libACE_Demux_la_SOURCES = \
         Event_Handler.cpp \
-	FlReactor.cpp \
         Handle_Set.cpp \
-	Msg_WFMO_Reactor.cpp \
         POSIX_Proactor.cpp \
         Priority_Reactor.cpp \
         Proactor.cpp \
         Reactor.cpp \
         Select_Reactor.cpp \
         Select_Reactor_Base.cpp \
-	TP_Reactor.cpp \
-	TkReactor.cpp \
-        WFMO_Reactor.cpp \
-        XtReactor.cpp
+        WFMO_Reactor.cpp
 
 libACE_Connection_la_SOURCES = \
         Asynch_IO.cpp \
@@ -280,7 +275,6 @@ libACE_Svcconf_la_SOURCES = \
 
 libACE_Streams_la_SOURCES = \
         CDR_Stream.cpp \
-	Codeset_IBM1047.cpp \
         Message_Block.cpp \
         Message_Queue.cpp \
         Task.cpp
@@ -307,12 +301,15 @@ libACE_Other_la_SOURCES = \
         CORBA_Handler.cpp \
         CORBA_Ref.cpp \
         Local_Name_Space.cpp \
+        Msg_WFMO_Reactor.cpp \
         Name_Proxy.cpp \
         Name_Request_Reply.cpp \
         Name_Space.cpp \
         Naming_Context.cpp \
         Registry_Name_Space.cpp \
-        Remote_Name_Space.cpp
+        Remote_Name_Space.cpp \
+        TP_Reactor.cpp \
+        XtReactor.cpp
 
 libACE_la_SOURCES = \
 	$(libACE_OS_la_SOURCES) \
@@ -385,11 +382,6 @@ ACE_TEMPLATE_FILES = \
         Auto_Ptr.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 \
@@ -397,10 +389,7 @@ ACE_TEMPLATE_FILES = \
         Free_List.cpp \
         Functor_T.cpp \
         Future.cpp \
-	Future_Node.cpp \
-	Future_Set.cpp \
         Hash_Map_Manager_T.cpp \
-        Hash_Cache_Map_Manager_T.cpp \
         IOStream_T.cpp \
         LOCK_SOCK_Acceptor.cpp \
         Local_Name_Space_T.cpp \
@@ -446,8 +435,8 @@ pkginclude_HEADERS = \
         ACE.i \
         ARGV.h \
         ARGV.i \
-        ATM_Addr.h \
-        ATM_Addr.i \
+	ATM_Addr.h \
+	ATM_Addr.i \
         Acceptor.h \
         Acceptor.i \
         Activation_Queue.h \
@@ -478,17 +467,6 @@ pkginclude_HEADERS = \
         CORBA_Ref.h \
         CORBA_Ref.i \
         CORBA_macros.h \
-        Cache_Map_Manager_T.h \
-        Cache_Map_Manager_T.i \
-        Cached_Connect_Strategy_T.h \
-        Cached_Connect_Strategy_T.i \
-        Caching_Strategies_T.h \
-        Caching_Strategies_T.i \
-        Caching_Utility_T.h \
-        Caching_Utility_T.i \
-        Cleanup_Strategies_T.h \
-        Cleanup_Strategies_T.i \
-        Codeset_IBM1047.h \
         Connector.h \
         Connector.i \
         Containers.h \
@@ -539,8 +517,6 @@ pkginclude_HEADERS = \
         FILE_IO.h \
         FILE_IO.i \
         Filecache.h \
-        FlReactor.h \
-        FlReactor.i \
         Free_List.h \
         Free_List.i \
         Functor.h \
@@ -548,14 +524,10 @@ pkginclude_HEADERS = \
         Functor_T.h \
         Functor_T.i \
         Future.h \
-        Future_Node.h \
-        Future_Set.h \
         Get_Opt.h \
         Get_Opt.i \
         Handle_Set.h \
         Handle_Set.i \
-        Hash_Cache_Map_Manager_T.h \
-        Hash_Cache_Map_Manager_T.i \
         Hash_Map_Manager.h \
         Hash_Map_Manager.i \
         Hash_Map_Manager_T.h \
@@ -804,7 +776,6 @@ pkginclude_HEADERS = \
         Timer_Queue_T.i \
         Timer_Wheel.h \
         Timer_Wheel_T.h \
-        TkReactor.h \
         Token.h \
         Token.i \
         Token_Collection.h \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
deleted file mode 100644
index 1f40409661a..00000000000
--- a/ace/Makefile.bor
+++ /dev/null
@@ -1,195 +0,0 @@
-
-#
-# Makefile for building the ACE library with Borland C++Builder 4.x
-#
-
-NAME = ace
-
-OBJFILES = \
-	$(OBJDIR)\ACE.obj \
-	$(OBJDIR)\ARGV.obj \
-	$(OBJDIR)\ATM_Addr.obj \
-	$(OBJDIR)\Acceptor.obj \
-	$(OBJDIR)\Activation_Queue.obj \
-	$(OBJDIR)\Active_Map_Manager.obj \
-	$(OBJDIR)\Addr.obj \
-	$(OBJDIR)\Arg_Shifter.obj \
-	$(OBJDIR)\Asynch_Acceptor.obj \
-	$(OBJDIR)\Asynch_IO.obj \
-	$(OBJDIR)\Asynch_IO_Impl.obj \
-	$(OBJDIR)\Auto_Ptr.obj \
-	$(OBJDIR)\Based_Pointer_Repository.obj \
-	$(OBJDIR)\Basic_Types.obj \
-	$(OBJDIR)\CDR_Stream.obj \
-	$(OBJDIR)\CORBA_Handler.obj \
-	$(OBJDIR)\CORBA_Ref.obj \
-	$(OBJDIR)\Codeset_IBM1047.obj \
-	$(OBJDIR)\Connector.obj \
-	$(OBJDIR)\Containers.obj \
-	$(OBJDIR)\DEV.obj \
-	$(OBJDIR)\DEV_Addr.obj \
-	$(OBJDIR)\DEV_Connector.obj \
-	$(OBJDIR)\DEV_IO.obj \
-	$(OBJDIR)\DLL.obj \
-	$(OBJDIR)\Date_Time.obj \
-	$(OBJDIR)\Dirent.obj \
-	$(OBJDIR)\Dump.obj \
-	$(OBJDIR)\Dynamic.obj \
-	$(OBJDIR)\Dynamic_Service.obj \
-	$(OBJDIR)\Event_Handler.obj \
-	$(OBJDIR)\FIFO.obj \
-	$(OBJDIR)\FIFO_Recv.obj \
-	$(OBJDIR)\FIFO_Recv_Msg.obj \
-	$(OBJDIR)\FIFO_Send.obj \
-	$(OBJDIR)\FIFO_Send_Msg.obj \
-	$(OBJDIR)\FILE.obj \
-	$(OBJDIR)\FILE_Addr.obj \
-	$(OBJDIR)\FILE_Connector.obj \
-	$(OBJDIR)\FILE_IO.obj \
-	$(OBJDIR)\Filecache.obj \
-	$(OBJDIR)\FlReactor.obj \
-	$(OBJDIR)\Free_List.obj \
-	$(OBJDIR)\Functor.obj \
-	$(OBJDIR)\Future.obj \
-	$(OBJDIR)\Get_Opt.obj \
-	$(OBJDIR)\Handle_Set.obj \
-	$(OBJDIR)\Hash_Map_Manager.obj \
-	$(OBJDIR)\High_Res_Timer.obj \
-	$(OBJDIR)\INET_Addr.obj \
-	$(OBJDIR)\IOStream.obj \
-	$(OBJDIR)\IO_Cntl_Msg.obj \
-	$(OBJDIR)\IO_SAP.obj \
-	$(OBJDIR)\IPC_SAP.obj \
-	$(OBJDIR)\LOCK_SOCK_Acceptor.obj \
-	$(OBJDIR)\LSOCK.obj \
-	$(OBJDIR)\LSOCK_Acceptor.obj \
-	$(OBJDIR)\LSOCK_CODgram.obj \
-	$(OBJDIR)\LSOCK_Connector.obj \
-	$(OBJDIR)\LSOCK_Dgram.obj \
-	$(OBJDIR)\LSOCK_Stream.obj \
-	$(OBJDIR)\Local_Name_Space.obj \
-	$(OBJDIR)\Local_Tokens.obj \
-	$(OBJDIR)\Log_Msg.obj \
-	$(OBJDIR)\Log_Record.obj \
-	$(OBJDIR)\Malloc.obj \
-	$(OBJDIR)\Managed_Object.obj \
-	$(OBJDIR)\Map.obj \
-	$(OBJDIR)\Map_Manager.obj \
-	$(OBJDIR)\Mem_Map.obj \
-	$(OBJDIR)\Memory_Pool.obj \
-	$(OBJDIR)\Message_Block.obj \
-	$(OBJDIR)\Message_Queue.obj \
-	$(OBJDIR)\Method_Request.obj \
-	$(OBJDIR)\Module.obj \
-	$(OBJDIR)\Msg_WFMO_Reactor.obj \
-	$(OBJDIR)\Multiplexor.obj \
-	$(OBJDIR)\NT_Service.obj \
-	$(OBJDIR)\Name_Proxy.obj \
-	$(OBJDIR)\Name_Request_Reply.obj \
-	$(OBJDIR)\Name_Space.obj \
-	$(OBJDIR)\Naming_Context.obj \
-	$(OBJDIR)\OS.obj \
-	$(OBJDIR)\Object_Manager.obj \
-	$(OBJDIR)\Obstack.obj \
-	$(OBJDIR)\POSIX_Asynch_IO.obj \
-	$(OBJDIR)\POSIX_Proactor.obj \
-	$(OBJDIR)\Pair.obj \
-	$(OBJDIR)\Parse_Node.obj \
-	$(OBJDIR)\Pipe.obj \
-	$(OBJDIR)\Priority_Reactor.obj \
-	$(OBJDIR)\Proactor.obj \
-	$(OBJDIR)\Process.obj \
-	$(OBJDIR)\Process_Manager.obj \
-	$(OBJDIR)\Profile_Timer.obj \
-	$(OBJDIR)\RB_Tree.obj \
-	$(OBJDIR)\Reactor.obj \
-	$(OBJDIR)\Read_Buffer.obj \
-	$(OBJDIR)\Registry.obj \
-	$(OBJDIR)\Registry_Name_Space.obj \
-	$(OBJDIR)\Remote_Name_Space.obj \
-	$(OBJDIR)\Remote_Tokens.obj \
-	$(OBJDIR)\SOCK.obj \
-	$(OBJDIR)\SOCK_Acceptor.obj \
-	$(OBJDIR)\SOCK_CODgram.obj \
-	$(OBJDIR)\SOCK_Connector.obj \
-	$(OBJDIR)\SOCK_Dgram.obj \
-	$(OBJDIR)\SOCK_Dgram_Bcast.obj \
-	$(OBJDIR)\SOCK_Dgram_Mcast.obj \
-	$(OBJDIR)\SOCK_IO.obj \
-	$(OBJDIR)\SOCK_Stream.obj \
-	$(OBJDIR)\SPIPE.obj \
-	$(OBJDIR)\SPIPE_Acceptor.obj \
-	$(OBJDIR)\SPIPE_Addr.obj \
-	$(OBJDIR)\SPIPE_Connector.obj \
-	$(OBJDIR)\SPIPE_Stream.obj \
-	$(OBJDIR)\SString.obj \
-	$(OBJDIR)\SV_Message.obj \
-	$(OBJDIR)\SV_Message_Queue.obj \
-	$(OBJDIR)\SV_Semaphore_Complex.obj \
-	$(OBJDIR)\SV_Semaphore_Simple.obj \
-	$(OBJDIR)\SV_Shared_Memory.obj \
-	$(OBJDIR)\Sched_Params.obj \
-	$(OBJDIR)\Select_Reactor.obj \
-	$(OBJDIR)\Select_Reactor_Base.obj \
-	$(OBJDIR)\Service_Config.obj \
-	$(OBJDIR)\Service_Manager.obj \
-	$(OBJDIR)\Service_Object.obj \
-	$(OBJDIR)\Service_Repository.obj \
-	$(OBJDIR)\Service_Types.obj \
-	$(OBJDIR)\Shared_Memory.obj \
-	$(OBJDIR)\Shared_Memory_MM.obj \
-	$(OBJDIR)\Shared_Memory_SV.obj \
-	$(OBJDIR)\Shared_Object.obj \
-	$(OBJDIR)\Signal.obj \
-	$(OBJDIR)\Singleton.obj \
-	$(OBJDIR)\Stats.obj \
-	$(OBJDIR)\Strategies.obj \
-	$(OBJDIR)\Stream.obj \
-	$(OBJDIR)\Stream_Modules.obj \
-	$(OBJDIR)\Svc_Conf_l.obj \
-	$(OBJDIR)\Svc_Conf_y.obj \
-	$(OBJDIR)\Svc_Handler.obj \
-	$(OBJDIR)\Synch.obj \
-	$(OBJDIR)\Synch_Options.obj \
-	$(OBJDIR)\System_Time.obj \
-	$(OBJDIR)\TLI.obj \
-	$(OBJDIR)\TLI_Acceptor.obj \
-	$(OBJDIR)\TLI_Connector.obj \
-	$(OBJDIR)\TLI_Stream.obj \
-	$(OBJDIR)\TP_Reactor.obj \
-	$(OBJDIR)\TTY_IO.obj \
-	$(OBJDIR)\Task.obj \
-	$(OBJDIR)\Template_Instantiations.obj \
-	$(OBJDIR)\Thread.obj \
-	$(OBJDIR)\Thread_Manager.obj \
-	$(OBJDIR)\Time_Request_Reply.obj \
-	$(OBJDIR)\Timeprobe.obj \
-	$(OBJDIR)\Timer_Hash.obj \
-	$(OBJDIR)\Timer_Heap.obj \
-	$(OBJDIR)\Timer_List.obj \
-	$(OBJDIR)\Timer_Queue.obj \
-	$(OBJDIR)\Timer_Queue_Adapters.obj \
-	$(OBJDIR)\Timer_Wheel.obj \
-	$(OBJDIR)\TkReactor.obj \
-	$(OBJDIR)\Token.obj \
-	$(OBJDIR)\Token_Collection.obj \
-	$(OBJDIR)\Token_Invariants.obj \
-	$(OBJDIR)\Token_Manager.obj \
-	$(OBJDIR)\Token_Request_Reply.obj \
-	$(OBJDIR)\Trace.obj \
-	$(OBJDIR)\Typed_SV_Message.obj \
-	$(OBJDIR)\Typed_SV_Message_Queue.obj \
-	$(OBJDIR)\UNIX_Addr.obj \
-	$(OBJDIR)\UPIPE_Acceptor.obj \
-	$(OBJDIR)\UPIPE_Connector.obj \
-	$(OBJDIR)\UPIPE_Stream.obj \
-	$(OBJDIR)\WFMO_Reactor.obj \
-	$(OBJDIR)\WIN32_Asynch_IO.obj \
-	$(OBJDIR)\WIN32_Proactor.obj \
-	$(OBJDIR)\XtReactor.obj
-
-CFLAGS = $(ACE_CFLAGS)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/ace/Malloc.h b/ace/Malloc.h
index bcbc452aecf..57e240da004 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -34,10 +34,6 @@
 #define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple
 #endif /* ACE_HAS_THREADS */
 
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-#include "ace/Based_Pointer_T.h"
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
-
 typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT;
 
 struct ACE_Export ACE_Malloc_Stats
@@ -61,7 +57,6 @@ struct ACE_Export ACE_Malloc_Stats
 #define AMS(X)
 #endif /* ACE_HAS_MALLOC_STATS */
 
-#if !defined (ACE_MALLOC_ALIGN)
 // ACE_MALLOC_ALIGN allows you to insure that allocated regions are at
 // least <ACE_MALLOC_ALIGN> bytes long.  It is especially useful when
 // you want areas to be at least a page long, or 32K long, or
@@ -76,28 +71,19 @@ struct ACE_Export ACE_Malloc_Stats
 // use a signed integer number of bytes you want.  For example:
 // #define ACE_MALLOC_ALIGN ((int)4096)
 
+#if !defined (ACE_MALLOC_ALIGN)
 #define ACE_MALLOC_ALIGN ((int)(sizeof (long)))
 #endif /* ACE_MALLOC_ALIGN */
 
 union ACE_Export ACE_Malloc_Header
 {
-  // = TITLE
-  //   We use a union to force alignment to the most restrictive type.
+  // TITLE
+  //    This is a block header.
 
-  class ACE_Malloc_Control_Block
+  struct ACE_Malloc_Control_Block
   {
-    // = TITLE
-    //    This is the control block header.  It's used by <ACE_Malloc>
-    //    to keep track of each chunk of data when it's in the free
-    //    list or in use.
-  public:
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-    ACE_Based_Pointer<ACE_Malloc_Header> next_block_;
-    // Points to next block if on free list.
-#else 
     ACE_Malloc_Header *next_block_;
     // Points to next block if on free list.
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
 
     size_t size_;
     // Size of this block.
diff --git a/ace/Malloc.i b/ace/Malloc.i
index 32b903bcf3e..a257f7bc28b 100644
--- a/ace/Malloc.i
+++ b/ace/Malloc.i
@@ -20,7 +20,7 @@ ACE_INLINE void *
 ACE_New_Allocator::calloc (size_t nbytes,
                            char initial_value)
 {
-  char *ptr = 0;
+  char *ptr;
 
   ACE_NEW_RETURN (ptr, char[nbytes], 0);
 
@@ -144,8 +144,11 @@ ACE_INLINE void
 ACE_Static_Allocator_Base::free (void *ptr)
 {
   // Check to see if ptr is within our pool?!
+#if defined (ACE_NDEBUG)
   ACE_UNUSED_ARG (ptr);
+#else
   ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_);
+#endif /* ACE_NDEBUG */
 }
 
 ACE_INLINE int
@@ -229,3 +232,4 @@ ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer,
     offset_ (0)
 {
 }
+
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 50818cf70a9..a975f02fdd2 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -141,10 +141,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
                                      rounded_bytes,
                                      first_time);
   if (this->cb_ptr_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT (" (%P|%t) %p\n"),
-                       ASYS_TEXT ("init_acquire failed")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT (" (%P|%t) %p\n"),  ASYS_TEXT ("init_acquire failed")), -1);
   else if (first_time)
     {
       // ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) first time in, control block = %u\n"), this->cb_ptr_));
@@ -183,7 +180,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void)
 #else
           p->s_.size_ = (rounded_bytes - sizeof *this->cb_ptr_)
             / sizeof (ACE_Malloc_Header);
-#endif /* (__hpux) && defined (__LP64__) */
+#endif
 
           AMS (++this->cb_ptr_->malloc_stats_.nchunks_);
           AMS (++this->cb_ptr_->malloc_stats_.nblocks_);
@@ -204,10 +201,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name)
                                                ACE_DIRECTORY_SEPARATOR_CHAR))
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc");
-  if (this->open () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p"),
-                ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc")));
+  this->open ();
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
@@ -219,10 +213,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name,
                                                        ACE_DIRECTORY_SEPARATOR_CHAR))
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc");
-  if (this->open () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p"),
-                ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc")));
+  this->open ();
 }
 
 #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
@@ -234,10 +225,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (LPCTSTR pool_name,
     lock_ (lock_name)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc");
-  if (this->open () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p"),
-                ASYS_TEXT ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc")));
+  this->open ();
 }
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 
@@ -277,9 +265,6 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
 {
   ACE_TRACE ("ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc");
 
-  if (this->cb_ptr_ == 0)
-    return 0;
-
   // Round up request to a multiple of the ACE_Malloc_Header size.
   size_t nunits =
  (nbytes + sizeof (ACE_Malloc_Header) - 1) / sizeof (ACE_Malloc_Header)
@@ -337,10 +322,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_malloc (size_t nbytes)
               currp = this->cb_ptr_->freep_;
             }
           else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT (" (%P|%t) %p\n"),
-                               ASYS_TEXT ("malloc")),
-                              0);
+            ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT (" (%P|%t) %p\n"),  ASYS_TEXT ("malloc")), 0);
         }
     }
 }
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index b41afe45986..4c49896d923 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -163,10 +163,10 @@ public:
 
   virtual int find (const char *name, void *&pointer);
   // Locate <name> and pass out parameter via pointer.  If found,
-  // return 0, Returns -1 if <name> isn't found.
+  // return 0, Returns -1 if failure occurs.
 
   virtual int find (const char *name);
-  // Returns 0 if the name is in the mapping and -1 if not.
+  // returns 0 if the name is in the mapping. -1, otherwise.
 
   virtual int unbind (const char *name);
   // Unbind (remove) the name from the map.  Don't return the pointer
diff --git a/ace/Malloc_T.i b/ace/Malloc_T.i
index 2e13d231cd0..8db19ce8fc6 100644
--- a/ace/Malloc_T.i
+++ b/ace/Malloc_T.i
@@ -152,42 +152,36 @@ ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags)
   return this->allocator_.protect (addr, len, flags);
 }
 
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE ACE_MEM_POOL &
+template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_MEM_POOL &
 ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::memory_pool (void)
 {
   ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::memory_pool");
   return this->memory_pool_;
 }
 
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (ssize_t len,
-                                            int flags)
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (ssize_t len, int flags)
 {
   ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::sync");
   return this->memory_pool_.sync (len, flags);
 }
 
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (void *addr,
-                                            size_t len,
-                                            int flags)
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::sync (void *addr, size_t len, int flags)
 {
   ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::sync");
   return this->memory_pool_.sync (addr, len, flags);
 }
 
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (ssize_t len,
-                                               int flags)
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (ssize_t len, int flags)
 {
   ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::protect");
   return this->memory_pool_.protect (len, flags);
 }
 
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE int
-ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (void *addr,
-                                               size_t len,
-                                               int flags)
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::protect (void *addr, size_t len, int flags)
 {
   ACE_TRACE ("ACE_Malloc<MEMORY_POOL, ACE_LOCK>::protect");
   return this->memory_pool_.protect (addr, len, flags);
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 7bcec198a04..00b30a0a646 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -84,12 +84,16 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind_i (const EXT_ID &ext_id,
                                             slot);
 
   if (result == 0)
-    // We found the key. Nothing to change.
-    return 1;
+    {
+      // We found the key. Nothing to change.
+      return 1;
+    }
   else
-    // We didn't find the key.
-    return this->shared_bind (ext_id,
-                              int_id);
+    {
+      // We didn't find the key.
+      return this->shared_bind (ext_id,
+                                int_id);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -100,7 +104,9 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (size_t &free_slot)
 
   // Make sure we haven't run out of free slots.
   if (free_slot != this->free_list_id ())
-    return 0;
+    {
+      return 0;
+    }
   else
     {
       // Resize the map.
@@ -108,8 +114,10 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (size_t &free_slot)
 
       // Check for errors.
       if (result == 0)
-        // New free slot.
-        free_slot = this->free_list_.next ();
+        {
+          // New free slot.
+          free_slot = this->free_list_.next ();
+        }
 
       return result;
     }
@@ -125,25 +133,35 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t slot,
   // Grab the entry.
   ENTRY &entry = this->search_structure_[slot];
 
+  //
   // Remove from current list.
+  //
 
   // Fix the entry before us.
   size_t current_list_prev = entry.prev ();
-
   if (current_list_prev == current_list_id)
-    current_list.next (entry.next ());
+    {
+      current_list.next (entry.next ());
+    }
   else
-    this->search_structure_[current_list_prev].next (entry.next ());
+    {
+      this->search_structure_[current_list_prev].next (entry.next ());
+    }
 
   // Fix the entry after us.
   size_t current_list_next = entry.next ();
-
   if (current_list_next == current_list_id)
-    current_list.prev (entry.prev ());
+    {
+      current_list.prev (entry.prev ());
+    }
   else
-    this->search_structure_[current_list_next].prev (entry.prev ());
+    {
+      this->search_structure_[current_list_next].prev (entry.prev ());
+    }
 
+  //
   // Add to new list.
+  //
 
   // Fix us.
   size_t new_list_next = new_list.next ();
@@ -155,9 +173,13 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t slot,
 
   // Fix entry after us.
   if (new_list_next == new_list_id)
-    new_list.prev (slot);
+    {
+      new_list.prev (slot);
+    }
   else
-    this->search_structure_[new_list_next].prev (slot);
+    {
+      this->search_structure_[new_list_next].prev (slot);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -197,6 +219,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
   size_t slot = 0;
   int result = this->find_and_return_index (ext_id,
                                             slot);
+
   if (result == 0)
     {
       // We found it, so make copies of the old entries and rebind
@@ -213,9 +236,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
       return 1;
     }
   else
-    // We didn't find it, so let's add it.
-    return this->shared_bind (ext_id,
-                              int_id);
+    {
+      // We didn't find it, so let's add it.
+      return this->shared_bind (ext_id,
+                                int_id);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -227,6 +252,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
   size_t slot = 0;
   int result = this->find_and_return_index (ext_id,
                                             slot);
+
   if (result == 0)
     {
       // We found it, so make copies of the old entries and rebind
@@ -242,19 +268,23 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
       return 1;
     }
   else
-    // We didn't find it, so let's add it.
-    return this->shared_bind (ext_id,
-                              int_id);
+    {
+      // We didn't find it, so let's add it.
+      return this->shared_bind (ext_id,
+                                int_id);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
                                                      const INT_ID &int_id)
 {
+
   // First try to find the key.
   size_t slot = 0;
   int result = this->find_and_return_index (ext_id,
                                             slot);
+
   if (result == 0)
     {
       // We found it, so rebind current entries.
@@ -268,9 +298,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
       return 1;
     }
   else
-    // We didn't find it, so let's add it.
-    return this->shared_bind (ext_id,
-                              int_id);
+    {
+      // We didn't find it, so let's add it.
+      return this->shared_bind (ext_id,
+                                int_id);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -281,6 +313,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind_i (const EXT_ID &ext_id,
   size_t slot = 0;
   int result = this->find_and_return_index (ext_id,
                                             slot);
+
   if (result == 0)
     {
       // Key was found.  Make a copy of value, but *don't* update
@@ -289,9 +322,11 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind_i (const EXT_ID &ext_id,
       return 1;
     }
   else
-    // We didn't find it, so let's bind it!
-    return this->bind_i (ext_id,
-                         int_id);
+    {
+      // We didn't find it, so let's bind it!
+      return this->bind_i (ext_id,
+                           int_id);
+    }
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
@@ -324,9 +359,12 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_i (const EXT_ID &ext_id,
   size_t slot = 0;
   int result = this->find_and_return_index (ext_id,
                                             slot);
+
   if (result == 0)
-    // Key was found.  Make a copy of value.
-    int_id = this->search_structure_[slot].int_id_;
+    {
+      // Key was found.  Make a copy of value.
+      int_id = this->search_structure_[slot].int_id_;
+    }
 
   return result;
 }
@@ -359,9 +397,12 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_i (const EXT_ID &ext_id,
   size_t slot = 0;
   int result = this->unbind_and_return_index (ext_id,
                                               slot);
+
   if (result == 0)
-    // If found, copy the value.
-    int_id = this->search_structure_[slot].int_id_;
+    {
+      // If found, copy the value.
+      int_id = this->search_structure_[slot].int_id_;
+    }
 
   return result;
 }
@@ -381,22 +422,26 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (size_t new_size)
   for (i = this->occupied_list_.next ();
        i != this->occupied_list_id ();
        i = this->search_structure_[i].next ())
-    // Call the copy constructor using operator placement new.
-    new (&(temp[i])) ENTRY (this->search_structure_[i]);
+    {
+      // Copy constructor.
+      new (&(temp[i])) ENTRY (this->search_structure_[i]);
+    }
 
   // Copy over the free entires.
   for (i = this->free_list_.next ();
        i != this->free_list_id ();
        i = this->search_structure_[i].next ())
-    // Call the copy constructor using operator placement new.
-    new (&(temp[i])) ENTRY (this->search_structure_[i]);
+    {
+      // Copy constructor.
+      new (&(temp[i])) ENTRY (this->search_structure_[i]);
+    }
 
   // Construct the new elements.
   for (i = this->total_size_; i < new_size; i++)
     {
-      // Call the constructor for each element in the array using
-      // operator placement new.  Note that this requires a default
-      // constructor for <EXT_ID> and <INT_ID>.
+      // Call the constructor for each element in the array.  Note
+      // that this requires a default constructor for <EXT_ID> and
+      // <INT_ID>.
       new (&(temp[i])) ENTRY;
       temp[i].next (i + 1);
       temp[i].prev (i - 1);
@@ -425,11 +470,15 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void)
   size_t current_size = this->total_size_;
 
   if (current_size < MAX_EXPONENTIAL)
-    // Exponentially increase if we haven't reached MAX_EXPONENTIAL.
-    current_size *= 2;
+    {
+      // Exponentially increase if we haven't reached MAX_EXPONENTIAL.
+      current_size *= 2;
+    }
   else
-    // Linear increase if we have reached MAX_EXPONENTIAL.
-    current_size += LINEAR_INCREASE;
+    {
+      // Linear increase if we have reached MAX_EXPONENTIAL.
+      current_size += LINEAR_INCREASE;
+    }
 
   // This should be the new size.
   return current_size;
@@ -489,8 +538,8 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK>
 ACE_Map_Entry<EXT_ID, INT_ID>&
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
 {
-  // @@ This function should be inlined.  We moved it here to avoid a
-  // compiler bug in SunCC 4.2.  Once we know the correct patch to fix
+  // @@ This function should be inlined.  We moved it here to avoid
+  // a compiler bug in SunCC 4.2.  Once we know the correct patch to fix
   // the compiler problem, it should be moved back to .i file again.
   ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
 
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 0925d3c6dd7..3a1969b7707 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -34,26 +34,28 @@ class ACE_Map_Entry
   // = TITLE
   //     An entry in the Map.
 public:
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
-  ~ACE_Map_Entry (void);
-  // We need this destructor to keep some compilers from complaining.
-  // It's just a no-op, however.
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
-
   EXT_ID ext_id_;
   // Key used to look up an entry.
 
   INT_ID int_id_;
   // The contents of the entry itself.
 
+# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
+  ~ACE_Map_Entry (void);
+  // We need this destructor to keep some compilers from complaining.
+  // It's just a no-op, however.
+# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
+
   void dump (void) const;
   // Dump the state of an object.
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
+  //
   // = These are really private, but unfortunately template friends
-  // are not portable.
+  // don't work too well.
+  //
 
   size_t next (void) const;
   void next (size_t n);
@@ -200,10 +202,10 @@ public:
   // in case the caller needs to deallocate memory.  Returns 0 if
   // successful, else -1.
 
-  size_t current_size (void) const;
+  size_t current_size (void);
   // Return the current size of the map.
 
-  size_t total_size (void) const;
+  size_t total_size (void);
   // Return the total size of the map.
 
   ACE_LOCK &mutex (void);
diff --git a/ace/Map_Manager.i b/ace/Map_Manager.i
index 34d3fe254c8..d837cbd06b1 100644
--- a/ace/Map_Manager.i
+++ b/ace/Map_Manager.i
@@ -173,16 +173,18 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void)
 {
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, ACE_const_cast (ACE_LOCK &, this->lock_), ACE_static_cast (size_t, -1));
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_,
+                          ACE_static_cast(size_t, -1));
   return this->cur_size_;
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void) const
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void)
 {
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, ACE_const_cast (ACE_LOCK &, this->lock_), ACE_static_cast (size_t, -1));
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_,
+                          ACE_static_cast (size_t, -1));
   return this->total_size_;
 }
 
diff --git a/ace/Map_T.h b/ace/Map_T.h
index 2b9e2594a72..fe1c9926fdb 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -10,7 +10,7 @@
 //    Map_T.h
 //
 // = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
+//    Irfan Pyarali
 //
 // ============================================================================
 
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Noop_Key_Generator
 {
@@ -38,6 +40,8 @@ public:
   // Functor method: generates a new key.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Incremental_Key_Generator
 {
@@ -71,6 +75,8 @@ protected:
   // Current value.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Iterator_Impl
 {
@@ -100,6 +106,8 @@ public:
   // Reverse.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Reverse_Iterator_Impl
 {
@@ -129,6 +137,8 @@ public:
   // Reverse.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Iterator
 {
@@ -183,6 +193,8 @@ protected:
   // Implementation pointer.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T>
 class ACE_Reverse_Iterator
 {
@@ -237,6 +249,8 @@ protected:
   // Implementation pointer.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE>
 class ACE_Map
 {
@@ -248,20 +262,13 @@ class ACE_Map
 public:
 
   // = Traits.
-  typedef KEY 
-          key_type;
-  typedef VALUE 
-          mapped_type;
-  typedef ACE_Reference_Pair<const KEY, VALUE> 
-          value_type;
-  typedef ACE_Iterator<value_type> 
-          iterator;
-  typedef ACE_Reverse_Iterator<value_type> 
-          reverse_iterator;
-  typedef ACE_Iterator_Impl<value_type> 
-          iterator_implementation; 
-  typedef ACE_Reverse_Iterator_Impl<value_type> 
-          reverse_iterator_implementation; 
+  typedef KEY key_type;
+  typedef VALUE mapped_type;
+  typedef ACE_Reference_Pair<const KEY, VALUE> value_type;
+  typedef ACE_Iterator<value_type> iterator;
+  typedef ACE_Reverse_Iterator<value_type> reverse_iterator;
+  typedef ACE_Iterator_Impl<value_type> iterator_implementation;
+  typedef ACE_Reverse_Iterator_Impl<value_type> reverse_iterator_implementation;
 
   virtual ~ACE_Map (void);
   // Close down and release dynamically allocated resources.
@@ -362,10 +369,10 @@ public:
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
 
-  virtual size_t current_size (void) const = 0;
+  virtual size_t current_size (void) = 0;
   // Return the current size of the map.
 
-  virtual size_t total_size (void) const = 0;
+  virtual size_t total_size (void) = 0;
   // Return the total size of the map.
 
   virtual void dump (void) const = 0;
@@ -401,6 +408,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Map (const ACE_Map<KEY, VALUE> &))
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class IMPLEMENTATION, class ENTRY>
 class ACE_Map_Impl_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
@@ -412,8 +421,7 @@ class ACE_Map_Impl_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef IMPLEMENTATION 
-          implementation;
+  typedef IMPLEMENTATION implementation;
 
   ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl);
   // Constructor.
@@ -445,6 +453,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class IMPLEMENTATION, class ENTRY>
 class ACE_Map_Impl_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
@@ -489,6 +499,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY>
 class ACE_Map_Impl : public ACE_Map<KEY, VALUE>
 {
@@ -500,13 +512,9 @@ class ACE_Map_Impl : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Map_Impl_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, ITERATOR, ENTRY>
-          iterator_impl;
-  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, REVERSE_ITERATOR, ENTRY>
-          reverse_iterator_impl;
-
-  typedef IMPLEMENTATION 
-          implementation;
+  typedef ACE_Map_Impl_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, ITERATOR, ENTRY> iterator_impl;
+  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, REVERSE_ITERATOR, ENTRY> reverse_iterator_impl;
+  typedef IMPLEMENTATION implementation;
 
   // = Initialization and termination methods.
   ACE_Map_Impl (ACE_Allocator *alloc = 0);
@@ -616,10 +624,10 @@ public:
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
 
-  virtual size_t current_size (void) const;
+  virtual size_t current_size (void);
   // Return the current size of the map.
 
-  virtual size_t total_size (void) const;
+  virtual size_t total_size (void);
   // Return the total size of the map.
 
   virtual void dump (void) const;
@@ -650,6 +658,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Map_Impl (const ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY> &))
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class VALUE>
 class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
@@ -661,8 +671,7 @@ class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator implementation;
 
   ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -694,6 +703,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class VALUE>
 class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
@@ -705,8 +716,7 @@ class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Itera
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator implementation;
 
   ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -738,6 +748,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class KEY_ADAPTER>
 class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 {
@@ -749,14 +761,10 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Pair<KEY, VALUE> 
-          expanded_value;
-  typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> 
-          iterator_impl;
-  typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> 
-          reverse_iterator_impl;
-  typedef ACE_Active_Map_Manager<expanded_value> 
-          implementation;
+  typedef ACE_Pair<KEY, VALUE> expanded_value;
+  typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> iterator_impl;
+  typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> reverse_iterator_impl;
+  typedef ACE_Active_Map_Manager<expanded_value> implementation;
 
   // = Initialization and termination methods.
   ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
@@ -866,10 +874,10 @@ public:
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
 
-  virtual size_t current_size (void) const;
+  virtual size_t current_size (void);
   // Return the current size of the map.
 
-  virtual size_t total_size (void) const;
+  virtual size_t total_size (void);
   // Return the total size of the map.
 
   virtual void dump (void) const;
@@ -914,6 +922,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager_Adapter (const ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER> &))
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
 class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
@@ -925,8 +935,7 @@ class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator implementation;
 
   ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -958,6 +967,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
 class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
@@ -969,8 +980,7 @@ class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iter
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator implementation;
 
   ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -1002,6 +1012,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR>
 class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map<KEY, VALUE>
 {
@@ -1013,12 +1025,9 @@ class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> 
-          iterator_impl;
-  typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> 
-          reverse_iterator_impl;
-  typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> 
-          implementation;
+  typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> iterator_impl;
+  typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> reverse_iterator_impl;
+  typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation;
 
   // = Initialization and termination methods.
   ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0);
@@ -1128,10 +1137,10 @@ public:
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
 
-  virtual size_t current_size (void) const;
+  virtual size_t current_size (void);
   // Return the current size of the map.
 
-  virtual size_t total_size (void) const;
+  virtual size_t total_size (void);
   // Return the total size of the map.
 
   virtual void dump (void) const;
@@ -1168,6 +1177,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Hash_Map_Manager_Ex_Adapter (const ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR> &))
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE>
 class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
@@ -1179,8 +1190,7 @@ class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator implementation;
 
   ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -1212,6 +1222,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE>
 class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
@@ -1223,8 +1235,7 @@ class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Imp
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator 
-          implementation;
+  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator implementation;
 
   ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
   // Constructor.
@@ -1256,6 +1267,8 @@ protected:
   // All implementation details are forwarded to this class.
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class KEY_GENERATOR>
 class ACE_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 {
@@ -1267,12 +1280,9 @@ class ACE_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> 
-          iterator_impl;
-  typedef ACE_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> 
-          reverse_iterator_impl;
-  typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> 
-          implementation;
+  typedef ACE_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> iterator_impl;
+  typedef ACE_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> reverse_iterator_impl;
+  typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> implementation;
 
   // = Initialization and termination methods.
   ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0);
@@ -1382,10 +1392,10 @@ public:
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
 
-  virtual size_t current_size (void) const;
+  virtual size_t current_size (void);
   // Return the current size of the map.
 
-  virtual size_t total_size (void) const;
+  virtual size_t total_size (void);
   // Return the total size of the map.
 
   virtual void dump (void) const;
@@ -1422,6 +1432,8 @@ private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Map_Manager_Adapter (const ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR> &))
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 #if defined (__ACE_INLINE__)
 #include "ace/Map_T.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Map_T.i b/ace/Map_T.i
index 08899ad7a63..ed64cf6d6a7 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.i
@@ -1,11 +1,15 @@
 // $Id$
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE int
 ACE_Noop_Key_Generator<T>::operator() (T &)
 {
   return -1;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE
 ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator (void)
   : t_ (0)
@@ -25,16 +29,22 @@ ACE_Incremental_Key_Generator<T>::current_value (void)
   return this->t_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE
 ACE_Iterator_Impl<T>::~ACE_Iterator_Impl (void)
 {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE
 ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl (void)
 {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE
 ACE_Iterator<T>::ACE_Iterator (ACE_Iterator_Impl<T> *impl)
   : implementation_ (impl)
@@ -115,6 +125,8 @@ ACE_Iterator<T>::impl (void)
   return *this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T> ACE_INLINE
 ACE_Reverse_Iterator<T>::ACE_Reverse_Iterator (ACE_Reverse_Iterator_Impl<T> *impl)
   : implementation_ (impl)
@@ -195,6 +207,8 @@ ACE_Reverse_Iterator<T>::impl (void)
   return *this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE> ACE_INLINE
 ACE_Map<KEY, VALUE>::ACE_Map (void)
 {
@@ -229,6 +243,8 @@ ACE_Map<KEY, VALUE>::rend (void)
   return reverse_iterator (this->rend_impl ());
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE
 ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl)
   : implementation_ (impl)
@@ -282,6 +298,8 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE
 ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Reverse_Iterator_Adapter (const IMPLEMENTATION &impl)
   : implementation_ (impl)
@@ -335,6 +353,8 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ACE_Map_Impl (ACE_Allocator *alloc)
   : implementation_ (alloc)
@@ -473,13 +493,13 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unb
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void) const
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void) const
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
@@ -520,6 +540,8 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::imp
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class VALUE> ACE_INLINE
 ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -574,6 +596,8 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class VALUE> ACE_INLINE
 ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -628,6 +652,8 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
@@ -927,13 +953,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void) const
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) const
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
@@ -980,6 +1006,8 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter (void)
   return this->key_adapter_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE
 ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -1034,6 +1062,8 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>:
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE
 ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -1088,6 +1118,8 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
@@ -1237,13 +1269,13 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void) const
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void) const
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
@@ -1290,6 +1322,8 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
   return this->key_generator_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE> ACE_INLINE
 ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -1344,6 +1378,8 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class T, class KEY, class VALUE> ACE_INLINE
 ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl)
   : implementation_ (impl)
@@ -1398,6 +1434,8 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl (void)
   return this->implementation_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::ACE_Map_Manager_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
@@ -1547,13 +1585,13 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key,
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void) const
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) const
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
@@ -1599,3 +1637,5 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator (void)
 {
   return this->key_generator_;
 }
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 1d07027de11..b8a3567fa6d 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -10,10 +10,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-#include "ace/Based_Pointer_T.h"
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
-
 ACE_RCSID(ace, Memory_Pool, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool)
@@ -37,17 +33,16 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes,
   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);
+  ACE_Auto_Basic_Array_Ptr<char> cp (new char[rounded_bytes]);
 
-  if (this->allocated_chunks_.insert (cp.get ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) insertion into set failed\n")),
-                      0);
+  if (cp.get () == 0)
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) new failed \n")), 0);
+  else
+    {
+      int result = this->allocated_chunks_.insert (cp.get ());
+      if (result != 0)
+        ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) insertion into set failed\n")), 0);
+    }
 
   return cp.release ();
 }
@@ -61,7 +56,9 @@ ACE_Local_Memory_Pool::release (void)
   for (ACE_Unbounded_Set<char *>::iterator i = this->allocated_chunks_.begin ();
        i != this->allocated_chunks_.end ();
        ++i)
-    delete [] *i;
+    {
+      delete[] *i;
+    }
 
   return 0;
 }
@@ -78,12 +75,6 @@ int
 ACE_MMAP_Memory_Pool::release (void)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::release");
-
-#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-  ACE_POSITION_INDEPENDENT_REPOSITORY::instance ()->unbind (this->mmap_.addr (),
-                                                     this->mmap_.size ());
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
-
   this->mmap_.remove ();
   return 0;
 }
@@ -184,21 +175,20 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (LPCTSTR backing_store_name,
 
 #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_));
+    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
+// Compute the new file_offset 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)
+                                                 off_t &file_offset)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::commit_backing_store_name");
 
 #if defined (CHORUS)
-  map_size = rounded_bytes;
+  file_offset = rounded_bytes;
 #else
   size_t seek_len;
 
@@ -218,9 +208,9 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
        cur_block < rounded_bytes;
        cur_block += seek_len)
     {
-      map_size = ACE_OS::lseek (this->mmap_.handle () , seek_len - 1, SEEK_END);
+      file_offset = ACE_OS::lseek (this->mmap_.handle () , seek_len - 1, SEEK_END);
 
-      if (map_size == -1 || ACE_OS::write (this->mmap_.handle (), "", 1) == -1)
+      if (file_offset == -1 || ACE_OS::write (this->mmap_.handle (), "", 1) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ASYS_TEXT ("(%P|%t) %p\n"),
                            this->backing_store_name_),
@@ -228,15 +218,15 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
     }
 
   // Increment by one to put us at the beginning of the next chunk...
-  map_size++;
+  file_offset++;
 #endif /* CHORUS */
   return 0;
 }
 
-// Memory map the file up to <map_size> bytes.
+// Memory map the file up to <file_offset> bytes.
 
 int
-ACE_MMAP_Memory_Pool::map_file (off_t map_size)
+ACE_MMAP_Memory_Pool::map_file (off_t file_offset)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::map_file");
 
@@ -244,32 +234,16 @@ ACE_MMAP_Memory_Pool::map_file (off_t map_size)
   this->mmap_.unmap ();
 
   // Remap the file.
-  if (this->mmap_.map (map_size,
-                       PROT_RDWR,
-                       this->flags_,
-                       this->base_addr_,
-                       0,
-                       this->sa_) == -1
+  if (this->mmap_.map (file_offset, PROT_RDWR,
+                       this->flags_, this->base_addr_, 0, this->sa_) == -1
       || this->base_addr_ != 0 && this->mmap_.addr () != this->base_addr_)
-    {
-#if 0
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_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 defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
-      ACE_POSITION_INDEPENDENT_REPOSITORY::instance ()->bind (this->base_addr_,
-                                                       map_size);
-#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
-      return 0;
-    }
+    return -1;
+  // ACE_ERROR_RETURN ((LM_ERROR,
+  //                   ASYS_TEXT ("(%P|%t) addr = %u, base_addr = %u, file_offset = %u, %p\n"),
+  //                   this->mmap_.addr (), this->base_addr_,
+  //                   file_offset, this->backing_store_name_), -1);
+
+  return 0;
 }
 
 // Ask operating system for more shared memory, increasing the mapping
@@ -286,17 +260,18 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes,
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes =
   // %d, rounded_bytes = %d\n", nbytes, rounded_bytes));
 
-  off_t map_size;
+  off_t file_offset;
 
   if (this->commit_backing_store_name (rounded_bytes,
-                                       map_size) == -1)
+                                       file_offset) == -1)
     return 0;
-  else if (this->map_file (map_size) == -1)
+
+  if (this->map_file (file_offset) == -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));
+  // rounded_bytes = %d, file_offset = %d\n", nbytes, rounded_bytes,
+  // file_offset));
 
   return (void *) ((char *) this->mmap_.addr () + (this->mmap_.size () - rounded_bytes));
 }
@@ -340,18 +315,12 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes,
                            this->base_addr_,
                            0,
                            this->sa_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("open")),
-                          0);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("open")), 0);
 
       return this->mmap_.addr ();
     }
   else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("open")),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("open")), 0);
 }
 
 int
@@ -359,15 +328,15 @@ ACE_MMAP_Memory_Pool::remap (void *addr)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::remap");
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("Remapping with fault address at: %X\n"), addr));
-  off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ());
+  off_t current_file_offset = 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)
+  if (!(addr < (void *) ((char *) this->mmap_.addr () + current_file_offset)
         && addr >= this->mmap_.addr ()))
     return -1;
 
   // Extend the mapping to cover the size of the backing store.
-  return this->map_file (current_map_size);
+  return this->map_file (current_file_offset);
 }
 
 ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (void *base_addr,
@@ -388,9 +357,9 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (void *base_addr,
   ACE_TRACE ("ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options");
 // 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__) */
+long temp = ACE_DEFAULT_BASE_ADDRL;
+base_addr_ = (void *)temp;
+#endif
 }
 
 // Handle SIGSEGV and SIGBUS signals to remap memory properly.  When a
@@ -411,7 +380,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
   else
     ; // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) received %S\n"), signum));
 
-  // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size));
+  // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_file_offset));
 
 #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)
   // Make sure that the pointer causing the problem is within the
@@ -438,16 +407,16 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
   if (guess_on_fault_)
     {
       // check if the current mapping is up to date.
-      off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ());
+      off_t current_file_offset = ACE_OS::filesize (this->mmap_.handle ());
 
-      if (ACE_static_cast(size_t, current_map_size) == this->mmap_.size())
+      if (ACE_static_cast(size_t, current_file_offset) == this->mmap_.size())
 	{
 	  // It is up to date so this is a bad address.
 	  return -1;
 	}
 
       // Extend the mapping to cover the size of the backing store.
-      return this->map_file (current_map_size);
+      return this->map_file (current_file_offset);
     }
   else
     return -1;
@@ -491,10 +460,7 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes,
   void *cp = ACE_OS::sbrk (rounded_bytes);
 
   if (cp == MAP_FAILED)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) cp = %u\n",
-                       cp),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) cp = %u\n", cp), 0);
   else
     // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp));
   return cp;
@@ -519,20 +485,18 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_Pool)
 ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (char *base_addr,
                                                                 size_t max_segments,
                                                                 size_t file_perms,
-                                                                off_t minimum_bytes,
-                                                                size_t segment_size)
+                                                                off_t minimum_bytes)
   : base_addr_ (base_addr),
     max_segments_ (max_segments),
     minimum_bytes_ (minimum_bytes),
-    file_perms_ (file_perms),
-    segment_size_ (segment_size)
+    file_perms_ (file_perms)
 {
   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__) */
+// HP-UX 11, 64-bit bug workaround
+#if defined (__hpux) && defined(__LP64__)
+long temp = ACE_DEFAULT_BASE_ADDRL;
+base_addr_ = (char *)temp;
+#endif
 }
 
 void
@@ -546,8 +510,7 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset,
                                 size_t &counter)
 {
   offset = 0;
-  SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                        this->base_addr_);
+  SHM_TABLE *st = (SHM_TABLE *) this->base_addr_;
   shmid_ds buf;
 
   for (counter = 0;
@@ -555,10 +518,7 @@ ACE_Shared_Memory_Pool::in_use (off_t &offset,
        counter++)
     {
       if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("shmctl")),
-                          -1);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("shmctl")), -1);
       offset += buf.shm_segsz;
       // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
     }
@@ -572,8 +532,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr,
                                   size_t &counter)
 {
   offset = 0;
-  SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                        this->base_addr_);
+  SHM_TABLE *st = (SHM_TABLE *) this->base_addr_;
   shmid_ds buf;
 
   for (counter = 0;
@@ -582,10 +541,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr,
        counter++)
     {
       if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("shmctl")),
-                          -1);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("shmctl")), -1);
       offset += buf.shm_segsz;
 
       // If segment 'counter' starts at a location greater than the
@@ -610,8 +566,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
   ACE_TRACE ("ACE_Shared_Memory_Pool::update");
 
   size_t counter;
-  SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                        this->base_addr_);
+  SHM_TABLE *st = (SHM_TABLE *) this->base_addr_;
 
   if (this->in_use (offset, counter) == -1)
     return -1;
@@ -619,35 +574,24 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
   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);
+                       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,  
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("shmget")),
-                          0);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("shmget")), 0);
+
       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);
+      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),
-                          0);
+        ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, shmem = %u, address = %u\n",
+                           "shmat", shmem, address), 0);
     }
   return 0;
 }
@@ -670,25 +614,19 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
       // ACE_DEBUG ((LM_DEBUG,  ASYS_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,
-                    ASYS_TEXT ("(%P|%t) %p\n"),
-                    ASYS_TEXT ("in_use")));
+        ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_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);
+        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);
+        ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n",
+                           siginfo->si_addr), -1);
 #endif /* ! _UNICOS */
     }
 
@@ -704,24 +642,16 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
 #else /* ! _UNICOS */
   if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1)
 #endif /* ! _UNICOS */
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%P|%t) %p\n"),
-                         ASYS_TEXT ("in_use")),
-                        -1);
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("in_use")), -1);
 
   void *address = (void *) (((char *) this->base_addr_) + offset);
-  SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                        this->base_addr_);
+  SHM_TABLE *st = (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),
-                        0);
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, shmem = %u, address = %u\n",
+                         "shmat", shmem, address), 0);
 
   // NOTE: this won't work if we dont have SIGINFO_T or SI_ADDR
 #else
@@ -736,8 +666,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name,
   : base_addr_ (0),
     file_perms_ (ACE_DEFAULT_FILE_PERMS),
     max_segments_ (ACE_DEFAULT_MAX_SEGMENTS),
-    minimum_bytes_ (0),
-    segment_size_ (ACE_DEFAULT_SEGMENT_SIZE)
+    minimum_bytes_ (0)
 {
   ACE_TRACE ("ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool");
 
@@ -748,7 +677,6 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name,
       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)
@@ -777,9 +705,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (LPCTSTR backing_store_name,
     this->base_shm_key_ = ACE_DEFAULT_SHM_KEY;
 
   if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Sig_Handler::register_handler")));
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Sig_Handler::register_handler")));
 }
 
 // Ask system for more shared memory.
@@ -826,51 +752,35 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
   if (shmid == -1)
     {
       if (errno != EEXIST)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("shmget")),
-                          0);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("shmget")), 0);
+
       first_time = 0;
 
       shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0);
 
       if (shmid == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("shmget")),
-                          0);
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("(%P|%t) %p\n"),  ASYS_TEXT ("shmget")), 0);
 
-      // This implementation doesn't care if we don't get the key we
-      // want...
-      this->base_addr_ = 
-        ACE_OS::shmat (shmid,
-                       (char *) this->base_addr_, 0);
+      // This implementation doesn't care if we don't get the key we want...
+      this->base_addr_ = ACE_OS::shmat (shmid, (char *) this->base_addr_, 0);
 
       if (this->base_addr_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p, base_addr = %u\n",
-                           "shmat",
-                           this->base_addr_),
-                          0);
+        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,
-                       (char *) this->base_addr_, 0);
+      // This implementation doesn't care if we don't get the key we want...
+      this->base_addr_ = ACE_OS::shmat (shmid, (char *) this->base_addr_, 0);
 
       if (this->base_addr_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p, base_addr = %u\n",
-                           "shmat",
-                           this->base_addr_), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p, base_addr = %u\n",
+                           "shmat", this->base_addr_), 0);
+
+      SHM_TABLE *st = (SHM_TABLE *) this->base_addr_;
 
-      SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                            this->base_addr_);
       st[0].key_ = this->base_shm_key_;
       st[0].shmid_ = shmid;
 
@@ -897,8 +807,7 @@ ACE_Shared_Memory_Pool::release (void)
   ACE_TRACE ("ACE_Shared_Memory_Pool::release");
 
   int result = 0;
-  SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
-                                        this->base_addr_);
+  SHM_TABLE *st = (SHM_TABLE *) this->base_addr_;
 
   for (size_t counter = 0;
        counter < this->max_segments_ && st[counter].used_ == 1;
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 78fdd72a966..5be4903deb5 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -34,7 +34,7 @@
 class ACE_Export ACE_Sbrk_Memory_Pool_Options
 {
   // = TITLE
-  //     Helper class for Sbrk Memory Pool constructor options.
+  //     Helper class for constructor options.
   //
   // = DESCRIPTION
   //     This should be a nested class, but that breaks too many
@@ -104,7 +104,7 @@ protected:
 class ACE_Export ACE_Shared_Memory_Pool_Options
 {
   // = TITLE
-  //     Helper class for Shared Memory Pool constructor options.
+  //     Helper class for constructor options.
   //
   // = DESCRIPTION
   //     This should be a nested class, but that breaks too many
@@ -114,8 +114,7 @@ public:
   ACE_Shared_Memory_Pool_Options (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);
+                                  off_t minimum_bytes = 0);
 
   char *base_addr_;
   // Base address of the memory-mapped backing store.
@@ -128,9 +127,6 @@ public:
 
   size_t file_perms_;
   // File permissions to use when creating/opening a segment.
-
-  size_t segment_size_;
-  // Shared memory segment size.
 };
 
 class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
@@ -224,9 +220,6 @@ protected:
   off_t minimum_bytes_;
   // What the minimim bytes of the initial segment should be.
 
-  size_t segment_size_;
-  // Shared memory segment size.
-
   key_t base_shm_key_;
   // Base shared memory key for the segment.
 
@@ -251,7 +244,7 @@ protected:
 class ACE_Export ACE_Local_Memory_Pool_Options
 {
   // = TITLE
-  //     Helper class for Local Memory Pool constructor options.
+  //     Helper class for constructor options.
   //
   // = DESCRIPTION
   //     This should be a nested class, but that breaks too many
@@ -323,7 +316,7 @@ protected:
 class ACE_Export ACE_MMAP_Memory_Pool_Options
 {
   // = TITLE
-  //     Helper class for MMAP Memory Pool constructor options.
+  //     Helper class for constructor options.
   //
   // = DESCRIPTION
   //     This should be a nested class, but that breaks too many
@@ -433,13 +426,12 @@ protected:
 
   virtual size_t round_up (size_t nbytes);
 
-  virtual int commit_backing_store_name (size_t rounded_bytes,
-                                         off_t &map_size);
-  // Compute the new <map_size> of the backing store and commit the
+  virtual int commit_backing_store_name (size_t rounded_bytes, off_t &file_offset);
+  // Compute the new file_offset of the backing store and commit the
   // memory.
 
-  virtual int map_file (off_t map_size);
-  // Memory map the file up to <map_size> bytes.
+  virtual int map_file (off_t file_offset);
+  // Memory map the file up to <file_offset> bytes.
 
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
   // Handle SIGSEGV and SIGBUS signals to remap shared memory
diff --git a/ace/Memory_Pool.i b/ace/Memory_Pool.i
index d18ccb7afdd..a3a8667c6a4 100644
--- a/ace/Memory_Pool.i
+++ b/ace/Memory_Pool.i
@@ -89,8 +89,8 @@ 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_;
+  if (nbytes < ACE_DEFAULT_SEGMENT_SIZE)
+    nbytes = ACE_DEFAULT_SEGMENT_SIZE;
 
   return ACE::round_to_pagesize (nbytes);
 }
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index e77eef128ba..67e76992def 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -756,7 +756,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
   if (result < 0)
     return result;
 
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING) 
       && this->pending_head_
       && this->pending_tail_)
     {
@@ -783,7 +783,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->pending_tail_ = 0;
     }
 
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE) 
       && this->late_head_
       && this->late_tail_)
     {
@@ -813,7 +813,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
       this->late_tail_ = 0;
     }
 
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE) 
       && this->beyond_late_head_
       && this->beyond_late_tail_)
     {
@@ -1470,8 +1470,8 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val
         case ACE_Dynamic_Message_Strategy::PENDING:
           // if we got here, something is *seriously* wrong with the queue
           ACE_ERROR_RETURN((LM_ERROR,
-                            ASYS_TEXT ("Unexpected message priority status ")
-                            ASYS_TEXT ("[%d] (expected LATE or BEYOND_LATE)"),
+                            ASYS_TEXT ("Unexpected message priority status "
+                                       "[%d] (expected LATE or BEYOND_LATE)"),
                             (int) current_status),
                            -1);
         default:
diff --git a/ace/Module.cpp b/ace/Module.cpp
index da64cac7f4f..9562a09a22c 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -84,10 +84,10 @@ ACE_Module<ACE_SYNCH_USE>::link (ACE_Module<ACE_SYNCH_USE> *m)
 
 template <ACE_SYNCH_DECL> int
 ACE_Module<ACE_SYNCH_USE>::open (const ASYS_TCHAR *mod_name,
-                                 ACE_Task<ACE_SYNCH_USE> *writer_q,
-                                 ACE_Task<ACE_SYNCH_USE> *reader_q,
-                                 void *arg,
-                                 int flags /* = M_DELETE */)
+                               ACE_Task<ACE_SYNCH_USE> *writer_q,
+                               ACE_Task<ACE_SYNCH_USE> *reader_q,
+                               void *arg,
+                               int flags /* = M_DELETE */)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::open");
   this->name (mod_name);
@@ -102,17 +102,13 @@ ACE_Module<ACE_SYNCH_USE>::open (const ASYS_TCHAR *mod_name,
 
   if (writer_q == 0)
     {
-      ACE_NEW_RETURN (writer_q,
-                      ACE_Thru_Task<ACE_SYNCH_USE>,
-                      -1);
+      writer_q = new ACE_Thru_Task<ACE_SYNCH_USE>;
       ACE_SET_BITS (flags, M_DELETE_WRITER);
     }
 
   if (reader_q == 0)
     {
-      ACE_NEW_RETURN (reader_q,
-                      ACE_Thru_Task<ACE_SYNCH_USE>,
-                      -1);
+      reader_q = new ACE_Thru_Task<ACE_SYNCH_USE>;
       ACE_SET_BITS (flags, M_DELETE_READER);
     }
 
@@ -191,9 +187,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ASYS_TCHAR *mod_name,
   this->q_pair_[1] = 0;
 
   if (this->open (mod_name, writer_q, reader_q, args, flags) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Module")));
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Module")));
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp
index efcaee781c4..d52d3bc31cd 100644
--- a/ace/Name_Proxy.cpp
+++ b/ace/Name_Proxy.cpp
@@ -148,8 +148,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
                   ASYS_TEXT ("****************** recv_reply returned -1\n")));
     default:
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("%p got %d bytes, expected %d bytes\n"),
-		  ASYS_TEXT ("recv failed"),
+                  "%p got %d bytes, expected %d bytes\n",
+		  "recv failed",
                   n,
                   sizeof (ACE_UINT32)));
       // FALLTHROUGH
@@ -171,9 +171,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
         // Subtract off the size of the part we skipped over...
         if (n != ssize_t (length - sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR,
-                        ASYS_TEXT ("%p expected %d, got %d\n"),
-			ASYS_TEXT ("invalid length"),
+            ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n",
+			"invalid length",
                         length,
                         n));
             return -1;
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 0d133a37ba4..b165a601ac9 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -12,9 +12,9 @@ ACE_RCSID(ace, Naming_Context, "$Id$")
 
 // Make life easier later on...
 
-typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
+typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> 
         LOCAL_NAME_SPACE;
-typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>
+typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> 
         LITE_LOCAL_NAME_SPACE;
 
 // The following Factory is used by the ACE_Service_Config and
@@ -48,10 +48,8 @@ int
 ACE_Naming_Context::local (void)
 {
   ACE_TRACE ("ACE_Naming_Context::local");
-  return ACE_OS::strcmp (this->netnameserver_host_,
-                         ASYS_TEXT ("localhost")) == 0
-    || ACE_OS::strcmp (this->netnameserver_host_,
-                       this->hostname_) == 0;
+  return ACE_OS::strcmp (this->netnameserver_host_, "localhost") == 0
+    || ACE_OS::strcmp (this->netnameserver_host_, this->hostname_) == 0;
 }
 
 int
@@ -59,7 +57,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
 {
   ACE_TRACE ("ACE_Naming_Context::open");
   ACE_OS::hostname (this->hostname_,
-                    (sizeof this->hostname_ / sizeof (ASYS_TCHAR)));
+                    (sizeof this->hostname_ / sizeof (char)));
 
   this->netnameserver_host_ =
     this->name_options_->nameserver_host ();
@@ -103,7 +101,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
 
   if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("NAME_SPACE::NAME_SPACE\n")),
+                       "NAME_SPACE::NAME_SPACE\n"),
                       -1);
   return 0;
 }
@@ -347,7 +345,7 @@ ACE_Naming_Context::list_value_entries (ACE_BINDING_SET &set_out,
                                         const char *pattern_in)
 {
   ACE_TRACE ("ACE_Naming_Context::list_value_entries");
-  return this->list_value_entries (set_out,
+  return this->list_value_entries (set_out, 
                                    ACE_WString (pattern_in));
 }
 
@@ -365,7 +363,7 @@ ACE_Naming_Context::list_type_entries (ACE_BINDING_SET &set_out,
                                        const char *pattern_in)
 {
   ACE_TRACE ("ACE_Naming_Context::list_type_entries");
-  return this->list_type_entries (set_out,
+  return this->list_type_entries (set_out, 
                                   ACE_WString (pattern_in));
 }
 
@@ -384,7 +382,7 @@ ACE_Naming_Context::dump ()
 }
 
 int
-ACE_Naming_Context::init (int argc, ASYS_TCHAR *argv[])
+ACE_Naming_Context::init (int argc, char *argv[])
 {
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
@@ -459,14 +457,14 @@ ACE_Name_Options::process_name (LPCTSTR pname)
 }
 
 void
-ACE_Name_Options::nameserver_host (const ASYS_TCHAR *host)
+ACE_Name_Options::nameserver_host (const char *host)
 {
   ACE_TRACE ("ACE_Name_Options::nameserver_host");
   ACE_OS::free ((void *) this->nameserver_host_);
   this->nameserver_host_ = ACE_OS::strdup (host);
 }
 
-const ASYS_TCHAR *
+const char *
 ACE_Name_Options::nameserver_host (void)
 {
   ACE_TRACE ("ACE_Name_Options::nameserver_host");
@@ -566,11 +564,11 @@ ACE_Name_Options::verbose (void)
 }
 
 void
-ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[])
+ACE_Name_Options::parse_args (int argc, char *argv[])
 {
   ACE_TRACE ("ACE_Name_Options::parse_args");
   ACE_LOG_MSG->open (argv[0]);
-  this->process_name (ASYS_ONLY_WIDE_STRING (argv[0]));
+  this->process_name (ACE_WIDE_STRING (argv[0]));
 
   // Default is to use the PROC_LOCAL context...
   this->context (ACE_Naming_Context::PROC_LOCAL);
@@ -580,18 +578,18 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[])
   // clean it up in the destructor).
   this->database (this->process_name ());
 
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("b:c:dh:l:P:p:s:T:vr"));
+  ACE_Get_Opt get_opt (argc, argv, "b:c:dh:l:P:p:s:T:vr");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
       {
       case 'c':
         {
-          if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("PROC_LOCAL")) == 0)
+          if (ACE_OS::strcmp (get_opt.optarg, "PROC_LOCAL") == 0)
             this->context (ACE_Naming_Context::PROC_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("NODE_LOCAL")) == 0)
+          else if (ACE_OS::strcmp (get_opt.optarg, "NODE_LOCAL") == 0)
             this->context (ACE_Naming_Context::NODE_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("NET_LOCAL")) == 0)
+          else if (ACE_OS::strcmp (get_opt.optarg, "NET_LOCAL") == 0)
             this->context (ACE_Naming_Context::NET_LOCAL);
         }
         break;
@@ -605,24 +603,24 @@ ACE_Name_Options::parse_args (int argc, ASYS_TCHAR *argv[])
         this->nameserver_host (get_opt.optarg);
         break;
       case 'l':
-        this->namespace_dir (ASYS_ONLY_WIDE_STRING (get_opt.optarg));
+        this->namespace_dir (ACE_WIDE_STRING (get_opt.optarg));
         break;
       case 'P':
-        this->process_name (ASYS_ONLY_WIDE_STRING (get_opt.optarg));
+        this->process_name (ACE_WIDE_STRING (get_opt.optarg));
         break;
       case 'p':
         this->nameserver_port (ACE_OS::atoi (get_opt.optarg));
         break;
       case 's':
-        this->database (ASYS_ONLY_WIDE_STRING (get_opt.optarg));
+        this->database (ACE_WIDE_STRING (get_opt.optarg));
         break;
       case 'b':
         this->base_address ((char *) ACE_OS::atoi (get_opt.optarg));
         break;
       case 'T':
-        if (ACE_OS::strcasecmp (get_opt.optarg, ASYS_TEXT ("ON")) == 0)
+        if (ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0)
           ACE_Trace::start_tracing ();
-        else if (ACE_OS::strcasecmp (get_opt.optarg, ASYS_TEXT ("OFF")) == 0)
+        else if (ACE_OS::strcasecmp (get_opt.optarg, "OFF") == 0)
           ACE_Trace::stop_tracing ();
         break;
       case 'v':
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 1067635cb82..078d35356cb 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -91,7 +91,7 @@ public:
   // file
 
   // = Dynamic initialization hooks.
-  virtual int init (int argc, ASYS_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
   // Initialize name options and naming context when dynamically
   // linked.
 
@@ -231,10 +231,10 @@ private:
   ACE_Name_Space *name_space_;
   // Name space (can be either local or remote) dynamically bound.
 
-  ASYS_TCHAR hostname_[MAXHOSTNAMELEN + 1];
+  char hostname_[MAXHOSTNAMELEN + 1];
   // Holds the local hostname.
 
-  const ASYS_TCHAR *netnameserver_host_;
+  const char *netnameserver_host_;
   // Holds name of net name server.
 
   int netnameserver_port_;
@@ -255,7 +255,7 @@ public:
   ~ACE_Name_Options (void);
 
   void parse_args (int argc,
-                   ASYS_TCHAR *argv[]);
+                   char *argv[]);
   // Parse arguments.
 
   // = Set/Get port number
@@ -267,8 +267,8 @@ public:
   void context (ACE_Naming_Context::Context_Scope_Type);
 
   // = Set/Get host name
-  void nameserver_host (const ASYS_TCHAR *host);
-  const ASYS_TCHAR *nameserver_host (void);
+  void nameserver_host (const char *host);
+  const char *nameserver_host (void);
 
   // = Set/Get name space directory
   void namespace_dir (LPCTSTR dir);
@@ -309,7 +309,7 @@ private:
   int nameserver_port_;
   // Port to connect to nameserver process.
 
-  const ASYS_TCHAR *nameserver_host_;
+  const char *nameserver_host_;
   // Hostname of nameserver.
 
   LPCTSTR namespace_dir_;
diff --git a/ace/OS.cpp b/ace/OS.cpp
index d0a6c362715..b5fef535e14 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -153,8 +153,7 @@ ACE_OS_Recursive_Thread_Mutex_Guard::release (void)
 inline
 ACE_OS_Recursive_Thread_Mutex_Guard::ACE_OS_Recursive_Thread_Mutex_Guard (
   ACE_recursive_thread_mutex_t &m)
-   : lock_ (m),
-     owner_ (-1)
+   : lock_ (m)
 {
   acquire ();
 }
@@ -230,7 +229,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Time_Value)
 //
 // In the beginning (Jan. 1, 1601), there was no time and no computer.
 // And Bill said: "Let there be time," and there was time....
-const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew = ACE_INT64_LITERAL (0x19db1ded53e8000);
+const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew = 0x19db1ded53e8000i64;
 
 ACE_Time_Value::ACE_Time_Value (const FILETIME &file_time)
 {
@@ -248,7 +247,7 @@ void ACE_Time_Value::set (const FILETIME &file_time)
   // Convert 100ns units to seconds;
   this->tv_.tv_sec = long (_100ns.QuadPart / (10000 * 1000));
   // Convert remainder to microseconds;
-  this->tv_.tv_usec = long ((long (_100ns.QuadPart) % long (10000 * 1000)) / 10);
+  this->tv_.tv_usec = long ((_100ns.QuadPart % (10000 * 1000)) / 10);
 }
 
 // Returns the value of the object as a Win32 FILETIME.
@@ -457,23 +456,9 @@ ACE_OS::uname (struct utsname *name)
   ::GetVersionEx (&vinfo);
 
   SYSTEM_INFO sinfo;
-#   if defined (ACE_HAS_PHARLAP)
-  // PharLap doesn't do GetSystemInfo.  What's really wanted is the CPU
-  // architecture, so we can get that with EtsGetSystemInfo. Fill in what's
-  // wanted in the SYSTEM_INFO structure, and carry on. Note that the
-  // CPU type values in EK_KERNELINFO have the same values are the ones
-  // defined for SYSTEM_INFO.
-  EK_KERNELINFO ets_kern;
-  EK_SYSTEMINFO ets_sys;
-  EtsGetSystemInfo (&ets_kern, &ets_sys);
-  sinfo.wProcessorLevel = ACE_static_cast (WORD, ets_kern.CpuType);
-  sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
-  sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86;
-#   else
   ::GetSystemInfo(&sinfo);
 
   ACE_OS::strcpy (name->sysname, ACE_TEXT ("Win32"));
-#   endif /* ACE_HAS_PHARLAP */
 
   if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
   {
@@ -846,11 +831,7 @@ ACE_OS::fopen (const char *filename, const char *mode)
       int fd = _open_osfhandle ((long) handle, hmode);
       if (fd != -1)
         {
-#   if defined(__BORLANDC__)
-          FILE *fp = _fdopen (fd, ACE_const_cast (char *, mode));
-#   else /* defined(__BORLANDC__) */
           FILE *fp = _fdopen (fd, mode);
-#   endif /* defined(__BORLANDC__) */
           if (fp != NULL)
             return fp;
           _close (fd);
@@ -881,11 +862,7 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
       int fd = _open_osfhandle ((long) handle, hmode);
       if (fd != -1)
         {
-#   if defined(__BORLANDC__)
-          FILE *fp = _wfdopen (fd, ACE_const_cast (wchar_t *, mode));
-#   else /* defined(__BORLANDC__) */
           FILE *fp = _wfdopen (fd, mode);
-#   endif /* defined(__BORLANDC__) */
           if (fp != NULL)
             return fp;
           _close (fd);
@@ -1357,17 +1334,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
     }
 
 # elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
-
-  // PharLap ETS can act on the current thread - it can set the quantum also,
-  // unlike Win32. All this only works on the RT version.
-#   if defined (ACE_HAS_PHARLAP_RT)
-  if (id != ACE_SELF)
-    ACE_NOTSUP_RETURN (-1);
-
-  if (sched_params.quantum() != ACE_Time_Value::zero)
-    EtsSetTimeSlice (sched_params.quantum().msec());
-
-#   else
   ACE_UNUSED_ARG (id);
 
   if (sched_params.scope () != ACE_SCOPE_PROCESS  ||
@@ -1389,7 +1355,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
     {
       return -1;
     }
-#   endif /* ACE_HAS_PHARLAP_RT */
 
   // Set the thread priority on the current thread.
   return ACE_OS::thr_setprio (sched_params.priority ());
@@ -1849,9 +1814,9 @@ ACE_TSS_Cleanup::instance (void)
       // Now, use the Double-Checked Locking pattern to make sure we
       // only create the ACE_TSS_Cleanup instance once.
       if (ACE_TSS_Cleanup::instance_ == 0)
-        ACE_NEW_RETURN (ACE_TSS_Cleanup::instance_,
-                        ACE_TSS_Cleanup,
-                        0);
+        {
+          ACE_NEW_RETURN (ACE_TSS_Cleanup::instance_, ACE_TSS_Cleanup, 0);
+        }
     }
 
   return ACE_TSS_Cleanup::instance_;
@@ -2005,14 +1970,11 @@ ACE_TSS_Cleanup::tss_keys ()
 
   if (ts_keys == 0)
     {
-      ACE_NEW_RETURN (ts_keys,
-                      ACE_TSS_Keys,
-                      0);
+      ACE_NEW_RETURN (ts_keys, ACE_TSS_Keys, 0);
       // Store the dynamically allocated pointer in thread-specific
       // storage.
       if (ACE_OS::thr_setspecific (in_use_,
-            ACE_reinterpret_cast (void *,
-                                  ts_keys)) == -1)
+            ACE_reinterpret_cast (void *, ts_keys)) == -1)
         {
           delete ts_keys;
           return 0; // Major problems, this should *never* happen!
@@ -2091,19 +2053,15 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[])
       {
         ACE_NO_HEAP_CHECK;
 
-        ACE_NEW_RETURN (ts_storage,
-                        void*[ACE_TSS_THREAD_KEYS_MAX],
-                        0);
+        ACE_NEW_RETURN (ts_storage, void*[ACE_TSS_THREAD_KEYS_MAX], 0);
 
         // Zero the entire TSS array.  Do it manually instead of using
-        // memset, for optimum speed.  Though, memset may be faster
-        // :-)
+        // memset, for optimum speed.  Though, memset may be faster :-)
         void **tss_base_p = ts_storage;
-
-        for (u_int i = 0;
-             i < ACE_TSS_THREAD_KEYS_MAX;
-             ++i)
-          *tss_base_p++ = 0;
+        for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p)
+          {
+            *tss_base_p = 0;
+          }
       }
 
      // Store the pointer in thread-specific storage.  It gets deleted
@@ -2261,16 +2219,6 @@ ACE_Thread_Adapter::inherit_log_msg (void)
 #endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG  &&  ! ACE_HAS_MINIMAL_ACE_OS */
 }
 
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ()
-#define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
-      ::_beginthreadex (STACK, (void *) STACKSIZE, (unsigned int) ENTRYPOINT, (unsigned int *) THR_ID)
-#else
-#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
-#define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
-      ::_beginthreadex (STACK, STACKSIZE, (unsigned (__stdcall *) (void *)) ENTRY_POINT, ARGS, FLAGS, (unsigned int *) THR_ID)
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
-
 void *
 ACE_Thread_Adapter::invoke (void)
 {
@@ -2403,7 +2351,7 @@ ACE_Thread_Adapter::invoke (void)
           if (using_afx)
             ::AfxEndThread ((DWORD)status);
           else
-            ACE_ENDTHREADEX (status);
+            ::_endthreadex ((DWORD) status);
         }
       else
         {
@@ -2414,13 +2362,12 @@ ACE_Thread_Adapter::invoke (void)
           CWinThread *pThread = ::AfxGetThread ();
 
           if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ())
-            ACE_ENDTHREADEX (status);
+            ::_endthreadex ((DWORD) status);
           else
             ::AfxEndThread ((DWORD)status);
         }
 #   else
-
-      ACE_ENDTHREADEX (status);
+      ::_endthreadex ((DWORD) status);
 #   endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/
 # endif /* ACE_WIN32 */
 #endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */
@@ -3159,12 +3106,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         // thread in a suspended mode.
         ACE_SET_BITS (flags, THR_SUSPENDED);
 
-      *thr_handle = (void *) ACE_BEGINTHREADEX (0,
-                                                stacksize,
-                                                thread_args->entry_point (),
-                                                thread_args,
-                                                flags,
-                                                thr_id);
+      *thr_handle = (void *) ::_beginthreadex
+        (0,
+         stacksize,
+         (unsigned (__stdcall *) (void *)) thread_args->entry_point (),
+         thread_args,
+         flags,
+         (unsigned int *) thr_id);
 
       if (priority != ACE_DEFAULT_THREAD_PRIORITY && *thr_handle != 0)
         {
@@ -3406,7 +3354,7 @@ ACE_TRACE ("ACE_OS::thr_exit");
         if (using_afx)
           ::AfxEndThread ((DWORD)status);
         else
-          ACE_ENDTHREADEX (status);
+          ::_endthreadex ((DWORD) status);
       }
     else
       {
@@ -3416,12 +3364,12 @@ ACE_TRACE ("ACE_OS::thr_exit");
         // know to cause some problem.
         CWinThread *pThread = ::AfxGetThread ();
         if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ())
-          ACE_ENDTHREADEX (status);
+          ::_endthreadex ((DWORD) status);
         else
           ::AfxEndThread ((DWORD)status);
       }
 #     else
-    ACE_ENDTHREADEX (status);
+    ::_endthreadex ((DWORD) status);
 #     endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/
 
 #   elif defined (VXWORKS)
@@ -4022,7 +3970,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
       startup_info.cb = sizeof startup_info;
 
       if (::CreateProcess (0,
-                           (LPTSTR) ASYS_ONLY_WIDE_STRING (buf),
+                           (LPTSTR) ACE_WIDE_STRING (buf),
                            0, // No process attributes.
                            0,  // No thread attributes.
                            TRUE, // Allow handle inheritance.
@@ -4033,7 +3981,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
                            &process_info))
 #   else
       if (::CreateProcess (0,
-                           (LPTSTR) ASYS_ONLY_WIDE_STRING (buf),
+                           (LPTSTR) buf,
                            0, // No process attributes.
                            0,  // No thread attributes.
                            FALSE, // Can's inherit handles on CE
@@ -4201,9 +4149,7 @@ writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
 #   if defined (ACE_HAS_ALLOCA)
   buf = (char *) alloca (length);
 #   else
-  ACE_NEW_RETURN (buf,
-                  char[length],
-                  -1);
+  ACE_NEW_RETURN (buf, char[length], -1);
 #   endif /* !defined (ACE_HAS_ALLOCA) */
 
   char *ptr = buf;
@@ -4247,9 +4193,7 @@ ACE_TRACE ("readv");
 #   if defined (ACE_HAS_ALLOCA)
   buf = (char *) alloca (length);
 #   else
-  ACE_NEW_RETURN (buf,
-                  char[length],
-                  -1);
+  ACE_NEW_RETURN (buf, char[length], -1);
 #   endif /* !defined (ACE_HAS_ALLOCA) */
 
   length = ACE_OS::read_n (handle, buf, length);
@@ -5186,28 +5130,19 @@ ACE_OS::difftime (time_t t1, time_t t0)
 }
 # endif /* ACE_LACKS_DIFFTIME */
 
-# if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
-#   if defined (ACE_HAS_WINCE)
+# if defined (ACE_HAS_WINCE)
 wchar_t *
 ACE_OS::ctime (const time_t *t)
 {
   wchar_t buf[26];              // 26 is a "magic number" ;)
   return ACE_OS::ctime_r (t, buf, 26);
 }
-#   endif /* ACE_HAS_WINCE */
 
 wchar_t *
 ACE_OS::ctime_r (const time_t *clock,
                  wchar_t *buf,
                  int buflen)
 {
-#if !defined (ACE_HAS_WINCE)
-  wchar_t *result;
-  ACE_OSCALL (::_wctime (clock), wchar_t *, 0, result);
-  if (result != 0)
-    ::wcsncpy (buf, result, buflen);
-  return buf;
-#else
   // buflen must be at least 26 wchar_t long.
   if (buflen < 26)              // Again, 26 is a magic number.
     return 0;
@@ -5239,9 +5174,8 @@ ACE_OS::ctime_r (const time_t *clock,
                    systime.wSecond,
                    systime.wYear);
   return buf;
-#endif /* ACE_HAS_WINCE */
 }
-# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
+# endif /* ACE_HAS_WINCE */
 
 # if !defined (ACE_HAS_WINCE)
 time_t
@@ -6299,9 +6233,7 @@ ACE_OS_Object_Manager::instance (void)
     {
       ACE_OS_Object_Manager *instance_pointer;
 
-      ACE_NEW_RETURN (instance_pointer,
-                      ACE_OS_Object_Manager,
-                      0);
+      ACE_NEW_RETURN (instance_pointer, ACE_OS_Object_Manager, 0);
       ACE_ASSERT (instance_pointer == instance_);
 
       instance_pointer->dynamically_allocated_ = 1;
@@ -6366,7 +6298,7 @@ ACE_OS_Object_Manager::init (void)
       return 0;
     } else {
       // Had already initialized.
-      return 1;
+      return -1;
     }
 }
 
@@ -6380,7 +6312,7 @@ ACE_OS_Object_Manager::fini (void)
   if (instance_ == 0  ||  shutting_down_i ())
     // Too late.  Or, maybe too early.  Either fini () has already
     // been called, or init () was never called.
-    return object_manager_state_ == OBJ_MAN_SHUT_DOWN  ?  1  :  -1;
+    return -1;
 
   // No mutex here.  Only the main thread should destroy the singleton
   // ACE_OS_Object_Manager instance.
diff --git a/ace/OS.h b/ace/OS.h
index 44001229dbc..bbd935b2e5e 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -18,6 +18,7 @@
 #ifndef ACE_OS_H
 # define ACE_OS_H
 
+
 // This file should be a link to the platform/compiler-specific
 // configuration file (e.g., config-sunos5-sunc++-4.x.h).
 # include "ace/inc_user_config.h"
@@ -303,16 +304,16 @@
 #   endif /* ACE_HAS_UNICODE && UNICODE */
 # endif /* ACE_DEFAULT_LOGGER_KEY */
 
+# if !defined (ACE_DEFAULT_SERVER_HOST)
+#   define ACE_DEFAULT_SERVER_HOST "localhost"
+# endif /* ACE_DEFAULT_SERVER_HOST */
+
 // The way to specify the local host for loopback IP. This is usually
 // "localhost" but it may need changing on some platforms.
 # if !defined (ACE_LOCALHOST)
 #   define ACE_LOCALHOST ASYS_TEXT("localhost")
 # endif
 
-# if !defined (ACE_DEFAULT_SERVER_HOST)
-#   define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST
-# endif /* ACE_DEFAULT_SERVER_HOST */
-
 // Default shared memory key
 # if !defined (ACE_DEFAULT_SHM_KEY)
 #   define ACE_DEFAULT_SHM_KEY 1234
@@ -412,7 +413,7 @@
 
 # if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
 #   define ASYS_TCHAR wchar_t
-#   define ASYS_TEXT(STRING)   __TEXT (STRING)
+#   define ASYS_TEXT(STRING)   _TEXT(STRING)
 # else
 #   define ASYS_TCHAR char
 #   define ASYS_TEXT(STRING)   STRING
@@ -950,8 +951,8 @@ typedef ACE_HANDLE ACE_SOCKET;
 #   define ACE_INVALID_HANDLE -1
 
 typedef ACE_HANDLE ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE ACE_INVALID_HANDLE
-#   define ACE_DEFAULT_SHLIB_MODE 0
+const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = ACE_INVALID_HANDLE;
+const int ACE_DEFAULT_SHLIB_MODE = 0;
 
 #   define ACE_INVALID_SEM_KEY -1
 
@@ -1033,8 +1034,9 @@ typedef struct timespec
 class ACE_Export ACE_PSOS_Time_t
 {
 public:
-  ACE_PSOS_Time_t (void);
-    // default ctor: date, time, and ticks all zeroed.
+
+  ACE_PSOS_Time_t ();
+    // default ctor: date, time, and ticks all zeroed
 
   ACE_PSOS_Time_t (const timespec_t& t);
     // ctor from a timespec_t
@@ -1049,14 +1051,18 @@ public:
     // static member function to set current system time
 
 #   if defined (ACE_PSOSIM)
-  static u_long init_simulator_time (void);
+
+  static u_long init_simulator_time ();
     // static member function to initialize system time, using UNIX calls
+
 #   endif /* ACE_PSOSIM */
 
   static const u_long max_ticks;
     // max number of ticks supported in a single system call
+
 private:
-  // = Constants for prying info out of the pSOS time encoding.
+
+  // constants for prying info out of the pSOS time encoding
   static const u_long year_mask;
   static const u_long month_mask;
   static const u_long day_mask;
@@ -1120,9 +1126,7 @@ private:
 // This needs to go here *first* to avoid problems with AIX.
 # if defined (ACE_HAS_PTHREADS)
 extern "C" {
-#   define ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#     include /**/ <signal.h>
-#   undef ACE_DONT_INCLUDE_ACE_SIGNAL_H
+#   include /**/ <signal.h>
 #   include /**/ <pthread.h>
 #   if defined (DIGITAL_UNIX)
 #     define pthread_self __pthread_self
@@ -1222,12 +1226,11 @@ public:
   // Constant "0".
 
   static const ACE_Time_Value max_time;
-  // Constant for maximum time representable.  Note that this time is
-  // not intended for use with <select> or other calls that may have
-  // *their own* implementation-specific maximum time representations.
+  // Constant for maximum time representable.  Note that this time
+  // is not intended for use with select () or other calls that may
+  // have *their own* implementation-specific maximum time representations.
   // Its primary use is in time computations such as those used by the
-  // dynamic subpriority strategies in the <ACE_Dynamic_Message_Queue>
-  // class.
+  // dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class.
 
   // = Initialization methods.
 
@@ -1417,11 +1420,6 @@ private:  ACE_Time_Value *max_wait_time_;
 #   define ACE_TEMPLATE_SPECIALIZATION
 # endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
 
-# if defined (ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION)
-#   define ACE_TEMPLATE_METHOD_SPECIALIZATION template<>
-# else
-#   define ACE_TEMPLATE_METHOD_SPECIALIZATION
-# endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
 
 // The following is necessary since many C++ compilers don't support
 // typedef'd types inside of classes used as formal template
@@ -1658,12 +1656,10 @@ if (gobbler != 0) *gobbler = (ACE_Service_Object_Exterminator) _gobble_##X; retu
 
 // the following macros are for POSIX conformance.
 
-#   if !defined (ACE_HAS_USER_MODE_MASKS)
-#     define S_IRWXU 00700         /* read, write, execute: owner. */
-#     define S_IRUSR 00400         /* read permission: owner. */
-#     define S_IWUSR 00200         /* write permission: owner. */
-#     define S_IXUSR 00100         /* execute permission: owner. */
-#   endif /* ACE_HAS_USER_MODE_MASKS */
+#   define S_IRWXU 00700           /* read, write, execute: owner. */
+#   define S_IRUSR 00400           /* read permission: owner. */
+#   define S_IWUSR 00200           /* write permission: owner. */
+#   define S_IXUSR 00100           /* execute permission: owner. */
 #   define S_IRWXG 00070           /* read, write, execute: group. */
 #   define S_IRGRP 00040           /* read permission: group. */
 #   define S_IWGRP 00020           /* write permission: group. */
@@ -2114,7 +2110,7 @@ protected:
 typedef rwlock_t ACE_rwlock_t;
 #         endif /* !ACE_LACKS_RWLOCK_T */
 #         include /**/ <thread.h>
-#       endif /* (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */
+#       endif /* defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */
 
 #     else
 #       if !defined (ACE_HAS_POSIX_SEM)
@@ -2429,8 +2425,6 @@ protected:
   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;
 #   elif defined (ACE_HAS_STHREADS)
 #     include /**/ <synch.h>
 typedef rwlock_t ACE_rwlock_t;
@@ -2587,11 +2581,9 @@ typedef unsigned int size_t;
 
 #   include /**/ <new.h>
 
-#   if !defined (ACE_PSOS_DIAB_MIPS)  &&  !defined (VXWORKS)
-#   define ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#     include /**/ <signal.h>
-#   undef ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#   endif /* ! ACE_PSOS_DIAB_MIPS && ! VXWORKS */
+#   if !defined (ACE_PSOS_DIAB_MIPS)
+#   include /**/ <signal.h>
+#   endif /* ACE_PSOS_DIAB_MIPS */
 
 #   include /**/ <errno.h>
 
@@ -2616,27 +2608,29 @@ typedef unsigned int size_t;
 # endif /* IOV_MAX */
 
 # if defined (ACE_PSOS_SNARFS_HEADER_INFO)
-  // Header information snarfed from compiler provided header files
+
+  // header information snarfed from compiler provided header files
   // that are not included because there is already an identically
-  // named file provided with pSOS, which does not have this info from
-  // compiler supplied stdio.h.
-  extern FILE *fdopen (int, const char *);
-  extern int getopt (int, char *const *, const char *);
-  extern char *tempnam (const char *, const char *);
-  extern "C" int fileno (FILE *);
+  // named file provided with pSOS, which does not have this info
+
+  // from compiler supplied stdio.h
+  extern FILE *fdopen(int, const char *);
+  extern int getopt(int, char *const *, const char *);
+  extern char *tempnam(const char *, const char *);
+  extern "C" int fileno(FILE *);
 
-//  #define fileno(stream) ((stream)->_file)
+//  #define fileno(stream)      ((stream)->_file)
 
   // from compiler supplied string.h
-  extern char *strdup (const char *);
+  extern char *strdup(const char *);
 
   // from compiler supplied stat.h
-  extern mode_t umask (mode_t);
-  extern int mkfifo (const char *, mode_t);
-  extern int mkdir (const char *, mode_t);
+  extern mode_t umask(mode_t);
+  extern int mkfifo(const char *, mode_t);
+  extern int mkdir(const char *, mode_t);
 
   // from compiler supplied stdlib.h
-  extern int putenv (char *);
+  extern int putenv(char *);
 
   int isatty (ACE_HANDLE h);
 
@@ -2651,6 +2645,7 @@ typedef unsigned int size_t;
 #   define isdigit iswdigit
 # endif /* ACE_HAS_WINCE */
 
+
 // If the user wants minimum IOStream inclusion, we will just include
 // the forward declarations
 # if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
@@ -3075,14 +3070,7 @@ PAGE_NOCACHE  */
 #     define _O_CREAT O_CREAT
 #     define _O_EXCL  O_EXCL
 #     define _O_TRUNC O_TRUNC
-      // 0x0800 is used for O_APPEND.  0x08 looks free.
-#     define _O_TEMPORARY 0x08 // see fcntl.h
-#     define _O_RDWR   O_RDWR
-#     define _O_WRONLY O_WRONLY
-#     define _O_RDONLY O_RDONLY
-#     define _O_APPEND O_APPEND
-#     define _O_BINARY O_BINARY
-#     define _O_TEXT   O_TEXT
+#     define _O_TEMPORARY 0x0800 // see fcntl.h
 #   endif /* __BORLANDC__ */
 
 typedef OVERLAPPED ACE_OVERLAPPED;
@@ -3151,10 +3139,7 @@ struct iovec
   size_t iov_len; // byte count to read/write
   char *iov_base; // data to be read/written
 
-  // WSABUF is a Winsock2-only type.
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   operator WSABUF &(void) { return *((WSABUF *) this); }
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
 };
 
 struct msghdr
@@ -3177,6 +3162,7 @@ struct msghdr
   int msg_accrightslen;
 };
 
+
 typedef int ACE_idtype_t;
 typedef DWORD ACE_id_t;
 #   define ACE_SELF (0)
@@ -3187,8 +3173,8 @@ typedef int ACE_pri_t;
 #     define RTLD_LAZY 1
 #   endif /* !RTLD_LAZY */
 typedef HINSTANCE ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   define ACE_DEFAULT_SHLIB_MODE 0
+const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0;
+const int ACE_DEFAULT_SHLIB_MODE = 0;
 
 # elif defined (ACE_PSOS)
 
@@ -3666,11 +3652,11 @@ extern "C" {
 }
 #     endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */
   typedef void *ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
+  const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0;
 #     if !defined (RTLD_LAZY)
 #       define RTLD_LAZY 1
 #     endif /* !RTLD_LAZY */
-#   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
+  const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY;
 #   elif defined (__hpux)
 #     if defined(__GNUC__) || __cplusplus >= 199707L
 #       include /**/ <dl.h>
@@ -3678,15 +3664,15 @@ extern "C" {
 #       include /**/ <cxxdl.h>
 #     endif /* (g++ || HP aC++) vs. HP C++ */
   typedef shl_t ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
+  const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0;
+  const int ACE_DEFAULT_SHLIB_MODE = BIND_DEFERRED;
 #   else
 #     if !defined(RTLD_LAZY)
 #       define RTLD_LAZY 1
 #     endif /* !RTLD_LAZY */
   typedef void *ACE_SHLIB_HANDLE;
-#   define ACE_SHLIB_INVALID_HANDLE 0
-#   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
+  const ACE_SHLIB_HANDLE ACE_SHLIB_INVALID_HANDLE = 0;
+  const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY;
 #   endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 
 #   if defined (ACE_HAS_SOCKIO_H)
@@ -4006,18 +3992,6 @@ struct sigaction
 #   define ACE_LACKS_IP_ADD_MEMBERSHIP
 # endif /* IP_ADD_MEMBERSHIP */
 
-# if !defined (IP_DEFAULT_MULTICAST_TTL)
-#   define IP_DEFAULT_MULTICAST_TTL 0
-# endif /* IP_DEFAULT_MULTICAST_TTL */
-
-# if !defined (IP_DEFAULT_MULTICAST_LOOP)
-#   define IP_DEFAULT_MULTICAST_LOOP 0
-# endif /* IP_DEFAULT_MULTICAST_LOOP */
-
-# if !defined (IP_MAX_MEMBERSHIPS)
-#   define IP_MAX_MEMBERSHIPS 0
-# endif /* IP_MAX_MEMBERSHIP */
-
 # if !defined (SIOCGIFBRDADDR)
 #   define SIOCGIFBRDADDR 0
 # endif /* SIOCGIFBRDADDR */
@@ -4243,19 +4217,11 @@ typedef void *(*ACE_THR_C_FUNC)(void *);
 #   define MAP_FAILED ((void *) -1L)
 # endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */
 
-# if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
-#   if defined (ACE_HAS_CHARPTR_DL)
-typedef ASYS_TCHAR * ACE_DL_TYPE;
-#   else
-typedef const ASYS_TCHAR * ACE_DL_TYPE;
-#   endif /* ACE_HAS_CHARPTR_DL */
-# else
-#   if defined (ACE_HAS_CHARPTR_DL)
+# if defined (ACE_HAS_CHARPTR_DL)
 typedef char * ACE_DL_TYPE;
-#   else
+# else
 typedef const char * ACE_DL_TYPE;
-#   endif /* ACE_HAS_CHARPTR_DL */
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
+# endif /* ACE_HAS_CHARPTR_DL */
 
 # if !defined (ACE_HAS_SIGINFO_T)
 struct ACE_Export siginfo_t
@@ -4802,7 +4768,8 @@ private:
   int error_;
 };
 
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+
+#if defined (ACE_HAS_WINSOCK2)
 #if defined (ACE_HAS_WINSOCK2_GQOS)
 typedef SERVICETYPE ACE_SERVICE_TYPE;
 #else
@@ -4810,38 +4777,21 @@ typedef u_long ACE_SERVICE_TYPE;
 #endif /* ACE_HAS_WINSOCK2_GQOS */
 typedef GROUP ACE_SOCK_GROUP;
 typedef WSAPROTOCOL_INFO ACE_Protocol_Info;
-#define ACE_OVERLAPPED_SOCKET_FLAG WSA_FLAG_OVERLAPPED
 #else
 typedef u_long ACE_SERVICE_TYPE;
 typedef u_long ACE_SOCK_GROUP;
 typedef u_long ACE_Protocol_Info;
-#define ACE_OVERLAPPED_SOCKET_FLAG 0
-#endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */
+#endif /* SERVICETYPE */
 
 class ACE_Export ACE_Flow_Spec
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   : public FLOWSPEC
 #endif /* ACE_HAS_WINSOCK2 */
 {
   // = TITLE
   //   Wrapper class that defines the flow spec QoS information, which
-  //   is used by IntServ (RSVP) and DiffServ.
+  //   is used by RSVP.
 public:
-  // = Initialization methods.
-  ACE_Flow_Spec (void);
-  // Default constructor.
-
-  ACE_Flow_Spec (u_long token_rate,
-                 u_long token_bucket_size,
-                 u_long peak_bandwidth,
-                 u_long latency,
-                 u_long delay_variation,
-                 ACE_SERVICE_TYPE service_type,
-                 u_long max_sdu_size,
-                 u_long minimum_policed_size,
-                 int ttl);
-  // Constructor that initializes all the fields.
-
   // = Get/set the token rate in bytes/sec.
   u_long token_rate (void);
   void token_rate (u_long tr);
@@ -4873,20 +4823,16 @@ public:
   // = Get/set the minimum policed size in bytes.
   u_long minimum_policed_size (void);
   void minimum_policed_size (u_long mps);
-
-  // = Get/set the time-to-live.
-  int ttl (void);
-  void ttl (int t);
 };
 
 class ACE_Export ACE_QoS
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   : public QOS
 #endif /* ACE_HAS_WINSOCK2 */
 {
   // = TITLE
   //   Wrapper class that holds the sender and receiver flow spec
-  //   information, which is used by IntServ (RSVP) and DiffServ.
+  //   information, which is used by RSVP.
 public:
   // = Get/set the flow spec for data sending.
   ACE_Flow_Spec sending_flowspec (void);
@@ -4901,13 +4847,13 @@ public:
   void provider_specific (const iovec &ps);
 };
 
-class ACE_Export ACE_QoS_Params
+class ACE_Export ACE_Connect_QoS_Params
 {
   // = TITLE
   //   Wrapper class that simplifies the information passed to the QoS
   //   enabled <ACE_OS::connect> and <ACE_OS::join_leaf> methods.
 public:
-  ACE_QoS_Params (iovec *caller_data = 0,
+  ACE_Connect_QoS_Params (iovec *caller_data = 0,
                           iovec *callee_data = 0,
                           ACE_QoS *socket_qos = 0,
                           ACE_QoS *group_socket_qos = 0,
@@ -4976,15 +4922,10 @@ typedef int (*ACE_QOS_CONDITION_FUNC) (iovec *caller_id,
 
 // Callback function that's used by the QoS-enabled <ACE_OS::ioctl>
 // method.
-#if defined(ACE_HAS_WINSOCK2) && ACE_HAS_WINSOCK2 != 0
-typedef LPWSAOVERLAPPED_COMPLETION_ROUTINE ACE_OVERLAPPED_COMPLETION_FUNC;
-#else
 typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (u_long error,
                                                 u_long bytes_transferred,
                                                 ACE_OVERLAPPED *overlapped,
                                                 u_long flags);
-#endif /* ACE_HAS_WINSOCK2 != 0 */
-
 class ACE_Export ACE_Accept_QoS_Params
 {
   // = TITLE
@@ -5144,12 +5085,14 @@ public:
 
   // = A set of wrappers for explicit dynamic linking.
   static int dlclose (ACE_SHLIB_HANDLE handle);
-
-  static ASYS_TCHAR *dlerror (void);
-  static ACE_SHLIB_HANDLE dlopen (const ASYS_TCHAR *filename,
+  // WinCE only supports UNICODE, so we don't need these functions.
+# if !defined (ACE_HAS_WINCE)
+  static char *dlerror (void);
+  static ACE_SHLIB_HANDLE dlopen (const char *filename,
                                   int mode = ACE_DEFAULT_SHLIB_MODE);
   static void *dlsym (ACE_SHLIB_HANDLE handle,
                       const char *symbol);
+# endif /* ! ACE_HAS_WINCE */
 
   // = A set of wrappers for the directory iterator.
   static DIR *opendir (const char *filename);
@@ -5166,8 +5109,6 @@ public:
   // = A set of wrappers for stdio file operations.
   static int last_error (void);
   static void last_error (int);
-  static int set_errno_to_last_error (void);
-  static int set_errno_to_wsa_last_error (void);
   static int fclose (FILE *fp);
   static int fcntl (ACE_HANDLE handle,
                     int cmd,
@@ -5380,17 +5321,17 @@ public:
   static char *asctime (const struct tm *tm);
   static char *asctime_r (const struct tm *tm,
                           char *buf, int buflen);
-  static ASYS_TCHAR *ctime (const time_t *t);
 # if !defined (ACE_HAS_WINCE)
+  static char *ctime (const time_t *t);
   static char *ctime_r (const time_t *clock,
                         char *buf,
                         int buflen);
-# endif /* !ACE_HAS_WINCE */
-# if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+# else
+  static wchar_t *ctime (const time_t *t);
   static wchar_t *ctime_r (const time_t *clock,
                            wchar_t *buf,
                            int buflen);
-# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
+# endif /* !ACE_HAS_WINCE */
   static size_t strftime (char *s,
                           size_t maxsize,
                           const char *format,
@@ -5793,7 +5734,7 @@ public:
   static int connect (ACE_HANDLE handle,
                       const sockaddr *addr,
                       int addrlen,
-                      const ACE_QoS_Params &qos_params);
+                      const ACE_Connect_QoS_Params &qos_params);
   // QoS-enabled <connect>, which passes <qos_params> to <connect>.
   // If the OS platform doesn't support QoS-enabled <connect> then the
   // <qos_params> are ignored and the BSD-style <connect> is called.
@@ -5853,7 +5794,7 @@ public:
   static ACE_HANDLE join_leaf (ACE_HANDLE socket,
                                const sockaddr *name,
                                int namelen,
-                               const ACE_QoS_Params &qos_params);
+                               const ACE_Connect_QoS_Params &qos_params);
   // Joins a leaf node into a QoS-enabled multi-point session.
   static int listen (ACE_HANDLE handle,
                      int backlog);
@@ -5867,15 +5808,6 @@ public:
                        int flags,
                        struct sockaddr *addr,
                        int *addrlen);
-  static int recvfrom (ACE_HANDLE handle,
-                       iovec *buffers,
-                       int buffer_count,
-                       size_t &number_of_bytes_recvd,
-                       int &flags,
-                       struct sockaddr *addr,
-                       int *addrlen,
-                       ACE_OVERLAPPED *overlapped,
-                       ACE_OVERLAPPED_COMPLETION_FUNC func);
   static int send (ACE_HANDLE handle,
                    const char *buf,
                    int len, int
@@ -5889,15 +5821,6 @@ public:
                      int flags,
                      const struct sockaddr *addr,
                      int addrlen);
-  static int sendto (ACE_HANDLE handle,
-                     const iovec *buffers,
-                     int buffer_count,
-                     size_t &number_of_bytes_sent,
-                     int flags,
-                     const struct sockaddr *addr,
-                     int addrlen,
-                     ACE_OVERLAPPED *overlapped,
-                     ACE_OVERLAPPED_COMPLETION_FUNC func);
   static int setsockopt (ACE_HANDLE handle,
                          int level,
                          int optname,
@@ -5906,11 +5829,11 @@ public:
   // QoS-enabled <ioctl> wrapper.
   static int shutdown (ACE_HANDLE handle,
                        int how);
-  static ACE_HANDLE socket (int protocol_family,
+  static ACE_HANDLE socket (int domain,
                             int type,
                             int proto);
   // Create a BSD-style socket (no QoS).
-  static ACE_HANDLE socket (int protocol_family,
+  static ACE_HANDLE socket (int domain,
                             int type,
                             int proto,
                             ACE_Protocol_Info *protocolinfo,
@@ -6029,9 +5952,6 @@ public:
                           const wchar_t *t);
   static int strcmp (const wchar_t *s,
                      const wchar_t *t);
-  static size_t strspn (const wchar_t *string,
-                        const wchar_t *charset);
-  static wchar_t *strenvdup (const wchar_t *str);
 # endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */
 
 #if !defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
@@ -6093,11 +6013,6 @@ public:
   static long strtol (const wchar_t *s,
                       wchar_t **ptr,
                       int base);
-  static u_long strtoul (const wchar_t *s,
-                         wchar_t **ptr,
-                         int base);
-  static double strtod (const wchar_t *s,
-                        wchar_t **endptr);
   static int ace_isspace (wchar_t c);
 
 #   if defined (ACE_WIN32)
@@ -6122,9 +6037,9 @@ public:
 #     endif /* 0 */
   // the following three are newly added for CE.
   // but they can also be use on Win32.
-  static wchar_t *fgets (wchar_t *buf,
-                         int size,
-                         FILE *fp);
+  //   static char *fgets (wchar_t *buf,
+  //                       int size,
+  //                       FILE *fp);
   static int fprintf (FILE *fp,
                       const wchar_t *format,
                       ...);
@@ -6144,7 +6059,6 @@ public:
                    struct stat *);
   static int truncate (const wchar_t *filename,
                        off_t length);
-  static int putenv (const wchar_t *str);
   static wchar_t *getenv (const wchar_t *symbol);
   static int system (const wchar_t *s);
   static int hostname (wchar_t *name,
@@ -6162,8 +6076,6 @@ public:
   static int chdir (const wchar_t *path);
   static wchar_t *getcwd (wchar_t *,
                           size_t);
-  static int mkfifo (const wchar_t *file,
-                          mode_t mode = ACE_DEFAULT_FILE_PERMS);
 #   endif /* ACE_WIN32 */
 # endif /* ACE_HAS_UNICODE */
 
@@ -6472,14 +6384,14 @@ protected:
 
 public:
   virtual int init (void) = 0;
-  // Explicitly initialize.  Returns 0 on success, -1 on failure due
-  // to dynamic allocation failure (in which case errno is set to
-  // ENOMEM), or 1 if it had already been called.
+  // Explicitly initialize.  Returns 0 on success, -1 on failure
+  // due to either already having been initialized, or dynamic
+  // allocation failure (in which case errno is set to ENOMEM).
 
   virtual int fini (void) = 0;
-  // Explicitly destroy.  Returns 0 on success, -1 on failure because
-  // the number of fini () calls hasn't reached the number of init ()
-  // calls, or 1 if it had already been called.
+  // Explicitly destroy.  Returns 0 on success, -1 on failure due to
+  // already having been destroyed, or 1 because the number of fini ()
+  // calls hasn't reached the number of init () calls.
 
   enum Object_Manager_State
     {
@@ -7080,6 +6992,7 @@ private:
             } \
         } \
      while (0)
+
 #   define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \
      do { \
           if (POINTER) \
@@ -7093,17 +7006,7 @@ private:
             } \
         } \
      while (0)
-#if defined(__IBMCPP__) && (__IBMCPP__ >= 400)
-#   define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS T_PARAMETER (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-#else
+
 #   define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
      do { \
           if (POINTER) \
@@ -7113,7 +7016,7 @@ private:
             } \
         } \
      while (0)
-#endif /* defined(__IBMCPP__) && (__IBMCPP__ >= 400) */
+
 #   define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \
      do { \
           if (POINTER) \
@@ -7128,17 +7031,7 @@ private:
             } \
         } \
      while (0)
-#if defined(__IBMCPP__) && (__IBMCPP__ >= 400)
-#   define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS <T_PARAM1, T_PARAM2> (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-#else
+
 #   define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
      do { \
           if (POINTER) \
@@ -7148,25 +7041,7 @@ private:
             } \
         } \
      while (0)
-#endif /* defined(__IBMCPP__) && (__IBMCPP__ >= 400) */
-#   define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-#   define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
+
 #   define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
      do { \
           if (POINTER) \
@@ -7181,6 +7056,7 @@ private:
             } \
         } \
      while (0)
+
 # else /* ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
 #   define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
      do { \
@@ -7190,6 +7066,7 @@ private:
             } \
         } \
      while (0)
+
 #   define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \
      do { \
           if (POINTER) \
@@ -7203,13 +7080,12 @@ private:
             } \
         } \
      while (0)
+
 #   if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L
   // LynxOS 3.0.0's g++ has trouble with the real versions of these.
 #     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
 #     define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
 #     define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
-#     define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
-#     define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
 #     define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
 #   else
 #     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
@@ -7221,6 +7097,7 @@ private:
               } \
           } \
        while (0)
+
 #     define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \
        do { \
             if (POINTER) \
@@ -7235,6 +7112,7 @@ private:
               } \
           } \
        while (0)
+
 #     define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
        do { \
             if (POINTER) \
@@ -7244,24 +7122,7 @@ private:
               } \
           } \
        while (0)
-#     define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \
-       do { \
-            if (POINTER) \
-              { \
-                POINTER->T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3>::~T_CLASS (); \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
-#     define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \
-       do { \
-            if (POINTER) \
-              { \
-                POINTER->T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3, T_PARAM4>::~T_CLASS (); \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
+
 #     define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
        do { \
             if (POINTER) \
@@ -7276,6 +7137,7 @@ private:
               } \
           } \
        while (0)
+
 #   endif /* defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L */
 # endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
 
@@ -7303,31 +7165,18 @@ private:
   do \
     RESULT = (TYPE) X; \
   while (0)
-#   if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
 #   define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \
   do { \
-    TYPE ace_result_; \
-    TYPE ace_local_result_ = (TYPE) X; \
-    ace_result_ = ace_local_result_; \
+    TYPE ace_result_ = (TYPE) X; \
     if (ace_result_ == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
+      errno = ::GetLastError (); \
     return ace_result_; \
   } while (0)
-#   else
-#     define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \
-  do { \
-    TYPE ace_result_; \
-    ace_result_ = (TYPE) X; \
-    if (ace_result_ == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
-    return ace_result_; \
-  } while (0)
-#   endif /* defined (__BORLANDC__) && (__BORLANDC__ <= 0x540) */
 #   define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \
   do { \
     RESULT = (TYPE) X; \
     if (RESULT == FAILVALUE) \
-      ACE_OS::set_errno_to_last_error (); \
+      errno = ::GetLastError (); \
   } while (0)
 # else
 #   define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) do { TYPE ace_result_ = FAILVALUE; ace_result_ = ace_result_; return OP; } while (0)
@@ -7651,6 +7500,19 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 #   include "ace/Trace.h"
 # endif /* ! ACE_HAS_MINIMAL_ACE_OS */
 
+# if defined (ACE_HAS_INLINED_OSCALLS)
+#   if defined (ACE_INLINE)
+#     undef ACE_INLINE
+#   endif /* ACE_INLINE */
+#   define ACE_INLINE inline
+#   include "ace/OS.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+# if !defined (ACE_HAS_MINIMAL_ACE_OS)
+    // This needs to come here to avoid problems with circular dependencies.
+#   include "ace/Log_Msg.h"
+# endif /* ! ACE_HAS_MINIMAL_ACE_OS */
+
 // The following are some insane macros that are useful in cases when
 // one has to have a string in a certain format.  Both of these macros
 // allow the user to create a temporary copy. If the user needs to
@@ -7697,19 +7559,6 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 #   define ASYS_WIDE_STRING(ASCII_STRING) ASCII_STRING
 # endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS.i"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
-# if !defined (ACE_HAS_MINIMAL_ACE_OS)
-    // This needs to come here to avoid problems with circular dependencies.
-#   include "ace/Log_Msg.h"
-# endif /* ! ACE_HAS_MINIMAL_ACE_OS */
-
 // Byte swapping macros to deal with differences between little endian
 // and big endian machines.  Note that "long" here refers to 32 bit
 // quantities.
@@ -7759,23 +7608,24 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
   // lack them.
 
   // Evaluates to a non-zero value if status was returned for a child
-  // process that terminated normally.  0 means status wasn't
-  // returned.
+  // process that terminated normally.
+  // 0 means status wasn't returned.
 #if !defined (WIFEXITED)
 #   define WIFEXITED(stat) 0
 #endif /* WIFEXITED */
 
-  // If the value of WIFEXITED(stat) is non-zero, this macro evaluates
-  // to the exit code that the child process exit(3C), or the value
-  // that the child process returned from main.  Peaceful exit code is
-  // 0.
+  // If the  value  of  WIFEXITED(stat)  is non-zero,  this macro
+  // evaluates to the exit  code  that  the  child process exit(3C),
+  // or the value that the  child process returned from main.
+  // Peaceful exit code is 0.
 #if !defined (WEXITSTATUS)
 #   define WEXITSTATUS(stat) 0
 #endif /* WEXITSTATUS */
 
-  // Evaluates to a non-zero value if status was returned for a child
-  // process that terminated due to the receipt of a signal.  0 means
-  // status wasnt returned.
+  // Evaluates  to  a  non-zero  value   if status  was  returned for
+  // a child process  that  terminated  due   to   the receipt of a
+  // signal.
+  // 0 means status wasnt returned.
 #if !defined (WIFSIGNALED)
 #   define WIFSIGNALED(stat) 0
 #endif /* WIFSIGNALED */
diff --git a/ace/OS.i b/ace/OS.i
index 36a482bc141..d2433111732 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -520,10 +520,9 @@ extern "C" char *mktemp (char *);
 #   include /**/ <ctype.h>
 # endif /* UNIXWARE */
 
-// Adapt the weird threading and synchronization routines (which
-// return errno rather than -1) so that they return -1 and set errno.
-// This is more consistent with the rest of ACE_OS and enables use to
-// use the ACE_OSCALL* macros.
+// Adapt the weird threading and synchronization routines (which don't
+// return -1 normally) so that they return -1 and work correctly with
+// the ACE_OSCALL macros.
 # if defined (VXWORKS)
 #   define ACE_ADAPT_RETVAL(OP,RESULT) ((RESULT = (OP)) != OK ? (errno = RESULT, -1) : 0)
 # else
@@ -536,7 +535,8 @@ ACE_OS::chdir (const char *path)
 {
   ACE_TRACE ("ACE_OS::chdir");
 #   if defined (VXWORKS)
-  ACE_OSCALL_RETURN (::chdir (ACE_const_cast (char *, path)), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::chdir ((char *) path), ace_result_),
+                     int, -1);
 
 #elif defined (ACE_PSOS_LACKS_PHILE)
   ACE_UNUSED_ARG (path);
@@ -752,7 +752,7 @@ ACE_OS::umask (mode_t cmask)
 
 // Perform a mapping of Win32 error numbers into POSIX errnos.
 # define ACE_FAIL_RETURN(RESULT) do { \
-  switch (ACE_OS::set_errno_to_last_error ()) { \
+  switch (errno = ::GetLastError ()) { \
   case ERROR_NOT_ENOUGH_MEMORY: errno = ENOMEM; break; \
   case ERROR_FILE_EXISTS:       errno = EEXIST; break; \
   case ERROR_SHARING_VIOLATION: errno = EACCES; break; \
@@ -787,11 +787,7 @@ ACE_INLINE int
 ACE_OS::chdir (const char *path)
 {
   ACE_TRACE ("ACE_OS::chdir");
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
   ACE_OSCALL_RETURN (::_chdir (path), int, -1);
-#else
-  ACE_OSCALL_RETURN (::_chdir ((char *) path), int, -1);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
 }
 
 #   if !defined (ACE_LACKS_MKTEMP)
@@ -847,11 +843,9 @@ ACE_OS::mkfifo (const char *file, mode_t mode)
 ACE_INLINE int
 ACE_OS::pipe (ACE_HANDLE fds[])
 {
-# if !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__) //VisualAge C++ 4.0 does not support this
+# if !defined (ACE_HAS_WINCE)
   ACE_TRACE ("ACE_OS::pipe");
-  ACE_OSCALL_RETURN (::_pipe ((int *) fds, PIPE_BUF, 0),
-                     int,
-                     -1);   // Use default mode
+  ACE_OSCALL_RETURN (::_pipe ((int *) fds, PIPE_BUF, 0), int, -1);   // Use default mode
 # else
   ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_WINCE */
@@ -893,7 +887,7 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
 
   if (::GetFileInformationByHandle (handle, &fdata) == FALSE)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else if (fdata.nFileSizeHigh != 0)
@@ -1070,7 +1064,9 @@ ACE_OS::unlink (const char *path)
 {
   ACE_TRACE ("ACE_OS::unlink");
 # if defined (VXWORKS)
-    ACE_OSCALL_RETURN (::unlink (ACE_const_cast (char *, path)), int, -1);
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::unlink ((char *) path),
+                                                   ace_result_),
+                       int, -1);
 # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE)
     ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1);
 # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_C_LIBRARY)
@@ -1111,11 +1107,11 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
   ACE_OSCALL_RETURN (::tmpnam ((char *) dir), char *, 0);
 #else
 #if defined (ACE_WIN32)
-#if defined (__BORLANDC__) || (__IBMCPP__)
+#if defined (__BORLANDC__)
   ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0);
 #     else
   ACE_OSCALL_RETURN (::_tempnam (dir, pfx), char *, 0);
-#     endif /* __BORLANDC__ || __IBMCPP__ */
+#     endif /* __BORLANDC__ */
 #   else
   ACE_OSCALL_RETURN (::tempnam (dir, pfx), char *, 0);
 #   endif /* WIN32 */
@@ -1561,28 +1557,23 @@ ACE_OS::strcasecmp (const char *s, const char *t)
 #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE)
   ACE_TRACE ("ACE_OS::strcasecmp");
 # if defined (ACE_LACKS_STRCASECMP)
-  const char *scan1 = s;
-  const char *scan2 = t;
+  // Handles most of what the BSD version does, but does not indicate
+  // lexicographic ordering if the strings are unequal.  Just
+  // indicates equal (ignoring case) by return value == 0, else not
+  // equal.
+  int result = 0;
 
-  while (*scan1 != 0
-         && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2))
+  do
     {
-      ++scan1;
-      ++scan2;
-    }
-
-  // The following case analysis is necessary so that characters which
-  // look negative collate low against normal characters but high
-  // against the end-of-string NUL.
+      int a = ACE_OS::to_lower (*s);
+      int b = ACE_OS::to_lower (*t);
+      result = ((a < b) ? -1 : (a > b));
+      if (result != 0)
+        break;
+    } while (*s++ != '\0' && *t++ != '\0');
+  //  paranoid termination condition
 
-  if (*scan1 == '\0' && *scan2 == '\0')
-    return 0;
-  else if (*scan1 == '\0')
-    return -1;
-  else if (*scan2 == '\0')
-    return 1;
-  else
-    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
+  return result; // == 0 for match, else 1
 # else
   return ::strcasecmp (s, t);
 # endif /* ACE_LACKS_STRCASECMP */
@@ -1592,40 +1583,29 @@ ACE_OS::strcasecmp (const char *s, const char *t)
 }
 
 ACE_INLINE int
-ACE_OS::strncasecmp (const char *s,
-                     const char *t,
-                     size_t len)
+ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
 {
 #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strncasecmp");
+  ACE_TRACE ("ACE_OS::strcasecmp");
 # if defined (ACE_LACKS_STRCASECMP)
-  const char *scan1 = s;
-  const char *scan2 = t;
-  ssize_t count = ssize_t (len);
+  // Handles most of what the BSD version does, but does not indicate
+  // lexicographic ordering if the strings are unequal.  Just
+  // indicates equal (ignoring case) by return value == 0, else not
+  // equal.
+  int result = 0;
 
-  while (--count >= 0
-         && *scan1 != 0
-         && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2))
+  while (*s != '\0' && *t != '\0' && len != 0)
     {
-      ++scan1;
-      ++scan2;
-    }
-
-  if (count < 0)
-    return 0;
+      if (ACE_OS::to_lower (*s) != ACE_OS::to_lower (*t))
+        {
+          result = ((ACE_OS::to_lower (*s) < ACE_OS::to_lower (*t)) ? -1 : 1);
+          break;
+        }
 
-  // The following case analysis is necessary so that characters which
-  // look negative collate low against normal characters but high
-  // against the end-of-string NUL.
+      ++s; ++t; --len;
+    }
 
-  if (*scan1 == '\0' && *scan2 == '\0')
-    return 0;
-  else if (*scan1 == '\0')
-    return -1;
-  else if (*scan2 == '\0')
-    return 1;
-  else
-    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
+  return result; // == 0 for match, else 1
 # else
   return ::strncasecmp (s, t, len);
 # endif /* ACE_LACKS_STRCASECMP */
@@ -1931,7 +1911,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m)
           return 0;
         default:
           // This is a hack, we need to find an appropriate mapping...
-          ACE_OS::set_errno_to_last_error ();
+          errno = ::GetLastError ();
           return -1;
         }
     case USYNC_THREAD:
@@ -1973,7 +1953,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m,
           return 0;  // something goofed, but we hold the lock ...
         default:
           // This is a hack, we need to find an appropriate mapping...
-          ACE_OS::set_errno_to_last_error ();
+          errno = ::GetLastError ();
           return -1;
         }
     case USYNC_THREAD:
@@ -2030,7 +2010,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m)
             errno = EBUSY;
             return -1;
           default:
-            ACE_OS::set_errno_to_last_error ();
+            errno = ::GetLastError ();
             return -1;
           }
       }
@@ -2095,7 +2075,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m, int &abandoned)
             errno = EBUSY;
             return -1;
           default:
-            ACE_OS::set_errno_to_last_error ();
+            errno = ::GetLastError ();
             return -1;
           }
       }
@@ -2821,7 +2801,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
   return result;
 #   elif defined (VXWORKS)
   int result;
-  ACE_OSCALL (::semDelete (s->sema_), int, -1, result);
+  ACE_OSCALL (ACE_ADAPT_RETVAL (::semDelete (s->sema_), result), int, -1, result);
   s->sema_ = 0;
   return result;
 #   endif /* ACE_HAS_STHREADS */
@@ -3077,7 +3057,7 @@ ACE_OS::sema_post (ACE_sema_t *s)
   ACE_OSCALL (ACE_ADAPT_RETVAL (::sm_v (s->sema_), result), int, -1, result);
   return result;
 #   elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::semGive (s->sema_), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::semGive (s->sema_), ace_result_), int, -1);
 #   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (s);
@@ -3146,10 +3126,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
     return 0;
   else
     {
-      if (result == WAIT_TIMEOUT)
-        errno = EBUSY;
-      else
-        ACE_OS::set_errno_to_last_error ();
+      errno = result == WAIT_TIMEOUT ? EBUSY : ::GetLastError ();
       // This is a hack, we need to find an appropriate mapping...
       return -1;
     }
@@ -3181,10 +3158,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
     }
 
   // Translate error message to errno used by ACE.
-  if (result == WAIT_TIMEOUT)
-    errno = EBUSY;
-  else
-    ACE_OS::set_errno_to_last_error ();
+  errno = result == WAIT_TIMEOUT ? EBUSY : ::GetLastError ();
   // This is taken from the hack above. ;)
   return -1;
 #     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
@@ -3270,7 +3244,7 @@ ACE_OS::sema_wait (ACE_sema_t *s)
       return 0;
     default:
       // This is a hack, we need to find an appropriate mapping...
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   /* NOTREACHED */
@@ -3308,7 +3282,7 @@ ACE_OS::sema_wait (ACE_sema_t *s)
       default:
         // Since we wait indefinitely, anything other than
         // WAIT_OBJECT_O indicates an error.
-        ACE_OS::set_errno_to_last_error ();
+        errno = ::GetLastError ();
         // This is taken from the hack above. ;)
         return -1;
       }
@@ -3320,7 +3294,7 @@ ACE_OS::sema_wait (ACE_sema_t *s)
                                 int, -1, result);
   return result;
 #   elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::semTake (s->sema_, WAIT_FOREVER), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::semTake (s->sema_, WAIT_FOREVER), ace_result_), int, -1);
 #   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (s);
@@ -3413,7 +3387,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
       return -1;
     default:
       // This is a hack, we need to find an appropriate mapping...
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   /* NOTREACHED */
@@ -3466,7 +3440,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 
           // What?
         default:
-          ACE_OS::set_errno_to_last_error ();
+          errno = ::GetLastError ();
           // This is taken from the hack above. ;)
           return -1;
         };
@@ -3527,13 +3501,7 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_tryrdlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
   int result = -1;
 
@@ -3569,13 +3537,7 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_trywrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
   int result = -1;
 
@@ -3611,13 +3573,7 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_rdlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
 #   if defined (ACE_HAS_PTHREADS)
   ACE_PTHREAD_CLEANUP_PUSH (&rw->lock_);
@@ -3660,13 +3616,7 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_wrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
 #   if defined (ACE_HAS_PTHREADS)
   ACE_PTHREAD_CLEANUP_PUSH (&rw->lock_);
@@ -3711,13 +3661,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_unlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
   if (ACE_OS::mutex_lock (&rw->lock_) == -1)
     return -1;
@@ -3773,7 +3717,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rw_wrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-  // Some native rwlocks, such as those on Solaris and HP-UX 11, don't
+  // Some native rwlocks, such as those on Solaris, don't
   // support the upgrade feature . . .
   ACE_UNUSED_ARG (rw);
   ACE_NOTSUP_RETURN (-1);
@@ -3842,26 +3786,9 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
                      void *arg)
 {
   // ACE_TRACE ("ACE_OS::rwlock_init");
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (arg);
-
-  int status;
-  pthread_rwlockattr_t attr;
-  pthread_rwlockattr_init (&attr);
-  pthread_rwlockattr_setpshared (&attr, (type == USYNC_THREAD ?
-                                         PTHREAD_PROCESS_PRIVATE :
-                                         PTHREAD_PROCESS_SHARED));
-  status = ACE_ADAPT_RETVAL (pthread_rwlock_init (rw, &attr), status);
-  pthread_rwlockattr_destroy (&attr);
-
-  return status;
-
-#  else
   type = type;
   name = name;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 }
 #endif /* ACE_HAS THREADS && !defined (ACE_LACKS_RWLOCK_T) */
 
@@ -3871,13 +3798,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw)
   ACE_TRACE ("ACE_OS::rwlock_destroy");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw),
-                                       ace_result_),
-                     int, -1);
-#  else /* Solaris */
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), ace_result_), int, -1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # else /* NT, POSIX, and VxWorks don't support this natively. */
   ACE_OS::mutex_destroy (&rw->lock_);
   ACE_OS::cond_destroy (&rw->waiting_readers_);
@@ -3962,7 +3883,7 @@ ACE_OS::event_wait (ACE_event_t *event)
     case WAIT_OBJECT_0:
       return 0;
     default:
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
 #elif defined (ACE_HAS_THREADS)
@@ -4050,7 +3971,7 @@ ACE_OS::event_timedwait (ACE_event_t *event,
       return -1;
     default:
       // This is a hack, we need to find an appropriate mapping...
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
 #elif defined (ACE_HAS_THREADS)
@@ -4267,68 +4188,10 @@ ACE_OS::event_reset (ACE_event_t *event)
 # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 #endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
 
-ACE_INLINE
-ACE_Flow_Spec::ACE_Flow_Spec (u_long token_rate,
-                              u_long token_bucket_size,
-                              u_long peak_bandwidth,
-                              u_long latency,
-                              u_long delay_variation,
-                              ACE_SERVICE_TYPE service_type,
-                              u_long max_sdu_size,
-                              u_long minimum_policed_size,
-                              int ttl)
-{
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  this->TokenRate = token_rate;
-  this->TokenBucketSize = token_bucket_size;
-  this->PeakBandwidth = peak_bandwidth;
-  this->Latency = latency;
-  this->DelayVariation = delay_variation;
-#if defined(ACE_HAS_WINSOCK2_GQOS)
-  this->ServiceType = service_type;
-  this->MaxSduSize = max_sdu_size;
-  this->MinimumPolicedSize = minimum_policed_size;
-#else
-  ACE_UNUSED_ARG (service_type);
-  ACE_UNUSED_ARG (max_sdu_size);
-  ACE_UNUSED_ARG (minimum_policed_size);
-#endif /* ACE_HAS_WINSOCK2_GQOS */
-  ACE_UNUSED_ARG (ttl);
-#else
-  ACE_UNUSED_ARG (token_rate);
-  ACE_UNUSED_ARG (token_bucket_size);
-  ACE_UNUSED_ARG (peak_bandwidth);
-  ACE_UNUSED_ARG (latency);
-  ACE_UNUSED_ARG (delay_variation);
-  ACE_UNUSED_ARG (service_type);
-  ACE_UNUSED_ARG (max_sdu_size);
-  ACE_UNUSED_ARG (minimum_policed_size);
-  ACE_UNUSED_ARG (ttl);
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
-}
-
-ACE_INLINE
-ACE_Flow_Spec::ACE_Flow_Spec (void)
-{
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  this->TokenRate = 0;
-  this->TokenBucketSize = 0;
-  this->PeakBandwidth = 0;
-  this->Latency = 0;
-  this->DelayVariation = 0;
-#if defined(ACE_HAS_WINSOCK2_GQOS)
-  this->ServiceType = 0;
-  this->MaxSduSize = 0;
-  this->MinimumPolicedSize = 0;
-#endif /* ACE_HAS_WINSOCK2_GQOS */
-#else
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
-}
-
 ACE_INLINE u_long
 ACE_Flow_Spec::token_rate (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return this->TokenRate;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4338,7 +4201,7 @@ ACE_Flow_Spec::token_rate (void)
 ACE_INLINE void
 ACE_Flow_Spec::token_rate (u_long tr)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->TokenRate = tr;
 #else
   ACE_UNUSED_ARG (tr);
@@ -4348,7 +4211,7 @@ ACE_Flow_Spec::token_rate (u_long tr)
 ACE_INLINE u_long
 ACE_Flow_Spec::token_bucket_size (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return this->TokenBucketSize;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4358,7 +4221,7 @@ ACE_Flow_Spec::token_bucket_size (void)
 ACE_INLINE void
 ACE_Flow_Spec::token_bucket_size (u_long tbs)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->TokenBucketSize = tbs;
 #else
   ACE_UNUSED_ARG (tbs);
@@ -4368,7 +4231,7 @@ ACE_Flow_Spec::token_bucket_size (u_long tbs)
 ACE_INLINE u_long
 ACE_Flow_Spec::peak_bandwidth (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return this->PeakBandwidth;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4378,7 +4241,7 @@ ACE_Flow_Spec::peak_bandwidth (void)
 ACE_INLINE void
 ACE_Flow_Spec::peak_bandwidth (u_long pb)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->PeakBandwidth = pb;
 #else
   ACE_UNUSED_ARG (pb);
@@ -4388,7 +4251,7 @@ ACE_Flow_Spec::peak_bandwidth (u_long pb)
 ACE_INLINE u_long
 ACE_Flow_Spec::latency (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return this->Latency;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4398,7 +4261,7 @@ ACE_Flow_Spec::latency (void)
 ACE_INLINE void
 ACE_Flow_Spec::latency (u_long l)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->Latency = l;
 #else
   ACE_UNUSED_ARG (l);
@@ -4408,7 +4271,7 @@ ACE_Flow_Spec::latency (u_long l)
 ACE_INLINE u_long
 ACE_Flow_Spec::delay_variation (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return this->DelayVariation;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4417,7 +4280,7 @@ ACE_Flow_Spec::delay_variation (void)
 ACE_INLINE void
 ACE_Flow_Spec::delay_variation (u_long dv)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->DelayVariation = dv;
 #else
   ACE_UNUSED_ARG (dv);
@@ -4427,8 +4290,7 @@ ACE_Flow_Spec::delay_variation (u_long dv)
 ACE_INLINE ACE_SERVICE_TYPE
 ACE_Flow_Spec::service_type (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   return this->ServiceType;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4438,8 +4300,7 @@ ACE_Flow_Spec::service_type (void)
 ACE_INLINE void
 ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   this->ServiceType = st;
 #else
   ACE_UNUSED_ARG (st);
@@ -4449,8 +4310,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st)
 ACE_INLINE u_long
 ACE_Flow_Spec::max_sdu_size (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   return this->MaxSduSize;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4460,8 +4320,7 @@ ACE_Flow_Spec::max_sdu_size (void)
 ACE_INLINE void
 ACE_Flow_Spec::max_sdu_size (u_long mss)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   this->MaxSduSize = mss;
 #else
   ACE_UNUSED_ARG (mss);
@@ -4471,8 +4330,7 @@ ACE_Flow_Spec::max_sdu_size (u_long mss)
 ACE_INLINE u_long
 ACE_Flow_Spec::minimum_policed_size (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   return this->MinimumPolicedSize;
 #else
   ACE_NOTSUP_RETURN (0);
@@ -4482,41 +4340,17 @@ ACE_Flow_Spec::minimum_policed_size (void)
 ACE_INLINE void
 ACE_Flow_Spec::minimum_policed_size (u_long mps)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
+#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINSOCK2_GQOS)
   this->MinimumPolicedSize = mps;
 #else
   ACE_UNUSED_ARG (mps);
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
-ACE_INLINE int
-ACE_Flow_Spec::ttl (void)
-{
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
-  ACE_NOTSUP_RETURN (-1);
-#else
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void
-ACE_Flow_Spec::ttl (int t)
-{
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
-    defined (ACE_HAS_WINSOCK2_GQOS)
-  ACE_UNUSED_ARG (t);
-  // TBD...
-#else
-  ACE_UNUSED_ARG (t);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
 ACE_INLINE ACE_Flow_Spec
 ACE_QoS::sending_flowspec (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return (ACE_Flow_Spec &) this->SendingFlowspec;
 #else
   ACE_NOTSUP_RETURN (ACE_Flow_Spec ());
@@ -4526,7 +4360,7 @@ ACE_QoS::sending_flowspec (void)
 ACE_INLINE void
 ACE_QoS::sending_flowspec (const ACE_Flow_Spec &fs)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->SendingFlowspec = (FLOWSPEC) fs;
 #else
   ACE_UNUSED_ARG (fs);
@@ -4536,7 +4370,7 @@ ACE_QoS::sending_flowspec (const ACE_Flow_Spec &fs)
 ACE_INLINE ACE_Flow_Spec
 ACE_QoS::receiving_flowspec (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return (ACE_Flow_Spec &) this->ReceivingFlowspec;
 #else
   ACE_NOTSUP_RETURN (ACE_Flow_Spec ());
@@ -4546,7 +4380,7 @@ ACE_QoS::receiving_flowspec (void)
 ACE_INLINE void
 ACE_QoS::receiving_flowspec (const ACE_Flow_Spec &fs)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->ReceivingFlowspec = (FLOWSPEC) fs;
 #else
   ACE_UNUSED_ARG (fs);
@@ -4556,7 +4390,7 @@ ACE_QoS::receiving_flowspec (const ACE_Flow_Spec &fs)
 ACE_INLINE iovec
 ACE_QoS::provider_specific (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   return (iovec &) this->ProviderSpecific;
 #else
   ACE_NOTSUP_RETURN (iovec ());
@@ -4566,7 +4400,7 @@ ACE_QoS::provider_specific (void)
 ACE_INLINE void
 ACE_QoS::provider_specific (const iovec &ps)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   this->ProviderSpecific = (WSABUF) ((iovec &) ps);
 #else
   ACE_UNUSED_ARG (ps);
@@ -4574,7 +4408,7 @@ ACE_QoS::provider_specific (const iovec &ps)
 }
 
 ACE_INLINE
-ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
+ACE_Connect_QoS_Params::ACE_Connect_QoS_Params (iovec *caller_data,
                                                 iovec *callee_data,
                                                 ACE_QoS *socket_qos,
                                                 ACE_QoS *group_socket_qos,
@@ -4588,61 +4422,61 @@ ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data,
 }
 
 ACE_INLINE iovec *
-ACE_QoS_Params::caller_data (void) const
+ACE_Connect_QoS_Params::caller_data (void) const
 {
   return this->caller_data_;
 }
 
 ACE_INLINE void
-ACE_QoS_Params::caller_data (iovec *cd)
+ACE_Connect_QoS_Params::caller_data (iovec *cd)
 {
   this->caller_data_ = cd;
 }
 
 ACE_INLINE iovec *
-ACE_QoS_Params::callee_data (void) const
+ACE_Connect_QoS_Params::callee_data (void) const
 {
   return this->callee_data_;
 }
 
 ACE_INLINE void
-ACE_QoS_Params::callee_data (iovec *cd)
+ACE_Connect_QoS_Params::callee_data (iovec *cd)
 {
   this->callee_data_ = cd;
 }
 
 ACE_INLINE ACE_QoS *
-ACE_QoS_Params::socket_qos (void) const
+ACE_Connect_QoS_Params::socket_qos (void) const
 {
   return this->socket_qos_;
 }
 
 ACE_INLINE void
-ACE_QoS_Params::socket_qos (ACE_QoS *sq)
+ACE_Connect_QoS_Params::socket_qos (ACE_QoS *sq)
 {
   this->socket_qos_ = sq;
 }
 
 ACE_INLINE ACE_QoS *
-ACE_QoS_Params::group_socket_qos (void) const
+ACE_Connect_QoS_Params::group_socket_qos (void) const
 {
   return this->group_socket_qos_;
 }
 
 ACE_INLINE void
-ACE_QoS_Params::group_socket_qos (ACE_QoS *gsq)
+ACE_Connect_QoS_Params::group_socket_qos (ACE_QoS *gsq)
 {
   this->group_socket_qos_ = gsq;
 }
 
 ACE_INLINE u_long
-ACE_QoS_Params::flags (void) const
+ACE_Connect_QoS_Params::flags (void) const
 {
   return this->flags_;
 }
 
 ACE_INLINE void
-ACE_QoS_Params::flags (u_long f)
+ACE_Connect_QoS_Params::flags (u_long f)
 {
   this->flags_ = f;
 }
@@ -4717,22 +4551,6 @@ ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle,
                        ACE_HANDLE,
                        ACE_INVALID_HANDLE);
 #  else
-#    if defined (ACE_HAS_BROKEN_ACCEPT_ADDR)
-  // Apparently some platforms like VxWorks can't correctly deal with
-  // a NULL addr.
-
-   sockaddr_in fake_addr;
-   int fake_addrlen;
-
-   if (addrlen == 0)
-     addrlen = &fake_addrlen;
-
-   if (addr == 0)
-     {
-       addr = (sockaddr *) &fake_addr;
-       *addrlen = sizeof fake_addr;
-     }
-#    endif /* VXWORKS */
   ACE_HANDLE ace_result = ::accept ((ACE_SOCKET) handle,
                                     addr,
                                     (ACE_SOCKET_LEN *) addrlen) ;
@@ -4750,7 +4568,7 @@ ACE_OS::accept (ACE_HANDLE handle,
                 int *addrlen,
                 const ACE_Accept_QoS_Params &qos_params)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   ACE_SOCKCALL_RETURN (::WSAAccept ((ACE_SOCKET) handle,
                                     addr,
                                     (ACE_SOCKET_LEN *) addrlen,
@@ -4770,9 +4588,9 @@ ACE_INLINE ACE_HANDLE
 ACE_OS::join_leaf (ACE_HANDLE socket,
                    const sockaddr *name,
                    int namelen,
-                   const ACE_QoS_Params &qos_params)
+                   const ACE_Connect_QoS_Params &qos_params)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   ACE_SOCKCALL_RETURN (::WSAJoinLeaf ((ACE_SOCKET) socket,
                                       name,
                                       namelen,
@@ -4803,7 +4621,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
                ACE_OVERLAPPED *overlapped,
                ACE_OVERLAPPED_COMPLETION_FUNC func)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   ACE_SOCKCALL_RETURN (::WSAIoctl ((ACE_SOCKET) socket,
                                    io_control_code,
                                    in_buffer_p,
@@ -4812,7 +4630,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
                                    out_buffer,
                                    bytes_returned,
                                    (WSAOVERLAPPED *) overlapped,
-                                   func),
+                                   (LPWSAOVERLAPPED_COMPLETION_ROUTINE) func),
                        int,
                        SOCKET_ERROR);
 #else
@@ -4825,7 +4643,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
   ACE_UNUSED_ARG (bytes_returned);
   ACE_UNUSED_ARG (overlapped);
   ACE_UNUSED_ARG (func);
-  ACE_NOTSUP_RETURN (-1);
+  ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
 #endif /* ACE_HAS_WINSOCK2 */
 }
 
@@ -4861,10 +4679,10 @@ ACE_INLINE int
 ACE_OS::connect (ACE_HANDLE handle,
                  const sockaddr *addr,
                  int addrlen,
-                 const ACE_QoS_Params &qos_params)
+                 const ACE_Connect_QoS_Params &qos_params)
 {
   ACE_TRACE ("ACE_OS::connect");
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   ACE_SOCKCALL_RETURN (::WSAConnect ((ACE_SOCKET) handle,
                                      (const sockaddr *) addr,
                                      (ACE_SOCKET_LEN) addrlen,
@@ -5022,12 +4840,8 @@ ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags)
 }
 
 ACE_INLINE int
-ACE_OS::recvfrom (ACE_HANDLE handle,
-                  char *buf,
-                  int len,
-                  int flags,
-                  struct sockaddr *addr,
-                  int *addrlen)
+ACE_OS::recvfrom (ACE_HANDLE handle, char *buf, int len,
+                  int flags, struct sockaddr *addr, int *addrlen)
 {
   ACE_TRACE ("ACE_OS::recvfrom");
 #if defined (ACE_PSOS)
@@ -5049,7 +4863,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle,
                            (ACE_SOCKET_LEN *) addrlen);
   if (result == SOCKET_ERROR)
     {
-      ACE_OS::set_errno_to_wsa_last_error ();
+      errno = ::WSAGetLastError ();
       if (errno == WSAEMSGSIZE &&
           ACE_BIT_ENABLED (flags, MSG_PEEK))
         return len;
@@ -5077,48 +4891,6 @@ ACE_OS::send (ACE_HANDLE handle, const char *buf, int len, int flags)
 }
 
 ACE_INLINE int
-ACE_OS::recvfrom (ACE_HANDLE handle,
-                  iovec *buffers,
-                  int buffer_count,
-                  size_t &number_of_bytes_recvd,
-                  int &flags,
-                  struct sockaddr *addr,
-                  int *addrlen,
-                  ACE_OVERLAPPED *overlapped,
-                  ACE_OVERLAPPED_COMPLETION_FUNC func)
-{
-  ACE_TRACE ("ACE_OS::recvfrom");
-
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  DWORD bytes_recvd;
-  DWORD the_flags = flags;
-  int result = ::WSARecvFrom ((SOCKET) handle,
-                              (WSABUF*)buffers,
-                              buffer_count,
-                              &bytes_recvd,
-                              &the_flags,
-                              addr,
-                              addrlen,
-                              overlapped,
-                              func);
-  flags = the_flags;
-  number_of_bytes_recvd = ACE_static_cast(size_t,bytes_recvd);
-  return result;
-#else
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (buffers);
-  ACE_UNUSED_ARG (buffer_count);
-  ACE_UNUSED_ARG (number_of_bytes_recvd);
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (addr);
-  ACE_UNUSED_ARG (addrlen);
-  ACE_UNUSED_ARG (overlapped);
-  ACE_UNUSED_ARG (func);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
-}
-
-ACE_INLINE int
 ACE_OS::sendto (ACE_HANDLE handle,
                 const char *buf,
                 int len,
@@ -5149,57 +4921,6 @@ ACE_OS::sendto (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::sendto (ACE_HANDLE handle,
-                const iovec *buffers,
-                int buffer_count,
-                size_t &number_of_bytes_sent,
-                int flags,
-                const struct sockaddr *addr,
-                int addrlen,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func)
-{
-  ACE_TRACE ("ACE_OS::sendto");
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-  DWORD bytes_sent;
-  int result = ::WSASendTo ((SOCKET) handle,
-                            (WSABUF*)buffers,
-                            buffer_count,
-                            &bytes_sent,
-                            flags,
-                            addr,
-                            addrlen,
-                            overlapped,
-                            func);
-  number_of_bytes_sent = ACE_static_cast(size_t, bytes_sent);
-  return result;
-#else
-  ACE_UNUSED_ARG (overlapped);
-  ACE_UNUSED_ARG (func);
-
-  number_of_bytes_sent = 0;
-
-  int result = 0;
-
-  for (int i = 0; i < buffer_count; i++)
-    {
-       result = ACE_OS::sendto (handle,
-                                ACE_reinterpret_cast(char* ACE_CAST_CONST,
-                                                     buffers[i].iov_base),
-                                buffers[i].iov_len,
-                                flags,
-                                addr,
-                                addrlen);
-       if (result == -1)
-         break;
-       number_of_bytes_sent += result;
-    }
-
-  return result;
-#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */
-}
-
-ACE_INLINE int
 ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr,
                      int *addrlen)
 {
@@ -5410,7 +5131,7 @@ ACE_OS::socket (int domain,
 {
   ACE_TRACE ("ACE_OS::socket");
 
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2)
   ACE_SOCKCALL_RETURN (::WSASocket (domain,
                                     type,
                                     proto,
@@ -5457,7 +5178,7 @@ ACE_OS::recvmsg (ACE_HANDLE handle, struct msghdr *msg, int flags)
 
   if (result != 0)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else
@@ -5495,7 +5216,7 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
 
   if (result != 0)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else
@@ -5572,7 +5293,7 @@ ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 
   if (::ReadFile (fp, ptr, tlen, &len, NULL) == FALSE)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else if (tlen != len)
@@ -5600,7 +5321,7 @@ ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
 
   if (::WriteFile (fp, ptr, tlen, &len, NULL) == FALSE)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else if (tlen != len)
@@ -6028,13 +5749,13 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
 
   if (family == AF_INET)
     {
-      ASYS_TCHAR temp[INET_ADDRSTRLEN];
+      char temp[INET_ADDRSTRLEN];
 
       // Stevens uses snprintf() in his implementation but snprintf()
       // doesn't appear to be very portable.  For now, hope that using
       // sprintf() will not cause any string/memory overrun problems.
       ACE_OS::sprintf (temp,
-                       ASYS_TEXT ("%d.%d.%d.%d"),
+                       "%d.%d.%d.%d",
                        p[0], p[1], p[2], p[3]);
 
       if (ACE_OS::strlen (temp) >= len)
@@ -6043,7 +5764,7 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
           return 0; // Failure
         }
 
-      ACE_OS::strcpy (strptr, ASYS_ONLY_MULTIBYTE_STRING (temp));
+      ACE_OS::strcpy (strptr, temp);
       return strptr;
     }
 
@@ -6052,52 +5773,12 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
 }
 
 ACE_INLINE int
-ACE_OS::set_errno_to_last_error (void)
-{
-# if defined (ACE_WIN32)
-// Borland C++ Builder 4 has a bug in the RTL that resets the
-// <GetLastError> value to zero when errno is accessed.  Thus, we have
-// to use this to set errno to GetLastError.  It's bad, but only for
-// WIN32
-#   if defined(__BORLANDC__) && (__BORLANDC__ == 0x540)
-  int last_error = ::GetLastError ();
-  return errno = last_error;
-#   else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
-  return errno = ::GetLastError ();
-#   endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
-#else
-  return errno;
-# endif /* defined(ACE_WIN32) */
-}
-
-ACE_INLINE int
-ACE_OS::set_errno_to_wsa_last_error (void)
-{
-# if defined (ACE_WIN32)
-// Borland C++ Builder 4 has a bug in the RTL that resets the
-// <GetLastError> value to zero when errno is accessed.  Thus, we have
-// to use this to set errno to GetLastError.  It's bad, but only for
-// WIN32
-#   if defined(__BORLANDC__) && (__BORLANDC__ == 0x540)
-  int last_error = ::WSAGetLastError ();
-  return errno = last_error;
-#   else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
-  return errno = ::WSAGetLastError ();
-#   endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
-#else
-  return errno;
-# endif /* defined(ACE_WIN32) */
-}
-
-ACE_INLINE int
 ACE_OS::last_error (void)
 {
   // ACE_TRACE ("ACE_OS::last_error");
 
 #if defined (ACE_WIN32)
-  int lerror = ::GetLastError ();
-  int lerrno = errno;
-  return lerrno == 0 ? lerror : lerrno;
+  return errno == 0 ? ::GetLastError () : errno;
 #else
   return errno;
 #endif /* ACE_HAS_WIN32 */
@@ -6190,14 +5871,8 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), ace_result_), int, -1);
 # elif defined (ACE_HAS_PTHREADS)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread),
-                                       ace_result_),
-                     int, -1);
-#  else
   ACE_UNUSED_ARG (target_thread);
   ACE_NOTSUP_RETURN (-1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # elif defined (ACE_HAS_WTHREADS)
   DWORD result = ::ResumeThread (target_thread);
   if (result == ACE_SYSCALL_FAILED)
@@ -6207,7 +5882,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread)
 # elif defined (ACE_PSOS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_resume (target_thread), ace_result_), int, -1);
 # elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::taskResume (target_thread), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskResume (target_thread), ace_result_), int, -1);
 # endif /* ACE_HAS_STHREADS */
 #else
   ACE_UNUSED_ARG (target_thread);
@@ -6299,7 +5974,7 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio)
   // passing a 0 in the second argument does not alter task priority, third arg gets existing one
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_setpri (thr_id, 0, (u_long *) &prio), ace_result_), int, -1);
 # elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::taskPriorityGet (thr_id, &prio), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskPriorityGet (thr_id, &prio), ace_result_), int, -1);
 # else
   ACE_UNUSED_ARG (thr_id);
   ACE_UNUSED_ARG (prio);
@@ -6727,7 +6402,7 @@ ACE_OS::sigwait (sigset_t *set, int *sig)
   if (sig == 0)
     sig = &local_sig;
 #if defined (ACE_HAS_THREADS)
-# if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || defined (CHORUS) || defined (ACE_PSOS)
+# if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS)
     ACE_UNUSED_ARG (set);
     ACE_NOTSUP_RETURN (-1);
 # elif (defined (ACE_HAS_STHREADS) && !defined (_POSIX_PTHREAD_SEMANTICS))
@@ -6914,7 +6589,8 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
   if (tid == ERROR)
     return -1;
   else
-    ACE_OSCALL_RETURN (::kill (tid, signum), int, -1);
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::kill (tid, signum), ace_result_),
+                       int, -1);
 
 # else /* This should not happen! */
   ACE_UNUSED_ARG (thr_id);
@@ -7050,7 +6726,9 @@ ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio)
                                        ace_result_),
                      int, -1);
 # elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::taskPrioritySet (thr_id, prio), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskPrioritySet (thr_id, prio),
+                                       ace_result_),
+                     int, -1);
 # else
   // For example, platforms that support Pthreads but LACK_SETSCHED.
   ACE_UNUSED_ARG (thr_id);
@@ -7072,14 +6750,8 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), ace_result_), int, -1);
 # elif defined (ACE_HAS_PTHREADS)
-#  if defined (ACE_HAS_PTHREADS_UNIX98_EXT)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread),
-                                       ace_result_),
-                     int, -1);
-#  else
   ACE_UNUSED_ARG (target_thread);
   ACE_NOTSUP_RETURN (-1);
-#  endif /* ACE_HAS_PTHREADS_UNIX98_EXT */
 # elif defined (ACE_HAS_WTHREADS)
   if (::SuspendThread (target_thread) != ACE_SYSCALL_FAILED)
     return 0;
@@ -7089,7 +6761,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 # elif defined (ACE_PSOS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_suspend (target_thread), ace_result_), int, -1);
 # elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::taskSuspend (target_thread), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::taskSuspend (target_thread), ace_result_), int, -1);
 # endif /* ACE_HAS_STHREADS */
 #else
   ACE_UNUSED_ARG (target_thread);
@@ -7197,16 +6869,15 @@ ACE_OS::recvv (ACE_HANDLE handle,
   DWORD bytes_received = 0;
   int result = 1;
 
-  // Winsock 2 has WSARecv and can do this directly, but Winsock 1 needs
+  // Winsock 2 has WSASend and can do this directly, but Winsock 1 needs
   // to do the recvs piece-by-piece.
 
 # if (ACE_HAS_WINSOCK2 != 0)
-  DWORD flags = 0;
   result = ::WSARecv ((SOCKET) handle,
                       (WSABUF *) buffers,
                       n,
                       &bytes_received,
-                      &flags,
+                      0,
                       0,
                       0);
 # else
@@ -7234,7 +6905,7 @@ ACE_OS::recvv (ACE_HANDLE handle,
 
   if (result == SOCKET_ERROR)
     {
-      ACE_OS::set_errno_to_wsa_last_error ();
+      errno = ::WSAGetLastError ();
       return -1;
     }
   else
@@ -7277,7 +6948,7 @@ ACE_OS::sendv (ACE_HANDLE handle,
 
   if (result == SOCKET_ERROR)
     {
-      ACE_OS::set_errno_to_wsa_last_error ();
+      errno = ::WSAGetLastError ();
       return -1;
     }
   else
@@ -7783,19 +7454,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 {
   ACE_TRACE ("ACE_OS::hostname");
 #if !defined (ACE_HAS_WINCE)
-# if defined (ACE_HAS_PHARLAP)
-  // PharLap only can do net stuff with the RT version.
-#   if defined (ACE_HAS_PHARLAP_RT)
-  // @@This is not at all reliable... requires ethernet and BOOTP to be used.
-  // A more reliable way is to go thru the devices w/ EtsTCPGetDeviceCfg until
-  // a legit IP address is found, then get its name w/ gethostbyaddr.
-  ACE_SOCKCALL_RETURN (gethostname (name, maxnamelen), int, SOCKET_ERROR);
-#   else
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (maxnamelen);
-  ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_PHARLAP_RT */
-# elif defined (ACE_WIN32)
+# if defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameA (name, LPDWORD (&maxnamelen)),
                                           ace_result_), int, -1);
 # elif defined (VXWORKS)
@@ -8004,7 +7663,8 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
 #endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 }
 
-ACE_INLINE ASYS_TCHAR *
+#if !defined (ACE_HAS_WINCE)
+ACE_INLINE char *
 ACE_OS::dlerror (void)
 {
   ACE_TRACE ("ACE_OS::dlerror");
@@ -8013,28 +7673,14 @@ ACE_OS::dlerror (void)
 # elif defined (__hpux)
   ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
-  static ASYS_TCHAR buf[128];
-#   if defined (ACE_HAS_PHARLAP)
-  ACE_OS::sprintf (buf, "error code %d", GetLastError());
-#   else
-#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+  static char buf[128];
   FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM,
                   NULL,
-                  ::GetLastError (),
+                  GetLastError (),
                   0,
                   buf,
                   sizeof buf,
                   NULL);
-#else
-  FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM,
-                 NULL,
-                 ::GetLastError (),
-                 0,
-                 buf,
-                 sizeof buf / sizeof ASYS_TCHAR,
-                 NULL);
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
-#   endif /* ACE_HAS_PHARLAP */
   return buf;
 # else
   ACE_NOTSUP_RETURN (0);
@@ -8042,7 +7688,7 @@ ACE_OS::dlerror (void)
 }
 
 ACE_INLINE ACE_SHLIB_HANDLE
-ACE_OS::dlopen (const ASYS_TCHAR *fname,
+ACE_OS::dlopen (const char *fname,
                 int mode)
 {
   ACE_TRACE ("ACE_OS::dlopen");
@@ -8078,11 +7724,7 @@ ACE_OS::dlopen (const ASYS_TCHAR *fname,
 # elif defined (ACE_WIN32)
   ACE_UNUSED_ARG (mode);
 
-#   if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
-  ACE_WIN32CALL_RETURN (::LoadLibrary (filename), ACE_SHLIB_HANDLE, 0);
-#   else
   ACE_WIN32CALL_RETURN (::LoadLibraryA (filename), ACE_SHLIB_HANDLE, 0);
-#   endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 # elif defined (__hpux)
 
 #   if defined(__GNUC__) || __cplusplus >= 199707L
@@ -8140,6 +7782,8 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_NOTSUP_RETURN (0);
 # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 }
+#endif /* ACE_HAS_WINCE */
+
 
 ACE_INLINE int
 ACE_OS::step (const char *str, char *expbuf)
@@ -8346,8 +7990,7 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 # if defined (ACE_WIN32)
   ACE_UNUSED_ARG (who);
 
-  FILETIME dummy_1;
-  FILETIME dummy_2;
+  FILETIME dummy_1, dummy_2;
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(),
                                                              &dummy_1,   // start
                                                              &dummy_2,     // exited
@@ -8393,7 +8036,7 @@ ACE_OS::mmap (void *addr,
               LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_OS::mmap");
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32)
   int nt_flags = 0;
   ACE_HANDLE local_handle = ACE_INVALID_HANDLE;
 
@@ -8539,7 +8182,7 @@ ACE_INLINE int
 ACE_OS::mprotect (void *addr, size_t len, int prot)
 {
   ACE_TRACE ("ACE_OS::mprotect");
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32)
   DWORD dummy; // Sigh!
   return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1;
 #elif !defined (ACE_LACKS_MPROTECT)
@@ -8556,7 +8199,7 @@ ACE_INLINE int
 ACE_OS::msync (void *addr, size_t len, int sync)
 {
   ACE_TRACE ("ACE_OS::msync");
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32)
   ACE_UNUSED_ARG (sync);
 
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1);
@@ -9873,7 +9516,7 @@ ACE_INLINE int
 ACE_OS::getpagesize (void)
 {
   ACE_TRACE ("ACE_OS::getpagesize");
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return (int) sys_info.dwPageSize;
@@ -10063,7 +9706,8 @@ ACE_OS::ioctl (ACE_HANDLE handle, int cmd, void *val)
   ACE_SOCKET sock = (ACE_SOCKET) handle;
   ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, (u_long *) val), int, -1);
 #elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::ioctl (handle, cmd, ACE_reinterpret_cast (int, val)),
+  // This may not work very well...
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::ioctl (handle, cmd, (int) val), ace_result_),
                      int, -1);
 #elif defined (ACE_PSOS)
   ACE_OSCALL_RETURN (::ioctl (handle, cmd, (char *) val), int, -1);
@@ -10343,11 +9987,7 @@ ACE_OS::mkdir (const char *path, mode_t mode)
 # if defined (ACE_WIN32)
   ACE_UNUSED_ARG (mode);
 
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1);
-#else
   ACE_OSCALL_RETURN (::_mkdir (path), int, -1);
- #endif /* __IBMCPP__ */
 # elif defined (ACE_PSOS_LACKS_PHILE)
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (mode);
@@ -10448,19 +10088,6 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
 # endif /* ACE_HAS_UNICODE */
 }
 
-ACE_INLINE size_t
-ACE_OS::strspn (const wchar_t *s, const wchar_t *t)
-{
-#if !defined (ACE_HAS_WINCE) && defined (ACE_HAS_UNICODE)
-  ACE_TRACE ("ACE_OS::strspn");
-  return ::wcsspn (s, t);
-#else
-  ACE_UNUSED_ARG (s);
-  ACE_UNUSED_ARG (t);
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINCE */
-}
-
 ACE_INLINE int
 ACE_OS::strcmp (const wchar_t *s, const wchar_t *t)
 {
@@ -10471,27 +10098,15 @@ ACE_OS::strcmp (const wchar_t *s, const wchar_t *t)
 #   if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
   return wcscmp (s, t);
 #   else
-  const wchar_t *scan1 = s;
-  const wchar_t *scan2 = t;
-
-  while (*scan1 != 0 && *scan1 == *scan2)
+  while (*s != 0 &&
+         *t != 0 &&
+         *s == *t)
     {
-      ++scan1;
-      ++scan2;
+      s++;
+      t++;
     }
 
-  // The following case analysis is necessary so that characters which
-  // look negative collate low against normal characters but high
-  // against the end-of-string NUL.
-
-  if (*scan1 == '\0' && *scan2 == '\0')
-    return 0;
-  else if (*scan1 == '\0')
-    return -1;
-  else if (*scan2 == '\0')
-    return 1;
-  else
-    return *scan1 - *scan2;
+  return *s - *t;
 #   endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */
 # endif /* ACE_HAS_UNICODE */
 }
@@ -10528,12 +10143,12 @@ ACE_OS::strcmp (const ACE_USHORT16 *s, const ACE_USHORT16 *t)
 {
   ACE_TRACE ("ACE_OS::strcmp");
 
-  while (*s != 0
-         && *t != 0
-         && *s == *t)
+  while (*s != 0 &&
+         *t != 0 &&
+         *s == *t)
     {
-      ++s;
-      ++t;
+      s++;
+      t++;
     }
 
   return *s - *t;
@@ -10545,7 +10160,7 @@ ACE_OS::wslen (const WChar *s)
 {
   u_int len = 0;
 
-  while (*s++ != 0)
+  while (*s++)
     len++;
 
   return len;
@@ -10685,68 +10300,54 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
   ACE_TRACE ("ACE_OS::strcasecmp");
 
 # if !defined (ACE_WIN32)
-  const wchar_t *scan1 = s;
-  const wchar_t *scan2 = t;
+  // Handles most of what the BSD version does, but does not indicate
+  // lexicographic ordering if the strings are unequal.  Just
+  // indicates equal (ignoring case) by return value == 0, else not
+  // equal.
+  int result = 0;
 
-  while (*scan1 != 0
-         && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2))
+  do
     {
-      ++scan1;
-      ++scan2;
-    }
+      int a = ACE_OS::to_lower (*s);
+      int b = ACE_OS::to_lower (*t);
+      result = ((a < b) ? -1 : (a > b));
+      if (result != 0)
+        break;
+    } while (*s++ != '\0' && *t++ != '\0');
+  //  paranoid termination condition
 
-  // The following case analysis is necessary so that characters which
-  // look negative collate low against normal characters but high
-  // against the end-of-string NUL.
+  return result; // == 0 for match, else 1
 
-  if (*scan1 == '\0' && *scan2 == '\0')
-    return 0;
-  else if (*scan1 == '\0')
-    return -1;
-  else if (*scan2 == '\0')
-    return 1;
-  else
-    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 # else /* ACE_WIN32 */
   return ::_wcsicmp (s, t);
 # endif /* ACE_WIN32 */
 }
 
 ACE_INLINE int
-ACE_OS::strncasecmp (const wchar_t *s,
-                     const wchar_t *t,
-                     size_t len)
+ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
   ACE_TRACE ("ACE_OS::strcasecmp");
 
 # if !defined (ACE_WIN32)
-  const wchar_t *scan1 = s;
-  const wchar_t *scan2 = t;
-  ssize_t count = ssize_t (n);
+  // Handles most of what the BSD version does, but does not indicate
+  // lexicographic ordering if the strings are unequal.  Just
+  // indicates equal (ignoring case) by return value == 0, else not
+  // equal.
+  int result = 0;
 
-  while (--count >= 0
-         && *scan1 != 0
-         && ACE_OS::to_lower (*scan1) == ACE_OS::to_lower (*scan2))
+  while (*s != '\0' && *t != '\0' && len != 0)
     {
-      ++scan1;
-      ++scan2;
-    }
+      if (ACE_OS::to_lower (*s) != ACE_OS::to_lower (*t))
+        {
+          result = ((ACE_OS::to_lower (*s) < ACE_OS::to_lower (*t)) ? -1 : 1);
+          break;
+        }
 
-  if (count < 0)
-    return 0;
+      ++s; ++t; --len;
+    }
 
-  // The following case analysis is necessary so that characters which
-  // look negative collate low against normal characters but high
-  // against the end-of-string NUL.
+  return result; // == 0 for match, else 1
 
-  if (*scan1 == '\0' && *scan2 == '\0')
-    return 0;
-  else if (*scan1 == '\0')
-    return -1;
-  else if (*scan2 == '\0')
-    return 1;
-  else
-    return ACE_OS::to_lower (*scan1) - ACE_OS::to_lower (*scan2);
 # else /* ACE_WIN32 */
   return ::_wcsnicmp (s, t, len);
 # endif /* ACE_WIN32 */
@@ -10787,20 +10388,6 @@ ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base)
   return ::wcstol (s, ptr, base);
 }
 
-ACE_INLINE unsigned long
-ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base)
-{
-  ACE_TRACE ("ACE_OS::strtoul");
-  return ::wcstoul (s, ptr, base);
-}
-
-ACE_INLINE double
-ACE_OS::strtod (const wchar_t *s, wchar_t **endptr)
-{
-  ACE_TRACE ("ACE_OS::strtod");
-  return ::wcstod (s, endptr);
-}
-
 ACE_INLINE int
 ACE_OS::ace_isspace (wchar_t c)
 {
@@ -10874,7 +10461,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 ACE_INLINE int
 ACE_OS::hostname (wchar_t *name, size_t maxnamelen)
 {
-#   if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
+#   if !defined (ACE_HAS_WINCE)
   ACE_TRACE ("ACE_OS::hostname");
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameW (name, LPDWORD (&maxnamelen)),
                                           ace_result_), int, -1);
@@ -10911,20 +10498,6 @@ ACE_OS::getenv (const wchar_t *symbol)
 }
 
 ACE_INLINE int
-ACE_OS::putenv (const wchar_t *string)
-{
-  ACE_TRACE ("ACE_OS::putenv");
-  // VxWorks declares ::putenv with a non-const arg.
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS)
-  ACE_OSCALL_RETURN (::_wputenv ((wchar_t *) string), int, -1);
-#else
-  // @@ WinCE and pSOS don't have the concept of environment variables.
-  ACE_UNUSED_ARG (string);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ! ACE_HAS_WINCE && ! ACE_PSOS */
-}
-
-ACE_INLINE int
 ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name)
 {
 #   if !defined (ACE_HAS_WINCE)
@@ -10977,7 +10550,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const wchar_t *mode)
   if (crt_handle != -1)
     {
 #     if defined(__BORLANDC__)
-      file = ::_wfdopen (crt_handle, ACE_const_cast (wchar_t *, mode));
+      file = ::_wfdopen (crt_handle, (wchar_t*) mode);
 #     else
       file = ::_wfdopen (crt_handle, mode);
 #     endif /* defined(__BORLANDC__) */
@@ -11013,7 +10586,7 @@ ACE_OS::stat (const wchar_t *file, struct stat *stp)
   fhandle = ::FindFirstFile (file, &fdata);
   if (fhandle == INVALID_HANDLE_VALUE)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     }
   else if (fdata.nFileSizeHigh != 0)
@@ -11049,22 +10622,6 @@ ACE_OS::perror (const wchar_t *s)
 }
 
 
-// Here are functions that CE doesn't support at all.
-// Notice that some of them might have UNICODE version.
-ACE_INLINE wchar_t *
-ACE_OS::fgets (wchar_t *buf, int size, FILE *fp)
-{
-#if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::fgets");
-  ACE_OSCALL_RETURN (::fgetws (buf, size, fp), wchar_t *, 0);
-#else
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (size);
-  ACE_UNUSED_ARG (fp);
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINCE */
-}
-
 ACE_INLINE int
 ACE_OS::system (const wchar_t *command)
 {
@@ -11125,15 +10682,6 @@ ACE_OS::getcwd (wchar_t *buf, size_t size)
   return ::_wgetcwd (buf, size);
 #   endif /* ACE_HAS_WINCE */
 }
-
-ACE_INLINE int
-ACE_OS::mkfifo (const wchar_t *file, mode_t mode)
-{
-  // ACE_TRACE ("ACE_OS::mkfifo");
-  ACE_UNUSED_ARG (file);
-  ACE_UNUSED_ARG (mode);
-  ACE_NOTSUP_RETURN (-1);
-}
 # endif /* ACE_WIN32 */
 #endif /* ACE_HAS_UNICODE */
 
@@ -11893,25 +11441,6 @@ ACE_OS::strenvdup (const char *str)
 #endif /* ACE_HAS_WINCE */
 }
 
-#if !defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) && defined (ACE_WIN32)
-ACE_INLINE wchar_t *
-ACE_OS::strenvdup (const wchar_t *str)
-{
-#if defined (ACE_HAS_WINCE)
-     // WinCE doesn't have environment variables so we just skip it.
-  return ACE_OS::strdup (str);
-#else
-  wchar_t *temp = 0;
-
-  if (str[0] == '$'
-      && (temp = ACE_OS::getenv (&str[1])) != 0)
-    return ACE_OS::strdup (temp);
-  else
-    return ACE_OS::strdup (str);
-#endif /* ACE_HAS_WINCE */
-}
-#endif /* ACE_HAS_WCHAR_TYPEDEFS_CHAR */
-
 ACE_INLINE
 ACE_OS_WString::~ACE_OS_WString (void)
 {
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 70c0d7fee03..c6f5e15b430 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -235,16 +235,15 @@ ACE_Object_Manager::init (void)
           ACE_TSS_Emulation::tss_open (ts_storage_);
 #     endif /* ACE_HAS_TSS_EMULATION */
 
-          ACE_NEW_RETURN (preallocations_,
-                          ACE_Object_Manager_Preallocations,
+          ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations,
                           -1);
+
           // Open the main thread's ACE_Log_Msg.
           (void) ACE_LOG_MSG;
         }
 
-      ACE_NEW_RETURN (default_mask_,
-                      ACE_Sig_Set (1),
-                      -1);
+      ACE_NEW_RETURN (default_mask_, ACE_Sig_Set (1), -1);
+
       // Finally, indicate that the ACE_Object_Manager instance has
       // been initialized.
       object_manager_state_ = OBJ_MAN_INITIALIZED;
@@ -252,7 +251,7 @@ ACE_Object_Manager::init (void)
       return 0;
     } else {
       // Had already initialized.
-      return 1;
+      return -1;
     }
 }
 
@@ -302,9 +301,7 @@ ACE_Object_Manager::instance (void)
     {
       ACE_Object_Manager *instance_pointer;
 
-      ACE_NEW_RETURN (instance_pointer,
-                      ACE_Object_Manager,
-                      0);
+      ACE_NEW_RETURN (instance_pointer, ACE_Object_Manager, 0);
       ACE_ASSERT (instance_pointer == instance_);
 
       instance_pointer->dynamically_allocated_ = 1;
@@ -312,7 +309,9 @@ ACE_Object_Manager::instance (void)
       return instance_pointer;
     }
   else
-    return instance_;
+    {
+      return instance_;
+    }
 }
 
 ACE_Sig_Set &
@@ -402,7 +401,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock)
 {
   if (lock == 0)
     {
-      if (starting_up () || shutting_down ())
+      if (starting_up ()  ||  shutting_down ())
         {
           // The Object_Manager and its internal lock have not been
           // constructed yet.  Therefore, the program is single-
@@ -410,9 +409,8 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock)
           // instance has been destroyed, so the internal lock is not
           // available.  Either way, we can not use double-checked
           // locking.  So, we'll leak the lock.
-          ACE_NEW_RETURN (lock,
-                          ACE_Thread_Mutex,
-                          -1);
+
+          ACE_NEW_RETURN (lock, ACE_Thread_Mutex, -1);
         }
       else
         {
@@ -421,7 +419,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock)
           ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
                                     ace_mon,
                                     *ACE_Object_Manager::instance ()->
-                                    internal_lock_,
+                                      internal_lock_,
                                     -1));
 
           if (lock == 0)
@@ -458,9 +456,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Mutex *&lock)
           // available.  Either way, we can not use double-checked
           // locking.  So, we'll leak the lock.
 
-          ACE_NEW_RETURN (lock,
-                          ACE_Mutex,
-                          -1);
+          ACE_NEW_RETURN (lock, ACE_Mutex, -1);
         }
       else
         {
@@ -533,7 +529,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
 {
   if (lock == 0)
     {
-      if (starting_up () || shutting_down ())
+      if (starting_up ()  ||  shutting_down ())
         {
           // The Object_Manager and its internal lock have not been
           // constructed yet.  Therefore, the program is single-
@@ -542,9 +538,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
           // available.  Either way, we can not use double-checked
           // locking.  So, we'll leak the lock.
 
-          ACE_NEW_RETURN (lock,
-                          ACE_RW_Thread_Mutex,
-                          -1);
+          ACE_NEW_RETURN (lock, ACE_RW_Thread_Mutex, -1);
         }
       else
         {
@@ -553,7 +547,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
           ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
                                     ace_mon,
                                     *ACE_Object_Manager::instance ()->
-                                    internal_lock_,
+                                      internal_lock_,
                                     -1));
 
           if (lock == 0)
@@ -593,7 +587,7 @@ ACE_Object_Manager::fini (void)
   if (shutting_down_i ())
     // Too late.  Or, maybe too early.  Either fini () has already
     // been called, or init () was never called.
-    return object_manager_state_ == OBJ_MAN_SHUT_DOWN  ?  1  :  -1;
+    return -1;
 
   // No mutex here.  Only the main thread should destroy the singleton
   // ACE_Object_Manager instance.
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index cacc50b5faa..96bd39daf79 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -182,13 +182,11 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
 public:
   virtual int init (void);
   // Explicitly initialize (construct the singleton instance of) the
-  // ACE_Object_Manager.  Returns 0 on success, -1 on failure, and 1
-  // if it had already been called.
+  // ACE_Object_Manager.
 
   virtual int fini (void);
   // Explicitly destroy the singleton instance of the
-  // ACE_Object_Manager.  Returns 0 on success, -1 on failure, and 1
-  // if it had already been called.
+  // ACE_Object_Manager.
 
   static int starting_up (void);
   // Returns 1 before the ACE_Object_Manager has been constructed.
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 9a6eb50e940..9738b4f1c1a 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -357,6 +357,8 @@ ACE_POSIX_Proactor::post_wakeup_completions (int how_many)
   return 0;
 }  
 
+// *********************************************************************
+
 class ACE_Export ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler
 {
   // = TITLE
@@ -911,9 +913,7 @@ ACE_Asynch_Read_Stream_Impl *
 ACE_POSIX_SIG_Proactor::create_asynch_read_stream (void)
 {
   ACE_Asynch_Read_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Read_Stream (this),
-                  0);
+  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_Stream (this), 0);
   return  implementation;
 }
 
@@ -921,9 +921,7 @@ ACE_Asynch_Write_Stream_Impl *
 ACE_POSIX_SIG_Proactor::create_asynch_write_stream (void)
 {
   ACE_Asynch_Write_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Write_Stream (this),
-                  0);
+  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_Stream (this), 0);
   return  implementation;
 }
 
@@ -931,9 +929,7 @@ ACE_Asynch_Read_File_Impl *
 ACE_POSIX_SIG_Proactor::create_asynch_read_file (void)
 {
   ACE_Asynch_Read_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Read_File (this),
-                  0);
+  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_File (this), 0);
   return  implementation;
 }
 
@@ -941,9 +937,7 @@ ACE_Asynch_Write_File_Impl *
 ACE_POSIX_SIG_Proactor::create_asynch_write_file (void)
 {
   ACE_Asynch_Write_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Write_File (this),
-                  0);
+  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_File (this), 0);
   return  implementation;
 }
 
@@ -951,9 +945,7 @@ ACE_Asynch_Accept_Impl *
 ACE_POSIX_SIG_Proactor::create_asynch_accept (void)
 {
   ACE_Asynch_Accept_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Accept (this),
-                  0);
+  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Accept (this), 0);
   return implementation;
 }
 
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 34803d53f54..cda7c90ee05 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -54,7 +54,7 @@ ACE_Parse_Node::dump (void) const
   ACE_TRACE ("ACE_Parse_Node::dump");
 }
 
-const ASYS_TCHAR *
+const char *
 ACE_Parse_Node::name (void) const
 {
   ACE_TRACE ("ACE_Parse_Node::name");
@@ -78,12 +78,12 @@ 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 (ASYS_TCHAR *,
+  : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (char *,
                                                     ASYS_TEXT ("<unknown>"))
-                                 : ACE_static_cast (ASYS_TCHAR *,
+                                 : ACE_static_cast (char *,
                                                     str_ops->name ())),
 #else
-  : ACE_Parse_Node ((str_ops == 0 ? ASYS_TEXT ("<unknown>") : str_ops->name ())),
+  : ACE_Parse_Node (str_ops == 0 ? "<unknown>" : str_ops->name ()),
 #endif /* defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
     node_ (str_ops),
     mods_ (str_mods)
@@ -110,7 +110,7 @@ ACE_Parse_Node::ACE_Parse_Node (void)
 }
 
 
-ACE_Parse_Node::ACE_Parse_Node (const ASYS_TCHAR *nm)
+ACE_Parse_Node::ACE_Parse_Node (const char *nm)
   : name_ (nm),
     next_ (0)
 {
@@ -145,7 +145,7 @@ ACE_Suspend_Node::dump (void) const
   ACE_TRACE ("ACE_Suspend_Node::dump");
 }
 
-ACE_Suspend_Node::ACE_Suspend_Node (const ASYS_TCHAR *name)
+ACE_Suspend_Node::ACE_Suspend_Node (const char *name)
   : ACE_Parse_Node (name)
 {
   ACE_TRACE ("ACE_Suspend_Node::ACE_Suspend_Node");
@@ -159,7 +159,7 @@ ACE_Resume_Node::dump (void) const
   ACE_TRACE ("ACE_Resume_Node::dump");
 }
 
-ACE_Resume_Node::ACE_Resume_Node (const ASYS_TCHAR *name)
+ACE_Resume_Node::ACE_Resume_Node (const char *name)
   : ACE_Parse_Node (name)
 {
   ACE_TRACE ("ACE_Resume_Node::ACE_Resume_Node");
@@ -202,7 +202,7 @@ ACE_Remove_Node::dump (void) const
   ACE_TRACE ("ACE_Remove_Node::dump");
 }
 
-ACE_Remove_Node::ACE_Remove_Node (const ASYS_TCHAR *name)
+ACE_Remove_Node::ACE_Remove_Node (const char *name)
   : ACE_Parse_Node (name)
 {
   ACE_TRACE ("ACE_Remove_Node::ACE_Remove_Node");
@@ -223,8 +223,8 @@ ACE_Remove_Node::apply (void)
 }
 
 ACE_Dynamic_Node::ACE_Dynamic_Node (const ACE_Service_Type *sr,
-                                    ASYS_TCHAR *parms)
-  : ACE_Static_Node (sr->name (), parms),
+                                    char *parms)
+  : ACE_Static_Node (sr->chname (), parms),
     record_ (sr)
 {
   ACE_TRACE ("ACE_Dynamic_Node::ACE_Dynamic_Node");
@@ -274,8 +274,8 @@ ACE_Static_Node::dump (void) const
   ACE_TRACE ("ACE_Static_Node::dump");
 }
 
-ACE_Static_Node::ACE_Static_Node (const ASYS_TCHAR *nm,
-                                  ASYS_TCHAR *params)
+ACE_Static_Node::ACE_Static_Node (const char *nm,
+                                  char *params)
   : ACE_Parse_Node (nm),
     parameters_ (params)
 {
@@ -289,14 +289,14 @@ ACE_Static_Node::record (void) const
   ACE_Service_Type *sr;
 
   if (ACE_Service_Repository::instance()->find
-      (this->name (),
+      (ASYS_WIDE_STRING (this->name ()),
        (const ACE_Service_Type **) &sr) == -1)
     return 0;
   else
     return sr;
 }
 
-ASYS_TCHAR *
+char *
 ACE_Static_Node::parameters (void) const
 {
   ACE_TRACE ("ACE_Static_Node::parameters");
@@ -344,7 +344,7 @@ ACE_Location_Node::~ACE_Location_Node (void)
   ACE_TRACE ("ACE_Location_Node::~ACE_Location_Node");
 }
 
-const ASYS_TCHAR *
+const char *
 ACE_Location_Node::pathname (void) const
 {
   ACE_TRACE ("ACE_Location_Node::pathname");
@@ -352,7 +352,7 @@ ACE_Location_Node::pathname (void) const
 }
 
 void
-ACE_Location_Node::pathname (const ASYS_TCHAR *p)
+ACE_Location_Node::pathname (const char *p)
 {
   ACE_TRACE ("ACE_Location_Node::pathname");
   this->pathname_ = p;
@@ -395,7 +395,7 @@ ACE_Location_Node::open_handle (void)
 
   // Transform the pathname into the appropriate dynamic link library
   // by searching the ACE_LD_SEARCH_PATH.
-  int result = ACE::ldfind (this->pathname (),
+  int result = ACE::ldfind (ASYS_WIDE_STRING (this->pathname ()),
                             dl_pathname,
                             (sizeof dl_pathname / sizeof (ASYS_TCHAR)));
 
@@ -438,8 +438,8 @@ ACE_Object_Node::dump (void) const
   ACE_TRACE ("ACE_Object_Node::dump");
 }
 
-ACE_Object_Node::ACE_Object_Node (const ASYS_TCHAR *path,
-                                  const ASYS_TCHAR *obj_name)
+ACE_Object_Node::ACE_Object_Node (const char *path,
+                                  const char *obj_name)
   : object_name_ (obj_name)
 {
   ACE_TRACE ("ACE_Object_Node::ACE_Object_Node");
@@ -457,7 +457,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *)
 
       this->symbol_ = (void *)
         ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
-                       ASYS_ONLY_MULTIBYTE_STRING (object_name));
+                       object_name);
 
       if (this->symbol_ == 0)
         {
@@ -498,8 +498,8 @@ ACE_Function_Node::dump (void) const
   ACE_TRACE ("ACE_Function_Node::dump");
 }
 
-ACE_Function_Node::ACE_Function_Node (const ASYS_TCHAR *path,
-                                      const ASYS_TCHAR *func_name)
+ACE_Function_Node::ACE_Function_Node (const char *path,
+                                      const char *func_name)
   : function_name_ (func_name)
 {
   ACE_TRACE ("ACE_Function_Node::ACE_Function_Node");
@@ -519,8 +519,8 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       // Locate the factory function <function_name> in the shared
       // object.
 
-      ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *,
-                                                  this->function_name_);
+      char *function_name = ACE_const_cast (char *,
+                                            this->function_name_);
 
       // According to the new ANSI C++ specification, casting a void*
       // pointer to a function pointer is not allowed.  However,
@@ -536,7 +536,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       long temp_ptr =
         ACE_reinterpret_cast(long,
                              ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
-                                            ASYS_ONLY_MULTIBYTE_STRING (function_name)));
+                                            ASYS_WIDE_STRING (function_name)));
       func = ACE_reinterpret_cast(void *(*)(ACE_Service_Object_Exterminator *),
                                   temp_ptr);
 
@@ -550,7 +550,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
 
               ACE_ERROR ((LM_ERROR,
                           ASYS_TEXT ("dlsym failed for function %s\n"),
-                          function_name));
+                          ASYS_WIDE_STRING (function_name)));
 
               ASYS_TCHAR *errmsg = ACE_OS::dlerror ();
 
@@ -573,7 +573,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
           ace_yyerrno++;
           ACE_ERROR_RETURN ((LM_ERROR,
                              ASYS_TEXT ("%p\n"),
-                             this->function_name_),
+                             ASYS_WIDE_STRING (this->function_name_)),
                             0);
         }
     }
@@ -633,7 +633,7 @@ ACE_Static_Function_Node::dump (void) const
   ACE_TRACE ("ACE_Static_Function_Node::dump");
 }
 
-ACE_Static_Function_Node::ACE_Static_Function_Node (const ASYS_TCHAR *func_name)
+ACE_Static_Function_Node::ACE_Static_Function_Node (const char *func_name)
   : function_name_ (func_name)
 {
   ACE_TRACE ("ACE_Static_Function_Node::ACE_Static_Function_Node");
@@ -653,7 +653,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
 
   ACE_Static_Svc_Descriptor **ssdp = 0;
   ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs ();
-  ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_);
+  char *function_name = ACE_const_cast (char *, this->function_name_);
 
   for (ACE_STATIC_SVCS_ITERATOR iter (svcs);
        iter.next (ssdp) != 0;
@@ -661,7 +661,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
     {
       ACE_Static_Svc_Descriptor *ssd = *ssdp;
       if (ACE_OS::strcmp (ssd->name_,
-                          function_name) == 0)
+                          ASYS_WIDE_STRING (function_name)) == 0)
         func = (void *(*)(ACE_Service_Object_Exterminator*)) ssd->alloc_;
     }
 
@@ -675,7 +675,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              ASYS_TEXT ("no static service registered for function %s\n"),
-                             function_name),
+                             ASYS_WIDE_STRING (function_name)),
                              0);
         }
     }
@@ -688,7 +688,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       ace_yyerrno++;
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("%p\n"),
-                         this->function_name_),
+                         ACE_WIDE_STRING (this->function_name_)),
                         0);
     }
 
diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h
index 492895e85b2..b6975d1355d 100644
--- a/ace/Parse_Node.h
+++ b/ace/Parse_Node.h
@@ -30,14 +30,14 @@ class ACE_Export ACE_Parse_Node
   //    tree of Service Nodes.
 public:
   ACE_Parse_Node (void);
-  ACE_Parse_Node (const ASYS_TCHAR *name);
+  ACE_Parse_Node (const char *name);
   virtual ~ACE_Parse_Node (void);
 
   ACE_Parse_Node *link (void) const;
   void link (ACE_Parse_Node *);
   virtual void apply (void) = 0;
 
-  const ASYS_TCHAR *name (void) const;
+  const char *name (void) const;
   void print (void) const;
 
   void dump (void) const;
@@ -47,7 +47,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  const ASYS_TCHAR *name_;
+  const char *name_;
   ACE_Parse_Node *next_;
 };
 
@@ -56,7 +56,7 @@ class ACE_Export ACE_Suspend_Node : public ACE_Parse_Node
   // = TITLE
   //     Suspend a Service Node.
 public:
-  ACE_Suspend_Node (const ASYS_TCHAR *name);
+  ACE_Suspend_Node (const char *name);
   ~ACE_Suspend_Node (void);
 
   virtual void apply (void);
@@ -73,7 +73,7 @@ class ACE_Export ACE_Resume_Node : public ACE_Parse_Node
   // = TITLE
   //     Resume a Service Node.
 public:
-  ACE_Resume_Node (const ASYS_TCHAR *name);
+  ACE_Resume_Node (const char *name);
   ~ACE_Resume_Node (void);
 
   virtual void apply (void);
@@ -90,7 +90,7 @@ class ACE_Export ACE_Remove_Node : public ACE_Parse_Node
   // = TITLE
   //     Remove a Service Node.
 public:
-  ACE_Remove_Node (const ASYS_TCHAR *name);
+  ACE_Remove_Node (const char *name);
   ~ACE_Remove_Node (void);
 
   virtual void apply (void);
@@ -107,12 +107,12 @@ class ACE_Export ACE_Static_Node : public ACE_Parse_Node
   // = TITLE
   //     Handle a statically linked node.
 public:
-  ACE_Static_Node (const ASYS_TCHAR *name, ASYS_TCHAR *params = 0);
+  ACE_Static_Node (const char *name, char *params = 0);
   virtual ~ACE_Static_Node (void);
 
   virtual void apply (void);
   virtual const ACE_Service_Type *record (void) const;
-  ASYS_TCHAR *parameters (void) const;
+  char *parameters (void) const;
 
   void dump (void) const;
   // Dump the state of an object.
@@ -121,7 +121,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  ASYS_TCHAR *parameters_;
+  char *parameters_;
   // "Command-line" parameters.
 };
 
@@ -130,7 +130,7 @@ class ACE_Export ACE_Dynamic_Node : public ACE_Static_Node
   // = TITLE
   //     Handle a dynamically linked node.
 public:
-  ACE_Dynamic_Node (const ACE_Service_Type *, ASYS_TCHAR *params);
+  ACE_Dynamic_Node (const ACE_Service_Type *, char *params);
   virtual ~ACE_Dynamic_Node (void);
 
   virtual const ACE_Service_Type *record (void) const;
@@ -179,8 +179,8 @@ public:
   virtual void set_symbol (void *h);
   ACE_SHLIB_HANDLE handle (void) const;
   void handle (const ACE_SHLIB_HANDLE h);
-  const ASYS_TCHAR *pathname (void) const;
-  void pathname (const ASYS_TCHAR *h);
+  const char *pathname (void) const;
+  void pathname (const char *h);
   int dispose (void) const;
 
   virtual ~ACE_Location_Node (void);
@@ -194,7 +194,7 @@ public:
 protected:
   ACE_SHLIB_HANDLE open_handle (void);
 
-  const ASYS_TCHAR *pathname_;
+  const char *pathname_;
   // Pathname to the shared library we are working on.
 
   int must_delete_;
@@ -212,7 +212,7 @@ class ACE_Export ACE_Object_Node : public ACE_Location_Node
   // = TITLE
   //   Keeps track of the symbol name for a shared object.
 public:
-  ACE_Object_Node (const ASYS_TCHAR *pathname, const ASYS_TCHAR *obj_name);
+  ACE_Object_Node (const char *pathname, const char *obj_name);
   virtual void *symbol (ACE_Service_Object_Exterminator * = 0);
   virtual ~ACE_Object_Node (void);
 
@@ -223,7 +223,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  const ASYS_TCHAR *object_name_;
+  const char *object_name_;
   // Name of the object that we're parsing.
 };
 
@@ -232,7 +232,7 @@ class ACE_Export ACE_Function_Node : public ACE_Location_Node
   // = TITLE
   //     Keeps track of the symbol name of for a shared function.
 public:
-  ACE_Function_Node (const ASYS_TCHAR *pathname, const ASYS_TCHAR *func_name);
+  ACE_Function_Node (const char *pathname, const char *func_name);
   virtual void *symbol (ACE_Service_Object_Exterminator *gobbler = 0);
   virtual ~ACE_Function_Node (void);
 
@@ -243,7 +243,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  const ASYS_TCHAR *function_name_;
+  const char *function_name_;
   // Name of the function that we're parsing.
 };
 
@@ -275,7 +275,7 @@ class ACE_Export ACE_Static_Function_Node : public ACE_Location_Node
   //     linked in from a DLL, but is statically linked with the
   //     application.
 public:
-  ACE_Static_Function_Node (const ASYS_TCHAR *func_name);
+  ACE_Static_Function_Node (const char *func_name);
   virtual void *symbol (ACE_Service_Object_Exterminator * = 0);
   virtual ~ACE_Static_Function_Node (void);
 
@@ -286,7 +286,7 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-  const ASYS_TCHAR *function_name_;
+  const char *function_name_;
   // Name of the function that we're parsing.
 };
 
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 53f5212e0e6..e76ccd73e2b 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -64,12 +64,7 @@ ACE_Pipe::open (void)
   // Make sure that the TCP stack doesn't try to buffer small writes.
   // Since this communication is purely local to the host it doesn't
   // affect network performance.
-# if defined (ACE_HAS_PHARLAP_RT)
-  int level = SOL_SOCKET;
-# else
-  int level = IPPROTO_TCP;
-# endif /* ACE_HAS_PHARLAP_RT */
-  if (writer.set_option (level, TCP_NODELAY,
+  if (writer.set_option (IPPROTO_TCP, TCP_NODELAY,
                          &one, sizeof one) == -1)
     return -1;
 #endif /* ACE_LACKS_TCP_NODELAY */
diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp
index de12d4b755e..6ce6b11ffc8 100644
--- a/ace/Priority_Reactor.cpp
+++ b/ace/Priority_Reactor.cpp
@@ -35,13 +35,13 @@ ACE_Priority_Reactor::init_bucket (void)
 	   TUPLE_ALLOCATOR (ACE_Select_Reactor::DEFAULT_SIZE));
 
   // The event handlers are assigned to a new As the Event
-  ACE_NEW (this->bucket_,
-           QUEUE *[npriorities]);
-
+  ACE_NEW (this->bucket_, QUEUE*[npriorities]);
   // This loops "ensures" exception safety.
-  for (int i = 0; i < npriorities; ++i)
-    ACE_NEW (this->bucket_[i],
-             QUEUE (this->tuple_allocator_));
+  int i;
+  for (i = 0; i < npriorities; ++i)
+    {
+      ACE_NEW (this->bucket_[i], QUEUE (this->tuple_allocator_));
+    }
 }
 
 ACE_Priority_Reactor::ACE_Priority_Reactor (ACE_Sig_Handler *sh,
@@ -69,10 +69,10 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size,
 ACE_Priority_Reactor::~ACE_Priority_Reactor (void)
 {
   ACE_TRACE ("ACE_Priority_Reactor::~ACE_Priority_Reactor");
-
   for (int i = 0; i < npriorities; ++i)
-    delete this->bucket_[i];
-
+    {
+      delete this->bucket_[i];
+    }
   delete[] this->bucket_;
   delete tuple_allocator_;
 }
@@ -88,37 +88,49 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
   ACE_TRACE ("ACE_Priority_Reactor::dispatch_io_set");
 
   if (number_of_active_handles == 0)
-    return 0;
+    {
+      return 0;
+    }
+
+  // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("ACE_Priority_Reactor::dispatch_io_set\n")));
+
+  ACE_HANDLE handle;
+
 
   // The range for which there exists any Event_Tuple is computed on
-  // the ordering loop, minimizing iterations on the dispatching loop.
+  // the ordering loop, minimizing iterations on the dispatching
+  // loop.
   int min_priority = ACE_Event_Handler::HI_PRIORITY;
   int max_priority = ACE_Event_Handler::LO_PRIORITY;
 
   ACE_Handle_Set_Iterator handle_iter (dispatch_mask);
 
-  for (ACE_HANDLE handle;
-       (handle = handle_iter ()) != ACE_INVALID_HANDLE;
-       )
+  while ((handle = handle_iter ()) != ACE_INVALID_HANDLE)
     {
-      ACE_Event_Tuple et (this->handler_rep_.find (handle), 
-                          handle);
+      ACE_Event_Tuple et (this->handler_rep_.find (handle), handle);
       int prio = et.event_handler_->priority ();
 
       // If the priority is out of range assign the minimum priority.
       if (prio < ACE_Event_Handler::LO_PRIORITY
 	  || prio > ACE_Event_Handler::HI_PRIORITY)
-        prio = ACE_Event_Handler::LO_PRIORITY;
+	{
+	  prio = ACE_Event_Handler::LO_PRIORITY;
+	}
 
       bucket_[prio]->enqueue_tail (et);
-
       // Update the priority ranges....
       if (min_priority > prio)
-        min_priority = prio;
+	{
+	  min_priority = prio;
+	}
       if (max_priority < prio)
-        max_priority = prio;
+	{
+	  max_priority = prio;
+	}
     }
 
+  // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("dispatching.... %d\n"), number_of_active_handles));
+
   for (int i = max_priority; i >= min_priority; --i)
     {
       // Remove all the entries from the wrappers
@@ -141,7 +153,9 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
     }
 
   if (number_dispatched > 0 && this->state_changed_)
-    return -1;
+    {
+      return -1;
+    }
 
   return 0;
 }
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 6089b432e8f..8801109ffef 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -50,7 +50,7 @@ class ACE_Export ACE_Proactor_Timer_Handler : public ACE_Task <ACE_NULL_SYNCH>
   //     to waiting on the timer queue and event. If the event is
   //     signaled, the thread will refresh the time it is currently
   //     waiting on (in case the earliest time has changed).
-
+  
   friend class ACE_Proactor;
   // Proactor has special privileges
   // Access needed to: timer_event_
@@ -65,7 +65,7 @@ public:
   int destroy (void);
   // Proactor calls this to shut down the timer handler
   // gracefully. Just calling the destructor alone doesnt do what
-  // <destroy> does. <destroy> make sure the thread exits properly.
+  // <destroy> does. <destroy> make sure the thread exits properly. 
 
 protected:
   virtual int svc (void);
@@ -97,8 +97,8 @@ ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void)
 
   // Signal timer event.
   this->timer_event_.signal ();
-
-  // Wait for the Timer Handler thread to exit.
+  
+  // Wait for the Timer Handler thread to exit. 
   this->thr_mgr ()->wait ();
 }
 
@@ -113,12 +113,12 @@ ACE_Proactor_Timer_Handler::svc (void)
     {
       // Is the timer queue empty?
       empty_flag = this->proactor_.timer_queue ()->is_empty ();
-
+      
       if (!empty_flag)
-        {
-          // Get the earliest absolute time.
-          absolute_time = this->proactor_.timer_queue ()->earliest_time ();
-
+	{
+	  // Get the earliest absolute time.
+	  absolute_time = this->proactor_.timer_queue ()->earliest_time ();
+          
           // Block for absolute time.
           result = this->timer_event_.wait (&absolute_time);
         }
@@ -127,7 +127,7 @@ ACE_Proactor_Timer_Handler::svc (void)
           // Wait for ever.
           result = this->timer_event_.wait ();
         }
-
+      
       // Check for timer expiries.
       if (result == -1)
         {
@@ -163,13 +163,13 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue,
                                              const ACE_Time_Value &time)
 {
   ACE_UNUSED_ARG (timer_queue);
-
+  
   if (this->proactor_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,")
                        ASYS_TEXT (" no completion port to post timeout to?!@\n")),
                       -1);
-
+  
   // Create the Asynch_Timer.
   ACE_Asynch_Result_Impl *asynch_timer = this->proactor_->create_asynch_timer (*handler,
                                                                                act,
@@ -179,11 +179,11 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue,
                                                                                -1);
   if (asynch_timer == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%N:%l:(%P | %t):%p\n"),
-                       ASYS_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:")
-                       ASYS_TEXT ("create_asynch_timer failed")),
+                       "%N:%l:(%P | %t):%p\n",
+                       "ACE_Proactor_Handle_Timeout_Upcall::timeout:"
+                       "create_asynch_timer failed"),
                       -1);
-
+  
   // Post a completion.
   if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -244,25 +244,21 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
     delete_timer_queue_ (0)
 {
   this->implementation (implementation);
-
+  
   if (this->implementation () == 0)
     {
 #if defined (ACE_HAS_AIO_CALLS)
       // POSIX Proactor.
   #if defined (ACE_POSIX_AIOCB_PROACTOR)
-      ACE_NEW (implementation,
-               ACE_POSIX_AIOCB_Proactor);
+      ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
   #elif defined (ACE_POSIX_SIG_PROACTOR)
-      ACE_NEW (implementation,
-               ACE_POSIX_SIG_Proactor);
+      ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
   #else /* Default is to use the SIG one */
-      ACE_NEW (implementation,
-               ACE_POSIX_SIG_Proactor);
+      ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
   #endif
 #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
       // WIN_Proactor.
-      ACE_NEW (implementation,
-               ACE_WIN32_Proactor);
+      ACE_NEW (implementation, ACE_WIN32_Proactor);
 #endif /* ACE_HAS_AIO_CALLS */
       this->implementation (implementation);
       this->delete_implementation_ = 1;
@@ -270,11 +266,11 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
 
   // Set the timer queue.
   this->timer_queue (tq);
-
+  
   // Create the timer handler
   ACE_NEW (this->timer_handler_,
            ACE_Proactor_Timer_Handler (*this));
-
+  
   // Activate <timer_handler>
   if (this->timer_handler_->activate (THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
@@ -296,16 +292,16 @@ ACE_Proactor::instance (size_t /* threads */)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-                                *ACE_Static_Object_Lock::instance (),
+				*ACE_Static_Object_Lock::instance (),
                                 0));
 
       if (ACE_Proactor::proactor_ == 0)
-        {
-          ACE_NEW_RETURN (ACE_Proactor::proactor_,
+	{
+	  ACE_NEW_RETURN (ACE_Proactor::proactor_,
                           ACE_Proactor,
                           0);
-          ACE_Proactor::delete_proactor_ = 1;
-        }
+	  ACE_Proactor::delete_proactor_ = 1;
+	}
     }
   return ACE_Proactor::proactor_;
 }
@@ -316,7 +312,7 @@ ACE_Proactor::instance (ACE_Proactor *r)
   ACE_TRACE ("ACE_Proactor::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-                            *ACE_Static_Object_Lock::instance (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
 
   ACE_Proactor *t = ACE_Proactor::proactor_;
 
@@ -333,7 +329,7 @@ ACE_Proactor::close_singleton (void)
   ACE_TRACE ("ACE_Proactor::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
-                     *ACE_Static_Object_Lock::instance ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Proactor::delete_proactor_)
     {
@@ -359,7 +355,7 @@ ACE_Proactor::run_event_loop (void)
   // whether it is zero or non-zero.
   if (ACE_Proactor::end_event_loop_ != 0)
     return 0;
-
+   
   // First time you are in. Increment the thread count.
   {
     // Obtain the lock in the MT environments.
@@ -370,32 +366,32 @@ ACE_Proactor::run_event_loop (void)
     // Increment the thread count.
     ACE_Proactor::event_loop_thread_count_ ++;
   }
-
+    
   // Run the event loop.
   while (1)
     {
       // Check the end loop flag. It is ok to do this without lock,
-      // since we care just whether it is zero or non-zero.
+      // since we care just whether it is zero or non-zero. 
       if (ACE_Proactor::end_event_loop_ != 0)
           break;
-
+      
       // <end_event_loop> is not set. Ready to do <handle_events>.
       result = ACE_Proactor::instance ()->handle_events ();
 
       if (ACE_Service_Config::reconfig_occurred ())
-        ACE_Service_Config::reconfigure ();
-
+	ACE_Service_Config::reconfigure ();
+      
       else if (result == -1)
-        break;
+	break;
     }
-
+  
   // Leaving the event loop. Decrement the thread count.
 
   // Obtain the lock in the MT environments.
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
 #endif /* ACE_MT_SAFE */
-
+  
   // Decrement the thread count.
   ACE_Proactor::event_loop_thread_count_ --;
 
@@ -418,19 +414,19 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
     (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
 #endif /* ACE_MT_SAFE */
 
-  // Early check. It is ok to do this without lock, since we care just
+  // Early check. It is ok to do this without lock, since we care just 
   // whether it is zero or non-zero.
   if (ACE_Proactor::end_event_loop_ != 0 ||
       tv == ACE_Time_Value::zero)
     return 0;
-
+  
   // First time you are in. Increment the thread count.
   {
     // Obtain the lock in the MT environments.
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
     ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
 #endif /* ACE_MT_SAFE */
-
+    
     // Increment the thread count.
     ACE_Proactor::event_loop_thread_count_ ++;
   }
@@ -448,11 +444,11 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
       result = ACE_Proactor::instance ()->handle_events (tv);
 
       if (ACE_Service_Config::reconfig_occurred ())
-        ACE_Service_Config::reconfigure ();
-
+	ACE_Service_Config::reconfigure ();
+      
       // An error has occurred.
       else if (result == -1)
-        break;
+	break;
     }
 
   // Leaving the event loop. Decrement the thread count.
@@ -461,7 +457,7 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
 #endif /* ACE_MT_SAFE */
-
+  
   // Decrement the thread count.
   ACE_Proactor::event_loop_thread_count_ --;
 
@@ -472,10 +468,10 @@ int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
-
+  
   // Obtain the lock, set the end flag and post the wakeup
-  // completions.
-
+  // completions. 
+  
   // Obtain the lock in the MT environments.
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_Thread_Mutex *lock =
@@ -483,18 +479,18 @@ ACE_Proactor::end_event_loop (void)
     (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
 #endif /* ACE_MT_SAFE */
-
+  
   // Set the end flag.
   ACE_Proactor::end_event_loop_ = 1;
-
+    
   // Number of completions to post.
   int how_many = ACE_Proactor::event_loop_thread_count_;
-
+  
   // Reset the thread count.
   ACE_Proactor::event_loop_thread_count_ = 0;
 
   // Post completions to all the threads so that they will all wake
-  // up.
+  // up. 
   return ACE_Proactor::post_wakeup_completions (how_many);
 }
 
@@ -511,10 +507,10 @@ ACE_Proactor::close (void)
   // Close the implementation.
   if (this->implementation ()->close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%N:%l:(%P | %t):%p\n"),
-                       ASYS_TEXT ("ACE_Proactor::close:implementation couldnt be closed")),
+                       "%N:%l:(%P | %t):%p\n",
+                       "ACE_Proactor::close:implementation couldnt be closed"),
                       -1);
-
+  
   // Delete the implementation.
   if (this->delete_implementation_)
     {
@@ -528,7 +524,7 @@ ACE_Proactor::close (void)
       delete this->timer_handler_;
       this->timer_handler_ = 0;
     }
-
+  
   // Delete the timer queue.
   if (this->delete_timer_queue_)
     {
@@ -542,7 +538,7 @@ ACE_Proactor::close (void)
 
 int
 ACE_Proactor::register_handle (ACE_HANDLE handle,
-                               const void *completion_key)
+			       const void *completion_key)
 {
   return this->implementation ()->register_handle (handle,
                                                    completion_key);
@@ -579,12 +575,12 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
   // absolute time.
   ACE_Time_Value absolute_time =
     this->timer_queue_->gettimeofday () + time;
-
+  
   // Only one guy goes in here at a time
   ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
                     ace_mon,
                     this->timer_queue_->mutex (),
-                    -1);
+                    -1);  
 
   // Schedule the timer
   long result = this->timer_queue_->schedule (&handler,
@@ -595,7 +591,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
     {
       // no failures: check to see if we are the earliest time
       if (this->timer_queue_->earliest_time () == absolute_time)
-
+        
         // wake up the timer thread
         if (this->timer_handler_->timer_event_.signal () == -1)
           {
@@ -684,8 +680,7 @@ ACE_Proactor::timer_queue (TIMER_QUEUE *tq)
   // New timer queue.
   if (tq == 0)
     {
-      ACE_NEW (this->timer_queue_,
-               TIMER_HEAP);
+      this->timer_queue_ = new TIMER_HEAP;
       this->delete_timer_queue_ = 1;
     }
   else
@@ -959,36 +954,21 @@ template class ACE_Timer_Wheel_Iterator_T<ACE_Handler *,
   ACE_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Timer_Queue_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_Queue_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_List_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_List_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Node_T<ACE_Handler *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Node <ACE_Timer_Node_T<ACE_Handler *> *>
-#pragma instantiate ACE_Free_List<ACE_Timer_Node_T<ACE_Handler *> >
-#pragma instantiate ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Handler *>,\
-   ACE_Null_Mutex>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_Heap_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_Heap_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Timer_Wheel_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
+#pragma instantiate ACE_Timer_Wheel_T<ACE_Handler *,
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Timer_Wheel_Iterator_T<ACE_Handler *,\
-  ACE_Proactor_Handle_Timeout_Upcall,\
-  ACE_SYNCH_RECURSIVE_MUTEX>
+        ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */
diff --git a/ace/Process.cpp b/ace/Process.cpp
index b2be00615fb..d560a9d51e8 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -239,16 +239,13 @@ ACE_Process_Options::ACE_Process_Options (int ie,
     command_line_argv_calculated_ (0),
     command_line_buf_ (0)
 {
-  ACE_NEW (command_line_buf_,
-           TCHAR[cobl]);
+  ACE_NEW (command_line_buf_, TCHAR[cobl]);
   command_line_buf_[0] = '\0';
 
 #if !defined (ACE_HAS_WINCE)
   working_directory_[0] = '\0';
-  ACE_NEW (environment_buf_,
-           TCHAR[ebl]);
-  ACE_NEW (environment_argv_,
-           LPTSTR[mea]);
+  ACE_NEW (environment_buf_, TCHAR[ebl]);
+  ACE_NEW (environment_argv_, LPTSTR[mea]);
   environment_buf_[0] = '\0';
   environment_argv_[0] = 0;
 
@@ -285,8 +282,8 @@ ACE_Process_Options::inherit_environment (void)
       // Add the string to our env buffer.
       if (this->setenv_i (existing_environment + slot, len) == -1)
         {
-          ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p.\n"),
-                      ASYS_TEXT ("ACE_Process_Options::ACE_Process_Options")));
+          ACE_ERROR ((LM_ERROR, "%p.\n",
+                      "ACE_Process_Options::ACE_Process_Options"));
           break;
         }
 
@@ -424,7 +421,7 @@ ACE_Process_Options::setenv_i (LPTSTR assignment,
 
   // If environment larger than allocated buffer return. Also check to
   // make sure we have enough room.
-  if (environment_argv_index_ == max_environ_argv_index_
+  if (environment_argv_index_ == max_environ_argv_index_  
       || (len + environment_buf_index_) >= environment_buf_len_)
     return -1;
 
@@ -524,7 +521,7 @@ ACE_Process_Options::~ACE_Process_Options (void)
 int
 ACE_Process_Options::command_line (LPCTSTR argv[])
 {
-  // @@ Factor out the code between this
+  // @@ Factor out the code between this 
   int i = 0;
 
   if (argv[i])
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 6be9d9b4c4c..d1d3f0ada79 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -55,9 +55,7 @@ ACE_Process_Manager::resize (size_t size)
 
   ACE_Process_Descriptor *temp;
   
-  ACE_NEW_RETURN (temp,
-                  ACE_Process_Descriptor[size],
-                  -1);
+  ACE_NEW_RETURN (temp, ACE_Process_Descriptor[size], -1);
 
   for (size_t i = 0; i < this->max_table_size_; i++)
     temp[i] = this->proc_table_[i]; // Structure assignment.
diff --git a/ace/QoS.cpp b/ace/QoS.cpp
new file mode 100644
index 00000000000..620a58c436f
--- /dev/null
+++ b/ace/QoS.cpp
@@ -0,0 +1,130 @@
+// $Id$
+
+#define ACE_BUILD_DLL
+
+#include "ace/ACE_QoS.h"
+
+ACE_RCSID( ace, "$Id$" )
+
+ACE_ALLOC_HOOK_DEFINE( ACE_QoS )
+
+class Ace_Export ACE_QoS
+{
+	// = TITLE
+	//	Define the basic QoS parameters
+
+public:
+	// = Initializattion and termination methods.
+	// Default
+	ACE_QoS::ACE_QoS( void )
+	{
+		ACE_TRACE( "ACE_QoS::ACE_QoS" );
+	}
+
+	// set CBR rate
+	int ACE_QoS::set_cbr_rate( int rate )
+	{
+		ACE_TRACE( "ACE_QoS::set_cbr_rate" );
+
+#if defined (ACE_HAS_FORE_ATM_WS2)
+		AAL_PARAMETERS_IE					ie_aalparams;
+		ATM_TRAFFIC_DESCRIPTOR_IE			ie_td;
+		ATM_BROADBAND_BEARER_CAPBILITY_IE	ie_bbc;
+		ATM_QOS_CLASS_IE					ie_qos;
+		Q2931_IE							*ie_ptr;
+		int size;
+
+		ie_aalparams.AALType = AALTYPE_5;
+		ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize = 1516; 
+		ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize = 1516; 
+		ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE;
+		ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL;
+
+		size = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(AAL_PARAMETERS_IE);
+
+		ie_td.Forward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Forward.PeakCellRate_CLP01 = cellRate;
+    	ie_td.Forward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Forward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT;
+		ie_td.Forward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Forward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT;
+		ie_td.Forward.Tagging = SAP_FIELD_ABSENT;
+
+		ie_td.Backward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Backward.PeakCellRate_CLP01 = cellRate;
+		ie_td.Backward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Backward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT;
+		ie_td.Backward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT;
+		ie_td.Backward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT;
+		ie_td.Backward.Tagging = SAP_FIELD_ABSENT;
+
+		ie_td.BestEffort = 0; // Note: this must be set to zero for CBR
+
+		size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_TRAFFIC_DESCRIPTOR_IE);
+
+		ie_bbc.BearerClass = BCOB_X;
+		ie_bbc.TrafficType = TT_CBR;
+		ie_bbc.TimingRequirements = TR_END_TO_END;
+		ie_bbc.ClippingSusceptability = CLIP_NOT;
+		ie_bbc.UserPlaneConnectionConfig = UP_P2P;
+
+		size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) 
+			+ sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE);
+
+		ie_qos.QOSClassForward = QOS_CLASS1;
+		ie_qos.QOSClassBackward = QOS_CLASS1; 
+
+		size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE);
+	
+		qos_.ProviderSpecific.buf = (char *) malloc(size);
+		qos_.ProviderSpecific.len = size;
+		memset(qos_.ProviderSpecific.buf, 0, size);
+
+		ie_ptr = (Q2931_IE *) qos_.ProviderSpecific.buf;
+		ie_ptr->IEType = IE_AALParameters;
+		ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) 
+						+ sizeof(AAL_PARAMETERS_IE);
+    	memcpy(ie_ptr->IE, &ie_aalparams, sizeof(AAL_PARAMETERS_IE));
+
+		ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
+		ie_ptr->IEType = IE_TrafficDescriptor;
+		ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_TRAFFIC_DESCRIPTOR_IE);
+		memcpy(ie_ptr->IE, &ie_td, sizeof(ATM_TRAFFIC_DESCRIPTOR_IE));
+
+		ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
+		ie_ptr->IEType = IE_BroadbandBearerCapability;
+		ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE);
+		memcpy(ie_ptr->IE, &ie_bbc, sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE));
+	
+		ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength);
+		ie_ptr->IEType = IE_QOSClass;
+		ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE);
+		memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE));
+
+		qos_.SendingFlowspec.TokenRate = -1;
+		qos_.SendingFlowspec.TokenBucketSize = -1;
+		qos_.SendingFlowspec.PeakBandwidth = -1;
+		qos_.SendingFlowspec.Latency = -1;
+		qos_.SendingFlowspec.DelayVariation = -1;
+		qos_.SendingFlowspec.LevelOfGuarantee = BestEffortService ; 
+		// will most probably be ignored by the service provider
+		qos_.SendingFlowspec.CostOfCall = 0;
+
+		qos_.ReceivingFlowspec.TokenRate = -1;
+		qos_.ReceivingFlowspec.TokenBucketSize = -1;
+		qos_.ReceivingFlowspec.PeakBandwidth = -1;
+		qos_.ReceivingFlowspec.Latency = -1;
+		qos_.ReceivingFlowspec.DelayVariation = -1;
+		qos_.ReceivingFlowspec.LevelOfGuarantee = BestEffortService; 
+		// will most probably be ignored by the service provider
+		qos_.ReceivingFlowspec.CostOfCall = 0;
+#elif defined (ACE_HAS_FORE_ATM_XTI)
+		// XTI part
+#endif // ACE_HAS_FORE_ATM_WS2 && ACE_HAS_FORE_ATM_XTI
+	}
+
+	QOS ACE_QoS::get_qos( void )
+	{
+		return qos_;
+	}
+}
diff --git a/ace/QoS.h b/ace/QoS.h
new file mode 100644
index 00000000000..17292afd502
--- /dev/null
+++ b/ace/QoS.h
@@ -0,0 +1,70 @@
+// $Id$
+
+// QoS class definition (refer to WinSock2 QoS)
+
+#ifndef QOS_H
+#define QOS_H
+
+#include 
+
+#if !defined(ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class Ace_Export ACE_QoS
+{
+	// = TITLE
+	//	Define the basic QoS parameters
+
+public:
+	// = Initializattion and termination methods.
+	ACE_QoS( void );
+	// Default
+
+	~ACE_QoS( void );
+	// Default dtor
+
+	// set CBR rate
+	int set_cbr_rate( int );
+
+	// get QoS struct
+	QOS get_qos( void );
+
+private:
+#if defined (ACE_HAS_FORE_ATM_WS2)
+	// just map to WS2 GQOS struct
+	QOS	qos_;
+#elif defined (ACE_HAS_FOR_ATM_XTI)
+typedef enum {
+	BEST_EFFORT,
+	CONTROLLED_LOAD,
+	GUARANTEED
+} SERVICETYPE;
+
+typedef struct _flowspec {
+	int	TokeRate;
+	int	TokenBucketSize;
+	int	PeakBandwidth;
+	int	Latency;
+	int	DelayVariation;
+	SERVICETYPE	ServiceType;
+	int	MaxSduSize;
+	int	MinimumPolicedSize;
+} FLOWSPEC;
+
+typedef struct _BUF {
+	ulong	len;
+	char	*buf;
+} BUF;
+
+typedef struct _QualityOfService {
+	FLOWSPEC	SendingFlowspec;
+	FLOWSPEC	ReceivingFlowspec;
+	BUF			ProviderSpecific;
+} QOS;
+
+	QOS	qos_;
+#endif // ACE_HAS_FORE_ATM_WS2 && ACE_HAS_FOREATM_XTI
+}
+
+#endif /* QOS_H */
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 5abb8601885..251f5c563e3 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -17,16 +17,21 @@
 
 ACE_RCSID(ace, RB_Tree, "$Id$")
 
+/////////////////////////////////////////////////////
+// template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
+/////////////////////////////////////////////////////
+
+
 // Constructor.
 
 template <class EXT_ID, class INT_ID>
 ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)
-  : k_ (k),
-    t_ (t),
-    color_ (RED),
-    parent_ (0),
-    left_ (0),
-    right_ (0)
+  : k_ (k)
+  , t_ (t)
+  , color_ (RED)
+  , parent_ (0)
+  , left_ (0)
+  , right_ (0)
 {
   ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)");
 }
@@ -35,7 +40,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_I
 // Destructor.
 
 template <class EXT_ID, class INT_ID>
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void)
+ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node ()
 {
   ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node");
 
@@ -46,6 +51,12 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void)
   delete right_;
 }
 
+
+
+////////////////////////////////////////////////
+// template class ACE_RB_Tree<EXT_ID, INT_ID> //
+////////////////////////////////////////////////
+
 // Constructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -57,10 +68,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
              "ACE_RB_Tree (ACE_Allocator *alloc)");
   if (this->open (alloc) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
 }
 
+
 // Copy constructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -75,12 +86,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (const ACE_RB_T
 
   // Make a deep copy of the passed tree.
   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt);
-
-  for (iter.first ();
-
-       iter.is_done () == 0; iter.next ())
-    insert_i (*(iter.key ()),
-              *(iter.item ()));
+  for (iter.first (); iter.is_done () == 0; iter.next ())
+  {
+    insert_i (*(iter.key ()), *(iter.item ()));
+  }
 }
 
 // Destructor.
@@ -90,11 +99,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree");
 
-  // Use the locked public method, to be totally safe, as the class
-  // can be used with an allocator and placement new.
+  // Use the locked public method, to be totally safe, as the
+  // class can be used with an allocator and placement new.
   this->close ();
 }
 
+
 // Assignment operator.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
@@ -108,19 +118,17 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator = (const ACE_RB_Tr
 
   // Make a deep copy of the passed tree.
   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt);
-
-  for (iter.first ();
-       iter.is_done () == 0;
-       iter.next ())
-    insert_i (*(iter.key ()),
-              *(iter.item ()));
+  for (iter.first (); iter.is_done () == 0; iter.next ())
+  {
+    insert_i (*(iter.key ()), *(iter.item ()));
+  }
 
   // Use the same allocator as the rhs.
   allocator_ = rbt.allocator_;
 }
 
-// Less than comparison function for keys, default functor
-// implementation returns 1 if k1 < k2, 0 otherwise.
+// Less than comparison function for keys, default
+// functor implementation returns 1 if k1 < k2, 0 otherwise.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan (const EXT_ID &k1, const EXT_ID &k2)
@@ -129,6 +137,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan (const EXT_ID &k1,
   return this->compare_keys_ (k1, k2);
 }
 
+
 // Method for right rotation of the tree about a given node.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  void
@@ -137,37 +146,48 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right");
 
   if (! x)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in "
-                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+  {
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                       ASYS_TEXT ("\nerror: x is a null pointer in "
+                                  "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+  }
   else if (! (x->left()))
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x->left () is a null pointer in ")
-                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+  {
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("\nerror: x->left () is a null pointer in "
+                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+  }
   else
+  {
+    ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
+    y = x->left ();
+    x->left (y->right ());
+    if (y->right ())
     {
-      ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
-      y = x->left ();
-      x->left (y->right ());
-      if (y->right ())
-        y->right ()->parent (x);
-      y->parent (x->parent ());
-      if (x->parent ())
-        {
-          if (x == x->parent ()->right ())
-            x->parent ()->right (y);
-          else
-            x->parent ()->left (y);
-        }
+      y->right ()->parent (x);
+    }
+    y->parent (x->parent ());
+    if (x->parent ())
+    {
+      if (x == x->parent ()->right ())
+      {
+        x->parent ()->right (y);
+      }
       else
-        root_ = y;
-      y->right (x);
-      x->parent (y);
+      {
+        x->parent ()->left (y);
+      }
+    }
+    else
+    {
+      root_ = y;
     }
+    y->right (x);
+    x->parent (y);
+  }
 }
 
+
 // Method for left rotation of the tree about a given node.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
@@ -176,145 +196,169 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left");
 
   if (! x)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
+  {
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("\nerror: x is a null pointer in "
                            "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+  }
   else if (! (x->right()))
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x->right () is a null pointer ")
-                ASYS_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+  {
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("\nerror: x->right () is a null pointer "
+                           "in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+  }
   else
+  {
+    ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
+    y = x->right ();
+    x->right (y->left ());
+    if (y->left ())
     {
-      ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
-      y = x->right ();
-      x->right (y->left ());
-      if (y->left ())
-        y->left ()->parent (x);
-      y->parent (x->parent ());
-      if (x->parent ())
-        {
-          if (x == x->parent ()->left ())
-            x->parent ()->left (y);
-          else
-            x->parent ()->right (y);
-        }
+      y->left ()->parent (x);
+    }
+    y->parent (x->parent ());
+    if (x->parent ())
+    {
+      if (x == x->parent ()->left ())
+      {
+        x->parent ()->left (y);
+      }
       else
-        root_ = y;
-      y->left (x);
-      x->parent (y);
+      {
+        x->parent ()->right (y);
+      }
     }
+    else
+    {
+      root_ = y;
+    }
+    y->left (x);
+    x->parent (y);
+  }
 }
 
+
 // Method for restoring Red-Black properties after deletion.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x)
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x)
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup");
 
-  while (x != 0
-         && x->parent ()
-         && x->color () == ACE_RB_Tree_Node_Base::BLACK)
+  while (x &&
+         x->parent () &&
+         x->color () == ACE_RB_Tree_Node_Base::BLACK)
+  {
+    if (x == x->parent ()->left ())
     {
-      if (x == x->parent ()->left ())
+      ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->right ();
+      if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
+      {
+        w->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        RB_rotate_left (x->parent ());
+        w = x->parent ()->right ();
+      }
+      // CLR pp. 263 says that nil nodes are implicitly colored BLACK
+      if ((w) &&
+          (!w->left () ||
+           w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
+          (!w->right () ||
+           w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+      {
+        w->color (ACE_RB_Tree_Node_Base::RED);
+        x = x->parent ();
+      }
+      else
+      {
+        // CLR pp. 263 says that nil nodes are implicitly colored BLACK
+        if (w &&
+            (!w->right () ||
+             w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
         {
-          ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->right ();
-          if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
-            {
-              w->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              RB_rotate_left (x->parent ());
-              w = x->parent ()->right ();
-            }
-          // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-          if ((w) &&
-              (!w->left ()
-               || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)
-              && (!w->right ()
-                  || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+          if (w->left ())
             {
-              w->color (ACE_RB_Tree_Node_Base::RED);
-              x = x->parent ();
-            }
-          else
-            {
-              // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-              if (w &&
-                  (!w->right ()
-                   || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
-                {
-                  if (w->left ())
-                    w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
-                  w->color (ACE_RB_Tree_Node_Base::RED);
-                  RB_rotate_right (w);
-                  w = x->parent ()->right ();
-                }
-              if (w)
-                {
-                  w->color (x->parent ()->color ());
-                  if (w->right ())
-                    w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
-                }
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              RB_rotate_left (x->parent ());
-              x = root_;
+              w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
             }
+          w->color (ACE_RB_Tree_Node_Base::RED);
+          RB_rotate_right (w);
+          w = x->parent ()->right ();
         }
+        if (w)
+          {
+            w->color (x->parent ()->color ());
+            if (w->right ())
+              {
+                w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
+              }
+          }
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        RB_rotate_left (x->parent ());
+        x = root_;
+      }
+    }
+    else
+    {
+      ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->left ();
+      if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
+      {
+        w->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        RB_rotate_right (x->parent ());
+        w = x->parent ()->left ();
+      }
+      // CLR pp. 263 says that nil nodes are implicitly colored BLACK
+      if (w &&
+          (!w->left () ||
+           w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
+          (!w->right () ||
+           w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+      {
+        w->color (ACE_RB_Tree_Node_Base::RED);
+        x = x->parent ();
+      }
       else
+      {
+        // CLR pp. 263 says that nil nodes are implicitly colored BLACK
+        if (w &&
+            (!w->left () ||
+             w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK))
         {
-          ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->left ();
-          if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
-            {
-              w->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              RB_rotate_right (x->parent ());
-              w = x->parent ()->left ();
-            }
-          // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-          if (w &&
-              (!w->left ()
-               || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)
-              && (!w->right ()
-                  || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
-            {
-              w->color (ACE_RB_Tree_Node_Base::RED);
-              x = x->parent ();
-            }
-          else
+          w->color (ACE_RB_Tree_Node_Base::RED);
+          if (w->right ())
             {
-              // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-              if (w &&
-                  (!w->left ()
-                   || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK))
-                {
-                  w->color (ACE_RB_Tree_Node_Base::RED);
-                  if (w->right ())
-                    w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
-                  RB_rotate_left (w);
-                  w = x->parent ()->left ();
-                }
-              if (w)
-                {
-                  w->color (x->parent ()->color ());
-                  if (w->left ())
-                    w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
-                }
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              RB_rotate_right (x->parent ());
-              x = root_;
+              w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
             }
+          RB_rotate_left (w);
+          w = x->parent ()->left ();
         }
+        if (w)
+          {
+            w->color (x->parent ()->color ());
+            if (w->left ())
+              {
+                w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
+              }
+          }
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        RB_rotate_right (x->parent ());
+        x = root_;
+      }
     }
+  }
 
   if (x)
+  {
     x->color (ACE_RB_Tree_Node_Base::BLACK);
+  }
 }
 
-// Return a pointer to a matching node if there is one, a pointer to
-// the node under which to insert the item if the tree is not empty
-// and there is no such match, or 0 if the tree is empty.
+
+
+// Return a pointer to a matching node if there is one,
+// a pointer to the node under which to insert the item
+// if the tree is not empty and there is no such match,
+// or 0 if the tree is empty.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k, ACE_RB_Tree_Base::RB_SearchResult &result)
@@ -325,47 +369,52 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k,
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = root_;
 
   while (current)
+  {
+    // While there are more nodes to examine.
+    if (this->lessthan (current->key (), k))
     {
-      // While there are more nodes to examine.
-      if (this->lessthan (current->key (), k))
-        {
-          // If the search key is greater than the current node's key.
-          if (current->right ())
-            // If the right subtree is not empty, search to the right.
-            current = current->right ();
-          else
-            {
-              // If the right subtree is empty, we're done searching,
-              // and are positioned to the left of the insertion point.
-              result = LEFT;
-              break;
-            }
-        }
-      else if (this->lessthan (k, current->key ()))
-        {
-          // Else if the search key is less than the current node's key.
-          if (current->left ())
-            // If the left subtree is not empty, search to the left.
-            current = current->left ();
-          else
-            {
-              // If the left subtree is empty, we're done searching,
-              // and are positioned to the right of the insertion point.
-              result = RIGHT;
-              break;
-            }
-        }
+      // If the search key is greater than the current node's key.
+      if (current->right ())
+      {
+        // If the right subtree is not empty, search to the right.
+        current = current->right ();
+      }
       else
-        {
-          // If the keys match exactly, we're done as well.
-          result = EXACT;
-          break;
-        }
+      {
+        // If the right subtree is empty, we're done searching,
+        // and are positioned to the left of the insertion point.
+        result = LEFT;
+        break;
+      }
+    }
+    else if (this->lessthan (k, current->key ()))
+    {
+      // Else if the search key is less than the current node's key.
+      if (current->left ())
+      {
+        // If the left subtree is not empty, search to the left.
+        current = current->left ();
+      }
+      else
+      {
+        // If the left subtree is empty, we're done searching,
+        // and are positioned to the right of the insertion point.
+        result = RIGHT;
+        break;
+      }
+    }
+    else
+    {
+      // If the keys match exactly, we're done as well.
+      result = EXACT;
+      break;
     }
+  }
 
   return current;
 }
 
+
 // Rebalance the tree after insertion of a node.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
@@ -376,74 +425,74 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = 0;
 
   while (x &&
-         x->parent ()
-         && x->parent ()->color () == ACE_RB_Tree_Node_Base::RED)
+         x->parent () &&
+         x->parent ()->color () == ACE_RB_Tree_Node_Base::RED)
+  {
+    if (! x->parent ()->parent ())
     {
-      if (! x->parent ()->parent ())
-        {
-          // If we got here, something is drastically wrong!
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("\nerror: parent's parent is null in ")
-                      ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
-          return;
-        }
+      // If we got here, something is drastically wrong!
+      ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                  ASYS_TEXT ("\nerror: parent's parent is null in "
+                             "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
+      return;
+    }
 
-      if (x->parent () == x->parent ()->parent ()->left ())
+    if (x->parent () == x->parent ()->parent ()->left ())
+    {
+      y = x->parent ()->parent ()->right ();
+      if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
+      {
+        // Handle case 1 (see CLR book, pp. 269).
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        y->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        x = x->parent ()->parent ();
+      }
+      else
+      {
+        if (x == x->parent ()->right ())
         {
-          y = x->parent ()->parent ()->right ();
-          if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
-            {
-              // Handle case 1 (see CLR book, pp. 269).
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              y->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              x = x->parent ()->parent ();
-            }
-          else
-            {
-              if (x == x->parent ()->right ())
-                {
-                  // Transform case 2 into case 3 (see CLR book, pp. 269).
-                  x = x->parent ();
-                  RB_rotate_left (x);
-                }
-
-              // Handle case 3 (see CLR book, pp. 269).
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              RB_rotate_right (x->parent ()->parent ());
-            }
+          // Transform case 2 into case 3 (see CLR book, pp. 269).
+          x = x->parent ();
+          RB_rotate_left (x);
         }
+
+        // Handle case 3 (see CLR book, pp. 269).
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        RB_rotate_right (x->parent ()->parent ());
+      }
+    }
+    else
+    {
+      y = x->parent ()->parent ()->left ();
+      if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
+      {
+        // Handle case 1 (see CLR book, pp. 269).
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        y->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        x = x->parent ()->parent ();
+      }
       else
+      {
+        if (x == x->parent ()->left ())
         {
-          y = x->parent ()->parent ()->left ();
-          if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
-            {
-              // Handle case 1 (see CLR book, pp. 269).
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              y->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              x = x->parent ()->parent ();
-            }
-          else
-            {
-              if (x == x->parent ()->left ())
-                {
-                  // Transform case 2 into case 3 (see CLR book, pp. 269).
-                  x = x->parent ();
-                  RB_rotate_right (x);
-                }
-
-              // Handle case 3 (see CLR book, pp. 269).
-              x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
-              RB_rotate_left (x->parent ()->parent ());
-            }
+          // Transform case 2 into case 3 (see CLR book, pp. 269).
+          x = x->parent ();
+          RB_rotate_right (x);
         }
+
+        // Handle case 3 (see CLR book, pp. 269).
+        x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED);
+        RB_rotate_left (x->parent ()->parent ());
+      }
     }
+  }
 }
 
+
 // Method to find the successor node of the given node in the tree.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
@@ -452,18 +501,21 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor (ACE_RB_T
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor");
 
   if (x->right ())
+  {
     return RB_tree_minimum (x->right ());
+  }
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent ();
   while ((y) && (x == y->right ()))
-    {
-      x = y;
-      y = y->parent ();
-    }
+  {
+    x = y;
+    y = y->parent ();
+  }
 
   return y;
 }
 
+
 // Method to find the predecessor node of the given node in the tree.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
@@ -472,19 +524,21 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor (ACE_RB
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor");
 
   if (x->left ())
+  {
     return RB_tree_maximum (x->left ());
+  }
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent ();
-
   while ((y) && (x == y->left ()))
-    {
-      x = y;
-      y = y->parent ();
-    }
+  {
+    x = y;
+    y = y->parent ();
+  }
 
   return y;
 }
 
+
 // Method to find the minimum node of the subtree rooted at the given node.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
@@ -493,11 +547,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum (ACE_RB_Tre
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum");
 
   while ((x) && (x->left ()))
+  {
     x = x->left ();
+  }
 
   return x;
 }
 
+
 // Method to find the maximum node of the subtree rooted at the given node.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
@@ -506,15 +563,18 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum (ACE_RB_Tre
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum");
 
   while ((x) && (x->right ()))
+  {
     x = x->right ();
+  }
 
   return x;
 }
 
-// Close down an RB_Tree.  this method should only be called with
-// locks already held.
+// Close down an RB_Tree.  this method should
+// only be called with locks already held.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
+template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
+int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i ()
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i");
@@ -526,9 +586,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i ()
   return 0;
 }
 
-// Returns a pointer to the item corresponding to the given key, or 0
-// if it cannot find the key in the tree.  This method should only be
-// called with locks already held.
+// Returns a pointer to the item corresponding to the given key,
+// or 0 if it cannot find the key in the tree.  This method should
+// only be called with locks already held.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &k,
@@ -541,26 +601,30 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &k,
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
 
   if (current && result == EXACT)
-    {
-      // Found an exact match: return a pointer to the node.
-      entry = current;
-      return 0;
-    }
+  {
+    // Found an exact match: return a pointer to the node.
+    entry = current;
+    return 0;
+  }
   else
+  {
     // The node is not there.
     return -1;
+  }
 }
 
-// Inserts a *copy* of the key and the item into the tree: both the
-// key type EXT_ID and the item type INT_ID must have well defined
-// semantics for copy construction and < comparison.  This method
-// returns a pointer to the inserted item copy, or 0 if an error
-// occurred.  NOTE: if an identical key already exists in the tree, no
-// new item is created, and the returned pointer addresses the
-// existing item associated with the existing key.  This method should
+
+// Inserts a *copy* of the key and the item into the tree:
+// both the key type EXT_ID and the item type INT_ID must have well
+// defined semantics for copy construction and < comparison.
+// This method returns a pointer to the inserted item copy,
+// or 0 if an error occurred.  NOTE: if an identical key
+// already exists in the tree, no new item is created, and
+// the returned pointer addresses the existing item
+// associated with the existing key.   This method should
 // only be called with locks already held.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> INT_ID *
+template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> INT_ID*
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t)
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t)");
@@ -569,105 +633,116 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
   RB_SearchResult result = LEFT;
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
   if (current)
+  {
+    // If the keys match, just return a pointer to the node's item.
+    if (result == EXACT)
     {
-      // If the keys match, just return a pointer to the node's item.
-      if (result == EXACT)
-        return &current->item ();
-
-      // Otherwise if we're to the left of the insertion point, insert
-      // into the right subtree.
-      else if (result == LEFT)
+      return &(current->item ());
+    }
+    // Otherwise if we're to the left of the insertion
+    // point, insert into the right subtree.
+    else if (result == LEFT)
+    {
+      if (current->right ())
+      {
+        // If there is already a right subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nright subtree already present in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
+      }
+      else
+      {
+        // The right subtree is empty: insert new node there.
+        current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
+        if (current->right ())
         {
-          if (current->right ())
-            // If there is already a right subtree, complain.
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("%p\n"),
-                               ASYS_TEXT ("\nright subtree already present in ")
-                               ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-                              0);
-          else
-            {
-              // The right subtree is empty: insert new node there.
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-
-              ACE_NEW_RETURN (tmp,
-                              (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                              0);
-              current->right (tmp);
-
-              // If the node was successfully inserted, set its
-              // parent, rebalance the tree, color the root black, and
-              // return a pointer to the inserted item.
-              INT_ID *item = &(current->right ()->item ());
-              current->right ()->parent (current);
-              RB_rebalance (current->right ());
-              root_->color (ACE_RB_Tree_Node_Base::BLACK);
-              ++current_size_;
-              return item;
-            }
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          INT_ID *item = &(current->right ()->item ());
+          current->right ()->parent (current);
+          RB_rebalance (current->right ());
+          root_->color (ACE_RB_Tree_Node_Base::BLACK);
+          ++current_size_;
+          return item;
         }
-      // Otherwise, we're to the right of the insertion point, so
-      // insert into the left subtree.
-      else // (result == RIGHT)
+        else
         {
-          if (current->left ())
-            // If there is already a left subtree, complain.
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("%p\n"),
-                               ASYS_TEXT ("\nleft subtree already present in ")
-                               ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-                              0);
-          else
-            {
-              // The left subtree is empty: insert new node there.
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_RETURN (tmp,
-                              (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                              0);
-              current->left (tmp);
-
-              // If the node was successfully inserted, set its
-              // parent, rebalance the tree, color the root black, and
-              // return a pointer to the inserted item.
-              INT_ID *item = &current->left ()->item ();
-              current->left ()->parent (current);
-              RB_rebalance (current->left ());
-              root_->color (ACE_RB_Tree_Node_Base::BLACK);
-              ++current_size_;
-              return item;
-            }
+          // Memory allocation failed.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->right_ failed "
+                                      "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
         }
+      }
     }
-  else
+    // Otherwise, we're to the right of the insertion
+    // point, so insert into the left subtree.
+    else // (result == RIGHT)
     {
-      // The tree is empty: insert at the root and color the root
-      // black.
-      ACE_NEW_RETURN (root_,
-                      (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                      0);
-      if (root_)
+      if (current->left ())
+      {
+        // If there is already a left subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nleft subtree already present in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
+      }
+      else
+      {
+        // The left subtree is empty: insert new node there.
+        current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
+        if (current->left ())
         {
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          INT_ID *item = &(current->left ()->item ());
+          current->left ()->parent (current);
+          RB_rebalance (current->left ());
           root_->color (ACE_RB_Tree_Node_Base::BLACK);
           ++current_size_;
-          return &root_->item ();
+          return item;
+        }
+        else
+        {
+          // Memory allocation failed.
+          ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->left_ failed in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
         }
+      }
     }
-  return 0;
+  }
+  else
+  {
+    // The tree is empty: insert at the root and color the root black.
+    root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t);
+    if (root_)
+    {
+      root_->color (ACE_RB_Tree_Node_Base::BLACK);
+      ++current_size_;
+      return &(root_->item ());
+    }
+    else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                         ASYS_TEXT ("\nmemory allocation to root_ failed in "
+                                    "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
+    }
+  }
 }
 
+
 // Inserts a *copy* of the key and the item into the tree: both the
-// key type EXT_ID and the item type INT_ID must have well defined
-// semantics for copy construction.  The default implementation also
-// requires that the key type support well defined < semantics.  This
-// method passes back a pointer to the inserted (or existing) node,
-// and the search status.  If the node already exists, the method
-// returns 1.  If the node does not exist, and a new one is
-// successfully created, and the method returns 0.  If there was an
-// error, the method returns -1.
+// key type EXT_ID and the item type INT_ID must have well defined semantics
+// for copy construction.  The default implementation also requires that
+// the key type support well defined < semantics.  This method passes back
+// a pointer to the inserted (or existing) node, and the search status.  If
+// the node already exists, the method returns 1.  If the node does not
+// exist, and a new one is successfully created, and the method returns 0.
+// If there was an error, the method returns -1.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
-                                                               const INT_ID &t,
+ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t,
                                                                ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t, "
@@ -677,95 +752,112 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
   RB_SearchResult result = LEFT;
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
   if (current)
+  {
+    // If the keys match, just return a pointer to the node's item.
+    if (result == EXACT)
+    {
+      entry = current;
+      return 1;
+    }
+    // Otherwise if we're to the left of the insertion
+    // point, insert into the right subtree.
+    else if (result == LEFT)
     {
-      // If the keys match, just return a pointer to the node's item.
-      if (result == EXACT)
+      if (current->right ())
+      {
+        // If there is already a right subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nright subtree already present in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
+      }
+      else
+      {
+        // The right subtree is empty: insert new node there.
+        current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
+        if (current->right ())
         {
-          entry = current;
-          return 1;
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          entry = current->right ();
+          current->right ()->parent (current);
+          RB_rebalance (current->right ());
+          root_->color (ACE_RB_Tree_Node_Base::BLACK);
+          ++current_size_;
+          return 0;
         }
-      // Otherwise if we're to the left of the insertion
-      // point, insert into the right subtree.
-      else if (result == LEFT)
+        else
         {
-          if (current->right ())
-            {
-              // If there is already a right subtree, complain.
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("%p\n"),
-                                 ASYS_TEXT ("\nright subtree already present in ")
-                                 ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-                                -1);
-            }
-          else
-            {
-              // The right subtree is empty: insert new node there.
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_RETURN (tmp,
-                              (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                              -1);
-              current->right (tmp);
-
-              // If the node was successfully inserted, set its parent, rebalance
-              // the tree, color the root black, and return a pointer to the
-              // inserted item.
-              entry = current->right ();
-              current->right ()->parent (current);
-              RB_rebalance (current->right ());
-              root_->color (ACE_RB_Tree_Node_Base::BLACK);
-              ++current_size_;
-              return 0;
-            }
+          // Memory allocation failed.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->right_ failed "
+                                      "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
         }
-      // Otherwise, we're to the right of the insertion point, so
-      // insert into the left subtree.
-      else // (result == RIGHT)
+      }
+    }
+    // Otherwise, we're to the right of the insertion
+    // point, so insert into the left subtree.
+    else // (result == RIGHT)
+    {
+      if (current->left ())
+      {
+        // If there is already a left subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nleft subtree already present in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
+      }
+      else
+      {
+        // The left subtree is empty: insert new node there.
+        current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
+        if (current->left ())
         {
-          if (current->left ())
-            // If there is already a left subtree, complain.
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("%p\n"),
-                               ASYS_TEXT ("\nleft subtree already present in ")
-                               ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-                              -1);
-          else
-            {
-              // The left subtree is empty: insert new node there.
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0;
-              ACE_NEW_RETURN (tmp,
-                              (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                              -1);
-              current->left (tmp);
-              // If the node was successfully inserted, set its
-              // parent, rebalance the tree, color the root black, and
-              // return a pointer to the inserted item.
-              entry = current->left ();
-              current->left ()->parent (current);
-              RB_rebalance (current->left ());
-              root_->color (ACE_RB_Tree_Node_Base::BLACK);
-              ++current_size_;
-              return 0;
-            }
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          entry = current->left ();
+          current->left ()->parent (current);
+          RB_rebalance (current->left ());
+          root_->color (ACE_RB_Tree_Node_Base::BLACK);
+          ++current_size_;
+          return 0;
         }
+        else
+        {
+          // Memory allocation failed.
+          ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->left_ failed in "
+                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
+        }
+      }
     }
+  }
   else
+  {
+    // The tree is empty: insert at the root and color the root black.
+    root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t);
+    if (root_)
     {
-      // The tree is empty: insert at the root and color the root black.
-      ACE_NEW_RETURN (root_,
-                      (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t),
-                      -1);
       root_->color (ACE_RB_Tree_Node_Base::BLACK);
       ++current_size_;
       entry = root_;
       return 0;
     }
+    else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                         ASYS_TEXT ("\nmemory allocation to root_ failed in "
+                                    "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
+    }
+  }
 }
 
-// Removes the item associated with the given key from the tree and
-// destroys it.  Returns 1 if it found the item and successfully
-// destroyed it, 0 if it did not find the item, or -1 if an error
-// occurred.  This method should only be called with locks already
-// held.
+
+// Removes the item associated with the given key from the
+// tree and destroys it.  Returns 1 if it found the item
+// and successfully destroyed it, 0 if it did not find the
+// item, or -1 if an error occurred.  This method should
+// only be called with locks already held.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k, INT_ID &i)
@@ -782,7 +874,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k,
     {
       // Return the internal id stored in the deleted node.
       i = z->item ();
-      return -1 == this->remove_i (z) ? -1 : 1;
+      return (-1 == this->remove_i (z)) ? -1 : 1;
     }
   else
   {
@@ -796,46 +888,56 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<
 {
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *z)");
 
-  // Delete the node and reorganize the tree to satisfy the Red-Black
-  // properties.
+  // Delete the node and reorganize the tree to satisfy the Red-Black properties.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *x;
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *y;
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *x, *y;
 
-  if (z->left () && z->right ())
+  if ((z->left ()) && (z->right ()))
+  {
     y = RB_tree_successor (z);
+  }
   else
+  {
     y = z;
-
+  }
   if (y->left ())
+  {
     x = y->left ();
+  }
   else
+  {
     x = y->right ();
-
+  }
   if (x)
-    x->parent (y->parent ());
-
+      {
+        x->parent (y->parent ());
+      }
   if (y->parent ())
+  {
+    if (y == y->parent ()->left ())
     {
-      if (y == y->parent ()->left ())
-        y->parent ()->left (x);
-      else
-        y->parent ()->right (x);
+      y->parent ()->left (x);
+    }
+    else
+    {
+      y->parent ()->right (x);
     }
+  }
   else
+  {
     root_ = x;
-
+  }
   if (y != z)
-    {
-      // Copy the elements of y into z.
-      z->key () = y->key ();
-      z->item () = y->item ();
-    }
-
+  {
+    // Copy the elements of y into z.
+    z->key () = y->key ();
+    z->item () = y->item ();
+  }
   // CLR pp. 263 says that nil nodes are implicitly colored BLACK
   if (!y || y->color () == ACE_RB_Tree_Node_Base::BLACK)
+  {
     RB_delete_fixup (x);
-
+  }
   y->parent (0);
   y->right (0);
   y->left (0);
@@ -845,6 +947,13 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<
   return 0;
 }
 
+
+
+///////////////////////////////////////////////////////////////////////
+// template class                                                    //
+// ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
+///////////////////////////////////////////////////////////////////////
+
 ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator_Base)
 
 // Constructor.
@@ -857,9 +966,13 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_I
 
   // Position the iterator at the first (or last) node in the tree.
   if (set_first)
-    node_ = tree_->RB_tree_minimum (tree_->root_);
+    {
+      node_ = tree_->RB_tree_minimum (tree_->root_);
+    }
   else
-    node_ = tree_->RB_tree_maximum (tree_->root_);
+    {
+      node_ = tree_->RB_tree_maximum (tree_->root_);
+    }
 }
 
 // Copy constructor.
@@ -882,6 +995,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator= (co
   node_ = iter.node_;
 }
 
+
 // Destructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -890,6 +1004,12 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator_Base");
 }
 
+
+//////////////////////////////////////////////////////////////////
+// template class                                               //
+// ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
+//////////////////////////////////////////////////////////////////
+
 ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator)
 
 // Constructor.
@@ -902,6 +1022,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterat
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator");
 }
 
+
 // Destructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -910,6 +1031,11 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Itera
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator");
 }
 
+//////////////////////////////////////////////////////////////////////////
+// template class                                                       //
+// ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
+//////////////////////////////////////////////////////////////////////////
+
 ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Reverse_Iterator)
 
 // Constructor.
@@ -921,6 +1047,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tre
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator");
 }
 
+
 // Destructor.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -929,4 +1056,5 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tr
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Reverse_Iterator");
 }
 
+
 #endif /* !defined (ACE_RB_TREE_C) */
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index f75160d9a01..7b61793711a 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -473,6 +473,10 @@ public:
 
   // = Iteration methods.
 
+  int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
+  // Passes back the <entry> under the iterator.  Returns 0 if
+  // the iteration has completed, otherwise 1.
+
   int done (void) const;
   // Returns 1 when the iteration has completed, otherwise 0.
 
@@ -577,17 +581,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
-  // Passes back the <entry> under the iterator.  Returns 0 if
-  // the iteration has completed, otherwise 1.  This method must
-  // be declared and defined in both the derived forward and
-  // reverse iterator classes rather than in the base iterator
-  // class because of a method signature resolution problem
-  // caused by the existence of the deprecated next (void)
-  // method in the derived forward iterator class.  When that
-  // deprecated method is removed, this method should be removed
-  // from the derived classes and placed in the base class.
-
   // = DEPRECATED methods.  Please migrate your code to use the new methods instead
 
   EXT_ID *key (void);
@@ -666,17 +659,6 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
-  // Passes back the <entry> under the iterator.  Returns 0 if
-  // the iteration has completed, otherwise 1.  This method must
-  // be declared and defined in both the derived forward and
-  // reverse iterator classes rather than in the base iterator
-  // class because of a method signature resolution problem
-  // caused by the existence of the deprecated next (void)
-  // method in the derived forward iterator class.  When that
-  // deprecated method is removed, this method should be removed
-  // from the derived classes and placed in the base class.
-
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index 094812f3359..be04facc288 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -724,6 +724,25 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size ()
 // ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
 ///////////////////////////////////////////////////////////////////////
 
+// Passes back the <entry> under the iterator.  Returns 0 if
+// the iteration has completed, otherwise 1.
+
+template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
+ACE_INLINE int
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const
+{
+  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next");
+
+  if (this->node_)
+    {
+      next_entry = this->node_;
+      return 1;
+    }
+
+  return 0;
+}
+
+
 // Returns 1 when the iteration has completed, otherwise 0.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -909,32 +928,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int)
 }
 
 
-// Passes back the <entry> under the iterator.  Returns 0 if
-// the iteration has completed, otherwise 1.  This method must
-// be declared and defined in both the derived forward and
-// reverse iterator classes rather than in the base iterator
-// class because of a method signature resolution problem
-// caused by the existence of the deprecated next (void)
-// method in the derived forward iterator class.  When that
-// deprecated method is removed, this method should be removed
-// from the derived classes and placed in the base class.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next");
-
-  if (this->node_)
-    {
-      next_entry = this->node_;
-      return 1;
-    }
-
-  return 0;
-}
-
-
 // Accessor for key of node under iterator (if any). DEPRECATED.
 
 template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
@@ -1102,34 +1095,3 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator--
   this->forward_i ();
   return retv;
 }
-
-
-// Passes back the <entry> under the iterator.  Returns 0 if
-// the iteration has completed, otherwise 1.  This method must
-// be declared and defined in both the derived forward and
-// reverse iterator classes rather than in the base iterator
-// class because of a method signature resolution problem
-// caused by the existence of the deprecated next (void)
-// method in the derived forward iterator class.  When that
-// deprecated method is removed, this method should be removed
-// from the derived classes and placed in the base class.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next");
-
-  if (this->node_)
-    {
-      next_entry = this->node_;
-      return 1;
-    }
-
-  return 0;
-}
-
-
-
-
-
diff --git a/ace/README b/ace/README
index 44e5118b055..bacb522154d 100644
--- a/ace/README
+++ b/ace/README
@@ -169,9 +169,6 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
                                         Compiler handles explicit calling of
                                         template destructor correctly. See
                                         "ace/OS.h" for details.
-ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
-                                        with a NULL addr to accept()
-                                        (e.g, VxWorks).
 ACE_HAS_BROKEN_NAMESPACES               Compiler/platform doesn't
                                         support namespaces (or the
                                         support is not fully
@@ -379,9 +376,6 @@ ACE_HAS_OSF_TIMOD_H                     Platform supports the OSF TLI
 ACE_HAS_PENTIUM                         Platform is an Intel Pentium
                                         microprocessor.
 ACE_HAS_POLL                            Platform contains <poll.h>
-ACE_HAS_POSITION_INDEPENDENT_MALLOC     The ACE_Malloc<> class uses
-                                        "position-independent" features
-                                        provided by ACE_Based_Pointer<>.
 ACE_HAS_POSIX_NONBLOCK                  Platform supports POSIX
                                         O_NONBLOCK semantics
 ACE_HAS_POSIX_SEM                       Platform supports POSIX
@@ -411,8 +405,6 @@ ACE_HAS_PTHREADS_DRAFT7                 Platform's 'Pthreads' is .1c draft 7
 ACE_HAS_PTHREADS_STD                    Platform supports POSIX.1c-1995 threads
                                         (This is the final standard
                                         Pthreads).
-ACE_HAS_PTHREADS_UNIX98_EXT             Platform has the UNIX98 extensions to
-                                        Pthreads (susp/cont, rwlocks)
 ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP     Platform has pthread_condattr_setkind_np().
 ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
                                         pthread_mutexattr_setkind_np().
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index ebf860d9786..bb43fcbdee8 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -35,19 +35,15 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
       || 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)
-      ACE_NEW (impl,
-               ACE_TP_Reactor);
+      ACE_NEW (impl, ACE_TP_Reactor);
   #else  
-      ACE_NEW (impl,
-               ACE_Select_Reactor);
+      ACE_NEW (impl, ACE_Select_Reactor);
   #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,
-               ACE_Msg_WFMO_Reactor);
+      ACE_NEW (impl, ACE_Msg_WFMO_Reactor);
   #else
-      ACE_NEW (impl,
-               ACE_WFMO_Reactor);
+      ACE_NEW (impl, ACE_WFMO_Reactor);
   #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */
 #endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
       this->implementation (impl);
@@ -84,9 +80,7 @@ ACE_Reactor::instance (void)
 
       if (ACE_Reactor::reactor_ == 0)
         {
-          ACE_NEW_RETURN (ACE_Reactor::reactor_,
-                          ACE_Reactor,
-                          0);
+          ACE_NEW_RETURN (ACE_Reactor::reactor_, ACE_Reactor, 0);
           ACE_Reactor::delete_reactor_ = 1;
         }
     }
diff --git a/ace/Reactor.h b/ace/Reactor.h
index cf26d6fb25d..9cc24fac749 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -135,11 +135,6 @@ public:
 
   // = Event loop drivers.
 
-  virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero);
-  // Returns non-zero if there are I/O events "ready" for dispatching,
-  // but does not actually dispatch the event handlers.  By default,
-  // don't block while checking this, i.e., "poll".
-
   virtual int handle_events (ACE_Time_Value *max_wait_time = 0);
   virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0);
   // This event loop driver blocks for up to <max_wait_time> before
diff --git a/ace/Reactor.i b/ace/Reactor.i
index 847857a96bb..9bc9c833eac 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.i
@@ -53,12 +53,6 @@ ACE_Reactor::close (void)
 }
 
 ACE_INLINE int 
-ACE_Reactor::work_pending (const ACE_Time_Value &max_wait_time)
-{
-  return this->implementation ()->work_pending (max_wait_time);
-}
-
-ACE_INLINE int 
 ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->implementation ()->handle_events (max_wait_time);
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 67d12ec66c1..e5ed3b2f18f 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -116,10 +116,6 @@ public:
   // Close down and release all resources.
 
   // = Event loop drivers.
-  virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero)  = 0;
-  // Returns non-zero if there are I/O events "ready" for dispatching,
-  // but does not actually dispatch the event handlers.  By default,
-  // don't block while checking this, i.e., "poll".
 
   virtual int handle_events (ACE_Time_Value *max_wait_time = 0) = 0;
   virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0) = 0;
diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp
index 30686c25d52..543ddd1a4e2 100644
--- a/ace/Registry_Name_Space.cpp
+++ b/ace/Registry_Name_Space.cpp
@@ -16,8 +16,7 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void)
 ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options)
 {
   if (this->open (name_options) != 0)
-    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Registry_Name_Space::open")));
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Registry_Name_Space::open")));
 }
 
 
@@ -26,19 +25,17 @@ ACE_Registry_Name_Space::~ACE_Registry_Name_Space (void)
 }
 
 
-int
+int 
 ACE_Registry_Name_Space::open (ACE_Name_Options *name_options)
 {
-  const ASYS_TCHAR *host = name_options->nameserver_host ();
+  const char *host = name_options->nameserver_host ();
   ACE_Registry::Naming_Context predefined;
-
+  
   int result = ACE_Predefined_Naming_Contexts::connect (predefined,
 							HKEY_LOCAL_MACHINE,
-							ASYS_ONLY_WIDE_STRING (host));
+							ACE_WIDE_STRING (host));
   if (result != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")),
-                      result);
+    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")), result);
   else
     {
       // Directory
@@ -58,68 +55,68 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options)
 }
 
 
-int
-ACE_Registry_Name_Space::bind (const ACE_WString &name,
-			       const ACE_WString &value,
+int 
+ACE_Registry_Name_Space::bind (const ACE_WString &name, 
+			       const ACE_WString &value, 
 			       const char *type)
 {
   // Pointer to data
   const ACE_USHORT16 *data = value.fast_rep ();
-
+  
   // Size
   u_long size = value.length () * sizeof (ACE_USHORT16);
-
+  
   // Represent value as an ACE_Registry::Object
   ACE_Registry::Object object ((void *) data,
 			       size,
 			       REG_SZ);
   // Add new <key>/<value> pair
-  return this->context_.bind (name.fast_rep(),
+  return this->context_.bind (name.fast_rep(), 
 			      object);
 }
 
 
-int
-ACE_Registry_Name_Space::rebind (const ACE_WString &name,
-				 const ACE_WString &value,
+int 
+ACE_Registry_Name_Space::rebind (const ACE_WString &name, 
+				 const ACE_WString &value, 
 				 const char *type)
 {
   // Pointer to data
   const ACE_USHORT16 *data = value.fast_rep ();
-
+  
   // Size
   u_long size = value.length () * sizeof (ACE_USHORT16);
-
+  
   // Represent value as an ACE_Registry::Object
   ACE_Registry::Object object ((void *) data,
 			       size,
 			       REG_SZ);
   // Add new <key>/<value> pair
-  return this->context_.rebind (name.fast_rep (),
+  return this->context_.rebind (name.fast_rep (), 
 				object);
 }
 
 
-int
+int 
 ACE_Registry_Name_Space::unbind (const ACE_WString &name)
 {
   return this->context_.unbind (name.fast_rep ());
 }
 
 
-int
-ACE_Registry_Name_Space::resolve (const ACE_WString &name,
-				  ACE_WString &value,
+int 
+ACE_Registry_Name_Space::resolve (const ACE_WString &name, 
+				  ACE_WString &value, 
 				  char *&type)
 {
-  // This object will be used to query the size of the data.
+  // This object will be used to query the size of the data. 
   // Note: The query_object.data will be null for this invocation.
   ACE_Registry::Object query_object;
   int result = this->context_.resolve (name.fast_rep (), query_object);
   if (result != 0)
     return result;
 
-  // Resize the value passed by the user
+  // Resize the value passed by the user 
   // Note: -1 is used because the size includes the null terminator
   value.resize ((query_object.size () - 1) / sizeof (ACE_USHORT16));
 
@@ -137,9 +134,9 @@ ACE_Registry_Name_Space::resolve (const ACE_WString &name,
   return 0;
 }
 
-
-int
-ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set,
+  
+int 
+ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, 
 				      const ACE_WString &pattern)
 {
   ACE_BINDING_SET binding_set;
@@ -147,7 +144,7 @@ ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set,
 					pattern);
   if (result != 0)
     return result;
-
+  
   ACE_BINDING_ITERATOR iterator (binding_set);
 
   for (ACE_Name_Binding *entry = 0;
@@ -160,8 +157,8 @@ ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set,
 }
 
 
-int
-ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set,
+int 
+ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, 
 				      const ACE_WString &pattern)
 {
   ACE_BINDING_SET binding_set;
@@ -169,7 +166,7 @@ ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set,
 					pattern);
   if (result != 0)
     return result;
-
+  
   ACE_BINDING_ITERATOR iterator (binding_set);
 
   for (ACE_Name_Binding *entry = 0;
@@ -182,16 +179,16 @@ ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set,
 }
 
 
-int
-ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set,
+int 
+ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, 
 				     const ACE_WString &pattern)
 {
   return 0;
 }
 
 
-int
-ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set,
+int 
+ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, 
 					    const ACE_WString &pattern)
 {
   ACE_Registry::Binding_List list;
@@ -206,22 +203,22 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set,
     {
       // Yeeesss! STL rules!
       ACE_Registry::Binding &binding = *i;
-
+      
       if (binding.type () == ACE_Registry::OBJECT)
-	{
+	{	  
 	  // Key
 	  ACE_Registry::Istring string = binding.name ();
 	  ACE_WString key (string.c_str ());
-
+	  
 	  // Value
 	  ACE_WString value;
 	  char *type = 0;
 	  result = this->resolve (key,
 				  value,
-				  type);
+				  type);	  
 	  if (result != 0)
 	    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Registry::Naming_Context::resolve")), result);
-
+	  
 	  // Complete binding
 	  ACE_Name_Binding binding (key, value, type);
 	  set.insert (binding);
@@ -231,23 +228,23 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set,
 }
 
 
-int
-ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set,
+int 
+ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, 
 					     const ACE_WString &pattern)
 {
   return this->list_name_entries (set, pattern);
 }
 
 
-int
-ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set,
+int 
+ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, 
 					    const ACE_WString &pattern)
 {
   return this->list_name_entries (set, pattern);
 }
 
 
-void
+void 
 ACE_Registry_Name_Space::dump (void) const
 {
 }
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index e33702af313..cbd886b0d13 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -7,11 +7,11 @@
 ACE_RCSID(ace, Remote_Name_Space, "$Id$")
 
 int
-ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port)
+ACE_Remote_Name_Space::open (const char *servername, u_short port)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::open");
   ACE_INET_Addr servaddr;
-
+  
   // Initialize Addr
   if (servaddr.set (port, servername) == -1)
     return -1;
@@ -19,7 +19,7 @@ ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port)
   // Connect to Name Server process.
   if (this->ns_proxy_.open (servaddr) == -1)
     return -1;
-
+      
   return 0;
 }
 
@@ -28,7 +28,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (void)
   ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
 }
 
-ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname,
+ACE_Remote_Name_Space::ACE_Remote_Name_Space (const char *hostname, 
 					      u_short port)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
@@ -36,9 +36,9 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname,
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space")));
 }
 
-int
-ACE_Remote_Name_Space::bind (const ACE_WString &name,
-			     const ACE_WString &value,
+int 
+ACE_Remote_Name_Space::bind (const ACE_WString &name, 
+			     const ACE_WString &value, 
 			     const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::bind");
@@ -47,14 +47,14 @@ ACE_Remote_Name_Space::bind (const ACE_WString &name,
 			    name.length () * sizeof (ACE_USHORT16),
 			    value.fast_rep (),
 			    value.length () * sizeof (ACE_USHORT16),
-			    type,
+			    type, 
                             ACE_OS::strlen (type));
   return this->ns_proxy_.request_reply (request);
 }
 
-int
-ACE_Remote_Name_Space::rebind (const ACE_WString &name,
-			       const ACE_WString &value,
+int 
+ACE_Remote_Name_Space::rebind (const ACE_WString &name, 
+			       const ACE_WString &value, 
 			       const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::rebind");
@@ -63,14 +63,14 @@ ACE_Remote_Name_Space::rebind (const ACE_WString &name,
 			    name.length () * sizeof (ACE_USHORT16),
 			    value.fast_rep (),
 			    value.length () * sizeof (ACE_USHORT16),
-			    type,
+			    type, 
                             ACE_OS::strlen (type));
   return this->ns_proxy_.request_reply (request);
 }
 
-int
-ACE_Remote_Name_Space::resolve (const ACE_WString &name,
-				ACE_WString &value,
+int 
+ACE_Remote_Name_Space::resolve (const ACE_WString &name, 
+				ACE_WString &value, 
 				char *&type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::resolve");
@@ -89,14 +89,14 @@ ACE_Remote_Name_Space::resolve (const ACE_WString &name,
 
   ACE_WString temp (reply.value (), reply.value_len () / sizeof (ACE_USHORT16));
   value = temp;
-  ACE_NEW_RETURN (type,
+  ACE_NEW_RETURN (type, 
                   char[reply.type_len () + 1],
                   -1);
   ACE_OS::strcpy (type, reply.type ());
   return 0;
 }
 
-int
+int  
 ACE_Remote_Name_Space::unbind (const ACE_WString &name)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::unbind");
@@ -107,8 +107,8 @@ ACE_Remote_Name_Space::unbind (const ACE_WString &name)
   return this->ns_proxy_.request_reply (request);
 }
 
-int
-ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
+int 
+ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, 
 				   const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
@@ -118,7 +118,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
 			    0, 0, 0, 0);
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -138,8 +138,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
   return 0;
 }
 
-int
-ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
+int 
+ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, 
 				    const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
@@ -149,7 +149,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
 			    0, 0, 0, 0);
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -170,8 +170,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
   return 0;
 }
 
-int
-ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
+int 
+ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, 
 				   const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
@@ -182,7 +182,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
 
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -202,8 +202,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
   return 0;
 }
 
-int
-ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
+int 
+ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, 
 					  const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
@@ -214,7 +214,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
 
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -240,8 +240,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
   return 0;
 }
 
-int
-ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
+int 
+ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, 
 					   const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
@@ -252,7 +252,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
 
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -278,8 +278,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
   return 0;
 }
 
-int
-ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
+int 
+ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, 
 					  const ACE_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
@@ -290,7 +290,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
 
   if (this->ns_proxy_.send_request (request) == -1)
     return -1;
-
+  
   ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
 
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -330,3 +330,4 @@ ACE_Remote_Name_Space::dump (void) const
   this->ns_proxy_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index 154c57ece5c..3ba0b8edce9 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -48,12 +48,12 @@ public:
   ACE_Remote_Name_Space (void);
   // "Do-nothing" constructor.
 
-  ACE_Remote_Name_Space (const ASYS_TCHAR *hostname, u_short port);
+  ACE_Remote_Name_Space (const char *hostname, u_short port);
   // Specifies the scope of this namespace, opens and memory-maps the
   // associated file (if accessible) or contacts the dedicated name
   // server process for NET_LOCAL namespace.
 
-  int open (const ASYS_TCHAR *servername, u_short port);
+  int open (const char *servername, u_short port);
   // Specifies the scope of this namespace, opens and memory-maps the
   // associated file (if accessible) or contacts the dedicated name
   // server process for NET_LOCAL namespace.
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 23c8426e0e6..72881602d7d 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -58,9 +58,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const
   ACE_SOCK_Connector connector;
   ACE_SOCK_Stream *stream = 0;
 
-  ACE_NEW_RETURN (stream,
-                  ACE_SOCK_Stream,
-                  0);
+  ACE_NEW_RETURN (stream, ACE_SOCK_Stream, 0);
 
   if (connector.connect (*stream, server_address_) == -1)
     {
@@ -102,7 +100,7 @@ ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void)
 }
 
 int
-ACE_Remote_Token_Proxy::open (const ASYS_TCHAR *name,
+ACE_Remote_Token_Proxy::open (const char *name,
 			      int ignore_deadlock,
 			      int debug)
 {
@@ -125,8 +123,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void)
   if (token_ == 0)
     {
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "ACE_Remote_Token_Proxy not open.\n"), -1);
     }
 
   ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection ();
@@ -161,7 +158,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
 
       // Receive reply via blocking read.
 
-      if (peer->recv (&reply, sizeof reply) != sizeof reply)
+      if (peer->recv (&reply, sizeof reply) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("recv failed")), -1);
 
       if (reply.decode () == -1)
@@ -212,8 +209,8 @@ ACE_Remote_Token_Proxy::acquire (int notify,
 
 	default :
 	  ACE_ERROR_RETURN ((LM_ERROR,
-			     ASYS_TEXT ("(%t) %p shadow acquire failed\n"),
-			     ASYS_TEXT ("ACE_Remote_Token_Proxy")),
+			     "(%t) %p shadow acquire failed\n",
+			     "ACE_Remote_Token_Proxy"),
 			    -1);
 	}
     }
@@ -221,8 +218,8 @@ ACE_Remote_Token_Proxy::acquire (int notify,
   ACE_Token_Request request (token_->type (),
 			     this->type (),
 			     ACE_Token_Request::ACQUIRE,
-			     ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
-			     ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+			     this->name (),
+			     this->client_id (),
 			     options);
 
   request.notify (notify);
@@ -272,8 +269,8 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
   ACE_Token_Request request (token_->type (),
 			     this->type (),
 			     ACE_Token_Request::RELEASE,
-			     ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
-			     ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+			     this->name (),
+			     this->client_id (),
 			     ACE_Synch_Options::synch);
 
   return this->request_reply (request,
@@ -294,15 +291,15 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
 	return -1;
       else if (debug_)
 	ACE_DEBUG ((LM_DEBUG,
-		    ASYS_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
+		    "(%t) shadow: renew would block. owner %s.\n",
 		    this->token_->owner_id ()));
     }
 
   ACE_Token_Request request (token_->type (),
 			     this->type (),
 			     ACE_Token_Request::RENEW,
-			     ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
-			     ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+			     this->name (),
+			     this->client_id (),
 			     options);
 
   request.requeue_position (requeue_position);
@@ -317,8 +314,8 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
         ACE_Token_Proxy::release ();
       }
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p error on remote renew, releasing shadow mutex.\n"),
-                         ASYS_TEXT ("ACE_Remote_Token_Proxy")), -1);
+                         "%p error on remote renew, releasing shadow mutex.\n",
+                         "ACE_Remote_Token_Proxy"), -1);
     }
   else
     {
@@ -338,8 +335,8 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options)
   ACE_Token_Request request (token_->type (),
 			     this->type (),
 			     ACE_Token_Request::RELEASE,
-			     ASYS_ONLY_MULTIBYTE_STRING (this->name ()),
-			     ASYS_ONLY_MULTIBYTE_STRING (this->client_id ()),
+			     this->name (),
+			     this->client_id (),
 			     options);
 
   int result = this->request_reply (request, options);
@@ -350,7 +347,7 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options)
   // If race conditions exist such that we are no longer the owner,
   // this release will perform a remove.
   if (ACE_Token_Proxy::release () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) shadow: release failed\n")));
+    ACE_ERROR ((LM_ERROR, "(%t) shadow: release failed\n"));
 
   return result;
 }
@@ -372,7 +369,7 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *)
   // ACE_Token_Proxy::token_acquired (vp);
 }
 
-const ASYS_TCHAR*
+const char*
 ACE_Remote_Token_Proxy::owner_id (void)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
@@ -387,8 +384,8 @@ ACE_Remote_Token_Proxy::dump (void) const
   ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("ACE_Tokens::dump:\n")
-              ASYS_TEXT (" ignore_shadow_deadlock_ = %d\n"),
-              ignore_shadow_deadlock_));
+			" ignore_shadow_deadlock_ = %d\n",
+			ignore_shadow_deadlock_));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("base:\n")));
   ACE_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
@@ -434,3 +431,4 @@ template class ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>;
 #pragma instantiate ACE_TSS <ACE_SOCK_Stream>
 #pragma instantiate ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 4aa5dab587c..f9fd4ee6664 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -51,7 +51,7 @@ public:
   virtual ~ACE_Remote_Token_Proxy (void);
   // Death.
 
-  int open (const ASYS_TCHAR *name,
+  int open (const char *name,
             int ignore_deadlock = 0,
             int debug = 0);
   // Same as Token_Proxy. <name> is the string uniquely identifying
@@ -113,7 +113,7 @@ public:
   virtual void token_acquired (ACE_TPQ_Entry *);
   // Override the default to do nothing.
 
-  virtual const ASYS_TCHAR* owner_id (void);
+  virtual const char* owner_id (void);
   // the client id of the current token holder
 
   static void set_server_address (const ACE_INET_Addr &server_address);
@@ -153,7 +153,7 @@ public:
   ACE_Remote_Mutex (void);
   // Null creation.  Remote_Token_Proxy::open must be called.
 
-  ACE_Remote_Mutex (const ASYS_TCHAR *token_name,
+  ACE_Remote_Mutex (const char *token_name,
                     int ignore_deadlock = 0,
                     int debug = 0);
   // Calls Remote_Token_Proxy::open for you.
@@ -165,7 +165,7 @@ public:
   // Return deep copy.
 
 protected:
-  virtual ACE_Tokens *create_token (const ASYS_TCHAR *name);
+  virtual ACE_Tokens *create_token (const char *name);
   // Make the correct type of ACE_Tokens.  This is called by the Token
   // Manager.
 };
@@ -186,7 +186,7 @@ class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy
 public:
   ACE_Remote_RLock (void);
 
-  ACE_Remote_RLock (const ASYS_TCHAR *token_name,
+  ACE_Remote_RLock (const char *token_name,
                     int ignore_deadlock = 0,
                     int debug = 0);
 
@@ -202,7 +202,7 @@ public:
   // Return deep copy.
 
 protected:
-  virtual ACE_Tokens *create_token (const ASYS_TCHAR *name);
+  virtual ACE_Tokens *create_token (const char *name);
   // Make the correct type of ACE_Tokens.  This is called by the Token
   // Manager.
 };
@@ -222,7 +222,7 @@ class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy
 public:
   ACE_Remote_WLock (void);
 
-  ACE_Remote_WLock (const ASYS_TCHAR *token_name,
+  ACE_Remote_WLock (const char *token_name,
                     int ignore_deadlock = 0,
                     int debug = 0);
 
@@ -238,7 +238,7 @@ public:
   // Return deep copy.
 
 protected:
-  virtual ACE_Tokens *create_token (const ASYS_TCHAR *name);
+  virtual ACE_Tokens *create_token (const char *name);
   // Make the correct type of ACE_Tokens.  This is called by the Token
   // Manager.
 };
diff --git a/ace/Remote_Tokens.i b/ace/Remote_Tokens.i
index 5392280cbe0..2a87bf30919 100644
--- a/ace/Remote_Tokens.i
+++ b/ace/Remote_Tokens.i
@@ -10,7 +10,7 @@ ACE_Remote_Mutex::ACE_Remote_Mutex (void)
 }
 
 ACE_INLINE
-ACE_Remote_Mutex::ACE_Remote_Mutex (const ASYS_TCHAR *token_name,
+ACE_Remote_Mutex::ACE_Remote_Mutex (const char *token_name,
 				    int ignore_deadlock,
 				    int debug)
 {
@@ -27,7 +27,7 @@ ACE_Remote_Mutex::clone (void) const
 }
 
 ACE_INLINE ACE_Tokens *
-ACE_Remote_Mutex::create_token (const ASYS_TCHAR *name)
+ACE_Remote_Mutex::create_token (const char *name)
 {
   return new ACE_Mutex_Token (name);
 }
@@ -35,7 +35,7 @@ ACE_Remote_Mutex::create_token (const ASYS_TCHAR *name)
 // ************************************************************
 
 ACE_INLINE
-ACE_Remote_RLock::ACE_Remote_RLock (const ASYS_TCHAR *token_name,
+ACE_Remote_RLock::ACE_Remote_RLock (const char *token_name,
 				    int ignore_deadlock,
 				    int debug)
 {
@@ -44,7 +44,7 @@ ACE_Remote_RLock::ACE_Remote_RLock (const ASYS_TCHAR *token_name,
 }
 
 ACE_INLINE ACE_Tokens *
-ACE_Remote_RLock::create_token (const ASYS_TCHAR *name)
+ACE_Remote_RLock::create_token (const char *name)
 {
   return new ACE_RW_Token (name);
 }
@@ -66,7 +66,7 @@ ACE_Remote_RLock::clone (void) const
 // ************************************************************
 
 ACE_INLINE
-ACE_Remote_WLock::ACE_Remote_WLock (const ASYS_TCHAR *token_name,
+ACE_Remote_WLock::ACE_Remote_WLock (const char *token_name,
 				    int ignore_deadlock,
 				    int debug)
 {
@@ -76,7 +76,7 @@ ACE_Remote_WLock::ACE_Remote_WLock (const ASYS_TCHAR *token_name,
 
 
 ACE_INLINE ACE_Tokens *
-ACE_Remote_WLock::create_token (const ASYS_TCHAR *name)
+ACE_Remote_WLock::create_token (const char *name)
 {
   return new ACE_RW_Token (name);
 }
@@ -94,3 +94,5 @@ ACE_Remote_WLock::clone (void) const
 			       ignore_deadlock_,
 			       debug_);
 }
+
+
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 67a10d44d64..010b1c1f986 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -54,22 +54,6 @@ ACE_SOCK::get_local_addr (ACE_Addr &sa) const
   return 0;
 }
 
-// Close down a ACE_SOCK.
-
-int
-ACE_SOCK::close (void)
-{
-  ACE_TRACE ("ACE_SOCK::close");
-  int result = 0;
-
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      result = ACE_OS::closesocket (this->get_handle ());
-      this->set_handle (ACE_INVALID_HANDLE);
-    }
-  return result;
-}
-
 int
 ACE_SOCK::open (int type, 
                 int protocol_family, 
@@ -85,8 +69,8 @@ ACE_SOCK::open (int type,
 
   if (this->get_handle () == ACE_INVALID_HANDLE)
     return -1;
-  else if (protocol_family != PF_UNIX 
-           && reuse_addr 
+  else if (protocol_family != PF_UNIX &&
+           reuse_addr 
            && this->set_option (SOL_SOCKET,
                                 SO_REUSEADDR,
                                 &one,
@@ -98,76 +82,32 @@ ACE_SOCK::open (int type,
   return 0;
 }
 
-// General purpose constructor for performing server ACE_SOCK
-// creation.
-
-ACE_SOCK::ACE_SOCK (int type, 
-                    int protocol_family, 
-                    int protocol,
-                    int reuse_addr)
-{
-  // ACE_TRACE ("ACE_SOCK::ACE_SOCK");
-  if (this->open (type,
-                  protocol_family, 
-                  protocol,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK::ACE_SOCK")));
-}
+// Close down a ACE_SOCK.
 
 int
-ACE_SOCK::open (int type, 
-                int protocol_family, 
-                int protocol,
-                ACE_Protocol_Info *protocolinfo,
-                ACE_SOCK_GROUP g,
-                u_long flags,
-                int reuse_addr)
+ACE_SOCK::close (void)
 {
-  ACE_TRACE ("ACE_SOCK::open");
-
-  this->set_handle (ACE_OS::socket (protocol_family,
-                                    type,
-                                    protocol,
-                                    protocolinfo,
-                                    g,
-                                    flags));
-
-  int one = 1;
+  ACE_TRACE ("ACE_SOCK::close");
+  int result = 0;
 
-  if (this->get_handle () == ACE_INVALID_HANDLE)
-    return -1;
-  else if (reuse_addr 
-           && this->set_option (SOL_SOCKET,
-                                SO_REUSEADDR,
-                                &one,
-                                sizeof one) == -1)
+  if (this->get_handle () != ACE_INVALID_HANDLE)
     {
-      this->close ();
-      return -1;
+      result = ACE_OS::closesocket (this->get_handle ());
+      this->set_handle (ACE_INVALID_HANDLE);
     }
-  return 0;
+  return result;
 }
 
+// General purpose constructor for performing server ACE_SOCK
+// creation.
+
 ACE_SOCK::ACE_SOCK (int type, 
                     int protocol_family, 
                     int protocol,
-                    ACE_Protocol_Info *protocolinfo,
-                    ACE_SOCK_GROUP g,
-                    u_long flags,
                     int reuse_addr)
 {
   // ACE_TRACE ("ACE_SOCK::ACE_SOCK");
-  if (this->open (type,
-                  protocol_family,
-                  protocol,
-                  protocolinfo,
-                  g,
-                  flags,
-                  reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_SOCK::ACE_SOCK")));
+  if (this->open (type, protocol_family, 
+                  protocol, reuse_addr) == -1)
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK::ACE_SOCK")));
 }
-
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 6918bf12ff3..ff7fe250221 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -75,34 +75,14 @@ public:
             int protocol_family,
             int protocol,
             int reuse_addr);
-  // Wrapper around the BSD-style <socket> system call (no QoS).
-
-  int open (int type,
-            int protocol_family,
-            int protocol,
-            ACE_Protocol_Info *protocolinfo,
-            ACE_SOCK_GROUP g,
-            u_long flags,
-            int reuse_addr);
-  // Wrapper around the QoS-enabled <WSASocket> function.
+  // Wrapper around the <socket> system call.
 
 protected:
   ACE_SOCK (int type,
             int protocol_family,
             int protocol = 0,
             int reuse_addr = 0);
-  // Constructor with arguments to call the BSD-style <socket> system
-  // call (no QoS).
-
-  ACE_SOCK (int type,
-            int protocol_family,
-            int protocol,
-            ACE_Protocol_Info *protocolinfo,
-            ACE_SOCK_GROUP g,
-            u_long flags,
-            int reuse_addr);
-  // Constructor with arguments to call the QoS-enabled <WSASocket>
-  // function.
+  // Constructor with arguments to call the <socket> system call.
 
   ACE_SOCK (void);
   // Default constructor is private to prevent instances of this class
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 96726920173..04c8553631e 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -14,14 +14,14 @@ ACE_RCSID(ace, SOCK_Acceptor, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor)
 
-// Do nothing routine for constructor.
+// Do nothing routine for constructor. 
 
 ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
 }
 
-// Performs the timed accept operation.
+// Performs the timed accept operation. 
 
 int
 ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout,
@@ -45,7 +45,7 @@ ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout,
 					       ACE_NONBLOCK);
 	  // Set the handle into non-blocking mode if it's not already
 	  // in it.
-	  if (in_blocking_mode
+	  if (in_blocking_mode 
 	      && ACE::set_flags (handle,
 				 ACE_NONBLOCK) == -1)
 	    return -1;
@@ -82,7 +82,7 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream,
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
   if (reset_new_handle)
     // Reset the event association inherited by the new handle.
-    ::WSAEventSelect ((SOCKET) new_handle, 0, 0);
+    ::WSAEventSelect ((SOCKET) new_handle, 0, 0);      
 #else
   ACE_UNUSED_ARG (reset_new_handle);
 #endif /* ACE_WIN32 */
@@ -90,12 +90,12 @@ ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream,
   return new_handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
-// General purpose routine for accepting new connections.
+// General purpose routine for accepting new connections. 
 
 int
-ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
-                           ACE_Addr *remote_addr,
-			   ACE_Time_Value *timeout,
+ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, 
+                           ACE_Addr *remote_addr, 
+			   ACE_Time_Value *timeout, 
                            int restart,
                            int reset_new_handle) const
 {
@@ -125,14 +125,14 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 	new_stream.set_handle (ACE_OS::accept (this->get_handle (),
 					       addr,
 					       len_ptr));
-      while (new_stream.get_handle () == ACE_INVALID_HANDLE
+      while (new_stream.get_handle () == ACE_INVALID_HANDLE 
 	     && restart != 0
 	     && errno == EINTR
 	     && timeout == 0);
 
       // Reset the size of the addr, which is only necessary for UNIX
       // domain sockets.
-      if (new_stream.get_handle () != ACE_INVALID_HANDLE
+      if (new_stream.get_handle () != ACE_INVALID_HANDLE 
 	  && remote_addr != 0)
 	remote_addr->set_size (len);
     }
@@ -143,10 +143,10 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 }
 
 int
-ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
+ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, 
 			   ACE_Accept_QoS_Params qos_params,
-                           ACE_Addr *remote_addr,
-			   ACE_Time_Value *timeout,
+                           ACE_Addr *remote_addr, 
+			   ACE_Time_Value *timeout, 
                            int restart,
                            int reset_new_handle) const
 {
@@ -177,14 +177,14 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 					       addr,
 					       len_ptr,
 					       qos_params));
-      while (new_stream.get_handle () == ACE_INVALID_HANDLE
+      while (new_stream.get_handle () == ACE_INVALID_HANDLE 
 	     && restart != 0
 	     && errno == EINTR
 	     && timeout == 0);
 
       // Reset the size of the addr, which is only necessary for UNIX
       // domain sockets.
-      if (new_stream.get_handle () != ACE_INVALID_HANDLE
+      if (new_stream.get_handle () != ACE_INVALID_HANDLE 
 	  && remote_addr != 0)
 	remote_addr->set_size (len);
     }
@@ -196,16 +196,16 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 
 // General purpose routine for performing server ACE_SOCK creation.
 
-ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
-				      int reuse_addr,
+ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, 
+				      int reuse_addr, 
 				      int protocol_family,
-				      int backlog,
+				      int backlog, 
 				      int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
   if (this->open (local_sap,
 		  reuse_addr,
-		  protocol_family,
+		  protocol_family, 
 		  backlog,
 		  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
@@ -219,65 +219,20 @@ ACE_SOCK_Acceptor::dump (void) const
   ACE_TRACE ("ACE_SOCK_Acceptor::dump");
 }
 
-int
-ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
-                         ACE_Protocol_Info *protocolinfo,
-                         ACE_SOCK_GROUP g,
-                         u_long flags,
-                         int reuse_addr,
-                         int protocol_family,
-                         int backlog,
-                         int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::open");
-  ACE_UNUSED_ARG (local_sap);
-  ACE_UNUSED_ARG (protocolinfo);
-  ACE_UNUSED_ARG (g);
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (reuse_addr);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (backlog);
-  ACE_UNUSED_ARG (protocol);
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
-                                      ACE_Protocol_Info *protocolinfo,
-                                      ACE_SOCK_GROUP g,
-                                      u_long flags,
-                                      int reuse_addr,
-                                      int protocol_family,
-                                      int backlog,
-                                      int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
-  if (this->open (local_sap,
-                  protocolinfo,
-                  g,
-                  flags,
-		  reuse_addr,
-		  protocol_family,
-		  backlog,
-		  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SOCK_Acceptor")));
-}
-
 // General purpose routine for performing server ACE_SOCK creation.
 
 int
-ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
+ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, 
 			 int reuse_addr,
-			 int protocol_family,
-			 int backlog,
+			 int protocol_family, 
+			 int backlog, 
 			 int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
   int error = 0;
-
+  
   if (ACE_SOCK::open (SOCK_STREAM,
-		      protocol_family,
+		      protocol_family, 
 		      protocol,
 		      reuse_addr) == -1)
     error = 1;
@@ -295,8 +250,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
           local_inet_addr.sin_addr.s_addr = htonl (INADDR_ANY);
         }
       else
-        local_inet_addr = *(sockaddr_in *) local_sap.get_addr ();
-
+        local_inet_addr = *(sockaddr_in *) local_sap.get_addr ();  
+  
       if (local_inet_addr.sin_port == 0)
         {
           if (ACE::bind_port (this->get_handle (),
@@ -305,24 +260,21 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
         }
       else
         {
-          if (ACE_OS::bind (this->get_handle (),
+          if (ACE_OS::bind (this->get_handle (), 
                             ACE_reinterpret_cast (sockaddr *,
-						  &local_inet_addr),
+						  &local_inet_addr), 
                             sizeof local_inet_addr) == -1)
             error = 1;
         }
     }
   else if (ACE_OS::bind (this->get_handle (),
-			 (sockaddr *) local_sap.get_addr (),
+			 (sockaddr *) local_sap.get_addr (), 
                          local_sap.get_size ()) == -1)
     error = 1;
 
   if (error || ACE_OS::listen (this->get_handle (),
 			       backlog) == -1)
-    {
-      error = 1;
-      this->close ();
-    }
+    this->close ();
 
   return error ? -1 : 0;
 }
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index e86ba1e8522..18cd3005431 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -46,37 +46,14 @@ public:
                      int protocol_family = PF_INET,
                      int backlog = ACE_DEFAULT_BACKLOG,
                      int protocol = 0);
-  // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-
-  ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
-                     ACE_Protocol_Info *protocolinfo,
-                     ACE_SOCK_GROUP g,
-                     u_long flags,
-                     int reuse_addr,
-                     int protocol_family,
-                     int backlog = ACE_DEFAULT_BACKLOG,
-                     int protocol = 0);
-  // Initialize a passive-mode QoS-enabled acceptor socket.  Returns 0
-  // on success and -1 on failure.
+    // Initiate a passive mode socket.
 
   int open (const ACE_Addr &local_sap,
             int reuse_addr = 0,
             int protocol_family = PF_INET,
             int backlog = ACE_DEFAULT_BACKLOG,
             int protocol = 0);
-  // Initialize a passive-mode BSD-style acceptor socket (no QoS).
-  // Returns 0 on success and -1 on failure.
-
-  int open (const ACE_Addr &local_sap,
-            ACE_Protocol_Info *protocolinfo,
-            ACE_SOCK_GROUP g,
-            u_long flags,
-            int reuse_addr,
-            int protocol_family,
-            int backlog = ACE_DEFAULT_BACKLOG,
-            int protocol = 0);
-  // Initialize a passive-mode QoS-enabled acceptor socket.  Returns 0
-  // on success and -1 on failure.
+  // Initiate a passive mode socket.
 
   ~ACE_SOCK_Acceptor (void);
   // Default dtor.
@@ -97,7 +74,7 @@ public:
               ACE_Time_Value *timeout = 0,
               int restart = 1,
               int reset_new_handle = 0) const;
-  // Accept a new <ACE_SOCK_Stream> connection using the QoS
+  // Accept a new <ACE_SOCK_Stream> connection using the RVSP QoS
   // information in <qos_params>.  A <timeout> of 0 means block
   // forever, a <timeout> of {0, 0} means poll.  <restart> == 1 means
   // "restart if interrupted," i.e., if errno == EINTR.
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index f5f1ab00077..9938d839f4a 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -20,19 +20,19 @@ ACE_SOCK_Connector::dump (void) const
   ACE_TRACE ("ACE_SOCK_Connector::dump");
 }
 
-int
+int 
 ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
 					  ACE_Time_Value *timeout,
 					  const ACE_Addr &local_sap,
 					  int reuse_addr,
-					  int protocol_family,
+					  int protocol_family, 
 					  int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
   // Only open a new socket if we don't already have a valid handle.
   if (new_stream.get_handle () == ACE_INVALID_HANDLE
       && new_stream.open (SOCK_STREAM,
-			  protocol_family,
+			  protocol_family, 
 			  protocol,
 			  reuse_addr) == -1)
     return -1;
@@ -58,7 +58,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
     return 0;
 }
 
-int
+int 
 ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
 					   ACE_Time_Value *timeout,
 					   int result)
@@ -98,14 +98,14 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
 // Actively connect and produce a new ACE_SOCK_Stream if things go well...
 
 int
-ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
-			     const ACE_Addr &remote_sap,
+ACE_SOCK_Connector::connect (ACE_SOCK_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_family, 
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
@@ -127,17 +127,15 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
 }
 
 int
-ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
-			     const ACE_Addr &remote_sap,
-			     ACE_QoS_Params qos_params,
+ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, 
+			     const ACE_Addr &remote_sap, 
+			     ACE_Connect_QoS_Params qos_params,
 			     ACE_Time_Value *timeout,
 			     const ACE_Addr &local_sap,
-                             ACE_Protocol_Info * /* protocolinfo */,
-                             ACE_SOCK_GROUP /* g */,
-			     u_long /* flags */,
 			     int reuse_addr,
+			     int /* flags */,
 			     int /* perms */,
-			     int protocol_family,
+			     int protocol_family, 
 			     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Connector::connect");
@@ -205,8 +203,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   return 0;
 }
 
-ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
-					const ACE_Addr &remote_sap,
+ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, 
+					const ACE_Addr &remote_sap, 
 					ACE_Time_Value *timeout,
 					const ACE_Addr &local_sap,
 					int reuse_addr,
@@ -226,22 +224,20 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
 		     perms,
 		     protocol_family,
 		     protocol) == -1
-      && timeout != 0
+      && timeout != 0 
       && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
 		ASYS_TEXT ("%p\n"),
 		ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
 
-ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
-					const ACE_Addr &remote_sap,
-					ACE_QoS_Params qos_params,
+ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, 
+					const ACE_Addr &remote_sap, 
+					ACE_Connect_QoS_Params qos_params,
 					ACE_Time_Value *timeout,
 					const ACE_Addr &local_sap,
-                                        ACE_Protocol_Info *protocolinfo,
-                                        ACE_SOCK_GROUP g,
-                                        u_long flags,
 					int reuse_addr,
+					int flags,
 					int perms,
 					int protocol_family,
 					int protocol)
@@ -253,16 +249,15 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
 		     qos_params,
 		     timeout,
 		     local_sap,
-                     protocolinfo,
-                     g,
-		     flags,
 		     reuse_addr,
+		     flags,
 		     perms,
 		     protocol_family,
 		     protocol) == -1
-      && timeout != 0
+      && timeout != 0 
       && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
 		ASYS_TEXT ("%p\n"),
 		ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
+
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 6d4387239b6..ac5a96e8911 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -69,31 +69,28 @@ public:
 
   ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                       const ACE_Addr &remote_sap,
-		      ACE_QoS_Params qos_params,
+		      ACE_Connect_QoS_Params qos_params,
                       ACE_Time_Value *timeout = 0,
                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                      ACE_Protocol_Info *protocolinfo = 0,
-                      ACE_SOCK_GROUP g = 0,
-                      u_long flags = 0,
                       int reuse_addr = 0,
+                      int flags = 0,
                       int perms = 0,
                       int protocol_family = PF_INET,
                       int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <qos_params> contains QoS parameters that are passed
-  // to the IntServ (RSVP) and DiffServ protocols.  The <timeout> is
-  // the amount of time to wait to connect.  If it's 0 then we block
-  // indefinitely.  If *timeout == {0, 0} then the connection is done
-  // using non-blocking mode.  In this case, if the connection can't
-  // be made immediately the value of -1 is returned with <errno ==
-  // EWOULDBLOCK>.  If *timeout > {0, 0} then this is the amount of
-  // time to wait before timing out.  If the time expires before the
-  // connection is made <errno == ETIME>.  The <local_sap> is the
-  // value of local address to bind to.  If it's the default value of
-  // <ACE_Addr::sap_any> then the user is letting the OS do the
-  // binding.  If <reuse_addr> == 1 then the <local_addr> is reused,
-  // even if it hasn't been cleanedup yet.
+  // to RSVP.  The <timeout> is the amount of time to wait to connect.
+  // If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
+  // the connection is done using non-blocking mode.  In this case, if
+  // the connection can't be made immediately the value of -1 is
+  // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
+  // this is the amount of time to wait before timing out.  If the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
+  // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   int connect (ACE_SOCK_Stream &new_stream,
                const ACE_Addr &remote_sap,
@@ -120,31 +117,28 @@ public:
 
   int connect (ACE_SOCK_Stream &new_stream,
 	       const ACE_Addr &remote_sap,
-	       ACE_QoS_Params qos_params,
+	       ACE_Connect_QoS_Params qos_params,
 	       ACE_Time_Value *timeout = 0,
 	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-               ACE_Protocol_Info *protocolinfo = 0,
-               ACE_SOCK_GROUP g = 0,
-               u_long flags = 0,
 	       int reuse_addr = 0,
+	       int flags = 0,
 	       int perms = 0,
 	       int protocol_family = PF_INET,
 	       int protocol = 0);
   // Actively connect and produce a <new_stream> if things go well.
   // The <remote_sap> is the address that we are trying to connect
   // with.  The <qos_params> contains QoS parameters that are passed
-  // to the IntServ (RSVP) and DiffServ protocols.  The <timeout> is
-  // the amount of time to wait to connect.  If it's 0 then we block
-  // indefinitely.  If *timeout == {0, 0} then the connection is done
-  // using non-blocking mode.  In this case, if the connection can't
-  // be made immediately the value of -1 is returned with <errno ==
-  // EWOULDBLOCK>.  If *timeout > {0, 0} then this is the amount of
-  // time to wait before timing out.  If the time expires before the
-  // connection is made <errno == ETIME>.  The <local_sap> is the
-  // value of local address to bind to.  If it's the default value of
-  // <ACE_Addr::sap_any> then the user is letting the OS do the
-  // binding.  If <reuse_addr> == 1 then the <local_addr> is reused,
-  // even if it hasn't been cleanedup yet.
+  // to RSVP.  The <timeout> is the amount of time to wait to connect.
+  // If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
+  // the connection is done using non-blocking mode.  In this case, if
+  // the connection can't be made immediately the value of -1 is
+  // returned with <errno == EWOULDBLOCK>.  If *timeout > {0, 0} then
+  // this is the amount of time to wait before timing out.  If the
+  // time expires before the connection is made <errno == ETIME>.  The
+  // <local_sap> is the value of local address to bind to.  If it's
+  // the default value of <ACE_Addr::sap_any> then the user is letting
+  // the OS do the binding.  If <reuse_addr> == 1 then the
+  // <local_addr> is reused, even if it hasn't been cleanedup yet.
 
   ~ACE_SOCK_Connector (void);
   // Default dtor.
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 2c12b6eadd9..aaae0b6f8c2 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -26,7 +26,7 @@ ACE_SOCK_Dgram::dump (void) const
 // returns the number of bytes read.
 
 ssize_t
-ACE_SOCK_Dgram::recv (iovec io_vec[], 
+ACE_SOCK_Dgram::recv (iovec *io_vec, 
 		      ACE_Addr &addr, 
 		      int flags,
                       const ACE_Time_Value *timeout) const
@@ -133,42 +133,26 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local,
 }
 
 ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
-                                const ACE_QoS_Params &qos_params,
+                                const ACE_Connect_QoS_Params &qos_params,
                                 int protocol_family, 
                                 int protocol,
-                                ACE_Protocol_Info *protocolinfo,
-                                ACE_SOCK_GROUP g,
-                                u_long flags,
                                 int reuse_addr)
-  : ACE_SOCK (SOCK_DGRAM,
-              protocol_family,
-              protocol,
-              protocolinfo,
-              g,
-              flags,
-              reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM, protocol_family, protocol, reuse_addr)
 {
   ACE_UNUSED_ARG (qos_params);
-  ACE_UNUSED_ARG (local);
 }
 
 int
 ACE_SOCK_Dgram::open (const ACE_Addr &local, 
-                      const ACE_QoS_Params &qos_params,
+                      const ACE_Connect_QoS_Params &qos_params,
                       int protocol_family, 
                       int protocol,
-                      ACE_Protocol_Info *protocolinfo,
-                      ACE_SOCK_GROUP g,
-                      u_long flags,
                       int reuse_addr)
 {
   ACE_UNUSED_ARG (local);
   ACE_UNUSED_ARG (qos_params);
   ACE_UNUSED_ARG (protocol_family);
   ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (protocolinfo);
-  ACE_UNUSED_ARG (g);
-  ACE_UNUSED_ARG (flags);
   ACE_UNUSED_ARG (reuse_addr);
 
   // Under construction...
@@ -298,9 +282,7 @@ ACE_SOCK_Dgram::send (const iovec iov[],
 #if defined (ACE_HAS_ALLOCA)
   buf = alloca (length);
 #else 
-  ACE_NEW_RETURN (buf,
-                  char[length],
-                  -1);
+  ACE_NEW_RETURN (buf, char[length], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   char *ptr = buf;
@@ -347,9 +329,7 @@ ACE_SOCK_Dgram::recv (iovec iov[],
 #if defined (ACE_HAS_ALLOCA)
   buf = alloca (length);
 #else 
-  ACE_NEW_RETURN (buf,
-                  char[length],
-                  -1);
+  ACE_NEW_RETURN (buf, char[length], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   length = ACE_SOCK_Dgram::recv (buf, length, addr, flags);
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index 61d3f5af8b7..7ccf55f3f95 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -43,12 +43,9 @@ public:
   // dgram that will accept datagrams at the <local> address.
 
   ACE_SOCK_Dgram (const ACE_Addr &local,
-                  const ACE_QoS_Params &qos_params,
+                  const ACE_Connect_QoS_Params &qos_params,
                   int protocol_family = PF_INET,
                   int protocol = 0,
-                  ACE_Protocol_Info *protocolinfo = 0,
-                  ACE_SOCK_GROUP g = 0,
-                  u_long flags = 0,
                   int reuse_addr = 0);
   // This is a QoS-enabed method for initiating a socket dgram that
   // will accept datagrams at the <local> address.  The <qos_params>
@@ -62,12 +59,9 @@ public:
   // dgram that will accept datagrams at the <local> address.
 
   int open (const ACE_Addr &local,
-            const ACE_QoS_Params &qos_params,
+            const ACE_Connect_QoS_Params &qos_params,
             int protocol_family = PF_INET,
             int protocol = 0,
-            ACE_Protocol_Info *protocolinfo = 0,
-            ACE_SOCK_GROUP g = 0,
-            u_long flags = 0,
             int reuse_addr = 0);
   // This is a QoS-enabed method for initiating a socket dgram that
   // will accept datagrams at the <local> address.  The <qos_params>
@@ -81,14 +75,14 @@ public:
                 size_t n,
                 const ACE_Addr &addr,
                 int flags = 0) const;
-  // Send an <n> byte <buf> to the datagram socket (uses <sendto(3)>).
+  // Send an <n> byte <buf> to the datagram socket (uses sendto(3)).
 
   ssize_t recv (void *buf,
                 size_t n,
                 ACE_Addr &addr,
                 int flags = 0) const;
   // Receive an <n> byte <buf> from the datagram socket (uses
-  // <recvfrom(3)>).
+  // recvfrom(3)).
 
   ssize_t recv (iovec *io_vec,
                 ACE_Addr &addr,
@@ -106,14 +100,14 @@ public:
                 const ACE_Addr &addr,
                 int flags = 0) const;
   // Send an <iovec> of size <n> to the datagram socket (uses
-  // <sendmsg(3)>).
+  // sendmsg(3)).
 
   ssize_t recv (iovec iov[],
                 size_t n,
                 ACE_Addr &addr,
                 int flags = 0) const;
   // Recv an <iovec> of size <n> to the datagram socket (uses
-  // <recvmsg(3)>).
+  // recvmsg(3)).
 
   ssize_t recv (void *buf,
                 size_t n,
@@ -128,43 +122,6 @@ public:
   // returned with <errno == ETIME>.  If it succeeds the number of
   // bytes received is returned.
 
-  ssize_t send (const iovec buffers[],
-                int buffer_count,
-                size_t &number_of_bytes_sent,
-                int flags,
-                const ACE_Addr &addr,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-  // Send <buffer_count> worth of <buffers> to <addr> using overlapped
-  // I/O (uses <WSASentTo>).  Returns 0 on success.
-
-  ssize_t recv (iovec buffers[],
-                int buffer_count,
-                size_t &number_of_bytes_recvd,
-                int &flags,
-                ACE_Addr &addr,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-  // Recv <buffer_count> worth of <buffers> from <addr> using
-  // overlapped I/O (uses <WSARecvFrom>).  Returns 0 on success.
-
-  ssize_t send (const void *buf,
-                size_t n,
-                const ACE_Addr &addr,
-                int flags,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-  // Send an <n> byte <buf> to the datagram socket (uses <WSASentTo>).
-
-  ssize_t recv (void *buf,
-                size_t n,
-                ACE_Addr &addr,
-                int flags,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-  // Receive an <n> byte <buf> from the datagram socket (uses
-  // <WSARecvFrom>).
-
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i
index 723a3d3b9d8..efcb0b09974 100644
--- a/ace/SOCK_Dgram.i
+++ b/ace/SOCK_Dgram.i
@@ -29,11 +29,8 @@ ACE_SOCK_Dgram::send (const void *buf,
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   size_t len = addr.get_size ();
   return ACE_OS::sendto (this->get_handle (), 
-			 (const char *) buf,
-                         n,
-                         flags, 
-			 (struct sockaddr *) saddr,
-                         len);
+			 (const char *) buf, n, flags, 
+			 (struct sockaddr *) saddr, len);
 }
 
 // <recvfrom> an n byte datagram (connectionless version).
@@ -49,110 +46,8 @@ ACE_SOCK_Dgram::recv (void *buf,
   int addr_len = addr.get_size ();
 
   ssize_t status = ACE_OS::recvfrom (this->get_handle (), 
-				     (char *) buf,
-                                     n,
-                                     flags, 
-				     (sockaddr *) saddr,
-                                     &addr_len);
+				     (char *) buf, n, flags, 
+				     (sockaddr *) saddr, &addr_len);
   addr.set_size (addr_len);
   return status;
 }
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Dgram::send (const iovec buffers[],
-                      int buffer_count,
-                      size_t &number_of_bytes_sent,
-                      int flags,
-                      const ACE_Addr &addr,
-                      ACE_OVERLAPPED *overlapped,
-                      ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::send");
-  sockaddr *saddr = (sockaddr *) addr.get_addr ();
-  size_t len = addr.get_size ();
-  return ACE_OS::sendto (this->get_handle (), 
-                         buffers,
-                         buffer_count,
-                         number_of_bytes_sent,
-                         flags, 
-			 (const sockaddr *) saddr,
-                         len,
-                         overlapped,
-                         func);
-}
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Dgram::recv (iovec buffers[],
-                      int buffer_count,
-                      size_t &number_of_bytes_recvd,
-                      int &flags,
-                      ACE_Addr &addr,
-                      ACE_OVERLAPPED *overlapped,
-                      ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_IO::recv");
-  sockaddr *saddr = (sockaddr *) addr.get_addr ();
-  int addr_len = addr.get_size ();
-
-  ssize_t status = ACE_OS::recvfrom (this->get_handle (), 
-				     buffers,
-                                     buffer_count,
-                                     number_of_bytes_recvd,
-                                     flags, 
-				     (sockaddr *) saddr,
-                                     &addr_len,
-                                     overlapped,
-                                     func);
-  addr.set_size (addr_len);
-  return status;
-}
-
-// <sendto> an N byte datagram to <addr> (connectionless version).
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Dgram::send (const void *buf, 
-		      size_t n, 
-		      const ACE_Addr &addr, 
-		      int flags,
-                      ACE_OVERLAPPED *overlapped,
-                      ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::send");
-
-  iovec buffer[1];
-  buffer[0].iov_len = n;
-  buffer[0].iov_base = (char *) buf;
-  size_t number_of_bytes_sent = 0;
-  return this->send (buffer,
-                     1,
-                     number_of_bytes_sent,
-                     flags,
-                     addr,
-                     overlapped,
-                     func);
-}
-
-// <recvfrom> an n byte datagram (connectionless version).
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Dgram::recv (void *buf, 
-		      size_t n, 
-		      ACE_Addr &addr, 
-		      int flags,
-                      ACE_OVERLAPPED *overlapped,
-                      ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_Dgram::recv");
-
-  iovec buffer[1];
-  buffer[0].iov_len = n;
-  buffer[0].iov_base = (char *) buf;
-  size_t number_of_bytes_recvd = 0;
-  return this->recv (buffer,
-                     1,
-                     number_of_bytes_recvd,
-                     flags,
-                     addr,
-                     overlapped,
-                     func);
-}
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 0a184226281..d1bf892d7a1 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -27,10 +27,10 @@ ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast (void)
 
 int
 ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
-                                   int reuse_addr,
-                                   const ASYS_TCHAR *net_if,
-                                   int protocol_family,
-                                   int protocol)
+				   int reuse_addr,
+				   const ASYS_TCHAR *net_if,
+				   int protocol_family,
+				   int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i");
 
@@ -41,10 +41,10 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
   // earlier.
   if (this->get_handle () == ACE_INVALID_HANDLE)
     {
-      if (ACE_SOCK::open (SOCK_DGRAM,
-                          protocol_family,
-                          protocol,
-                          reuse_addr) == -1)
+      if (ACE_SOCK::open (SOCK_DGRAM, 
+			  protocol_family,
+			  protocol,
+			  reuse_addr) == -1)
         return -1;
 
       int one = 1;
@@ -68,7 +68,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
       if (local.set (this->mcast_addr_.get_port_number ()) == -1)
         return -1;
       else if (ACE_SOCK_Dgram::shared_open (local,
-                                            protocol_family) == -1)
+					    protocol_family) == -1)
         return -1;
     }
 #if defined (ACE_WIN32)
@@ -97,7 +97,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
       size_t if_cnt;
 
       if (ACE::get_ip_interfaces (if_cnt,
-                                  if_addrs) != 0)
+				  if_addrs) != 0)
         return -1;
 
       size_t nr_subscribed = 0;
@@ -105,10 +105,10 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
       if (if_cnt < 2)
         {
           if (this->subscribe (mcast_addr,
-                               reuse_addr,
-                               ASYS_TEXT ("0.0.0.0"),
-                               protocol_family,
-                               protocol) == 0)
+			       reuse_addr,
+			       ASYS_WIDE_STRING ("0.0.0.0"),
+			       protocol_family,
+			       protocol) == 0)
             ++nr_subscribed;
         }
       else
@@ -116,16 +116,16 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
         // offer multicast service, and subscribe to them.
         while (if_cnt > 0)
           {
-            --if_cnt;
+            --if_cnt;    
 
-            // Convert to 0-based for indexing, next loop check.
+	    // Convert to 0-based for indexing, next loop check.
             if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK)
               continue;
             if (this->subscribe (mcast_addr,
-                                 reuse_addr,
-                                 ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
-                                 protocol_family,
-                                 protocol) == 0)
+				 reuse_addr,
+				 ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
+				 protocol_family,
+				 protocol) == 0)
               ++nr_subscribed;
           }
 
@@ -144,7 +144,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
 
   // Create multicast request.
   if (this->make_multicast_address (this->mcast_addr_,
-                                    net_if) == -1)
+				    net_if) == -1)
     return -1;
   else
     return 0;
@@ -181,9 +181,9 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
     return 0;
 }
 
-int
+ACE_HANDLE
 ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
-                                 const ACE_QoS_Params &qos_params,
+				 const ACE_Connect_QoS_Params &qos_params,
                                  int reuse_addr,
                                  const ASYS_TCHAR *net_if,
                                  int protocol_family,
@@ -196,7 +196,7 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
                                   protocol);
   // Check for the error case.
   if (result == -1)
-    return -1;
+    return ACE_INVALID_HANDLE;
 #if defined (ACE_WIN32)
   // @@ Note that this code is currently broken since <subscribe_i>
   // calls the wrong version of subscribe recursively!
@@ -207,27 +207,19 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
 #endif /* ACE_WIN32 */
   // Tell network device driver to read datagrams with a
   // <mcast_request_if_> IP interface.
-  else if (ACE_OS::join_leaf (this->get_handle (),
-#if defined (_UNICOS)
-                              ACE_reinterpret_cast (const sockaddr *,
-                                                    &this->mcast_request_if_.imr_multiaddr),
-                              sizeof this->mcast_request_if_.imr_multiaddr,
-#else  /* ! _UNICOS */
+  else
+    return ACE_OS::join_leaf (this->get_handle (),
                               ACE_reinterpret_cast (const sockaddr *,
                                                     &this->mcast_request_if_.imr_multiaddr.s_addr),
                               sizeof this->mcast_request_if_.imr_multiaddr.s_addr,
-#endif /* ! _UNICOS */
-                              qos_params) == ACE_INVALID_HANDLE)
-    return -1;
-  else
-    return 0;
+                              qos_params);
 }
 
 int
 ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
-                                     const ASYS_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol)
+				     const ASYS_TCHAR *net_if,
+				     int protocol_family,
+				     int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i");
 #if defined (ACE_WIN32)
@@ -256,7 +248,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
       size_t if_cnt;
 
       if (ACE::get_ip_interfaces (if_cnt,
-                                  if_addrs) != 0)
+				  if_addrs) != 0)
         return -1;
 
       size_t nr_unsubscribed = 0;
@@ -272,8 +264,8 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
       else
         while (if_cnt > 0)
           {
-            --if_cnt;
-            // Convert to 0-based for indexing, next loop check
+            --if_cnt;    
+	    // Convert to 0-based for indexing, next loop check
             if (if_addrs[if_cnt].get_ip_address() == INADDR_LOOPBACK)
               continue;
             if (this->unsubscribe (mcast_addr,
@@ -302,8 +294,8 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
   ip_mreq multicast_address;
   // Create multicast request.
   if (this->make_multicast_address_i (mcast_addr,
-                                      multicast_address,
-                                      net_if) == -1)
+				      multicast_address,
+				      net_if) == -1)
     return -1;
   else
     return 0;
@@ -332,9 +324,9 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
   // Tell network device driver to read datagrams with a
   // multicast_address address.
   else if (ACE_SOCK::set_option (IPPROTO_IP,
-                                 IP_DROP_MEMBERSHIP,
-                                 &this->mcast_request_if_,
-                                 sizeof this->mcast_request_if_) == -1)
+				 IP_DROP_MEMBERSHIP,
+				 &this->mcast_request_if_,
+				 sizeof this->mcast_request_if_) == -1)
     return -1;
   return 0;
 }
@@ -375,8 +367,8 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
 #endif /* defined (ACE_PSOS) */
 
       if (ACE_OS::ioctl (this->get_handle (),
-                         SIOCGIFADDR,
-                         &if_address) == -1)
+			 SIOCGIFADDR,
+			 &if_address) == -1)
         return -1;
 
       struct sockaddr_in *socket_address;
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index b74db60e6da..5bc6cda37aa 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -66,12 +66,12 @@ public:
   // these numbers in alphanumeric form and <subscribe> will convert
   // them into numbers via <ACE_OS::atoi>.
 
-  int subscribe (const ACE_INET_Addr &mcast_addr,
-                 const ACE_QoS_Params &qos_params,
-                 int reuse_addr = 1,
-                 const ASYS_TCHAR *net_if = 0,
-                 int protocol_family = PF_INET,
-                 int protocol = 0);
+  ACE_HANDLE subscribe (const ACE_INET_Addr &mcast_addr,
+                        const ACE_Connect_QoS_Params &qos_params,
+                        int reuse_addr = 1,
+                        const ASYS_TCHAR *net_if = 0,
+                        int protocol_family = PF_INET,
+                        int protocol = 0);
   // This is a QoS-enabled method for joining a multicast group, which
   // passes <qos_params> via <ACE_OS::join_leaf>.  The network
   // interface device driver is instructed to accept datagrams with
@@ -82,7 +82,8 @@ public:
   // The <net_if> interface is hardware specific, e.g., use "netstat
   // -i" to find whether your interface is, such as "le0" or something
   // else.  If net_if == 0, <subscribe> uses the default mcast
-  // interface.  Returns: a 0 on success or -1 on failure.
+  // interface.  Returns: an <ACE_HANDLE> to the newly created
+  // multipoint socket on success or ACE_INVALID_HANDLE on failure.
   // 
   // Note that some platforms, such as pSoS, support only number, not
   // names, for network interfaces.  For these platforms, just give
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index 2431033c70d..abf00af3559 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -94,9 +94,7 @@ ACE_SOCK_IO::send (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -134,9 +132,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index d3a29106c8e..e978945f0c2 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -125,12 +125,12 @@ public:
   ssize_t send (const void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
-  // Send <n> bytes via Win32 <WriteFile> using overlapped I/O.
+  // Send <n> bytes via Win32 WriteFile using overlapped I/O.
 
   ssize_t recv (void *buf,
                 size_t n,
                 ACE_OVERLAPPED *overlapped) const;
-  // Recv <n> bytes via Win32 <ReadFile> using overlapped I/O.
+  // Recv <n> bytes via Win32 ReadFile using overlapped I/O.
 
   void dump (void) const;
   // Dump the state of an object.
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 8cb2c90822d..f06f9bbd0f5 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -26,8 +26,8 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
   if (this->connect (new_io, remote_sap, timeout, local_sap,
 		     reuse_addr, flags, perms) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("address %s, %p\n"),
-	       remote_sap.get_path_name (), ASYS_TEXT ("ACE_SPIPE_Connector")));
+    ACE_ERROR ((LM_ERROR, "address %s, %p\n",
+	       remote_sap.get_path_name (), "ACE_SPIPE_Connector"));
 }
 
 void
@@ -62,7 +62,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
   new_io.set_handle (handle);
   new_io.remote_addr_ = remote_sap; // class copy.
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32)
   DWORD pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT;
 
   // Set named pipe mode and buffering characteristics.
diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp
index 533a47bf080..29a5433dd3d 100644
--- a/ace/SPIPE_Stream.cpp
+++ b/ace/SPIPE_Stream.cpp
@@ -40,9 +40,7 @@ ACE_SPIPE_Stream::send (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
@@ -77,9 +75,7 @@ ACE_SPIPE_Stream::recv (size_t n, ...) const
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
 #else
-  ACE_NEW_RETURN (iovp,
-                  iovec[total_tuples],
-                  -1);
+  ACE_NEW_RETURN (iovp, iovec[total_tuples], -1);
 #endif /* !defined (ACE_HAS_ALLOCA) */
 
   va_start (argp, n);
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 84d12bedf9a..ce850e4673f 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -646,9 +646,7 @@ ACE_WString::char_rep (void) const
     {
       char *t;
 
-      ACE_NEW_RETURN (t,
-                      char[this->len_ + 1],
-                      0);
+      ACE_NEW_RETURN (t, char[this->len_ + 1], 0);
 
       for (size_t i = 0; i < this->len_; i++)
         // Note that this cast may lose data if wide chars are
diff --git a/ace/SString.h b/ace/SString.h
index dd8e7778ebc..bb5602afccc 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -487,17 +487,6 @@ private:
 ACE_Export ostream &operator << (ostream &, const ACE_SString &);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
-// This allows one to use W or C String based on the Unicode 
-// setting
-#if defined (UNICODE)
-typedef ACE_WString ACE_TString;
-#else /* UNICODE */
-typedef ACE_CString ACE_TString;
-#endif /* UNICODE */
-
-
-// ************************************************************
-
 class ACE_Export ACE_Tokenizer
 {
   // = TITLE
diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp
index 60b0b05731a..90aa454ddc6 100644
--- a/ace/SV_Message_Queue.cpp
+++ b/ace/SV_Message_Queue.cpp
@@ -28,12 +28,12 @@ ACE_SV_Message_Queue::~ACE_SV_Message_Queue (void)
   ACE_TRACE ("ACE_SV_Message_Queue::~ACE_SV_Message_Queue");
 }
 
-ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id,
-					    int create,
+ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, 
+					    int create, 
 					    int perms)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue");
   if (this->open (external_id, create, perms) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue")));
+    ACE_ERROR ((LM_ERROR, "%p\n", 
+		"ACE_SV_Message_Queue::ACE_SV_Message_Queue"));
 }
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index fda7b6b1cb0..aacec7f53fc 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -21,8 +21,8 @@ ACE_SV_Semaphore_Simple::dump (void) const
 }
 
 int
-ACE_SV_Semaphore_Simple::control (int cmd,
-				  int value,
+ACE_SV_Semaphore_Simple::control (int cmd, 
+				  int value, 
 				  u_short semnum) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::control");
@@ -34,7 +34,7 @@ ACE_SV_Semaphore_Simple::control (int cmd,
 
       semctl_arg.val = value;
       return ACE_OS::semctl (this->internal_id_,
-                             semnum,
+                             semnum, 
 			     cmd,
                              semctl_arg);
     }
@@ -50,9 +50,9 @@ ACE_SV_Semaphore_Simple::init (key_t k, int i)
 }
 
 // General ACE_SV_Semaphore operation. Increment or decrement by a
-// specific amount (positive or negative; amount can`t be zero).
-
-int
+// specific amount (positive or negative; amount can`t be zero). 
+     
+int 
 ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::op");
@@ -72,11 +72,11 @@ ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const
 // Open or create one or more SV_Semaphores.  We return 0 if all is
 // OK, else -1.
 
-int
-ACE_SV_Semaphore_Simple::open (key_t k,
-			       int flags,
-			       int initial_value,
-			       u_short n,
+int 
+ACE_SV_Semaphore_Simple::open (key_t k, 
+			       int flags, 
+			       int initial_value, 
+			       u_short n, 
 			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
@@ -102,10 +102,10 @@ ACE_SV_Semaphore_Simple::open (key_t k,
   return 0;
 }
 
-ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
-						  int flags,
-						  int initial_value,
-						  u_short n,
+ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, 
+						  int flags, 
+						  int initial_value, 
+						  u_short n, 
 						  int perms)
   : key_ (k)
 {
@@ -121,11 +121,11 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
 // measured close to collition ratio of nearly 0.1% for
 // ACE::unique_name()-like strings.
 
-key_t
+key_t 
 ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::name_2_key");
-
+  
   if (name == 0)
     {
       errno = EINVAL;
@@ -140,36 +140,36 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 
 // Open or create a ACE_SV_Semaphore.  We return 1 if all is OK, else
 // 0.
-
-int
-ACE_SV_Semaphore_Simple::open (const char *name,
-			       int flags,
-			       int initial_value,
-			       u_short n,
+     
+int 
+ACE_SV_Semaphore_Simple::open (const char *name, 
+			       int flags, 
+			       int initial_value, 
+			       u_short n, 
 			       int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open");
 
   key_t key;
-
+  
   if (name == 0)
     key = ACE_DEFAULT_SEM_KEY;
-  else
+  else 
     key = this->name_2_key (name);
 
   return this->open (key, flags, initial_value, n, perms);
 }
 
-ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
-						  int flags,
-						  int initial_value,
-						  u_short n,
+ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, 
+						  int flags, 
+						  int initial_value, 
+						  u_short n, 
 						  int perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   if (this->open (name, flags, initial_value, n, perms) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
+    ACE_ERROR ((LM_ERROR, "%p\n", 
+		"ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"));
 }
 
 ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
@@ -189,8 +189,8 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void)
 // is being shut down, as we do an IPC_RMID on the ACE_SV_Semaphore,
 // regardless of whether other processes may be using it or not.  Most
 // other processes should use close() below.
-
-int
+     
+int 
 ACE_SV_Semaphore_Simple::remove (void) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::remove");
@@ -198,3 +198,4 @@ ACE_SV_Semaphore_Simple::remove (void) const
   ((ACE_SV_Semaphore_Simple *) this)->init ();
   return result;
 }
+
diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp
index de4d8f070e1..128b487415a 100644
--- a/ace/SV_Shared_Memory.cpp
+++ b/ace/SV_Shared_Memory.cpp
@@ -22,11 +22,11 @@ ACE_SV_Shared_Memory::dump (void) const
 // this segment.
 
 int
-ACE_SV_Shared_Memory::open_and_attach (key_t external_id,
-				       size_t sz,
+ACE_SV_Shared_Memory::open_and_attach (key_t external_id, 
+				       size_t sz, 
 				       int create,
-				       int perms,
-				       void *virtual_addr,
+				       int perms, 
+				       void *virtual_addr, 
 				       int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::open_and_attach");
@@ -40,24 +40,24 @@ ACE_SV_Shared_Memory::open_and_attach (key_t external_id,
 
 // Constructor interface to this->open_and_attach () member function.
 
-ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id,
-					    size_t sz,
-					    int create,
-					    int perms,
-					    void *virtual_addr,
+ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, 
+					    size_t sz, 
+					    int create, 
+					    int perms, 
+					    void *virtual_addr, 
 					    int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
-  if (this->open_and_attach (external_id, sz, create,
+  if (this->open_and_attach (external_id, sz, create, 
 			     perms, virtual_addr, flags) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
+    ACE_ERROR ((LM_ERROR, "%p\n", 
+		"ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"));
 }
 
 // The "do nothing" constructor.
 
 ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void)
-  : internal_id_ (0),
+  : internal_id_ (0), 
     size_ (0),
     segment_ptr_ (0)
 {
@@ -73,11 +73,11 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void)
 
 ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id,
 					    int flags)
-  : internal_id_ (int_id),
+  : internal_id_ (int_id), 
     size_ (0)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
   if (this->attach (0, flags) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
+    ACE_ERROR ((LM_ERROR, "%p\n", 
+		"ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"));
 }
diff --git a/ace/Sched_Params.i b/ace/Sched_Params.i
index 041f9cb1648..35d75826416 100644
--- a/ace/Sched_Params.i
+++ b/ace/Sched_Params.i
@@ -98,11 +98,10 @@ ACE_INLINE
 ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy,
                                                           int scope)
  : policy_ (policy),
-   scope_ (scope),
-   priority_ (0),
-   done_ (0)
+   scope_ (scope)
 {
   priority_ = ACE_Sched_Params::priority_min (this->policy (), this->scope ());
+  this->done_ = 0;
 }
 
 ACE_INLINE
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 0b70607237c..cff77d9225d 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -35,7 +35,7 @@ typedef ACE_Select_Reactor_Token_T<ACE_Noop_Token> ACE_Select_Reactor_Token;
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
 typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor;
-ACE_TEMPLATE_SPECIALIZATION
+
 class ACE_Export ACE_Guard< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
 {
   // = TITLE
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 83f9d3d29eb..8d9c0d974f0 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -545,8 +545,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void)
       this->delete_timer_queue_ = 0;
     }
 
-  if (this->notify_handler_ != 0)
-    this->notify_handler_->close ();
+  this->notify_handler_->close ();
 
   if (this->delete_notify_handler_)
     {
@@ -857,26 +856,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler_i
   return this->handler_rep_.unbind (handle, mask);
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::work_pending (const ACE_Time_Value &timeout)
-{
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1);
-
-  if (ACE_OS::thr_equal (ACE_Thread::self (),
-                         this->owner_) == 0)
-    return -1;
-#endif /* defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) */
-
-  u_long width = (u_long) this->handler_rep_.max_handlep1 ();
-
-  return ACE_OS::select (int (width),
-                         this->wait_set_.rd_mask_,
-                         this->wait_set_.wr_mask_,
-                         this->wait_set_.ex_mask_,
-                         timeout);
-}
-
 // Must be called with lock held.
 
 template <class ACE_SELECT_REACTOR_TOKEN> int
@@ -892,7 +871,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::wait_for_multiple_events
   int number_of_active_handles = this->any_ready (dispatch_set);
 
   // If there are any bits enabled in the <ready_set_> then we'll
-  // handle those first, otherwise we'll block in <select>.
+  // handle those first, otherwise we'll block in select().
 
   if (number_of_active_handles == 0)
     {
@@ -1165,8 +1144,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1);
 
-  if (ACE_OS::thr_equal (ACE_Thread::self (),
-                         this->owner_) == 0)
+  if (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_) == 0)
     return -1;
 
   // Update the countdown to reflect time waiting for the mutex.
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 6c6a41e71e5..2f26d04379b 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -158,11 +158,6 @@ public:
 
   // = Event loop drivers.
 
-  virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero);
-  // Returns non-zero if there are I/O events "ready" for dispatching,
-  // but does not actually dispatch the event handlers.  By default,
-  // don't block while checking this, i.e., "poll".
-
   virtual int handle_events (ACE_Time_Value *max_wait_time = 0);
   virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0);
   // This event loop driver that blocks for <max_wait_time> before
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 52a2ec4b190..8ddf2a95520 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -73,9 +73,8 @@ ACE_STATIC_SVCS *
 ACE_Service_Config::static_svcs (void)
 {
   if (ACE_Service_Config::static_svcs_ == 0)
-    ACE_NEW_RETURN (ACE_Service_Config::static_svcs_,
-                    ACE_STATIC_SVCS,
-                    0);
+    ACE_NEW_RETURN (ACE_Service_Config::static_svcs_, ACE_STATIC_SVCS, 0);
+
   return ACE_Service_Config::static_svcs_;
 }
 
@@ -515,12 +514,11 @@ ACE_Service_Config::load_static_svcs (void)
 
       ACE_Service_Type *sr;
 
-      ACE_NEW_RETURN (sr,
-                      ACE_Service_Type (ssd->name_,
-                                        stp,
-                                        0,
-                                        ssd->active_),
-                      -1);
+      ACE_NEW_RETURN (sr, ACE_Service_Type (ssd->name_,
+                                            stp,
+                                            0,
+                                            ssd->active_), -1);
+
       if (ACE_Service_Repository::instance ()->insert (sr) == -1)
         return -1;
     }
@@ -534,7 +532,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
                             LPCTSTR logger_key,
                             int ignore_default_svc_conf_file)
 {
-  int result = 0;
+  int retval = 0;
   ACE_TRACE ("ACE_Service_Config::open");
 
   if (ACE_Service_Config::is_initialized_ != 0)
@@ -557,8 +555,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
                        "enqueue_tail"),
                       -1);
 
-  // Clear the LM_DEBUG bit from log messages if appropriate.  This
-  // will be reset at the bottom of this function.
+  // Clear the LM_DEBUG bit from log messages if appropriate
   if (ACE::debug ())
     ACE_Log_Msg::disable_debug_messages ();
   // Become a daemon before doing anything else.
@@ -582,7 +579,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
   if (ACE_LOG_MSG->open (program_name,
                          flags,
                          key) == -1)
-    result = -1;
+    retval = -1;
   else
     {
       if (ACE::debug ())
@@ -600,11 +597,11 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
       // See if we need to load the static services.
       if (ACE_Service_Config::no_static_svcs_ == 0
           && ACE_Service_Config::load_static_svcs () == -1)
-        result = -1;
+        retval = -1;
       else
         {
           int result = ACE_Service_Config::process_commandline_directives ();
-          result = ACE_Service_Config::process_directives () + result;
+          retval = ACE_Service_Config::process_directives () + result;
         }
 
       // There's no point in dealing with this on NT since it doesn't really
@@ -625,7 +622,7 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
   if (ACE::debug ())
     ACE_Log_Msg::enable_debug_messages ();
 
-  return result;
+  return retval;
 }
 
 ACE_Service_Config::ACE_Service_Config (const ASYS_TCHAR program_name[],
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 2c991865674..9b068dbfca0 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -135,23 +135,8 @@ public:
                    int ignore_default_svc_conf = 0);
   // This is the primary entry point into the ACE_Service_Config (the
   // constructor just handles simple initializations).  It parses
-  // arguments passed in from the command-line.  The arguments that
-  // are valid in a call to this method include:
-  // 
-  // '-b' - Option to indicate that we should be a daemon
-  // '-d' - Turn on debugging mode
-  // '-f' - Option to read in the list of svc.conf file names
-  // '-k' - Option to read a wide string where in the logger output can
-  //        be written
-  // '-y' - Turn on the flag for a repository of statically
-  //        linked services (by default, these are not configured).
-  // '-n' - Need not have a repository of statically linked services
-  // '-S' - Option to read in the list of services on the command-line
-  //        Please observe the difference between options '-f' that looks
-  //        for a list of files and here a list of services.
-  // 
-  // Returns number of errors that occurred on failure and 0
-  // otherwise.
+  // arguments passed in from the command-line.  Returns number of
+  // errors that occurred on failure and 0 otherwise.
 
   virtual ~ACE_Service_Config (void);
   // Perform user-specified close activities and remove dynamic
@@ -336,6 +321,19 @@ protected:
   // <ACE_Service_Config>.  Note that <argv[0]> is assumed to be the
   // program name.
 
+  // The arguments that are valid in a call to this method are
+  // '-b' - Option to indicate that we should be a daemon
+  // '-d' - Turn on debugging mode
+  // '-f' - Option to read in the list of svc.conf file names
+  // '-k' - Option to read a wide string where in the logger output can
+  //        be written
+  // '-y' - Turn on the flag for a  repository of statically
+  //        linked services
+  // '-n' - Need not have a repository of statically linked services
+  // '-S' - Option to read in the list of services on the command-line
+  //        Please observe the difference between options '-f' that looks
+  //        for a list of files and here a list of services.
+
   static int start_daemon (void);
   // Become a daemon.
 
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index a596ba17a33..16fd4fef9f5 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -465,9 +465,8 @@ ACE_Sig_Handlers_Set::instance (int signum)
   if (signum <= 0 || signum >= ACE_NSIG)
     return 0; // This will cause problems...
   else if (ACE_Sig_Handlers_Set::sig_handlers_[signum] == 0)
-    ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum],
-                    ACE_SIG_HANDLERS_SET,
-                    0);
+    ACE_NEW_RETURN (ACE_Sig_Handlers_Set::sig_handlers_[signum], ACE_SIG_HANDLERS_SET, 0);
+
   return ACE_Sig_Handlers_Set::sig_handlers_[signum];
 }
 
@@ -528,10 +527,8 @@ ACE_Sig_Handlers::register_handler (int signum,
 
           // Create a new 3rd party disposition, remembering its
           // preferred signal blocking etc...;
-          ACE_NEW_RETURN (extern_sh,
-                          ACE_Sig_Adapter (sa,
-                                           ++ACE_Sig_Handlers::sigkey_),
-                          -1);
+          ACE_NEW_RETURN (extern_sh, ACE_Sig_Adapter (sa, ++ACE_Sig_Handlers::sigkey_), -1);
+
           // Add the external signal handler to the set of handlers
           // for this signal.
           if (ACE_Sig_Handlers_Set::instance (signum)->insert (extern_sh) == -1)
@@ -541,10 +538,8 @@ ACE_Sig_Handlers::register_handler (int signum,
             }
         }
       // Add our new handler at this point.
-      ACE_NEW_RETURN (ace_sig_adapter,
-                      ACE_Sig_Adapter (new_sh,
-                                       ++ACE_Sig_Handlers::sigkey_),
-                      -1);
+      ACE_NEW_RETURN (ace_sig_adapter, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), -1);
+
       // Add the ACE signal handler to the set of handlers for this
       // signal (make sure it goes before the external one if there is
       // one of these).
@@ -755,10 +750,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh)
   // ACE_Unbounded_Set...).
   ACE_Sig_Adapter *temp;
 
-  ACE_NEW_RETURN (temp,
-                  ACE_Sig_Adapter (new_sh,
-                                   ++ACE_Sig_Handlers::sigkey_),
-                  0);
+  ACE_NEW_RETURN (temp, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), 0);
   handler_set->insert (temp);
   return *eh;
 }
diff --git a/ace/Signal.h b/ace/Signal.h
index d9901345263..dc92c572b80 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -17,10 +17,6 @@
 #ifndef ACE_SIGNAL_HANDLER_H
 #define ACE_SIGNAL_HANDLER_H
 
-#if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H)
-# error ace/Signal.h was #included instead of signal.h by ace/OS.h:  fix!!!!
-#endif /* ACE_DONT_INCLUDE_ACE_SIGNAL_H */
-
 #include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -110,6 +106,7 @@ public:
                   ACE_Sig_Set &sigmask,
                   int flags = 0);
   ACE_Sig_Action (const ACE_Sig_Action &s);
+  ACE_Sig_Action (struct sigaction *);
 
   ~ACE_Sig_Action (void);
   // Default dtor.
diff --git a/ace/Signal.i b/ace/Signal.i
index 26f7295c9af..c8c0cad3049 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -237,28 +237,25 @@ ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask)
   // If MASK is 0 then block all signals!
   if (mask == 0)
     {
+#if 0
+      ACE_Sig_Set smask (1);
+#endif
+
+
 #if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
-      ACE_OS::sigprocmask (SIG_BLOCK,
-                           (sigset_t *) ACE_Object_Manager::default_mask (),
-                           (sigset_t *)
+      ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *)
                            this->omask_);
 #else
-      ACE_OS::thr_sigsetmask (SIG_BLOCK,
-                              (sigset_t *) ACE_Object_Manager::default_mask (),
-                              (sigset_t *)
+      ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *)
                               this->omask_);
 #endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */
     }
   else
 #if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
-    ACE_OS::sigprocmask (SIG_BLOCK,
-                         (sigset_t *) *mask,
-                         (sigset_t *)
+    ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *)
                          this->omask_);
 #else
-  ACE_OS::thr_sigsetmask (SIG_BLOCK,
-                          (sigset_t *) *mask,
-                          (sigset_t *)
+  ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *)
                           this->omask_);
 #endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */
 }
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 6dc4def40c4..3ebca15eed5 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -68,9 +68,8 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
 
-          ACE_NEW_RETURN (singleton,
-                          (ACE_Singleton<TYPE,
-                           ACE_LOCK>), 0);
+          ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
+
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -87,9 +86,8 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton,
-                              (ACE_Singleton<TYPE, ACE_LOCK>),
-                              0);
+              ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
+
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
@@ -161,9 +159,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // don't register for destruction with the
           // ACE_Object_Manager:  we'll have to leak this instance.
 #endif /* ACE_MT_SAFE */
-          ACE_NEW_RETURN (singleton,
-                          (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
-                          0);
+
+          ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0);
+
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -179,9 +177,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton,
-                              (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
+              ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
                               0);
+
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
             }
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index 45b7eb8258b..fbd5f7f18c8 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -153,7 +153,8 @@ ACE_Stats::std_dev (ACE_Stats_Value &std_dev,
               // works with the Diab compiler the way it is! //
 
               // Square using 64-bit arithmetic.
-              sum_of_squares += difference * ACE_U64_TO_U32 (difference);
+              sum_of_squares += difference *
+                ACE_U64_TO_U32 (difference);
               i.advance ();
 
               if (sum_of_squares < original_sum_of_squares)
@@ -272,7 +273,7 @@ ACE_Stats::print_summary (const u_int precision,
 #if !defined (ACE_HAS_WINCE)
       ACE_OS::fprintf (file,
                        ASYS_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"),
-                       ASYS_WIDE_STRING (strerror (overflow_)));
+                       ASYS_TEXT (strerror (overflow_)));
 #else
       // WinCE doesn't have strerror ;(
       ACE_OS::fprintf (file,
@@ -419,222 +420,6 @@ ACE_Stats::square_root (const ACE_UINT64 n,
     }
 }
 
-// ****************************************************************
-
-ACE_Throughput_Stats::ACE_Throughput_Stats (void)
-  :  samples_count_ (0),
-     latency_min_ (0),
-     latency_max_ (0),
-     latency_sum_ (0),
-     latency_sum2_ (0),
-     throughput_last_ (0),
-     throughput_sum_x_ (0),
-     throughput_sum_x2_ (0),
-     throughput_sum_y_ (0),
-     throughput_sum_y2_ (0),
-     throughput_sum_xy_ (0)
-{
-}
-
-void
-ACE_Throughput_Stats::sample (ACE_UINT64 throughput,
-                              ACE_UINT64 latency)
-{
-  ++this->samples_count_;
-
-  if (this->samples_count_ == 1)
-    {
-      this->latency_min_ = latency;
-      this->latency_max_ = latency;
-      this->latency_sum_ = latency;
-#if defined ACE_LACKS_LONGLONG_T
-      this->latency_sum2_ = latency * ACE_U64_TO_U32 (latency);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->latency_sum2_ = latency * latency;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-      this->throughput_last_   = throughput;
-#if 0
-      this->throughput_sum_y_  = this->samples_count_;
-      this->throughput_sum_y2_ = this->samples_count_ * this->samples_count_;
-      this->throughput_sum_x_  = throughput;
-      this->throughput_sum_x2_ = throughput * throughput;
-      this->throughput_sum_xy_ = throughput * this->samples_count_;
-
-      printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_);
-#endif /* 0 */
-    }
-  else
-    {
-      if (this->latency_min_ > latency)
-        this->latency_min_ = latency;
-      if (this->latency_max_ < latency)
-        this->latency_max_ = latency;
-
-      this->latency_sum_  += latency;
-#if defined ACE_LACKS_LONGLONG_T
-      this->latency_sum2_ += latency * ACE_U64_TO_U32 (latency);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->latency_sum2_ += latency * latency;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-      this->throughput_last_ = throughput;
-
-#if 0
-      this->throughput_sum_y_  += this->samples_count_;
-      this->throughput_sum_y2_ += this->samples_count_ * this->samples_count_;
-      this->throughput_sum_x_  += throughput;
-      this->throughput_sum_x2_ += throughput * throughput;
-      this->throughput_sum_xy_ += throughput * this->samples_count_;
-
-      printf ("%f %qu\n", throughput / 400000000.0, this->samples_count_);
-#endif /* 0 */
-    }
-}
-
-void
-ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs)
-{
-  if (rhs.samples_count_ == 0)
-    return;
-
-  if (this->samples_count_ == 0)
-    {
-      this->samples_count_ = rhs.samples_count_;
-
-      this->latency_min_  = rhs.latency_min_;
-      this->latency_max_  = rhs.latency_max_;
-      this->latency_sum_  = rhs.latency_sum_;
-      this->latency_sum2_ = rhs.latency_sum2_;
-
-      this->throughput_last_   = rhs.throughput_last_;
-#if 0
-      this->throughput_sum_x_  = rhs.throughput_sum_x_;
-      this->throughput_sum_x2_ = rhs.throughput_sum_x2_;
-      this->throughput_sum_y_  = rhs.throughput_sum_y_;
-      this->throughput_sum_y2_ = rhs.throughput_sum_y2_;
-      this->throughput_sum_xy_ = rhs.throughput_sum_xy_;
-#endif /* 0 */
-
-      return;
-    }
-
-  this->samples_count_ += rhs.samples_count_;
-
-  if (this->latency_min_ > rhs.latency_min_)
-    this->latency_min_ = rhs.latency_min_;
-  if (this->latency_max_ < rhs.latency_max_)
-    this->latency_max_ = rhs.latency_max_;
-
-  this->latency_sum_  += rhs.latency_sum_;
-  this->latency_sum2_ += rhs.latency_sum2_;
-
-  if (this->throughput_last_ < rhs.throughput_last_)
-    this->throughput_last_ = rhs.throughput_last_;
-
-#if 0
-  this->throughput_sum_x_  += rhs.throughput_sum_x_;
-  this->throughput_sum_x2_ += rhs.throughput_sum_x2_;
-  this->throughput_sum_y_  += rhs.throughput_sum_y_;
-  this->throughput_sum_y2_ += rhs.throughput_sum_y2_;
-  this->throughput_sum_xy_ += rhs.throughput_sum_xy_;
-#endif /* 0 */
-}
-
-void
-ACE_Throughput_Stats::dump_results (const ASYS_TCHAR* msg,
-                                    ACE_UINT32 sf)
-{
-  if (this->samples_count_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s : no data collected\n")));
-      return;
-    }
-
-  ACE_UINT64 latency_avg = this->latency_sum_ /
-#if defined ACE_LACKS_LONGLONG_T
-    ACE_U64_TO_U32 (this->samples_count_);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-    this->samples_count_;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-  ACE_UINT64 latency_dev =
-#if defined ACE_LACKS_LONGLONG_T
-    ACE_static_cast (ACE_U_LongLong,
-      this->latency_sum2_ / ACE_U64_TO_U32(this->samples_count_)) -
-    latency_avg * ACE_U64_TO_U32(latency_avg);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-    this->latency_sum2_ / this->samples_count_ - latency_avg * latency_avg;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  double l_min = ACE_CU64_TO_CU32 (this->latency_min_) / sf;
-  double l_max = ACE_CU64_TO_CU32 (this->latency_max_) / sf;
-  double l_avg = ACE_CU64_TO_CU32 (latency_avg) / sf;
-  double l_dev = ACE_CU64_TO_CU32 (latency_dev) / (sf * sf);
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("%s latency: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2)\n"),
-              msg, l_min, l_avg, l_max, l_dev));
-
-  double seconds =
-#if defined ACE_LACKS_LONGLONG_T
-    this->throughput_last_ / sf;
-#else  /* ! ACE_LACKS_LONGLONG_T */
-    ACE_static_cast (double,
-                     ACE_UINT64_DBLCAST_ADAPTER(this->throughput_last_ / sf));
-#endif /* ! ACE_LACKS_LONGLONG_T */
-  seconds /= 1000000.0;
-  double t_avg = ACE_CU64_TO_CU32 (this->samples_count_) / seconds;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("%s throughput: %.2f (events/second)\n"),
-              msg, t_avg));
-
-#if 0
-  double t_sum_x =
-    ACE_CU64_TO_CU32 (this->throughput_sum_x_);// / sf);
-  //t_sum_x /= 1000000.0;
-  double t_sum_y =
-    ACE_CU64_TO_CU32 (this->throughput_sum_y_);
-  double t_sum_x2 =
-    ACE_CU64_TO_CU32 (this->throughput_sum_x2_);// / (sf*sf));
-  //t_sum_x2 /= 1000000.0;
-  //t_sum_x2 /= 1000000.0;
-  double t_sum_y2 =
-    ACE_CU64_TO_CU32 (this->throughput_sum_y2_);
-  double t_sum_xy =
-    ACE_CU64_TO_CU32 (this->throughput_sum_xy_);// / sf);
-  //t_sum_xy /= 1000000.0;
-  double t_avgx = t_sum_x / this->samples_count_;
-  double t_avgy = t_sum_y / this->samples_count_;
-
-  double t_a =
-    (this->samples_count_ * t_sum_xy - t_sum_x * t_sum_y)
-    / (this->samples_count_ * t_sum_x2 - t_sum_x * t_sum_x);
-  double t_b = (t_avgy - t_a * t_avgx);
-
-  t_a *= 1000000.0;
-
-  double d_r =
-    (t_sum_xy - t_avgx * t_sum_y - t_avgy * t_sum_x
-     + this->samples_count_ * t_avgx * t_avgy);
-  double n_r =
-    (t_sum_x2
-     - this->samples_count_ * t_avgx * t_avgx)
-    * (t_sum_y2
-       - this->samples_count_ * t_avgy * t_avgy);
-  double t_r = d_r * d_r / n_r;
-
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "%s throughput: %.2f/%.2f/%.2f/%.6f/%.2f (avg/a/b/r/elapsed)\n",
-  //              msg, t_avg, t_a, t_b, t_r, seconds));
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "%s        data: %.2f/%.2f/%.2f/%.6f/%.2f (x/x2/y/y2/xy)\n",
-  //              msg, t_sum_x, t_sum_x2, t_sum_y, t_sum_y2, t_sum_xy));
-#endif
-}
-
-// ****************************************************************
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Node <ACE_INT32>;
 template class ACE_Unbounded_Queue <ACE_INT32>;
diff --git a/ace/Stats.h b/ace/Stats.h
index 83feaea3939..7a7214f993b 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -186,55 +186,6 @@ private:
   // The samples.
 };
 
-// ****************************************************************
-
-class ACE_Export ACE_Throughput_Stats
-{
-  // = TITLE
-  //   A simple class to make throughput and latency analysis.
-  //
-  // = DESCRIPTION
-  //   Keep the relevant information to perform throughput and latency
-  //   analysis, including:
-  //   1) Minimum, Average and Maximum latency
-  //   2) Jitter for the latency
-  //   3) Linear regression for throughput
-  //   4) Accumulate results from several samples to obtain aggregated
-  //      results, across several threads or experiments.
-  //
-public:
-  ACE_Throughput_Stats (void);
-  // Default constructor.
-
-  void sample (ACE_UINT64 throughput, ACE_UINT64 latency);
-  // Store one sample
-
-  void accumulate (const ACE_Throughput_Stats &throughput);
-  // Update the values to reflect the stats in <throughput>
-
-  void dump_results (const ASYS_TCHAR* msg, ACE_UINT32 scale_factor);
-  // Print down the stats
-
-private:
-  ACE_UINT64 samples_count_;
-  // The number of samples
-
-  ACE_UINT64 latency_min_;
-  ACE_UINT64 latency_max_;
-  ACE_UINT64 latency_sum_;
-  ACE_UINT64 latency_sum2_;
-  // The stadigraphs for latency computation
-
-  ACE_UINT64 throughput_last_;
-  ACE_UINT64 throughput_sum_x_;
-  ACE_UINT64 throughput_sum_x2_;
-  ACE_UINT64 throughput_sum_y_;
-  ACE_UINT64 throughput_sum_y2_;
-  ACE_UINT64 throughput_sum_xy_;
-  // The stadigraphs for throughput computation
-};
-
-
 #if defined (__ACE_INLINE__)
 # include "ace/Stats.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 73b4dfb579b..55898c2ecc8 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -77,17 +77,18 @@ 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_NEW_RETURN (stp,
-                      ACE_Service_Object_Type (svc_handler,
-                                               this->svc_name_),
-                      -1);
+      ACE_Service_Type_Impl *stp =
+        new ACE_Service_Object_Type (svc_handler, this->svc_name_);
+
+      if (stp == 0)
+        {
+          errno = ENOMEM;
+          return -1;
+        }
 
       ACE_Service_Type *srp =
-        new ACE_Service_Type (this->svc_name_,
-                              stp,
-                              handle,
-                              1);
+        new ACE_Service_Type (this->svc_name_, stp, handle, 1);
+
       if (srp == 0)
         {
           delete stp;
@@ -206,7 +207,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr,
   // Must have a thread manager!
   if (this->thr_mgr_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("error: must have a non-NULL thread manager\n")),
+                       "error: must have a non-NULL thread manager\n"),
                       -1);
   else
     return 0;
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index fdb2ad5ca96..703ad95dfa1 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -638,6 +638,47 @@ public:
   // This is a no-op.
 };
 
+template <class ADDR_T>
+class ACE_Hash_Addr
+{
+  // = TITLE
+  //     Internal class to compute hash values on addresses in
+  //     <ACE_Cached_Connect_Strategy>.
+  //
+  // = DESCRIPTION
+  //     Intended to be used as a key to an <ACE_Hash_Map_Manager>.
+  //     <ADDR_T> parameter/subclass is typically <ACE_INET_Addr>.  It
+  //     is expected to implement operator==().
+public:
+  // = Initialization methods.
+  ACE_Hash_Addr (void);
+  // Default constructor.
+
+  ACE_Hash_Addr (const ADDR_T &a);
+  // Pre-compute hash value.
+
+  ~ACE_Hash_Addr (void);
+  // Destructor.
+
+  u_long hash (void) const;
+  // Computes and returns hash value.  This "caches" the hash value to
+  // improve performance.
+
+  int operator== (const ACE_Hash_Addr<ADDR_T> &rhs) const;
+  // Compares two hash values.
+
+private:
+  u_long hash_i (const ADDR_T &) const;
+  // This is the method that actually performs the non-cached hash
+  // computation.  It should typically be specialized.
+
+  u_long hash_value_;
+  // Pre-computed hash-value.
+
+  ADDR_T addr_;
+  // The underlying address.
+};
+
 template <class T>
 class ACE_Refcounted_Hash_Recyclable :  public ACE_Refcountable,
                                         public ACE_Hashable,
@@ -680,6 +721,25 @@ class ACE_Cached_Connect_Strategy : public ACE_Connection_Recycling_Strategy, pu
   //     <ACE_Cached_Connect_Strategy> is intended to be used as a
   //     plug-in connection strategy for <ACE_Strategy_Connector>.
   //     It's added value is re-use of established connections.
+  //
+  // = USAGE
+  //     In order to use this appropriately, the user must provide
+  //     a template specialization for <ACE_Hash_Addr::compare_i()> and
+  //     <ACE_Hash_Addr::hash_i()> based on the address type and the
+  //     service handler type.  For example, a specialization using
+  //     <ACE_INET_Addr> and <My_Service_Handler> might be:
+  //     = BEGIN<NOFILL>
+  //     = BEGIN<CODE>
+  //     size_t
+  //     ACE_Hash_Addr<ACE_INET_Addr, My_Service_Handler>::hash_i(const ACE_INET_Addr &a)
+  //     {
+  //       return ...;
+  //     }
+  //     = END<CODE>
+  //     = END<NOFILL>
+  //
+  // = SEE ALSO
+  //     <ACE_Hash_Addr>.
 public:
 
   ACE_Cached_Connect_Strategy (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
@@ -805,7 +865,7 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                     int &found);
 
-  virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
+  int connect_svc_handler_i (SVC_HANDLER *&sh,
                              const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                              ACE_Time_Value *timeout,
                              const ACE_PEER_CONNECTOR_ADDR &local_addr,
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i
index c456700a6f3..d86bfca51cf 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.i
@@ -1,6 +1,11 @@
 /* -*- C++ -*- */
 // $Id$
 
+template<class ADDR_T> ASYS_INLINE
+ACE_Hash_Addr<ADDR_T>::~ACE_Hash_Addr (void)
+{
+}
+
 template<class SVC_HANDLER> ASYS_INLINE
 ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void)
 {
@@ -125,8 +130,8 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor,
   ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy");
 
   if (this->open (reactor, mask, flags) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy")));
+    ACE_ERROR ((LM_ERROR, "%p\n",
+                "ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"));
 }
 
 template <class SVC_HANDLER> ASYS_INLINE
@@ -153,9 +158,8 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m
   ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy");
 
   if (this->open (thr_mgr, thr_flags, n_threads, flags) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy")));
+    ACE_ERROR ((LM_ERROR, "%p\n",
+                "ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"));
 }
 
 template <class SVC_HANDLER> ASYS_INLINE
@@ -378,6 +382,48 @@ ACE_Refcounted_Hash_Recyclable<T>::operator== (const T &rhs) const
     return this->t_ == rhs;
 }
 
+template<class ADDR_T> ASYS_INLINE
+ACE_Hash_Addr<ADDR_T>::ACE_Hash_Addr (void)
+  : hash_value_ (0)
+{
+}
+
+template<class ADDR_T> ASYS_INLINE
+ACE_Hash_Addr<ADDR_T>::ACE_Hash_Addr (const ADDR_T &a)
+  : hash_value_ (0),
+    addr_ (a)
+{
+  this->hash ();
+}
+
+template<class ADDR_T> ASYS_INLINE u_long
+ACE_Hash_Addr<ADDR_T>::hash (void) const
+{
+  // In doing the check below, we take chance of paying a performance
+  // price when the hash value is zero.  But, that will (hopefully)
+  // happen far less often than a non-zero value, so this caching
+  // strategy should pay off, esp. if hash computation is expensive
+  // relative to the simple comparison.
+
+  if (this->hash_value_ == 0)
+    ((ACE_Hash_Addr<ADDR_T> *) this)->hash_value_ = this->hash_i (addr_);
+
+  return this->hash_value_;
+}
+
+template<class ADDR_T> ASYS_INLINE u_long
+ACE_Hash_Addr<ADDR_T>::hash_i (const ADDR_T &b) const
+{
+  ACE_UNUSED_ARG (b);
+  return 0;
+}
+
+template<class ADDR_T> ASYS_INLINE int
+ACE_Hash_Addr<ADDR_T>::operator== (const ACE_Hash_Addr<ADDR_T> &rhs) const
+{
+  return this->addr_ == rhs.addr_;
+}
+
 template <class SVC_HANDLER> ASYS_INLINE int
 ACE_NOOP_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&)
 {
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index efdffd1cbb0..f8af657ff6d 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -231,10 +231,26 @@ ACE_Stream<ACE_SYNCH_USE>::push_module (ACE_Module<ACE_SYNCH_USE> *new_top,
   return 0;
 }
 
+#if 0
 template <ACE_SYNCH_DECL> int
 ACE_Stream<ACE_SYNCH_USE>::open (void *a,
-                                 ACE_Module<ACE_SYNCH_USE> *head,
-                                 ACE_Module<ACE_SYNCH_USE> *tail)
+                               ACE_Multiplexor &muxer,
+                               ACE_Module<ACE_SYNCH_USE> *head)
+{
+  ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open");
+  this->stream_head_ = head == 0
+    ? new ACE_Module<ACE_SYNCH_USE> ("ACE_Stream_Head",
+                               new ACE_Stream_Head<ACE_SYNCH_USE>,
+                               new ACE_Stream_Head<ACE_SYNCH_USE>, a) : head;
+  this->stream_tail_ = 0;
+  return muxer.link_from_below (this->stream_head_);
+}
+#endif
+
+template <ACE_SYNCH_DECL> int
+ACE_Stream<ACE_SYNCH_USE>::open (void *a,
+                               ACE_Module<ACE_SYNCH_USE> *head,
+                               ACE_Module<ACE_SYNCH_USE> *tail)
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::open");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
@@ -339,12 +355,11 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
   ACE_Message_Block *db;
 
   // Try to create a data block that contains the user-supplied data.
-  ACE_NEW_RETURN (db,
-                  ACE_Message_Block (sizeof (int),
-                                     ACE_Message_Block::MB_IOCTL,
-                                     0,
-                                     (char *) a),
-                  -1);
+  ACE_NEW_RETURN (db, ACE_Message_Block (sizeof (int),
+                                         ACE_Message_Block::MB_IOCTL,
+                                         0,
+                                         (char *) a), -1);
+
   // Try to create a control block <cb> that contains the control
   // field and a pointer to the data block <db> in <cb>'s continuation
   // field.
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 315e5f36063..76da4a83507 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -108,3 +108,4 @@ typedef union
 } ACE_YYSTYPE;
 extern ACE_YYSTYPE ace_yylval;
 #endif /* ACE_SVC_CONF_H */
+
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 908cbb5d721..a936a9a2047 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -12,7 +12,7 @@ ACE_RCSID(ace, Svc_Conf_y, "$Id$")
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         ACE_Static_Node *svc_type);
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
-                                        const ASYS_TCHAR *svc_name);
+                                        const char *svc_name);
 
 #define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
 
@@ -69,7 +69,7 @@ dynamic
   : ACE_DYNAMIC svc_location parameters_opt
     {
       if ($2 != 0)
-        $$ = new ACE_Dynamic_Node ($2, ASYS_WIDE_STRING ($3));
+        $$ = new ACE_Dynamic_Node ($2, $3);
       else
         $$ = 0;
     }
@@ -78,28 +78,28 @@ dynamic
 static
   : ACE_STATIC ACE_IDENT parameters_opt
     {
-      $$ = new ACE_Static_Node (ASYS_WIDE_STRING ($2), ASYS_WIDE_STRING ($3));
+      $$ = new ACE_Static_Node ($2, $3);
     }
   ;
 
 suspend
   : ACE_SUSPEND ACE_IDENT
     {
-      $$ = new ACE_Suspend_Node (ASYS_WIDE_STRING ($2));
+      $$ = new ACE_Suspend_Node ($2);
     }
   ;
 
 resume
   : ACE_RESUME ACE_IDENT
     {
-      $$ = new ACE_Resume_Node (ASYS_WIDE_STRING ($2));
+      $$ = new ACE_Resume_Node ($2);
     }
   ;
 
 remove
   : ACE_REMOVE ACE_IDENT
     {
-      $$ = new ACE_Remove_Node (ASYS_WIDE_STRING ($2));
+      $$ = new ACE_Remove_Node ($2);
     }
   ;
 
@@ -108,7 +108,7 @@ stream
     {
       $$ = new ACE_Stream_Node ($2, $3);
     }
-  | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node (ASYS_WIDE_STRING ($2)); } stream_modules
+  | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node ($2); } stream_modules
     {
       $$ = new ACE_Dummy_Node ($<static_node_>3, $4);
     }
@@ -157,7 +157,7 @@ module
         {
           ACE_Static_Node *module = $<static_node_>-1;
 
-          ACE_ARGV args (svc_type->parameters ());
+          ACE_ARGV args (ASYS_WIDE_STRING (svc_type->parameters ()));
           ACE_Module_Type *mt = ace_get_module (module,
                                                 svc_type);
           ACE_Stream_Type *st =
@@ -170,7 +170,7 @@ module
             {
               ACE_ERROR ((LM_ERROR,
                           ASYS_TEXT ("dynamic initialization failed for Module %s\n"),
-                          svc_type->name ()));
+                          ASYS_WIDE_STRING (svc_type->name ())));
               yyerrno++;
             }
         }
@@ -215,8 +215,8 @@ module
         {
           ACE_ERROR ((LM_ERROR,
                       ASYS_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
-                      module->name (),
-                      stream->name ()));
+                      ASYS_WIDE_STRING (module->name ()),
+                      ASYS_WIDE_STRING (stream->name ())));
           yyerrno++;
         }
     }
@@ -274,15 +274,15 @@ status
 svc_initializer
   : pathname ACE_COLON ACE_IDENT
     {
-      $$ = new ACE_Object_Node (ASYS_WIDE_STRING ($1), ASYS_WIDE_STRING($3));
+      $$ = new ACE_Object_Node ($1, $3);
     }
   | pathname ACE_COLON ACE_IDENT ACE_LPAREN ACE_RPAREN
     {
-      $$ = new ACE_Function_Node (ASYS_WIDE_STRING ($1), ASYS_WIDE_STRING ($3));
+      $$ = new ACE_Function_Node ($1, $3);
     }
   | ACE_COLON ACE_IDENT ACE_LPAREN ACE_RPAREN
     {
-      $$ = new ACE_Static_Function_Node (ASYS_WIDE_STRING ($2));
+      $$ = new ACE_Static_Function_Node ($2);
     }
   ;
 
@@ -334,7 +334,7 @@ yyerror (const char *s)
 
 static ACE_Module_Type *
 ace_get_module (ACE_Static_Node *str_rec,
-                const ASYS_TCHAR *svc_name)
+                const char *svc_name)
 {
   const ACE_Service_Type *sr = str_rec->record ();
   const ACE_Service_Type_Impl *type = sr->type ();
@@ -343,14 +343,14 @@ ace_get_module (ACE_Static_Node *str_rec,
     : ACE_dynamic_cast (ACE_Stream_Type *,
                         ACE_const_cast (ACE_Service_Type_Impl *,
                                         type));
-  ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
+  ACE_Module_Type *mt = st == 0 ? 0 : st->find (ASYS_WIDE_STRING (svc_name));
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"),
-                  svc_name,
-                  str_rec->name ()));
+                  ASYS_WIDE_STRING (svc_name),
+                  ASYS_WIDE_STRING (str_rec->name ())));
       yyerrno++;
     }
 
@@ -367,14 +367,14 @@ ace_get_module (ACE_Static_Node *str_rec,
   const ACE_Service_Type *sv = svc_type->record ();
   type = sv->type ();
   ACE_Module_Type *mt = (ACE_Module_Type *) type;
-  const ASYS_TCHAR *module_type_name = svc_type->name ();
+  const char *module_type_name = svc_type->name ();
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
-                  module_type_name,
-                  str_rec->name ()));
+                  ASYS_WIDE_STRING (module_type_name),
+                  ASYS_WIDE_STRING (str_rec->name ())));
       yyerrno++;
     }
 
@@ -382,13 +382,13 @@ ace_get_module (ACE_Static_Node *str_rec,
   // Module_Type object from the svc.conf file.
   ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
 
-  if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
+  if (ACE_OS::strcmp (mp->name (), ASYS_WIDE_STRING (module_type_name)) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
-                  module_type_name,
+                  ASYS_WIDE_STRING (module_type_name),
                   mp->name ()));
-      mp->name (module_type_name);
+      mp->name (ASYS_WIDE_STRING (module_type_name));
     }
 
   return mt;
@@ -440,7 +440,7 @@ ace_create_service_type (const ASYS_TCHAR *name,
 int yylineno = 1;
 
 // Name given on the command-line to envoke the program.
-ASYS_TCHAR *program_name;
+char *program_name;
 
 // Main driver program.
 
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index a17da8b62ab..9083f7fd7e1 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -16,7 +16,7 @@ ACE_RCSID(ace, Svc_Conf_y, "$Id$")
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         ACE_Static_Node *svc_type);
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
-                                        const ASYS_TCHAR *svc_name);
+                                        const char *svc_name);
 
 #define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext)
 
@@ -273,7 +273,7 @@ ace_yyerror (const char *s)
 
 static ACE_Module_Type *
 ace_get_module (ACE_Static_Node *str_rec,
-                const ASYS_TCHAR *svc_name)
+                const char *svc_name)
 {
   const ACE_Service_Type *sr = str_rec->record ();
   const ACE_Service_Type_Impl *type = sr->type ();
@@ -282,14 +282,14 @@ ace_get_module (ACE_Static_Node *str_rec,
     : ACE_dynamic_cast (ACE_Stream_Type *,
                         ACE_const_cast (ACE_Service_Type_Impl *,
                                         type));
-  ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
+  ACE_Module_Type *mt = st == 0 ? 0 : st->find (ASYS_WIDE_STRING (svc_name));
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"),
-                  svc_name,
-                  str_rec->name ()));
+                  ASYS_WIDE_STRING (svc_name),
+                  ASYS_WIDE_STRING (str_rec->name ())));
       ace_yyerrno++;
     }
 
@@ -306,14 +306,14 @@ ace_get_module (ACE_Static_Node *str_rec,
   const ACE_Service_Type *sv = svc_type->record ();
   type = sv->type ();
   ACE_Module_Type *mt = (ACE_Module_Type *) type;
-  const ASYS_TCHAR *module_type_name = svc_type->name ();
+  const char *module_type_name = svc_type->name ();
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
-                  module_type_name,
-                  str_rec->name ()));
+                  ASYS_WIDE_STRING (module_type_name),
+                  ASYS_WIDE_STRING (str_rec->name ())));
       ace_yyerrno++;
     }
 
@@ -321,13 +321,13 @@ ace_get_module (ACE_Static_Node *str_rec,
   // Module_Type object from the svc.conf file.
   ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
 
-  if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
+  if (ACE_OS::strcmp (mp->name (), ASYS_WIDE_STRING (module_type_name)) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
-                  module_type_name,
+                  ASYS_WIDE_STRING (module_type_name),
                   mp->name ()));
-      mp->name (module_type_name);
+      mp->name (ASYS_WIDE_STRING (module_type_name));
     }
 
   return mt;
@@ -379,7 +379,7 @@ ace_create_service_type (const ASYS_TCHAR *name,
 int ace_yylineno = 1;
 
 // Name given on the command-line to envoke the program.
-ASYS_TCHAR *program_name;
+char *program_name;
 
 // Main driver program.
 
@@ -722,7 +722,7 @@ case 10:
 #line 70 "Svc_Conf.y"
 {
       if (ace_yyvsp[-1].svc_record_ != 0)
-        ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ASYS_WIDE_STRING (ace_yyvsp[0].ident_));
+        ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_);
       else
         ace_yyval.parse_node_ = 0;
     }
@@ -730,25 +730,25 @@ break;
 case 11:
 #line 80 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Static_Node (ASYS_WIDE_STRING (ace_yyvsp[-1].ident_), ASYS_WIDE_STRING (ace_yyvsp[0].ident_));
+      ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 12:
 #line 87 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Suspend_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_));
+      ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 13:
 #line 94 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Resume_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_));
+      ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 14:
 #line 101 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Remove_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_));
+      ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 15:
@@ -759,7 +759,7 @@ case 15:
 break;
 case 16:
 #line 111 "Svc_Conf.y"
-{ ace_yyval.static_node_ = new ACE_Static_Node (ASYS_WIDE_STRING (ace_yyvsp[0].ident_)); }
+{ ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); }
 break;
 case 17:
 #line 112 "Svc_Conf.y"
@@ -817,7 +817,7 @@ case 25:
         {
           ACE_Static_Node *module = ace_yyvsp[-2].static_node_;
 
-          ACE_ARGV args (svc_type->parameters ());
+          ACE_ARGV args (ASYS_WIDE_STRING (svc_type->parameters ()));
           ACE_Module_Type *mt = ace_get_module (module,
                                                 svc_type);
           ACE_Stream_Type *st =
@@ -830,7 +830,7 @@ case 25:
             {
               ACE_ERROR ((LM_ERROR,
                           ASYS_TEXT ("dynamic initialization failed for Module %s\n"),
-                          svc_type->name ()));
+                          ASYS_WIDE_STRING (svc_type->name ())));
               ace_yyerrno++;
             }
         }
@@ -883,8 +883,8 @@ case 29:
         {
           ACE_ERROR ((LM_ERROR,
                       ASYS_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
-                      module->name (),
-                      stream->name ()));
+                      ASYS_WIDE_STRING (module->name ()),
+                      ASYS_WIDE_STRING (stream->name ())));
           ace_yyerrno++;
         }
     }
@@ -943,19 +943,19 @@ break;
 case 34:
 #line 276 "Svc_Conf.y"
 {
-      ace_yyval.location_node_ = new ACE_Object_Node (ASYS_WIDE_STRING (ace_yyvsp[-2].ident_), ASYS_WIDE_STRING(ace_yyvsp[0].ident_));
+      ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 35:
 #line 280 "Svc_Conf.y"
 {
-      ace_yyval.location_node_ = new ACE_Function_Node (ASYS_WIDE_STRING (ace_yyvsp[-4].ident_), ASYS_WIDE_STRING (ace_yyvsp[-2].ident_));
+      ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_);
     }
 break;
 case 36:
 #line 284 "Svc_Conf.y"
 {
-      ace_yyval.location_node_ = new ACE_Static_Function_Node (ASYS_WIDE_STRING (ace_yyvsp[-2].ident_));
+      ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_);
     }
 break;
 case 37:
diff --git a/ace/Synch.h b/ace/Synch.h
index 5297198ae95..d3d42b7f7af 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -260,13 +260,7 @@ public:
   // Note that <tv> is assumed to be in "absolute" rather than
   // "relative" time.  The value of <tv> is updated upon return, i.e.,
   // the caller gets the amount of time that has elapsed while waiting
-  // to acquire the semaphore.  
-  //
-  // NOTE: Solaris threads do not support timed semaphores.
-  // Therefore, if you're running on Solaris you might want to
-  // consider using the ACE POSIX pthreads implementation instead,
-  // which can be enabled by compiling ACE with
-  // -D_POSIX_PTHREAD_SEMANTICS.
+  // to acquire the semaphore.
 
   int tryacquire (void);
   // Conditionally decrement the semaphore if count is greater than 0
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 2c75b420838..5946d443182 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -32,8 +32,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
   : lock_ (0),
     delete_lock_ (1)
 {
-  ACE_NEW (this->lock_,
-           ACE_LOCKING_MECHANISM);
+  ACE_NEW (this->lock_, ACE_LOCKING_MECHANISM);
 }
 
 template <class ACE_LOCKING_MECHANISM>
@@ -726,9 +725,7 @@ ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, int block)
 
   this->init_key ();
   ACE_Guard<ACE_LOCK> *guard;
-  ACE_NEW (guard,
-           ACE_Guard<ACE_LOCK> (lock,
-                                block));
+  ACE_NEW (guard, ACE_Guard<ACE_LOCK> (lock, block));
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter;
@@ -791,9 +788,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard (ACE_LOCK &lock,
 
   this->init_key ();
   ACE_Guard<ACE_LOCK> *guard;
-  ACE_NEW (guard,
-           ACE_Write_Guard<ACE_LOCK> (lock,
-                                      block));
+  ACE_NEW (guard, ACE_Write_Guard<ACE_LOCK> (lock, block));
 
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter;
@@ -878,9 +873,8 @@ ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, int block)
 
   this->init_key ();
   ACE_Guard<ACE_LOCK> *guard;
-  ACE_NEW (guard,
-           ACE_Read_Guard<ACE_LOCK> (lock,
-                                     block));
+  ACE_NEW (guard, ACE_Read_Guard<ACE_LOCK> (lock, block));
+
 #if defined (ACE_HAS_THR_C_DEST)
   ACE_TSS_Adapter *tss_adapter;
   ACE_NEW (tss_adapter,
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp
index 833086650cd..0ad522daca9 100644
--- a/ace/System_Time.cpp
+++ b/ace/System_Time.cpp
@@ -10,8 +10,7 @@ ACE_System_Time::ACE_System_Time (LPCTSTR poolname)
   : delta_time_ (0)
 {
   ACE_TRACE ("ACE_System_Time::ACE_System_Time");
-  ACE_NEW (this->shmem_,
-           ALLOCATOR (poolname));
+  ACE_NEW (this->shmem_, ALLOCATOR (poolname));
 }
 
 ACE_System_Time::~ACE_System_Time (void)
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 39b17f2a58d..f6d0ec697cc 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -27,8 +27,7 @@ ACE_TLI::ACE_TLI (void)
 // (jph@ccrl.nj.nec.com) for the help.
 
   this->so_opt_req.opt.maxlen = sizeof (opthdr) + sizeof (long);
-  ACE_NEW (this->so_opt_req.opt.buf,
-           char[this->so_opt_req.opt.maxlen]);
+  ACE_NEW (this->so_opt_req.opt.buf, char[this->so_opt_req.opt.maxlen]);
 
   this->so_opt_ret.opt.maxlen = sizeof (opthdr) + sizeof (long);
   this->so_opt_ret.opt.buf = new char[this->so_opt_ret.opt.maxlen];
diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp
index 17c4612e67e..b6425369a05 100644
--- a/ace/Task_T.cpp
+++ b/ace/Task_T.cpp
@@ -56,8 +56,7 @@ ACE_Task<ACE_SYNCH_USE>::ACE_Task (ACE_Thread_Manager *thr_man,
 
   if (mq == 0)
     {
-      ACE_NEW (mq,
-               ACE_Message_Queue<ACE_SYNCH_USE>);
+      ACE_NEW (mq, ACE_Message_Queue<ACE_SYNCH_USE>);
       this->delete_msg_queue_ = 1;
     }
 
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 560cf96f404..b4210955aa6 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -203,11 +203,7 @@ ACE_Thread_Descriptor::at_exit (void *object,
   else
    {
      ACE_At_Thread_Exit* cleanup;
-     ACE_NEW_RETURN (cleanup,
-                     ACE_At_Thread_Exit_Func (object,
-                                              cleanup_hook,
-                                              param),
-                     -1);
+     ACE_NEW_RETURN (cleanup, ACE_At_Thread_Exit_Func (object,cleanup_hook,param), -1);
      this->at_push (cleanup);
    }
 #endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */
@@ -244,8 +240,7 @@ ACE_Thread_Descriptor::ACE_Thread_Descriptor (void)
   this->cleanup_info_.object_ = 0;
   this->cleanup_info_.param_ = 0;
 #endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */
-  ACE_NEW (this->sync_,
-           ACE_DEFAULT_THREAD_MANAGER_LOCK);
+  ACE_NEW (this->sync_, ACE_DEFAULT_THREAD_MANAGER_LOCK);
 }
 
 void
@@ -339,9 +334,7 @@ ACE_Thread_Manager::instance (void)
 
       if (ACE_Thread_Manager::thr_mgr_ == 0)
         {
-          ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_,
-                          ACE_Thread_Manager,
-                          0);
+          ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_, ACE_Thread_Manager, 0);
           ACE_Thread_Manager::delete_thr_mgr_ = 1;
         }
     }
@@ -450,19 +443,13 @@ ACE_Thread_Exit::instance (void)
 
       if (instance_ == 0)
         {
-           ACE_NEW_RETURN (instance_,
-                           ACE_TSS_TYPE (ACE_Thread_Exit),
-                           0);
+           ACE_NEW_RETURN (instance_, ACE_TSS_TYPE (ACE_Thread_Exit), 0);
 
           // Register for destruction with ACE_Object_Manager.
 #if defined ACE_HAS_SIG_C_FUNC
-          ACE_Object_Manager::at_exit (instance_,
-                                       ACE_Thread_Exit_cleanup,
-                                       0);
+          ACE_Object_Manager::at_exit (instance_, ACE_Thread_Exit_cleanup, 0);
 #else
-          ACE_Object_Manager::at_exit (instance_,
-                                       ACE_Thread_Exit::cleanup,
-                                       0);
+          ACE_Object_Manager::at_exit (instance_, ACE_Thread_Exit::cleanup, 0);
 #endif /* ACE_HAS_SIG_C_FUNC */
         }
     }
@@ -673,9 +660,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   if (t_id == 0)
     {
       char *thr_id;
-      ACE_NEW_RETURN (thr_id,
-                      char[16],
-                      -1);
+      ACE_NEW_RETURN (thr_id, char[16], -1);
       // Mark the thread ID to show that the ACE_Thread_Manager
       // allocated it.
       thr_id[0] = ACE_THR_ID_ALLOCATED;
@@ -857,9 +842,7 @@ ACE_Thread_Manager::append_thr (ACE_thread_t t_id,
   ACE_Thread_Descriptor *thr_desc;
 
   if (td == 0)
-    ACE_NEW_RETURN (thr_desc,
-                    ACE_Thread_Descriptor,
-                    -1);
+    ACE_NEW_RETURN (thr_desc, ACE_Thread_Descriptor, -1);
   else
     thr_desc = td;
 
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index 727afcc0d44..d6d8e2b3921 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -56,16 +56,14 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_E
 {
   ACE_UNUSED_ARG (timer_queue);
 
-  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *,
-                                        ACE_const_cast (void *,
-                                                        arg));
-  int result =
-    this->timer_hash_->upcall_functor ().timeout (*this->timer_hash_,
-                                                  handler,
-                                                  h->act_,
-                                                  cur_time);
+  Hash_Token *h = (Hash_Token *)arg;
+
+  int ret = this->timer_hash_->upcall_functor ().timeout (*this->timer_hash_,
+                                                          handler,
+                                                          h->act_,
+                                                          cur_time);
   delete h;
-  return result;
+  return ret;
 }
 
 
@@ -73,9 +71,9 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_E
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T<ACE_Event_Handler *,
-                                                              ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
-                                                              ACE_Null_Mutex> &timer_queue,
-                                                              ACE_Event_Handler *handler)
+                                                          ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
+                                                          ACE_Null_Mutex> &timer_queue,
+                                                          ACE_Event_Handler *handler)
 {
   ACE_UNUSED_ARG (timer_queue);
   return this->timer_hash_->upcall_functor ().cancellation (*this->timer_hash_,
@@ -87,22 +85,20 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T<
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::deletion (ACE_Timer_Queue_T<ACE_Event_Handler *,
-                                                          ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
-                                                          ACE_Null_Mutex> &timer_queue,
-                                                          ACE_Event_Handler *handler,
-                                                          const void *arg)
+                                                      ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
+                                                      ACE_Null_Mutex> &timer_queue,
+                                                      ACE_Event_Handler *handler,
+                                                      const void *arg)
 {
   ACE_UNUSED_ARG (timer_queue);
 
-  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, 
-                                        ACE_const_cast (void *,
-                                                        arg));
-  int result =
-    this->timer_hash_->upcall_functor ().deletion (*this->timer_hash_,
-                                                   handler,
-                                                   h->act_);
+  Hash_Token *h = (Hash_Token *)arg;
+
+  int ret = this->timer_hash_->upcall_functor ().deletion (*this->timer_hash_,
+                                                           handler,
+                                                           h->act_);
   delete h;
-  return result;
+  return ret;
 }
 
 
@@ -111,7 +107,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &hash)
   : timer_hash_ (hash)
 {
-  this->first ();
+  this->first();
   // Nothing
 }
 
@@ -137,6 +133,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::first (void)
   this->iter_ = 0;
 }
 
+
 // Positions the iterator at the next node in the bucket or goes to the next
 // bucket
 
@@ -167,6 +164,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::next (void)
     this->iter_->next ();
 }
 
+
 // Returns true when we are at the end (when bucket_item_ == 0)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
@@ -175,6 +173,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::isdone (void)
   return this->iter_ == 0;
 }
 
+
 // Returns the node at the current position in the sequence
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> *
@@ -212,14 +211,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (size_t tabl
 
   for (size_t i = 0; i < table_size; i++)
     {
-      ACE_NEW (this->table_[i],
-               BUCKET (&this->table_functor_,
-                       this->free_list_));
+      this->table_[i] = new BUCKET (&this->table_functor_, this->free_list_);
       this->table_[i]->gettimeofday (ACE_OS::gettimeofday);
     }
 
-  ACE_NEW (iterator_,
-           HASH_ITERATOR (*this));
+  iterator_ = new HASH_ITERATOR(*this);
 }
 
 
@@ -239,14 +235,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::ACE_Timer_Hash_T (FUNCTOR *up
 
   for (size_t i = 0; i < this->table_size_; i++)
     {
-      ACE_NEW (this->table_[i],
-               BUCKET (&this->table_functor_,
-                       this->free_list_));
+      this->table_[i] = new BUCKET (&this->table_functor_, this->free_list_);
       this->table_[i]->gettimeofday (ACE_OS::gettimeofday);
     }
 
-  ACE_NEW (iterator_,
-           HASH_ITERATOR (*this));
+  iterator_ = new HASH_ITERATOR(*this);
 }
 
 
@@ -275,6 +268,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::is_empty (void) const
   return this->table_[this->earliest_position_]->is_empty ();
 }
 
+
 // Returns earliest time in a non-empty bucket
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> const ACE_Time_Value &
@@ -298,6 +292,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
+
 // Reschedule a periodic timer.  This function must be called with the
 // mutex lock held.
 
@@ -306,12 +301,9 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T<
 {
   ACE_TRACE ("ACE_Timer_Hash_T::reschedule");
 
-  size_t position =
-    expired->get_timer_value ().usec () % this->table_size_;
+  size_t position = expired->get_timer_value ().usec () % this->table_size_;
 
-  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, 
-                                        ACE_const_cast (void *,
-                                                        expired->get_act ()));
+  Hash_Token *h = (Hash_Token *)expired->get_act ();
 
   h->orig_id_ = this->table_[position]->schedule (expired->get_type (),
                                                   h,
@@ -319,11 +311,11 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T<
                                                   expired->get_interval ());
 
   if (this->table_[this->earliest_position_]->is_empty ()
-      || this->table_[position]->earliest_time () 
-      < this->table_[this->earliest_position_]->earliest_time ())
+      || this->table_[position]->earliest_time () < this->table_[this->earliest_position_]->earliest_time ())
     this->earliest_position_ = position;
 }
 
+
 // Insert a new handler that expires at time future_time; if interval
 // is > 0, the handler will be reinvoked periodically.
 
@@ -338,13 +330,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
 
   size_t position = future_time.usec () % this->table_size_;
 
-  Hash_Token *h;
-  
-  ACE_NEW_RETURN (h,
-                  Hash_Token (act,
-                              position,
-                              0),
-                  -1);
+  Hash_Token *h = new Hash_Token (act, position, 0);
 
   h->orig_id_ = this->table_[position]->schedule (type,
                                                   h,
@@ -357,8 +343,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
 
   ++this->size_;
 
-  return ACE_reinterpret_cast (long,
-                               h);
+  return (long) h;
 }
 
 // Locate and remove the single <ACE_Event_Handler> with a value of
@@ -366,23 +351,20 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id,
-                                                           const void **act,
-                                                           int dont_call)
+                                               const void **act,
+                                               int dont_call)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Make sure we are getting a valid <timer_id>, not an error
-  // returned by <schedule>.
+  // returned by schedule ()
   if (timer_id == -1)
     return 0;
 
-  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *,
-                                        timer_id);
+  Hash_Token *h = (Hash_Token *)timer_id;
 
-  int result = this->table_[h->pos_]->cancel (h->orig_id_,
-                                              act,
-                                              dont_call);
+  int ret = this->table_[h->pos_]->cancel (h->orig_id_, act, dont_call);
 
   if (h->pos_ == this->earliest_position_)
     this->find_new_earliest ();
@@ -394,66 +376,55 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id,
 
   --this->size_;
 
-  return result;
+  return ret;
 }
 
+
 // Locate and remove all values of <type> from the timer queue.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type,
-                                                           int dont_call)
+                                               int dont_call)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::cancel");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
-  size_t i; // loop variable.
-
-  Hash_Token **timer_ids;
+  size_t i; // loop variable
 
-  ACE_NEW_RETURN (timer_ids,
-                  Hash_Token *[this->size_],
-                  -1);
+  Hash_Token **timer_ids = new Hash_Token *[this->size_];
   size_t pos = 0;
 
-  for (i = 0;
-       i < this->table_size_;
-       i++)
+  for (i = 0; i < this->table_size_; i++)
     {
-      ACE_Timer_Queue_Iterator_T<TYPE, ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, ACE_Null_Mutex> &iter =
-        this->table_[i]->iter ();
-
-      for (iter.first ();
-           !iter.isdone ();
-           iter.next ())
+      ACE_Timer_Queue_Iterator_T<TYPE, ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, ACE_Null_Mutex> &iter = this->table_[i]->iter ();
+      for (iter.first (); !iter.isdone (); iter.next ())
         if (iter.item ()->get_type () == type)
-          timer_ids[pos++] = ACE_reinterpret_cast (Hash_Token *,
-                                                   ACE_const_cast (void *,
-                                                                   iter.item ()->get_act ()));
+          timer_ids[pos++] = (Hash_Token *)iter.item ()->get_act ();
     }
 
-  if (pos > this->size_)
-    return -1;
+  ACE_ASSERT (pos <= this->size_);
 
   for (i = 0; i < pos; i++)
     {
-      this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_,
-                                                0,
-                                                1);
+      this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_, 0, 1);
+
       delete timer_ids[i];
+
       --this->size_;
     }
 
   delete [] timer_ids;
 
   if (dont_call == 0)
-    this->upcall_functor ().cancellation (*this, type);
+     this->upcall_functor ().cancellation (*this, type);
 
   this->find_new_earliest ();
 
   return pos;
 }
 
+
 // Removes the earliest node and finds the new earliest position
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> *
@@ -462,8 +433,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::remove_first (void)
   if (this->is_empty ())
     return 0;
 
-  ACE_Timer_Node_T<TYPE> *temp =
-    this->table_[this->earliest_position_]->remove_first ();
+  ACE_Timer_Node_T<TYPE> *temp = this->table_[this->earliest_position_]->remove_first ();
 
   this->find_new_earliest ();
 
@@ -479,12 +449,13 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::find_new_earliest (void)
 {
   for (size_t i = 0; i < this->table_size_; i++)
     if (!this->table_[i]->is_empty ())
-      if (this->table_[this->earliest_position_]->is_empty ()
+      if (this->table_[this->earliest_position_]->is_empty()
           || this->earliest_time () == ACE_Time_Value::zero
           || this->table_[i]->earliest_time () <= this->earliest_time ())
           this->earliest_position_ = i;
 }
 
+
 // Returns the earliest node without removing it
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> ACE_Timer_Node_T<TYPE> *
@@ -498,6 +469,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::get_first (void)
   return this->table_[this->earliest_position_]->get_first ();
 }
 
+
 // Dummy version of expire to get rid of warnings in Sun CC 4.2
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
@@ -506,6 +478,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire ()
   return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire();
 }
 
+
 // Specialized expire for Timer Hash
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
@@ -520,12 +493,10 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value
 
   // Go through the table and expire anything that can be expired
 
-  for (size_t i = 0;
-       i < this->table_size_;
-       i++)
+  for (size_t i = 0; i < this->table_size_; i++)
     {
-      while (!this->table_[i]->is_empty () 
-             && this->table_[i]->earliest_time () <= cur_time)
+      while (!this->table_[i]->is_empty () &&
+             this->table_[i]->earliest_time () <= cur_time)
         {
           expired = this->table_[i]->remove_first ();
           --this->size_;
@@ -539,23 +510,18 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value
               // Make sure that we skip past values that have already
               // "expired".
               do
-                expired->set_timer_value (expired->get_timer_value () 
-                                          + expired->get_interval ());
+                expired->set_timer_value (expired->get_timer_value () + expired->get_interval ());
               while (expired->get_timer_value () <= cur_time);
 
-              // Since this is an interval timer, we need to
-              // reschedule it.
+              // Since this is an interval timer, we need to reschedule
+              // it.
               this->reschedule (expired);
               reclaim = 0;
             }
 
           // call the functor
-          Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, 
-                                                ACE_const_cast (void *,
-                                                                act));
-          this->upcall (type,
-                        h->act_,
-                        cur_time);
+          Hash_Token *h = (Hash_Token *)act;
+          this->upcall (type, h->act_, cur_time);
 
           if (reclaim)
             {
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index f5e223a5eb0..2630c07b9c1 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -17,6 +17,7 @@ ACE_RCSID(ace, Timer_Heap_T, "$Id$")
 #define ACE_HEAP_PARENT(X) (X == 0 ? 0 : (((X) - 1) / 2))
 #define ACE_HEAP_LCHILD(X) (((X)+(X))+1)
 
+
 // Constructor that takes in an <ACE_Timer_Heap_T> to iterate over.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
@@ -32,6 +33,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_Iterator_T (
 {
 }
 
+
 // Positions the iterator at the first node in the heap array
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
@@ -40,6 +42,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void)
   this->position_ = 0;
 }
 
+
 // Positions the iterator at the next node in the heap array
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
@@ -49,6 +52,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void)
     this->position_++;
 }
 
+
 // Returns true the <position_> is at the end of the heap array
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
@@ -57,6 +61,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::isdone (void)
   return this->position_ == this->timer_heap_.cur_size_;
 }
 
+
 // Returns the node at the current position in the heap or 0 if at the end
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
@@ -71,9 +76,9 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size,
-                                                             int preallocate,
-                                                             FUNCTOR *upcall_functor,
-                                                             ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
+                                                         int preallocate,
+                                                         FUNCTOR *upcall_functor,
+                                                         ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
   : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist),
     max_size_ (size),
     cur_size_ (0),
@@ -84,12 +89,10 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size,
   ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T");
 
   // Create the heap array.
-  ACE_NEW (this->heap_,
-           ACE_Timer_Node_T<TYPE> *[size]);
+  ACE_NEW (this->heap_, (ACE_Timer_Node_T<TYPE> *[size]));
 
   // Create the parallel
-  ACE_NEW (this->timer_ids_,
-           long[size]);
+  ACE_NEW (this->timer_ids_, long[size]);
 
   // Initialize the "freelist," which uses negative values to
   // distinguish freelist elements from "pointers" into the <heap_>
@@ -100,10 +103,10 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size,
   if (preallocate)
     {
       ACE_NEW (this->preallocated_nodes_,
-               ACE_Timer_Node_T<TYPE>[size]);
+               (ACE_Timer_Node_T<TYPE>[size]));
 
-      // Add allocated array to set of such arrays for deletion on
-      // cleanup.
+      // Add allocated array to set of such arrays for deletion
+      // on cleanup.
       this->preallocated_node_set_.insert (this->preallocated_nodes_);
 
       // Form the freelist by linking the next_ pointers together.
@@ -118,13 +121,12 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (size_t size,
         &this->preallocated_nodes_[0];
     }
 
-  ACE_NEW (iterator_,
-           HEAP_ITERATOR (*this));
+  iterator_ = new HEAP_ITERATOR(*this);
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_functor,
-                                                             ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
+                                                         ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
   : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist),
     max_size_ (ACE_DEFAULT_TIMERS),
     cur_size_ (0),
@@ -135,30 +137,21 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun
   ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T");
 
   // Create the heap array.
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-    ACE_NEW (this->heap_,
-             ACE_Timer_Node_T<TYPE> *[ACE_DEFAULT_TIMERS]);
-#else
-    ACE_NEW (this->heap_,
-             ACE_Timer_Node_T<TYPE> *[this->max_size_]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
-
-  // Create the parallel array.
-  ACE_NEW (this->timer_ids_,
-           long[this->max_size_]);
+  ACE_NEW (this->heap_, (ACE_Timer_Node_T<TYPE> *[this->max_size_]));
+
+  // Create the parallel
+  ACE_NEW (this->timer_ids_, long[this->max_size_]);
 
   // Initialize the "freelist," which uses negative values to
   // distinguish freelist elements from "pointers" into the <heap_>
   // array.
-  for (size_t i = 0;
-       i < this->max_size_;
-       i++)
+  for (size_t i = 0; i < this->max_size_; i++)
     this->timer_ids_[i] = -((long) (i + 1));
 
-  ACE_NEW (iterator_,
-           HEAP_ITERATOR (*this));
+  iterator_ = new HEAP_ITERATOR(*this);
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
 {
@@ -175,6 +168,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
       this->free_node (this->heap_[i]);
     }
 
+
   delete [] this->heap_;
   delete [] this->timer_ids_;
 
@@ -191,6 +185,9 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
     }
 }
 
+
+
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 {
@@ -198,15 +195,13 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 
   // We need to truncate this to <int> for backwards compatibility.
   int new_id = (int) this->timer_ids_freelist_;
-
   // The freelist values in the <timer_ids_> are negative, so we need
   // to negate them to get the next freelist "pointer."
-  this->timer_ids_freelist_ =
-    -this->timer_ids_[this->timer_ids_freelist_];
-
+  this->timer_ids_freelist_ = -this->timer_ids_[this->timer_ids_freelist_];
   return new_id;
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id)
 {
@@ -236,6 +231,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const
   return this->cur_size_ == 0;
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void)
 {
@@ -245,6 +241,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void)
 
 // Returns earliest time in a non-empty queue.
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value &
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
 {
@@ -252,6 +249,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
   return this->heap_[0]->get_timer_value ();
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
@@ -264,19 +262,14 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 
   for (size_t i = 0; i < this->cur_size_; i++)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%d\n"),
-                  i));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), i));
       this->heap_[i]->dump ();
     }
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntimer_ids_ = \n")));
 
   for (size_t j = 0; j < this->cur_size_; j++)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("%d\t%d\n"),
-                j,
-                this->timer_ids_[j]));
+    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\t%d\n"), j, this->timer_ids_[j]));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
@@ -296,8 +289,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::copy (int slot, ACE_Timer_Node_T<TYPE
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::remove (size_t slot)
 {
-  ACE_Timer_Node_T<TYPE> *removed_node =
-    this->heap_[slot];
+  ACE_Timer_Node_T<TYPE> *removed_node = this->heap_[slot];
 
   // Return this timer id to the freelist.
   this->push_freelist (removed_node->get_timer_id ());
@@ -310,8 +302,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::remove (size_t slot)
 
   if (slot < this->cur_size_)
     {
-      ACE_Timer_Node_T<TYPE> *moved_node =
-        this->heap_[this->cur_size_];
+      ACE_Timer_Node_T<TYPE> *moved_node = this->heap_[this->cur_size_];
 
       // Move the end node to the location being removed and update
       // the corresponding slot in the parallel <timer_ids> array.
@@ -398,6 +389,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::insert (ACE_Timer_Node_T<TYPE> *new_n
   this->cur_size_++;
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 {
@@ -406,27 +398,18 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
    // First grow the heap itself.
 
-  ACE_Timer_Node_T<TYPE> **new_heap = 0;
-
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_NEW (new_heap,
-           ACE_Timer_Node_T<TYPE> *[1024]);
-#else
-  ACE_NEW (new_heap,
-           ACE_Timer_Node_T<TYPE> *[new_size]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
-  ACE_OS::memcpy (new_heap,
-                  this->heap_,
+  ACE_Timer_Node_T<TYPE> **new_heap;
+  ACE_NEW (new_heap, (ACE_Timer_Node_T<TYPE> *[new_size]));
+  ACE_OS::memcpy (new_heap, this->heap_,
                   max_size_ * sizeof *new_heap);
   delete [] this->heap_;
   this->heap_ = new_heap;
 
   // Grow the array of timer ids.
 
-  long *new_timer_ids = 0;
+  long *new_timer_ids;
 
-  ACE_NEW (new_timer_ids, 
-           long[new_size]);
+  ACE_NEW (new_timer_ids, long[new_size]);
 
   ACE_OS::memcpy (new_timer_ids,
                   this->timer_ids_,
@@ -435,7 +418,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
   delete [] timer_ids_;
   this->timer_ids_ = new_timer_ids;
 
-  // And add the new elements to the end of the "freelist".
+  // 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] = -((long) (i + 1));
 
@@ -444,32 +427,25 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
     {
       // Create a new array with max_size elements to link in
       // to existing list.
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-      ACE_NEW (this->preallocated_nodes_,
-               ACE_Timer_Node_T<TYPE>[88]);
-#else
       ACE_NEW (this->preallocated_nodes_,
-               ACE_Timer_Node_T<TYPE>[this->max_size_]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
+               (ACE_Timer_Node_T<TYPE>[this->max_size_]));
 
       // Add it to the set for later deletion
       this->preallocated_node_set_.insert (this->preallocated_nodes_);
 
-      // Link new nodes together (as for original list).
+      // link new nodes together (as for original list).
       for (size_t k = 1; k < this->max_size_; k++)
         this->preallocated_nodes_[k - 1].set_next (&this->preallocated_nodes_[k]);
 
       // NULL-terminate the new list.
       this->preallocated_nodes_[this->max_size_ - 1].set_next (0);
 
-      // Link new array to the end of the existling list.
+      // link new array to the end of the existling list
       if (this->preallocated_nodes_freelist_ == 0)
-        this->preallocated_nodes_freelist_ =
-          &preallocated_nodes_[0];
+        this->preallocated_nodes_freelist_ = &preallocated_nodes_[0];
       else
         {
-          ACE_Timer_Node_T<TYPE> *previous =
-            this->preallocated_nodes_freelist_;
+          ACE_Timer_Node_T<TYPE> *previous = this->preallocated_nodes_freelist_;
 
           for (ACE_Timer_Node_T<TYPE> *current = this->preallocated_nodes_freelist_->get_next ();
                current != 0;
@@ -492,29 +468,30 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *e
   ACE_TRACE ("ACE_Timer_Heap::reschedule");
 
   // If we are rescheduling then we have freed our timer id so we need
-  // to reacquire it.  NOTE: we rely on the fact that we will get the
-  // same timer id we just freed.
+  // to reacquire it.
+  // NOTE: we rely on the fact that we will get the same timer id we just
+  // freed.
 # if !defined (ACE_NDEBUG)
   int timerId =
 # endif /* ACE_NDEBUG */
     this->timer_id ();
 
-  // Just to be safe...
-  ACE_ASSERT (timerId == expired->get_timer_id ());   
+  ACE_ASSERT(timerId == expired->get_timer_id ());   // Just to be safe...
 
   // Restore the heap property.
   this->insert (expired);
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::alloc_node (void)
 {
-  ACE_Timer_Node_T<TYPE> *temp = 0;
+  ACE_Timer_Node_T<TYPE> *temp;
 
   // Only allocate a node if we are *not* using the preallocated heap.
   if (this->preallocated_nodes_ == 0)
     ACE_NEW_RETURN (temp,
-                    ACE_Timer_Node_T<TYPE>,
+                    (ACE_Timer_Node_T<TYPE>),
                     0);
   else
     {
@@ -531,6 +508,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::alloc_node (void)
   return temp;
 }
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::free_node (ACE_Timer_Node_T<TYPE> *node)
 {
@@ -547,11 +525,12 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::free_node (ACE_Timer_Node_T<TYPE> *no
 // Insert a new timer that expires at time future_time; if interval is
 // > 0, the handler will be reinvoked periodically.
 
+
 template <class TYPE, class FUNCTOR, class ACE_LOCK> long
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
-                                                     const void *act,
-                                                     const ACE_Time_Value &future_time,
-                                                     const ACE_Time_Value &interval)
+                                                 const void *act,
+                                                 const ACE_Time_Value &future_time,
+                                                 const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Timer_Heap::schedule");
 
@@ -563,22 +542,24 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
       int timer_id = this->timer_id ();
 
       // Obtain the memory to the new node.
-      ACE_Timer_Node_T<TYPE> *temp = 0;
-
-      ACE_ALLOCATOR_RETURN (temp,
-                            this->alloc_node (),
-                            -1);
-      temp->set (type,
-                 act,
-                 future_time,
-                 interval,
-                 0,
-                 timer_id);
-      this->insert (temp);
-      return timer_id;
+      ACE_Timer_Node_T<TYPE> *temp = this->alloc_node ();
+
+      if (temp)
+        {
+          temp->set (type,
+                     act,
+                     future_time,
+                     interval,
+                     0,
+                     timer_id);
+
+          this->insert (temp);
+          return timer_id;
+        }
     }
-  else
-    return -1;
+  // Failure return.
+  errno = ENOMEM;
+  return -1;
 }
 
 // Locate and remove the single timer with a value of <timer_id> from
@@ -595,7 +576,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
   // Locate the ACE_Timer_Node that corresponds to the timer_id.
 
   // Check to see if the timer_id is out of range
-  if (timer_id < 0 || (size_t) timer_id > this->max_size_)
+  if (timer_id < 0 || (size_t)timer_id > this->max_size_)
     return 0;
 
   long timer_node_slot = this->timer_ids_[timer_id];
@@ -657,6 +638,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
   return number_of_cancellations;
 }
 
+
 // Returns the earliest node or returns 0 if the heap is empty.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T <TYPE> *
@@ -675,7 +657,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void)
 {
   ACE_TRACE ("ACE_Timer_Heap_T::get_first");
 
-  return this->cur_size_ == 0 ? 0 : this->heap_[0];
+  return this->cur_size_ == 0  ?  0  :  this->heap_[0];
 }
 
 #endif /* ACE_TIMER_HEAP_T_C */
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index 2b9176d9589..73aba79ea01 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -86,8 +86,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_List_T (FUNCTOR *upcall_fun
   this->head_->set_next (this->head_);
   this->head_->set_prev (this->head_);
 
-  ACE_NEW (iterator_,
-           LIST_ITERATOR (*this));
+  iterator_ = new LIST_ITERATOR(*this);
 }
 
 
@@ -212,6 +211,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
   return (long) temp;
 }
 
+
 // Locate and remove the single <ACE_Event_Handler> with a value of
 // <timer_id> from the timer queue.
 
diff --git a/ace/Timer_Queue.i b/ace/Timer_Queue.i
deleted file mode 100644
index 41e4324e61e..00000000000
--- a/ace/Timer_Queue.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- */
-
-template <class TYPE, class FUNCTOR> ACE_INLINE void
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew)
-{
-  timer_skew_ = skew;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const
-{
-  return timer_skew_;
-}
-
-template <class TYPE, class FUNCTOR> ACE_INLINE int
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void)
-{
-  if (!this->is_empty ())
-    return this->expire (this->gettimeofday () + timer_skew_);
-  else
-    return 0;
-}
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index ff1557b2660..c654cd7d616 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -40,11 +40,10 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void)
        this->pos_++)
     {
       // Skip over empty entries
-      if (this->timer_wheel_.wheel_[this->pos_]->get_next () 
-          != this->timer_wheel_.wheel_[this->pos_])
+      if (this->timer_wheel_.wheel_[this->pos_]->get_next () !=
+            this->timer_wheel_.wheel_[this->pos_])
         {
-          this->list_item_ =
-            this->timer_wheel_.wheel_[this->pos_]->get_next ();
+          this->list_item_ = this->timer_wheel_.wheel_[this->pos_]->get_next ();
           return;
         }
     }
@@ -53,6 +52,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::first (void)
   this->list_item_ = 0;
 }
 
+
 // Positions the iterator at the next node in list or goes to the next
 // list
 
@@ -62,22 +62,18 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void)
   if (this->isdone ())
     return;
 
-  this->list_item_ =
-    this->list_item_->get_next ();
+  this->list_item_ = this->list_item_->get_next ();
 
   // If there is no more in the current list, go to the next
   if (this->list_item_ == this->timer_wheel_.wheel_[this->pos_])
     {
-      for (this->pos_++;
-           this->pos_ < this->timer_wheel_.wheel_size_;
-           this->pos_++)
+      for (this->pos_++; this->pos_ < this->timer_wheel_.wheel_size_; this->pos_++)
         {
           // Check for an empty entry
-          if (this->timer_wheel_.wheel_[this->pos_]->get_next () 
-              != this->timer_wheel_.wheel_[this->pos_])
+          if (this->timer_wheel_.wheel_[this->pos_]->get_next () !=
+                this->timer_wheel_.wheel_[this->pos_])
             {
-              this->list_item_ =
-                this->timer_wheel_.wheel_[this->pos_]->get_next ();
+              this->list_item_ = this->timer_wheel_.wheel_[this->pos_]->get_next ();
               return;
             }
         }
@@ -86,6 +82,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::next (void)
     }
 }
 
+
 // Returns true when we are at the end (when list_item_ == 0)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
@@ -94,6 +91,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::isdone (void)
   return this->list_item_ == 0;
 }
 
+
 // Returns the node at the current position in the sequence
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
@@ -105,8 +103,9 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void)
   return this->list_item_;
 }
 
-// Constructor that sets up the timing wheel and also may preallocate
-// some nodes on the free list
+
+// Constructor that sets up the timing wheel and also may preallocate some
+// nodes on the free list
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize,
@@ -125,14 +124,13 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize,
   this->gettimeofday (ACE_OS::gettimeofday);
 
   // Create the timing wheel
-  ACE_NEW (this->wheel_,
-           ACE_Timer_Node_T<TYPE> *[wheelsize]);
+  ACE_NEW (this->wheel_, (ACE_Timer_Node_T<TYPE> *[wheelsize]));
+
 
   // Create the dummy nodes
   for (i = 0; i < wheelsize; i++)
     {
-      ACE_Timer_Node_T<TYPE> *tempnode =
-        this->alloc_node ();
+      ACE_Timer_Node_T<TYPE> *tempnode = this->alloc_node ();
       tempnode->set_next (tempnode);
       tempnode->set_prev (tempnode);
       this->wheel_[i] = tempnode;
@@ -141,13 +139,12 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (size_t wheelsize,
   // Do the preallocation
   this->free_list_->resize (prealloc);
 
-  ACE_NEW (iterator_,
-           WHEEL_ITERATOR (*this));
+  iterator_ = new WHEEL_ITERATOR(*this);
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_functor,
-                                                               ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
+                                                           ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist)
   : ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK> (upcall_functor, freelist),
     wheel_size_ (ACE_DEFAULT_TIMER_WHEEL_SIZE),
     resolution_ (ACE_DEFAULT_TIMER_WHEEL_RESOLUTION),
@@ -159,8 +156,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_f
   this->gettimeofday (ACE_OS::gettimeofday);
 
   // Create the timing wheel
-  ACE_NEW (this->wheel_,
-           ACE_Timer_Node_T<TYPE> *[this->wheel_size_]);
+  ACE_NEW (this->wheel_, (ACE_Timer_Node_T<TYPE> *[this->wheel_size_]));
 
   // Create the dummy nodes
   for (i = 0; i < this->wheel_size_; i++)
@@ -171,8 +167,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Wheel_T (FUNCTOR *upcall_f
       this->wheel_[i] = tempnode;
     }
 
-  ACE_NEW (iterator_,
-           WHEEL_ITERATOR (*this));
+  iterator_ = new WHEEL_ITERATOR(*this);
 }
 
 // Destructor just cleans up its memory
@@ -184,20 +179,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Wheel_T (void)
 
   delete iterator_;
 
-  for (size_t i = 0;
-       i < this->wheel_size_;
-       i++)
+  for (size_t i = 0; i < this->wheel_size_; i++)
     {
       // delete nodes until only the dummy node is left
       while (this->wheel_[i]->get_next () != this->wheel_[i])
         {
-          ACE_Timer_Node_T<TYPE> *next =
-            this->wheel_[i]->get_next ();
+          ACE_Timer_Node_T<TYPE> *next = this->wheel_[i]->get_next ();
           this->wheel_[i]->set_next (next->get_next ());
           next->get_next ()->set_prev (this->wheel_[i]);
-          this->upcall_functor ().deletion (*this,
-                                            next->get_type (),
-                                            next->get_act ());
+          this->upcall_functor ().deletion (*this, next->get_type (), next->get_act ());
           this->free_node (next);
         }
 
@@ -209,6 +199,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Wheel_T (void)
   delete [] this->wheel_;
 }
 
+
 // Checks to see if <earliest_pos> points to a empty list (then it is empty)
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
@@ -219,6 +210,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const
   return this->wheel_[this->earliest_pos_]->get_next () == this->wheel_[this->earliest_pos_];
 }
 
+
 // Returns the first (earliest) node in the <wheel_>'s <earliest_pos_> list
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value &
@@ -232,8 +224,8 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
     return this->wheel_[this->earliest_pos_]->get_next ()->get_timer_value ();
 }
 
-// Create the node and pass it to reschedule.  Also check to see if
-// the <earliest_pos> should be changed.
+// Create the node and pass it to reschedule.  Also check to see if the
+// <earliest_pos> should be changed.
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> long
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
@@ -270,12 +262,13 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
   return -1;
 }
 
+
 // Goes through every list in the wheel and if it finds a node with <type>
 // then it removes the node and continues on looking for other nodes
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
-                                                    int dont_call_handle_close)
+                                                int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
@@ -306,14 +299,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
               this->free_node (tempnode);
             }
           else
-            curr = curr->get_next ();
+            {
+              curr = curr->get_next ();
+            }
         }
     }
 
   //  Look for a new earliest time
 
-  // Defaults to zero.
-  ACE_Time_Value earliest_time; 
+  ACE_Time_Value earliest_time; // defaults to zero
 
   // Check every entry in the table
   for (i = 0; i < this->wheel_size_; i++)
@@ -325,37 +319,36 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
           if (earliest_time == ACE_Time_Value::zero
               || this->wheel_[i]->get_timer_value () < earliest_time)
             {
-              earliest_time =
-                this->wheel_[i]->get_next ()->get_timer_value ();
+              earliest_time = this->wheel_[i]->get_next ()->get_timer_value ();
               this->earliest_pos_ = i;
             }
         }
     }
 
   if (dont_call_handle_close == 0)
-    this->upcall_functor ().cancellation (*this,
-                                          type);
+    this->upcall_functor ().cancellation (*this, type);
+
   return number_of_cancellations;
 }
 
+
 // Takes the <timer_id> and casts it to a pointer.  Then it removes it
 // from its neighbors
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
-                                                    const void **act,
-                                                    int dont_call_handle_close)
+                                                const void **act,
+                                                int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Make sure we are getting a valid <timer_id>, not an error
-  // returned by <schedule>.
+  // returned by schedule ()
   if (timer_id == -1)
     return 0;
 
-  ACE_Timer_Node_T<TYPE> *node =
-    (ACE_Timer_Node_T<TYPE> *) timer_id;
+  ACE_Timer_Node_T<TYPE> *node = (ACE_Timer_Node_T<TYPE> *) timer_id;
 
   // Check to see if the node looks like a true ACE_Timer_Node_T<TYPE>
   if (timer_id == node->get_timer_id ())
@@ -367,10 +360,9 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
         *act = node->get_act ();
 
       if (dont_call_handle_close == 0)
-        this->upcall_functor ().cancellation (*this,
-                                              node->get_type ());
+        this->upcall_functor ().cancellation (*this, node->get_type ());
 
-      // Find out what position it is in.
+      // Find out what position it is in
       size_t pos = (node->get_timer_value ().usec () / this->resolution_) % this->wheel_size_;
 
       this->free_node (node);
@@ -391,8 +383,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
                   if (earliest_time == ACE_Time_Value::zero
                       || this->wheel_[i]->get_timer_value () < earliest_time)
                     {
-                      earliest_time =
-                        this->wheel_[i]->get_next ()->get_timer_value ();
+                      earliest_time = this->wheel_[i]->get_next ()->get_timer_value ();
                       this->earliest_pos_ = i;
                     }
                 }
@@ -406,6 +397,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
   return 0;
 }
 
+
 // Dumps out some properties of this object
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
@@ -432,6 +424,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
+
 // Removes the earliest node and then find the new <earliest_pos_>
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
@@ -440,8 +433,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void)
   ACE_TRACE ("ACE_Timer_Wheel_T::remove_first");
 
   // Remove the item
-  ACE_Timer_Node_T<TYPE> *temp =
-    this->wheel_[this->earliest_pos_]->get_next ();
+  ACE_Timer_Node_T<TYPE> *temp = this->wheel_[this->earliest_pos_]->get_next ();
   temp->get_prev ()->set_next (temp->get_next ());
   temp->get_next ()->set_prev (temp->get_prev ());
 
@@ -457,16 +449,17 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void)
           if (earliest_time == ACE_Time_Value::zero
               || this->wheel_[i]->get_timer_value () < earliest_time)
             {
-              earliest_time =
-                this->wheel_[i]->get_next ()->get_timer_value ();
+              earliest_time = this->wheel_[i]->get_next ()->get_timer_value ();
               this->earliest_pos_ = i;
             }
         }
     }
 
+
   return temp;
 }
 
+
 // Returns the earliest node without removing it
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> *
@@ -477,26 +470,25 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void)
   return this->wheel_[this->earliest_pos_]->get_next ();
 }
 
-// Takes an ACE_Timer_Node and inserts it into the correct position in
-// the correct list.
+
+// Takes an ACE_Timer_Node and inserts it into the correct position in the correct
+// list
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *expired)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::reschedule");
 
-  size_t pos =
-    (expired->get_timer_value ().usec () / this->resolution_) % this->wheel_size_;
+  size_t pos = (expired->get_timer_value ().usec () / this->resolution_) % this->wheel_size_;
 
   // See if we need to update the earliest time
   if (this->earliest_time () == ACE_Time_Value::zero
       || expired->get_timer_value () < this->earliest_time ())
     this->earliest_pos_ = pos;
 
-  // Insert time into dummy node.
+  // Insert time into dummy node
   this->wheel_[pos]->set_timer_value (expired->get_timer_value ());
-  ACE_Timer_Node_T<TYPE> *cursor =
-    this->wheel_[pos]->get_next ();
+  ACE_Timer_Node_T<TYPE> *cursor = this->wheel_[pos]->get_next ();
 
   // Find position to insert
   while (cursor->get_timer_value () < expired->get_timer_value ())
@@ -509,6 +501,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *
   expired->get_prev ()->set_next (expired);
 }
 
+
 // Just return the iterator
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &
@@ -526,11 +519,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ()
   return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire ();
 }
 
-// Specialized expire which expires in total order.  It is optimized
-// by keeping track of the list with the earliest element and the next
-// earliest list.  It then goes through the earliest list until it can
-// switch to the second list.  it keeps going until it finishes with
-// everything before the <cur_time>
+
+// Specialized expire which expires in total order.  It is optimized by keeping
+// track of the list with the earliest element and the next earliest list.  It
+// then goes through the earliest list until it can switch to the second list.
+// it keeps going until it finishes with everything before the <cur_time>
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_time)
@@ -577,14 +570,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti
             }
         }
 
-      while (this->wheel_[earliest]->get_next () 
-             != this->wheel_[earliest]
-             && this->wheel_[earliest]->get_next ()->get_timer_value () 
-             <= next_earliest_time)
+      while (this->wheel_[earliest]->get_next () != this->wheel_[earliest]
+                     && this->wheel_[earliest]->get_next ()->get_timer_value () <= next_earliest_time)
         {
           // Remove the first node in the earliest position
-          ACE_Timer_Node_T<TYPE> *expired =
-            this->wheel_[earliest]->get_next ();
+          ACE_Timer_Node_T<TYPE> *expired = this->wheel_[earliest]->get_next ();
           this->wheel_[earliest]->set_next (expired->get_next ());
           expired->get_next ()->set_prev (this->wheel_[earliest]);
 
@@ -601,22 +591,22 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti
                 expired->set_timer_value (expired->get_timer_value () + expired->get_interval ());
               while (expired->get_timer_value () <= cur_time);
 
-              // Since this is an interval timer, we need to
-              // reschedule it.
+              // Since this is an interval timer, we need to reschedule
+              // it.
               this->reschedule (expired);
               reclaim = 0;
             }
 
-          // Call the functor.
+          // call the functor
           this->upcall (type, act, cur_time);
 
           if (reclaim)
-            // Free up the node and the token.
+            // Free up the node and the token
             this->free_node (expired);
 
           ++number_of_timers_expired;
 
-          // Check to see if we are empty.
+          // Check to see if we are empty
           if (this->wheel_[earliest]->get_next () == this->wheel_[earliest])
             break;
         }
@@ -630,4 +620,5 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_ti
   return number_of_timers_expired;
 }
 
+
 #endif /* ACE_TIMER_WHEEL_T_C */
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index d7317b1f590..e275942ea22 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -11,20 +11,20 @@
 ACE_RCSID(ace, Token_Collection, "$Id$")
 
 ACE_Token_Collection::ACE_Token_Collection (int debug,
-					    const ASYS_TCHAR *name)
+					    const char *name)
 : debug_ (debug)
 {
   ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection");
 
   if (name == 0)
-    name = ASYS_TEXT ("no name");
+    name = "no name";
 
   int n = ACE_OS::strlen (name) + 1;
 
   if (n >= ACE_MAXTOKENNAMELEN)
     n = ACE_MAXTOKENNAMELEN - 1;
 
-  ACE_OS::strncpy (this->name_, ACE_const_cast (ASYS_TCHAR*, name), n);
+  ACE_OS::strncpy (this->name_, (char *) name, n);
   this->name_[ACE_MAXTOKENNAMELEN - 1] = '\0';
 }
 
@@ -44,12 +44,12 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token)
   ACE_Token_Proxy *temp = new_token.clone ();
 
   if (collection_.bind (name, temp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("bind failed\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "bind failed\n"), -1);
   return 0;
 }
 
 int
-ACE_Token_Collection::extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&proxy)
+ACE_Token_Collection::extract (const char *token_name, ACE_Token_Proxy *&proxy)
 {
   ACE_TRACE ("ACE_Token_Collection::extract");
   TOKEN_NAME name (token_name);
@@ -57,7 +57,7 @@ ACE_Token_Collection::extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&p
 }
 
 ACE_Token_Proxy *
-ACE_Token_Collection::is_member (const ASYS_TCHAR *token_name)
+ACE_Token_Collection::is_member (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Collection::is_member");
   TOKEN_NAME name (token_name);
@@ -106,7 +106,7 @@ ACE_Token_Collection::acquire (int notify,
 }
 
 int
-ACE_Token_Collection::acquire (const ASYS_TCHAR *token_name,
+ACE_Token_Collection::acquire (const char *token_name,
 			       int notify,
 			       void (*sleep_hook)(void *),
 			       ACE_Synch_Options &options)
@@ -125,7 +125,7 @@ ACE_Token_Collection::acquire (const ASYS_TCHAR *token_name,
 
 
 int
-ACE_Token_Collection::tryacquire (const ASYS_TCHAR *token_name,
+ACE_Token_Collection::tryacquire (const char *token_name,
 				  void (*sleep_hook)(void *))
 {
   ACE_TRACE ("ACE_Token_Collection::tryacquire");
@@ -186,7 +186,7 @@ ACE_Token_Collection::renew (int requeue_position,
 }
 
 int
-ACE_Token_Collection::renew (const ASYS_TCHAR *token_name,
+ACE_Token_Collection::renew (const char *token_name,
 			     int requeue_position,
 			     ACE_Synch_Options &options)
 {
@@ -199,8 +199,8 @@ ACE_Token_Collection::renew (const ASYS_TCHAR *token_name,
 
   // Did we find it?
   if (result == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p %s\n"),
-		       ASYS_TEXT ("not in collection "),
+    ACE_ERROR_RETURN ((LM_DEBUG, "%p %s\n",
+		       "not in collection ",
 		       token_name), -1);
   // perform the operation
   return temp->renew (requeue_position, options);
@@ -227,7 +227,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &)
 }
 
 int
-ACE_Token_Collection::release (const ASYS_TCHAR *token_name,
+ACE_Token_Collection::release (const char *token_name,
 			       ACE_Synch_Options &options)
 {
   ACE_TRACE ("ACE_Token_Collection::release");
@@ -268,7 +268,7 @@ ACE_Token_Collection::clone (void) const
 
 // This method doesn't mean anything for a collection.
 ACE_Tokens *
-ACE_Token_Collection::create_token (const ASYS_TCHAR *)
+ACE_Token_Collection::create_token (const char *)
 {
   ACE_TRACE ("ACE_Token_Collection::create_token");
   return (ACE_Tokens *) 0;
@@ -280,7 +280,7 @@ ACE_Token_Collection::dump (void) const
   ACE_TRACE ("ACE_Token_Collection::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("ACE_Token_Collection::dump:\n")
-              ASYS_TEXT (" debug_ = %d\n"), debug_));
+			" debug_ = %d\n", debug_));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("collection_\n")));
   collection_.dump ();
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("base:\n")));
@@ -301,3 +301,4 @@ template class ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>;
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 075cee8757d..ecc02f2231b 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -59,7 +59,7 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy
   //   returns zero for now.
 public:
   ACE_Token_Collection (int debug = 0,
-                        const ASYS_TCHAR *name = 0);
+                        const char *name = 0);
   // <debug> print out verbose debugging messages. <name> will give a
   // name to the collection.  Collections don't really need names, but
   // are sometimes useful for debugging.
@@ -79,14 +79,14 @@ public:
   // thread using the collection will be used.  Client ID's can be
   // changed explicity on each proxy using is_member.
 
-  int extract (const ASYS_TCHAR *token_name, ACE_Token_Proxy *&proxy);
+  int extract (const char *token_name, ACE_Token_Proxy *&proxy);
   // removes the ACE_Token matching the given token_name from the
   // collection.  On success, extract returns 0. On failure
   // (token_name was not in the collection,) extract returns -1.  On
   // success, the state of the token found is copied into proxy.
   // The returned ACE_Token_Proxy* must be deleted by the user.
 
-  ACE_Token_Proxy *is_member (const ASYS_TCHAR *token_name);
+  ACE_Token_Proxy *is_member (const char *token_name);
   // returns the proxy if true.  0 otherwise.
 
   int is_member (const ACE_Token_Proxy &token);
@@ -124,7 +124,7 @@ public:
   // words, once the collection reports deadlock, it is out of our
   // hands.
 
-  virtual int acquire (const ASYS_TCHAR *token_name,
+  virtual int acquire (const char *token_name,
                        int notify = 0,
                        void (*sleep_hook)(void *) = 0,
                        ACE_Synch_Options &options =
@@ -135,7 +135,7 @@ public:
   virtual int tryacquire (void (*sleep_hook)(void *) = 0);
   // Try to acquire all tokens in collection.
 
-  virtual int tryacquire (const ASYS_TCHAR *token_name,
+  virtual int tryacquire (const char *token_name,
                           void (*sleep_hook)(void *) = 0);
   // Try to acquire <token_name>.
 
@@ -149,7 +149,7 @@ public:
   // problem.
 
 
-  virtual int renew (const ASYS_TCHAR *token_name,
+  virtual int renew (const char *token_name,
                      int requeue_position = 0,
                      ACE_Synch_Options &options =
                      ACE_Synch_Options::defaults);
@@ -165,7 +165,7 @@ public:
   // problem.
 
 
-  virtual int release (const ASYS_TCHAR *token_name,
+  virtual int release (const char *token_name,
                        ACE_Synch_Options &options =
                        ACE_Synch_Options::defaults);
   // Release the token corresponding to <token_name>.  The other
@@ -176,7 +176,7 @@ public:
   void dump (void) const;
   // Dump the state of the class.
 
-  virtual const ASYS_TCHAR *name (void) const;
+  virtual const char *name (void) const;
   // Return the name of the collection.  Not very functionally
   // important, but sometimes a useful debugging tool.
 
@@ -202,13 +202,13 @@ protected:
   int debug_;
   // Whether to print out debug messages or not.
 
-  ASYS_TCHAR name_[ACE_MAXTOKENNAMELEN];
+  char name_[ACE_MAXTOKENNAMELEN];
   // Name of the collection.
 
   // = I'm not sure what these mean, but they have to be defined since they're
   //   pure virtual in ACE_Token_Proxy.
   virtual ACE_Token_Proxy *clone (void) const;
-  virtual ACE_Tokens *create_token (const ASYS_TCHAR *name);
+  virtual ACE_Tokens *create_token (const char *name);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Token_Collection.i b/ace/Token_Collection.i
index b10735660bc..f871206c4d8 100644
--- a/ace/Token_Collection.i
+++ b/ace/Token_Collection.i
@@ -3,8 +3,9 @@
 
 // Token_Collection.i
 
-ACE_INLINE const ASYS_TCHAR *
+ACE_INLINE const char *
 ACE_Token_Collection::name (void) const
 {
   return name_;
 }
+
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp
index c9d093664a1..cf98e79c21d 100644
--- a/ace/Token_Invariants.cpp
+++ b/ace/Token_Invariants.cpp
@@ -28,9 +28,8 @@ ACE_Token_Invariant_Manager::instance (void)
 
       if (instance_ == 0)
         {
-          ACE_NEW_RETURN (instance_,
-                          ACE_Token_Invariant_Manager,
-                          0);
+          ACE_NEW_RETURN (instance_, ACE_Token_Invariant_Manager, 0);
+
           // Register for destruction with ACE_Object_Manager.
           ACE_Object_Manager::at_exit (instance_);
         }
@@ -45,7 +44,7 @@ ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void)
 }
 
 int
-ACE_Token_Invariant_Manager::mutex_acquired (const ASYS_TCHAR *token_name)
+ACE_Token_Invariant_Manager::mutex_acquired (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_acquired");
 
@@ -88,7 +87,7 @@ ACE_Token_Invariant_Manager::releasing (const ACE_Token_Proxy *proxy)
 }
 
 void
-ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name)
+ACE_Token_Invariant_Manager::mutex_releasing (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_releasing");
   ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_);
@@ -99,7 +98,7 @@ ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name)
 }
 
 int
-ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name)
+ACE_Token_Invariant_Manager::reader_acquired (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::reader_acquired");
   ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1);
@@ -112,7 +111,7 @@ ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name)
 }
 
 int
-ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name)
+ACE_Token_Invariant_Manager::writer_acquired (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::writer_acquired");
 
@@ -126,7 +125,7 @@ ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name)
 }
 
 void
-ACE_Token_Invariant_Manager::rwlock_releasing (const ASYS_TCHAR *token_name)
+ACE_Token_Invariant_Manager::rwlock_releasing (const char *token_name)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::rwlock_releasing");
 
@@ -151,7 +150,7 @@ ACE_Token_Invariant_Manager::dump (void) const
 
 
 int
-ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name,
+ACE_Token_Invariant_Manager::get_mutex (const char *token_name,
                                         ACE_Mutex_Invariants *&inv)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::get_mutex");
@@ -161,9 +160,8 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name,
     {
       ACE_Mutex_Invariants *new_invariant;
 
-      ACE_NEW_RETURN (new_invariant,
-                      ACE_Mutex_Invariants,
-                      -1);
+      ACE_NEW_RETURN (new_invariant, ACE_Mutex_Invariants, -1);
+
       if (mutex_collection_.bind (name, new_invariant) == -1)
         {
           delete new_invariant;
@@ -179,7 +177,7 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name,
 }
 
 int
-ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name,
+ACE_Token_Invariant_Manager::get_rwlock (const char *token_name,
                                          ACE_RWLock_Invariants *&inv)
 {
   ACE_TRACE ("ACE_Token_Invariant_Manager::get_rwlock");
@@ -189,9 +187,8 @@ ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name,
     {
       ACE_RWLock_Invariants *new_invariant;
 
-      ACE_NEW_RETURN (new_invariant,
-                      ACE_RWLock_Invariants,
-                      -1);
+      ACE_NEW_RETURN (new_invariant, ACE_RWLock_Invariants, -1);
+
       if (rwlock_collection_.bind (name, new_invariant) == -1)
         return -1;
 
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index 1ad9aacf5e4..8dc667a9d47 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -138,22 +138,22 @@ public:
   // = Explicit methods.  These to not require actual proxies in order
   // to test a scenario.
 
-  int mutex_acquired (const ASYS_TCHAR *token_name);
+  int mutex_acquired (const char *token_name);
   // Returns 1 on success, 0 when an invariant has been violated and
   // -1 on error.
 
-  void mutex_releasing (const ASYS_TCHAR *token_name);
+  void mutex_releasing (const char *token_name);
   // Updates internal database.
 
-  int reader_acquired (const ASYS_TCHAR *token_name);
+  int reader_acquired (const char *token_name);
   // Returns 1 on success, 0 when an invariant has been violated and
   // -1 on error.
 
-  int writer_acquired (const ASYS_TCHAR *token_name);
+  int writer_acquired (const char *token_name);
   // Returns 1 on success, 0 when an invariant has been violated and
   // -1 on error.
 
-  void rwlock_releasing (const ASYS_TCHAR *token_name);
+  void rwlock_releasing (const char *token_name);
   // Updates internal database.
 
   void dump (void) const;
@@ -168,11 +168,11 @@ public:
   // Destruction.
 
 protected:
-  int get_mutex (const ASYS_TCHAR *token_name,
+  int get_mutex (const char *token_name,
                  ACE_Mutex_Invariants *&inv);
   // Return or create.
 
-  int get_rwlock (const ASYS_TCHAR *token_name,
+  int get_rwlock (const char *token_name,
                   ACE_RWLock_Invariants *&inv);
   // Return or create.
 
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index 6d49239debd..d202bae2006 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -54,9 +54,8 @@ ACE_Token_Manager::instance (void)
 
       if (token_manager_ == 0)
         {
-          ACE_NEW_RETURN (token_manager_,
-                          ACE_Token_Manager,
-                          0);
+          ACE_NEW_RETURN (token_manager_, ACE_Token_Manager, 0);
+
           // Register for destruction with ACE_Object_Manager.
           ACE_Object_Manager::at_exit (token_manager_);
         }
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index e88f40e6505..a74e0d61348 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -72,15 +72,11 @@ ACE_Token_Request::decode (void)
   else // Skip this->tokenName_ + '\0' + ':'.
     this->client_id_ = &this->token_name_[token_len + 2];
 
-  // Fixed size header
-  // token_name_ plus '\0'
-  // ':'
-  // client_id_ plus '\0'
-  size_t data_size = ACE_TOKEN_REQUEST_HEADER_SIZE
-                     + ACE_OS::strlen (this->token_name_) + 1 
-		     + ACE_OS::strlen (this->client_id_) + 1  
-		     + 1;	                     
-
+  size_t data_size = ((sizeof this->transfer_ 
+		      - sizeof this->transfer_.data_)  // Fixed-size header.
+		     + ACE_OS::strlen (this->token_name_) + 1 // this->tokenName_ + '\0'
+		     + ACE_OS::strlen (this->client_id_) + 1  // this->clientId_ + '\0'
+		     + 1);	                       // Space for ':'
   // Make sure the message was correctly received and framed.
   return this->length () == data_size ? 0 : -1;
 }
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index d08a5a74df5..072842c23cf 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -30,10 +30,6 @@
 
 #include "ace/Time_Value.h"
 
-// Specifies the size of the fixed length portion of
-// the Transfer structure in ACE_Token_Request
-#define ACE_TOKEN_REQUEST_HEADER_SIZE 40
-
 class ACE_Export ACE_Token_Request
 {
   // = TITLE
@@ -156,9 +152,9 @@ private:
     ACE_UINT32 arg_;
     // value returned in Token_Reply::arg ();
 
-    char data_[ACE_MAXTOKENNAMELEN + ACE_MAXCLIENTIDLEN + 3];
-    // The data portion contains the <tokenName_> including a 0 terminator,
-    // a ':', then the <clientId> including a 0 terminator
+    char data_[ACE_MAXTOKENNAMELEN + ACE_MAXCLIENTIDLEN + 1];
+    // The data portion contains the <tokenName_> followed by a ':'
+    // followed by the <clientId_>.
   } transfer_;
 
   char *token_name_;
diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.i
index b58f0b89d3a..66428003359 100644
--- a/ace/Token_Request_Reply.i
+++ b/ace/Token_Request_Reply.i
@@ -129,9 +129,9 @@ ACE_Token_Request::token_name (const char *token_name, const char *client_id)
   (void) ACE_OS::memcpy (token_name_, token_name, token_name_length);
   (void) ACE_OS::memcpy (client_id_, client_id, client_id_length);
 
-  // Fixed length header size
-  size_t len = ACE_TOKEN_REQUEST_HEADER_SIZE;
-
+  // Compute size of the fixed portion of the message...
+  size_t len = sizeof this->transfer_ - sizeof this->transfer_.data_;
+  
   // ... then add in the amount of the variable-sized portion. 
   len += token_name_length + client_id_length + 1;
 
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 6d6349cba81..91bcaf945d3 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -34,13 +34,13 @@ ACE_UNIX_Addr::dump (void) const
 // Do nothing constructor. 
 
 ACE_UNIX_Addr::ACE_UNIX_Addr (void)
-  : ACE_Addr (AF_UNIX, sizeof this->unix_addr_)
 {
   (void) ACE_OS::memset ((void *) &this->unix_addr_,
                          0,
                          sizeof this->unix_addr_);
 
   this->unix_addr_.sun_family = AF_UNIX;
+  this->base_set (AF_UNIX, sizeof this->unix_addr_);
 }
 
 int
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp
index c102e6d089a..46f932138ea 100644
--- a/ace/UPIPE_Acceptor.cpp
+++ b/ace/UPIPE_Acceptor.cpp
@@ -22,7 +22,7 @@ ACE_UPIPE_Acceptor::dump (void) const
 
 /* Do nothing routine for constructor. */
 
-ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void)
+ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void) 
   : mb_ (sizeof (ACE_UPIPE_Stream *))
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor");
@@ -36,7 +36,7 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void)
 // General purpose routine for performing server ACE_UPIPE.
 
 int
-ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr,
+ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, 
 			  int reuse_addr)
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::open");
@@ -59,15 +59,13 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr,
   ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor");
 
   if (this->open (local_addr, reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_UPIPE_Acceptor")));
+    ACE_ERROR ( (LM_ERROR, "%p\n", "ACE_UPIPE_Acceptor"));
 }
 
 int
 ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
 			    ACE_UPIPE_Addr *remote_addr,
-			    ACE_Time_Value *timeout,
+			    ACE_Time_Value *timeout, 
 			    int restart,
                             int reset_new_handle)
 {
@@ -76,7 +74,7 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
 
   ACE_SPIPE_Stream new_io;
 
-  if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr,
+  if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr, 
 					timeout, restart) == -1)
     return -1;
   else
@@ -85,32 +83,32 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
 
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, new_stream.lock_, -1));
 
-      new_stream.set_handle (new_io.get_handle ());
-      new_stream.reference_count_++;
+      new_stream.set_handle (new_io.get_handle ());      
+      new_stream.reference_count_++; 
 
       // Transfer address ownership.
       new_io.get_local_addr (new_stream.local_addr_);
       new_io.get_remote_addr (new_stream.remote_addr_);
-
+      
       // Now that we got the handle, we'll read the address of the
       // connector-side ACE_UPIPE_Stream out of the pipe and link that
       // ACE_UPIPE_Stream to our ACE_UPIPE_Stream.
 
-      if (ACE_OS::read (new_stream.get_handle (),
+      if (ACE_OS::read (new_stream.get_handle (), 
 			(char *) &remote_stream,
 			sizeof remote_stream) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ASYS_TEXT ("read stream address failed")));
+	ACE_ERROR ((LM_ERROR,     
+		    "ACE_UPIPE_Acceptor: %p\n", 
+		    "read stream address failed"));
       else if (new_stream.stream_.link (remote_stream->stream_) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ASYS_TEXT ("link streams failed")));
+	ACE_ERROR ((LM_ERROR, 
+		    "ACE_UPIPE_Acceptor: %p\n", 
+		    "link streams failed"));
       // Send a message over the new streampipe to confirm acceptance.
       else if (new_stream.send (&mb_, 0) == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ASYS_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
-		    ASYS_TEXT ("linked stream.put failed")));
+	ACE_ERROR ((LM_ERROR, 
+		    "ACE_UPIPE_Acceptor: %p\n", 
+		    "linked stream.put failed"));
 
       // Close down the new_stream at this point in order to conserve
       // handles.  Note that we don't need the SPIPE connection
@@ -121,3 +119,9 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
 }
 
 #endif /* ACE_HAS_THREADS */
+
+
+
+
+
+
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index 8dee38a6d65..6136583ebee 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -20,14 +20,14 @@ ACE_UPIPE_Connector::dump (void) const
   ACE_TRACE ("ACE_UPIPE_Connector::dump");
 }
 
-ACE_UPIPE_Connector::ACE_UPIPE_Connector (void)
+ACE_UPIPE_Connector::ACE_UPIPE_Connector (void) 
 {
   ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector");
 }
 
 int
-ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
-			      const ACE_UPIPE_Addr &addr,
+ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, 
+			      const ACE_UPIPE_Addr &addr, 
 			      ACE_Time_Value *timeout,
 			      const ACE_Addr & /* local_sap */,
 			      int /* reuse_addr */,
@@ -36,8 +36,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
 {
   ACE_TRACE ("ACE_UPIPE_Connector::connect");
   ACE_ASSERT (new_stream.get_handle () == ACE_INVALID_HANDLE);
-
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
+  
+  ACE_HANDLE handle = ACE::handle_timed_open (timeout, 
 					      addr.get_path_name (),
 					      flags, perms);
 
@@ -55,18 +55,18 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
 
       new_stream.set_handle (handle);
       new_stream.remote_addr_ = addr; // class copy.
-      new_stream.reference_count_++;
+      new_stream.reference_count_++; 
 
       // Now send the address of our ACE_UPIPE_Stream over this pipe
       // to our corresponding ACE_UPIPE_Acceptor, so he may link the
       // two streams.
-      ssize_t result = ACE_OS::write (handle,
-				      (const char *) &ustream,
+      ssize_t result = ACE_OS::write (handle, 
+				      (const char *) &ustream, 
 				      sizeof ustream);
       if (result == -1)
-	ACE_ERROR ((LM_ERROR,
-		    ASYS_TEXT ("ACE_UPIPE_Connector %p\n"),
-		    ASYS_TEXT ("write to pipe failed")));
+	ACE_ERROR ((LM_ERROR, 
+		    "ACE_UPIPE_Connector %p\n", 
+		    "write to pipe failed"));
 
       // Wait for confirmation of stream linking.
       ACE_Message_Block *mb_p = 0;
@@ -77,9 +77,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
       // Do *not* coalesce the following two checks for result == -1.
       // They perform different checks and cannot be merged.
       if (result == -1)
-	  ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("ACE_UPIPE_Connector %p\n"),
-		      ASYS_TEXT ("no confirmation from server")));
+	  ACE_ERROR ((LM_ERROR, "ACE_UPIPE_Connector %p\n",
+		      "no confirmation from server"));
       else
 	// Close down the new_stream at this point in order to
 	// conserve handles.  Note that we don't need the SPIPE
@@ -90,3 +89,4 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
     }
 }
 #endif /* ACE_HAS_THREADS */
+
diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i
index 339a0b36f81..c7f32edb985 100644
--- a/ace/UPIPE_Connector.i
+++ b/ace/UPIPE_Connector.i
@@ -3,10 +3,10 @@
 
 // UPIPE_Connector.i
 
-// Creates a Local ACE_UPIPE.
+// Creates a Local ACE_UPIPE. 
 
 ASYS_INLINE
-ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
+ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, 
 					  const ACE_UPIPE_Addr &addr,
 					  ACE_Time_Value *timeout,
 					  const ACE_Addr &local_sap,
@@ -15,13 +15,11 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
 					  int perms)
 {
   ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector");
-  if (this->connect (new_stream, addr, timeout, local_sap,
+  if (this->connect (new_stream, addr, timeout, local_sap, 
 		     reuse_addr, flags, perms) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("address %s, %p\n"),
-                addr.get_path_name (),
-                ASYS_TEXT ("ACE_UPIPE_Connector")));
+    ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
+	       addr.get_path_name (), "ACE_UPIPE_Connector"));
 }
 
 ASYS_INLINE int
@@ -31,3 +29,4 @@ ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
   // Nothing to do here since the handle is not a socket
   return 0;
 }
+
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index 494b7c179b3..7cc6f94adf0 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -99,9 +99,8 @@ ACE_UPIPE_Stream::send (const char *buffer,
   ACE_TRACE ("ACE_UPIPE_Stream::send");
 
   ACE_Message_Block *mb_p;
-  ACE_NEW_RETURN (mb_p,
-                  ACE_Message_Block (n),
-                  -1);
+  ACE_NEW_RETURN (mb_p, ACE_Message_Block (n), -1);
+
   mb_p->copy (buffer, n);
   return this->stream_.put (mb_p, timeout) == -1 ? -1 : (int) n;
 }
diff --git a/ace/Version.h b/ace/Version.h
index 5def819a690..dfe2ab09ed9 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 4
 #define ACE_MINOR_VERSION 6
-#define ACE_BETA_VERSION 43
-#define ACE_VERSION "4.6.43"
+#define ACE_BETA_VERSION 42
+#define ACE_VERSION "4.6.42"
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index a78e3d6f048..c8a77fd771c 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -76,14 +76,18 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
                                               ACE_Reactor_Mask change_masks,
                                               int operation)
 {
+  //
   // Find the old reactor masks.  This automatically does the work of
   // the GET_MASK operation.
+  //
 
   ACE_Reactor_Mask old_masks = ACE_Event_Handler::NULL_MASK;
 
-  if (ACE_BIT_ENABLED (existing_masks, FD_READ)
-      || ACE_BIT_ENABLED (existing_masks, FD_CLOSE))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK);
+  if (ACE_BIT_ENABLED (existing_masks, FD_READ) ||
+      ACE_BIT_ENABLED (existing_masks, FD_CLOSE))
+    {
+      ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK);
+    }
 
   if (ACE_BIT_ENABLED (existing_masks, FD_WRITE))
     ACE_SET_BITS (old_masks, ACE_Event_Handler::WRITE_MASK);
@@ -106,7 +110,10 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
   switch (operation)
     {
     case ACE_Reactor::CLR_MASK:
+
+      //
       // For the CLR_MASK operation, clear only the specific masks.
+      //
 
       if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK))
         {
@@ -135,14 +142,20 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
       break;
 
     case ACE_Reactor::SET_MASK:
+
+      //
       // If the operation is a set, first reset any existing masks
+      //
 
       existing_masks = 0;
       /* FALLTHRU */
 
     case ACE_Reactor::ADD_MASK:
+
+      //
       // For the ADD_MASK and the SET_MASK operation, add only the
       // specific masks.
+      //
 
       if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK))
         {
@@ -172,8 +185,10 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
 
     case ACE_Reactor::GET_MASK:
 
+      //
       // The work for this operation is done in all cases at the
       // begining of the function.
+      //
 
       ACE_UNUSED_ARG (change_masks);
 
@@ -204,9 +219,9 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
   for (i = 0; i < this->max_handlep1_ && error == 0; i++)
     // Since the handle can either be the event or the I/O handle,
     // we have to check both
-    if ((this->current_handles_[i] == handle
-         || this->current_info_[i].io_handle_ == handle)
-        && // Make sure that it is not already marked for deleted
+    if ((this->current_handles_[i] == handle ||
+         this->current_info_[i].io_handle_ == handle) &&
+        // Make sure that it is not already marked for deleted
         !this->current_info_[i].delete_entry_)
       {
         result = this->remove_handler_i (i,
@@ -217,11 +232,10 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
 
   // Then check the suspended entries
   for (i = 0; i < this->suspended_handles_ && error == 0; i++)
-    // Since the handle can either be the event or the I/O handle, we
-    // have to check both
-    if ((this->current_suspended_info_[i].io_handle_ == handle
-         || this->current_suspended_info_[i].event_handle_ == handle)
-        &&
+    // Since the handle can either be the event or the I/O handle,
+    // we have to check both
+    if ((this->current_suspended_info_[i].io_handle_ == handle ||
+         this->current_suspended_info_[i].event_handle_ == handle) &&
         // Make sure that it is not already marked for deleted
         !this->current_suspended_info_[i].delete_entry_)
       {
@@ -235,9 +249,8 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
   for (i = 0; i < this->handles_to_be_added_ && error == 0; i++)
     // Since the handle can either be the event or the I/O handle,
     // we have to check both
-    if ((this->to_be_added_info_[i].io_handle_ == handle
-         || this->to_be_added_info_[i].event_handle_ == handle)
-        &&
+    if ((this->to_be_added_info_[i].io_handle_ == handle ||
+         this->to_be_added_info_[i].event_handle_ == handle) &&
         // Make sure that it is not already marked for deleted
         !this->to_be_added_info_[i].delete_entry_)
       {
@@ -278,12 +291,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
 			this->current_info_[slot].network_events_);
     }
   // Normal event entries.
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
-    // Preserve DONT_CALL
-    to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
   else
-    // Make sure that the <to_be_removed_masks> is the NULL_MASK
-    to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    {
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
+        // Preserve DONT_CALL
+        to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
+      else
+        // Make sure that the <to_be_removed_masks> is the NULL_MASK
+        to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    }
 
   // If there are no more events that the <Event_Handler> is
   // interested in, or this is a non-I/O entry, schedule the
@@ -297,17 +313,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
       // Increment the handle count
           this->handles_to_be_deleted_++;
     }
-
-  // Since it is not a complete removal, we'll call handle_close
-  // for all the masks that were removed.  This does not change
-  // the internal state of the reactor.
-  //
-  // Note: this condition only applies to I/O entries
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+  else
     {
-      ACE_HANDLE handle = this->current_info_[slot].io_handle_;
-      this->current_info_[slot].event_handler_->handle_close (handle,
-                                                              to_be_removed_masks);
+      // Since it is not a complete removal, we'll call handle_close
+      // for all the masks that were removed.  This does not change
+      // the internal state of the reactor.
+      //
+      // Note: this condition only applies to I/O entries
+      //
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+        {
+          ACE_HANDLE handle = this->current_info_[slot].io_handle_;
+          this->current_info_[slot].event_handler_->handle_close (handle,
+                                                                   to_be_removed_masks);
+        }
     }
 
   return 0;
@@ -336,12 +355,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
 			this->current_suspended_info_[slot].network_events_);
     }
   // Normal event entries.
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
-    // Preserve DONT_CALL
-    to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
   else
-    // Make sure that the <to_be_removed_masks> is the NULL_MASK
-    to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    {
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
+        // Preserve DONT_CALL
+        to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
+      else
+        // Make sure that the <to_be_removed_masks> is the NULL_MASK
+        to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    }
 
   // If there are no more events that the <Event_Handler> is
   // interested in, or this is a non-I/O entry, schedule the
@@ -355,16 +377,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
       // Increment the handle count
       this->handles_to_be_deleted_++;
     }
-  // Since it is not a complete removal, we'll call handle_close for
-  // all the masks that were removed.  This does not change the
-  // internal state of the reactor.
-  //
-  // Note: this condition only applies to I/O entries
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+  else
     {
-      ACE_HANDLE handle = this->current_suspended_info_[slot].io_handle_;
-      this->current_suspended_info_[slot].event_handler_->handle_close (handle,
-                                                                        to_be_removed_masks);
+      // Since it is not a complete removal, we'll call handle_close
+      // for all the masks that were removed.  This does not change
+      // the internal state of the reactor.
+      //
+      // Note: this condition only applies to I/O entries
+      //
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+        {
+          ACE_HANDLE handle = this->current_suspended_info_[slot].io_handle_;
+          this->current_suspended_info_[slot].event_handler_->handle_close (handle,
+                                                                             to_be_removed_masks);
+        }
     }
 
   return 0;
@@ -393,12 +419,15 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
 			this->to_be_added_info_[slot].network_events_);
     }
   // Normal event entries.
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
-    // Preserve DONT_CALL
-    to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
   else
-    // Make sure that the <to_be_removed_masks> is the NULL_MASK
-    to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    {
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL))
+        // Preserve DONT_CALL
+        to_be_removed_masks = ACE_Event_Handler::DONT_CALL;
+      else
+        // Make sure that the <to_be_removed_masks> is the NULL_MASK
+        to_be_removed_masks = ACE_Event_Handler::NULL_MASK;
+    }
 
   // If there are no more events that the <Event_Handler> is
   // interested in, or this is a non-I/O entry, schedule the
@@ -412,16 +441,20 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
       // Increment the handle count
       this->handles_to_be_deleted_++;
     }
-  // Since it is not a complete removal, we'll call handle_close
-  // for all the masks that were removed.  This does not change
-  // the internal state of the reactor.
-  //
-  // Note: this condition only applies to I/O entries
-  else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+  else
     {
-      ACE_HANDLE handle = this->to_be_added_info_[slot].io_handle_;
-      this->to_be_added_info_[slot].event_handler_->handle_close (handle,
-                                                                  to_be_removed_masks);
+      // Since it is not a complete removal, we'll call handle_close
+      // for all the masks that were removed.  This does not change
+      // the internal state of the reactor.
+      //
+      // Note: this condition only applies to I/O entries
+      //
+      if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
+        {
+          ACE_HANDLE handle = this->to_be_added_info_[slot].io_handle_;
+          this->to_be_added_info_[slot].event_handler_->handle_close (handle,
+                                                                       to_be_removed_masks);
+        }
     }
 
   return 0;
@@ -950,12 +983,6 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 
 /************************************************************/
 
-int
-ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
 				    ACE_Timer_Queue *tq)
   : signal_handler_ (0),
@@ -1042,9 +1069,7 @@ ACE_WFMO_Reactor::open (size_t size,
 
   if (tq == 0)
     {
-      ACE_NEW_RETURN (this->timer_queue_,
-                      ACE_Timer_Heap,
-                      -1);
+      ACE_NEW_RETURN (this->timer_queue_, ACE_Timer_Heap, -1);
       this->delete_timer_queue_ = 1;
     }
   else
@@ -1059,9 +1084,7 @@ ACE_WFMO_Reactor::open (size_t size,
 
   if (sh == 0)
     {
-      ACE_NEW_RETURN (this->signal_handler_,
-                      ACE_Sig_Handler,
-                      -1);
+      ACE_NEW_RETURN (this->signal_handler_, ACE_Sig_Handler, -1);
       this->delete_signal_handler_ = 1;
     }
   else
@@ -1214,17 +1237,6 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
 				      ACE_Event_Handler *event_handler,
 				      ACE_Reactor_Mask new_masks)
 {
-  // If this is a Winsock 1 system, the underlying event assignment will
-  // not work, so don't try. Winsock 1 must use ACE_Select_Reactor for
-  // reacting to socket activity.
-#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
-  ACE_UNUSED_ARG (event_handle);
-  ACE_UNUSED_ARG (io_handle);
-  ACE_UNUSED_ARG (event_handler);
-  ACE_UNUSED_ARG (new_masks);
-  ACE_NOTSUP_RETURN (-1);
-#else
-
   // Make sure that the <handle> is valid
   if (io_handle == ACE_INVALID_HANDLE)
     io_handle = event_handler->get_handle ();
@@ -1251,10 +1263,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
   // need to create one
   if (event_handle == ACE_INVALID_HANDLE)
     {
-      // Note: don't change this since some C++ compilers have
-      // <auto_ptr>s that don't work properly...
-      auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event);
-      event = tmp;
+      event = auto_ptr<ACE_Auto_Event> (new ACE_Auto_Event);
       event_handle = event->handle ();
       delete_event = 1;
     }
@@ -1281,7 +1290,6 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
     }
   else
     return -1;
-#endif /* ACE_HAS_PHARLAP */
 }
 
 int
@@ -1449,21 +1457,11 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
   int result = 0;
   while (1)
     {
-#if defined (ACE_HAS_PHARLAP)
-      // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't
-      // do async I/O, so it's not needed in this case anyway.
-      result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
-					 this->atomic_wait_array_,
-					 TRUE,
-					 timeout);
-#else
       result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE),
 					   this->atomic_wait_array_,
 					   TRUE,
 					   timeout,
 					   alertable);
-#endif /* ACE_HAS_PHARLAP */
-
       if (result != WAIT_IO_COMPLETION)
         break;
     }
@@ -1475,7 +1473,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time,
       return 0;
     case WAIT_FAILED:
     case WAIT_ABANDONED_0:
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
     default:
       break;
@@ -1492,21 +1490,11 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // Wait for any of handles_ to be active, or until timeout expires.
   // If <alertable> is enabled allow asynchronous completion of
   // ReadFile and WriteFile operations.
-#if defined (ACE_HAS_PHARLAP)
-  // PharLap doesn't do async I/O and doesn't implement
-  // WaitForMultipleObjectsEx, so use WaitForMultipleObjects.
-  ACE_UNUSED_ARG (alertable);
-  return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (),
-				   this->handler_rep_.handles (),
-				   FALSE,
-				   timeout);
-#else
   return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (),
 				     this->handler_rep_.handles (),
 				     FALSE,
 				     timeout,
 				     alertable);
-#endif /* ACE_HAS_PHARLAP */
 }
 
 DWORD
@@ -1558,7 +1546,7 @@ ACE_WFMO_Reactor::dispatch (int wait_status)
   switch (wait_status)
     {
     case WAIT_FAILED: // Failure.
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       return -1;
 
     case WAIT_TIMEOUT: // Timeout.
@@ -1628,7 +1616,7 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
       switch (wait_status)
 	{
 	case WAIT_FAILED: // Failure.
-          ACE_OS::set_errno_to_last_error ();
+	  errno = ::GetLastError ();
 	  /* FALLTHRU */
 	case WAIT_TIMEOUT:
 	  // There are no more handles ready, we can return.
@@ -1645,26 +1633,27 @@ ACE_WFMO_Reactor::dispatch_handler (size_t slot,
   if (slot == max_handlep1)
     return this->dispatch_window_messages ();
 
-  // Dispatch the handler if it has not been scheduled for deletion.
-  // Note that this is a very week test if there are multiple threads
-  // dispatching this slot as no locks are held here. Generally, you
-  // do not want to do something like deleting the this pointer in
-  // handle_close() if you have registered multiple times and there is
-  // more than one thread in WFMO_Reactor->handle_events().
-  else if (!this->handler_rep_.scheduled_for_deletion (slot))
-    {
-      ACE_HANDLE event_handle = *(this->handler_rep_.handles () + slot);
-
-      if (this->handler_rep_.current_info ()[slot].io_entry_)
-        return this->complex_dispatch_handler (slot,
-                                               event_handle);
-      else
-        return this->simple_dispatch_handler (slot,
-                                              event_handle);
-    }
   else
-    // The handle was scheduled for deletion, so we will skip it.
-    return 0;
+  {
+    // Dispatch the handler if it has not been scheduled for deletion.
+    // Note that this is a very week test if there are multiple threads
+    // dispatching this slot as no locks are held here. Generally, you
+    // do not want to do something like deleting the this pointer in
+    // handle_close() if you have registered multiple times and there is
+    // more than one thread in WFMO_Reactor->handle_events().
+    if (!this->handler_rep_.scheduled_for_deletion (slot))
+      {
+        ACE_HANDLE event_handle = *(this->handler_rep_.handles () + slot);
+
+        if (this->handler_rep_.current_info ()[slot].io_entry_)
+          return this->complex_dispatch_handler (slot, event_handle);
+        else
+          return this->simple_dispatch_handler (slot, event_handle);
+      }
+    else
+      // The handle was scheduled for deletion, so we will skip it.
+      return 0;
+  }
 }
 
 int
@@ -1676,13 +1665,11 @@ ACE_WFMO_Reactor::simple_dispatch_handler (int slot,
   // Assign the ``signaled'' HANDLE so that callers can get it.
   siginfo_t sig (event_handle);
 
-  ACE_Event_Handler *eh =
-    this->handler_rep_.current_info ()[slot].event_handler_;
+  ACE_Event_Handler *eh = this->handler_rep_.current_info ()[slot].event_handler_;
 
   // Upcall
   if (eh->handle_signal (0, &sig) == -1)
-    this->handler_rep_.unbind (event_handle,
-                               ACE_Event_Handler::NULL_MASK);
+    this->handler_rep_.unbind (event_handle, ACE_Event_Handler::NULL_MASK);
 
   return 0;
 }
@@ -1691,7 +1678,7 @@ int
 ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
 					    ACE_HANDLE event_handle)
 {
-  // This dispatch is used for I/O entires.
+  // This dispatch is used for I/O entires
 
   ACE_WFMO_Reactor_Handler_Repository::Current_Info &current_info =
     this->handler_rep_.current_info ()[slot];
@@ -1701,6 +1688,7 @@ ACE_WFMO_Reactor::complex_dispatch_handler (int slot,
                                             current_info.io_handle_,
                                             event_handle,
                                             current_info.network_events_);
+
   if (problems != ACE_Event_Handler::NULL_MASK)
     this->handler_rep_.unbind (event_handle, problems);
 
@@ -1727,21 +1715,21 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
     {
       long actual_events = events.lNetworkEvents;
 
-      if ((interested_events & actual_events & FD_READ)
-          && event_handler->handle_input (io_handle) == -1)
+      if ((interested_events & actual_events & FD_READ) &&
+          event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
 
-      if ((interested_events & actual_events & FD_CLOSE)
-          && !ACE_BIT_ENABLED (problems, ACE_Event_Handler::READ_MASK)
-          && event_handler->handle_input (io_handle) == -1)
+      if ((interested_events & actual_events & FD_CLOSE) &&
+          !ACE_BIT_ENABLED (problems, ACE_Event_Handler::READ_MASK) &&
+          event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
 
-      if ((interested_events & actual_events & FD_ACCEPT)
-          && event_handler->handle_input (io_handle) == -1)
+      if ((interested_events & actual_events & FD_ACCEPT) &&
+          event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::ACCEPT_MASK);
 
-      if ((interested_events & actual_events & FD_WRITE)
-          && event_handler->handle_output (io_handle) == -1)
+      if ((interested_events & actual_events & FD_WRITE) &&
+          event_handler->handle_output (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK);
 
       if (interested_events & actual_events & FD_CONNECT)
@@ -1758,8 +1746,8 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
             ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK);
 	}
 
-      if ((interested_events & actual_events & FD_OOB)
-          && event_handler->handle_exception (io_handle) == -1)
+      if ((interested_events & actual_events & FD_OOB) &&
+          event_handler->handle_exception (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::EXCEPT_MASK);
 
       if ((interested_events & actual_events & FD_QOS)
@@ -1858,6 +1846,8 @@ ACE_WFMO_Reactor::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
+// ************************************************************
+
 int
 ACE_WFMO_Reactor_Notify::dispatch_notifications (int &number_of_active_handles,
                                                  const ACE_Handle_Set &rd_mask)
@@ -1999,9 +1989,7 @@ ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh,
   if (eh != 0)
     {
       ACE_Message_Block *mb = 0;
-      ACE_NEW_RETURN (mb,
-                      ACE_Message_Block (sizeof (ACE_Notification_Buffer)),
-                      -1);
+      ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof (ACE_Notification_Buffer)), -1);
 
       ACE_Notification_Buffer *buffer =
 	(ACE_Notification_Buffer *) mb->base ();
@@ -2049,9 +2037,7 @@ ACE_WFMO_Reactor_Notify::dump (void) const
   ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->timer_queue_->dump ();
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Max. iteration: %d\n"),
-              this->max_notify_iterations_));
+  ACE_DEBUG ((LM_DEBUG, "Max. iteration: %d\n", this->max_notify_iterations_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 74e8c0fd7f0..38ceb25ca24 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -569,11 +569,6 @@ public:
 
   // = Event loop drivers.
 
-  virtual int work_pending (const ACE_Time_Value &max_wait_time =  ACE_Time_Value::zero);
-  // Returns non-zero if there are I/O events "ready" for dispatching,
-  // but does not actually dispatch the event handlers.  By default,
-  // don't block while checking this, i.e., "poll".
-
   virtual int handle_events (ACE_Time_Value *max_wait_time = 0);
   virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0);
   // This event loop driver blocks for up to <max_wait_time> before
diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp
index d96db3d62c9..5180bd8ed40 100644
--- a/ace/WIN32_Asynch_IO.cpp
+++ b/ace/WIN32_Asynch_IO.cpp
@@ -86,9 +86,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor)
                                                          proactor);
 
   if (win32_proactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("Dynamic cast to WIN32 Proactor failed\n")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to WIN32 Proactor failed\n"), -1);
 
   // Post myself.
   return win32_proactor->post_completion (this);
@@ -125,6 +123,8 @@ ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler,
   ACE_UNUSED_ARG (signal_number);
 }
 
+// ****************************************************************
+
 int
 ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler,
                                   ACE_HANDLE handle,
@@ -149,18 +149,16 @@ ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler,
 int
 ACE_WIN32_Asynch_Operation::cancel (void)
 {
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
-    && (   (defined (_MSC_VER) && (_MSC_VER > 1020)) \
-        || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)))
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
 
   // @@ This API returns 0 on failure. So, I am returning -1 in that
   //    case. Is that right? (Alex).
-
+  
   int result = (int) ::CancelIo (this->handle_);
-
+  
   if (result == 0)
     // Couldnt cancel the operations.
     return 2;
@@ -169,7 +167,9 @@ ACE_WIN32_Asynch_Operation::cancel (void)
   return 0;
 
 #else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */
+
   ACE_NOTSUP_RETURN (-1);
+
 #endif /* ACE_HAS_AIO_CALLS */
 }
 
@@ -324,6 +324,8 @@ ACE_WIN32_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proacto
   return ACE_WIN32_Asynch_Result::post_completion (proactor);
 }
 
+// ********************************************************************
+
 ACE_WIN32_Asynch_Read_Stream::ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor)
   : ACE_Asynch_Operation_Impl (),
     ACE_Asynch_Read_Stream_Impl (),
@@ -381,7 +383,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
     return 1;
 
   // If initiate failed, check for a bad error.
-  ACE_OS::set_errno_to_last_error ();
+  errno = ::GetLastError ();
   switch (errno)
     {
     case ERROR_IO_PENDING:
@@ -396,14 +398,8 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
       // Cleanup dynamically allocated Asynch_Result
       delete result;
 
-      if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("ReadFile")));
-        }
-
-      return -1;
+      // Return error
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
     }
 }
 
@@ -435,6 +431,9 @@ ACE_WIN32_Asynch_Read_Stream::proactor (void) const
   return ACE_WIN32_Asynch_Operation::proactor ();
 }
 
+
+// ************************************************************
+
 u_long
 ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (void) const
 {
@@ -476,7 +475,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (u_long bytes_transferred,
                                                 const void *completion_key,
                                                 u_long error)
 {
-  // Copy the data which was returned by <GetQueuedCompletionStatus>.
+  // Copy the data which was returned by GetQueuedCompletionStatus
   this->bytes_transferred_ = bytes_transferred;
   this->success_ = success;
   this->completion_key_ = completion_key;
@@ -565,6 +564,8 @@ ACE_WIN32_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proact
   return ACE_WIN32_Asynch_Result::post_completion (proactor);
 }
 
+// ********************************************************************
+
 ACE_WIN32_Asynch_Write_Stream::ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor)
   : ACE_Asynch_Operation_Impl (),
     ACE_Asynch_Write_Stream_Impl (),
@@ -621,7 +622,7 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
     return 1;
 
   // If initiate failed, check for a bad error.
-  ACE_OS::set_errno_to_last_error ();
+  errno = ::GetLastError ();
   switch (errno)
     {
     case ERROR_IO_PENDING:
@@ -636,13 +637,8 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
       // Cleanup dynamically allocated Asynch_Result
       delete result;
 
-      if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("WriteFile")));
-        }
-      return -1;
+      // Return error
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("WriteFile")), -1);
     }
 }
 
@@ -674,6 +670,8 @@ ACE_WIN32_Asynch_Write_Stream::proactor (void) const
   return ACE_WIN32_Asynch_Operation::proactor ();
 }
 
+// ************************************************************
+
 ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler,
                                                                       ACE_HANDLE handle,
                                                                       ACE_Message_Block &message_block,
@@ -908,6 +906,8 @@ ACE_WIN32_Asynch_Read_File::proactor (void) const
   return ACE_WIN32_Asynch_Operation::proactor ();
 }
 
+// ************************************************************
+
 ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler,
                                                                         ACE_HANDLE handle,
                                                                         ACE_Message_Block &message_block,
@@ -1052,6 +1052,8 @@ ACE_WIN32_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor
   return ACE_WIN32_Asynch_Result::post_completion (proactor);
 }
 
+// ************************************************************
+
 ACE_WIN32_Asynch_Write_File::ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor)
   : ACE_Asynch_Operation_Impl (),
     ACE_Asynch_Write_Stream_Impl (),
@@ -1139,6 +1141,8 @@ ACE_WIN32_Asynch_Write_File::proactor (void) const
   return ACE_WIN32_Asynch_Operation::proactor ();
 }
 
+// ************************************************************
+
 u_long
 ACE_WIN32_Asynch_Accept_Result::bytes_to_read (void) const
 {
@@ -1208,7 +1212,7 @@ ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void)
 {
 }
 
-// Base class operations. These operations are here to kill dominance
+// Base class operations. These operations are here to kill dominance 
 // warnings. These methods call the base class methods.
 
 u_long
@@ -1277,6 +1281,8 @@ ACE_WIN32_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor)
   return ACE_WIN32_Asynch_Result::post_completion (proactor);
 }
 
+// ************************************************************
+
 ACE_WIN32_Asynch_Accept::ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor)
   : ACE_Asynch_Operation_Impl (),
     ACE_Asynch_Accept_Impl (),
@@ -1313,15 +1319,9 @@ ACE_WIN32_Asynch_Accept::accept  (ACE_Message_Block &message_block,
                                       SOCK_STREAM,
                                       0);
       if (accept_handle == ACE_INVALID_HANDLE)
-        {
-          if (ACE::debug ())
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("ACE_OS::socket")));
-            }
-          return -1;
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("ACE_OS::socket")), -1);
       else
         // Remember to close the socket down if failures occur.
         close_accept_handle = 1;
@@ -1357,7 +1357,7 @@ ACE_WIN32_Asynch_Accept::accept  (ACE_Message_Block &message_block,
     return 1;
 
   // If initiate failed, check for a bad error.
-  ACE_OS::set_errno_to_last_error ();
+  errno = ::GetLastError ();
   switch (errno)
     {
     case ERROR_IO_PENDING:
@@ -1375,14 +1375,8 @@ ACE_WIN32_Asynch_Accept::accept  (ACE_Message_Block &message_block,
 
       // Cleanup dynamically allocated Asynch_Result.
       delete result;
-      
-      if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("ReadFile")));
-        }
-      return -1;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
     }
 #else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */
   ACE_NOTSUP_RETURN (-1);
@@ -1421,6 +1415,8 @@ ACE_WIN32_Asynch_Accept::proactor (void) const
   return ACE_WIN32_Asynch_Operation::proactor ();
 }
 
+// *********************************************************************
+
 ACE_HANDLE
 ACE_WIN32_Asynch_Transmit_File_Result::socket (void) const
 {
@@ -1590,6 +1586,8 @@ ACE_WIN32_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proac
   return ACE_WIN32_Asynch_Result::post_completion (proactor);
 }
 
+// ************************************************************
+
 ACE_WIN32_Asynch_Transmit_File::ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor)
   : ACE_Asynch_Operation_Impl (),
     ACE_Asynch_Transmit_File_Impl (),
@@ -1644,7 +1642,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
     return 1;
 
   // If initiate failed, check for a bad error.
-  ACE_OS::set_errno_to_last_error ();
+  errno = ::GetLastError ();
   switch (errno)
     {
     case ERROR_IO_PENDING:
@@ -1658,14 +1656,8 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
 
       // Cleanup dynamically allocated Asynch_Result
       delete result;
-      
-      if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("TransmitFile")));
-        }
-      return -1;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("TransmitFile")), -1);
     }
 #else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
   ACE_NOTSUP_RETURN (-1);
@@ -1702,6 +1694,6 @@ ACE_Proactor *
 ACE_WIN32_Asynch_Transmit_File::proactor (void) const
 {
   return ACE_WIN32_Asynch_Operation::proactor ();
-}
+} 
 
 #endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index 00ca490371c..fc87933c28b 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -19,10 +19,14 @@
 class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result
 {
   // = TITLE
-  //     This is result object is used by the <end_event_loop> of the
+  // 
+  //     This is result object is used by the <end_event_loop> of the 
   //     ACE_Proactor interface to wake up all the threads blocking
   //     for completions.
-
+  // 
+  // = DESCRIPTION
+  // 
+  
 public:
   ACE_WIN32_Wakeup_Completion (ACE_Handler &handler,
                                const void *act = 0,
@@ -30,11 +34,11 @@ public:
                                int priority = 0,
                                int signal_number = ACE_SIGRTMIN);
   // Constructor.
-
+  
   virtual ~ACE_WIN32_Wakeup_Completion (void);
   // Destructor.
-
-
+  
+  
   virtual void complete (u_long bytes_transferred = 0,
                          int success = 1,
                          const void *completion_key = 0,
@@ -42,6 +46,8 @@ public:
   // This method calls the <handler>'s <handle_wakeup> method.
 };
 
+// *********************************************************************
+
 ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads,
                                         int used_with_reactor_event_loop)
   : completion_port_ (0),
@@ -90,19 +96,13 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
                                             this->number_of_threads_);
   if (cp == 0)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
       // If errno == ERROR_INVALID_PARAMETER, then this handle was
       // already registered.
       if (errno != ERROR_INVALID_PARAMETER)
-        {
-          if (ACE::debug ())
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("CreateIoCompletionPort")));
-            }
-          return -1;
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("CreateIoCompletionPort")), -1);
     }
   return 0;
 }
@@ -177,7 +177,7 @@ ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
                                                       int priority,
                                                       int signal_number)
 {
-  ACE_Asynch_Read_Stream_Result_Impl *implementation = 0;
+  ACE_Asynch_Read_Stream_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Read_Stream_Result (handler,
                                                        handle,
@@ -201,7 +201,7 @@ ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
                                                        int priority,
                                                        int signal_number)
 {
-  ACE_Asynch_Write_Stream_Result_Impl *implementation = 0;
+  ACE_Asynch_Write_Stream_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Write_Stream_Result (handler,
                                                         handle,
@@ -227,7 +227,7 @@ ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
                                                     int priority,
                                                     int signal_number)
 {
-  ACE_Asynch_Read_File_Result_Impl *implementation = 0;
+  ACE_Asynch_Read_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Read_File_Result (handler,
                                                      handle,
@@ -255,7 +255,7 @@ ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
                                                      int priority,
                                                      int signal_number)
 {
-  ACE_Asynch_Write_File_Result_Impl *implementation = 0;
+  ACE_Asynch_Write_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Write_File_Result (handler,
                                                       handle,
@@ -282,7 +282,7 @@ ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler,
                                                  int priority,
                                                  int signal_number)
 {
-  ACE_Asynch_Accept_Result_Impl *implementation = 0;
+  ACE_Asynch_Accept_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Accept_Result (handler,
                                                   listen_handle,
@@ -312,7 +312,7 @@ ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
                                                         int priority,
                                                         int signal_number)
 {
-  ACE_Asynch_Transmit_File_Result_Impl *implementation = 0;
+  ACE_Asynch_Transmit_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Transmit_File_Result (handler,
                                                          socket,
@@ -339,7 +339,7 @@ ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler,
                                          int priority,
                                          int signal_number)
 {
-  ACE_Asynch_Result_Impl *implementation = 0;
+  ACE_Asynch_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
                   ACE_WIN32_Asynch_Timer (handler,
                                           act,
@@ -357,14 +357,12 @@ ACE_WIN32_Proactor::handle_signal (int, siginfo_t *, ucontext_t *)
   // Perform a non-blocking "poll" for all the I/O events that have
   // completed in the I/O completion queue.
 
+  ACE_Time_Value timeout (0, 0);
   int result = 0;
 
-  for (ACE_Time_Value timeout (0, 0);
-       ;
-       )
+  while (1)
     {
       result = this->handle_events (timeout);
-
       if (result != 0 || errno == ETIME)
         break;
     }
@@ -422,7 +420,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
                                              milli_seconds);
   if (result == FALSE && overlapped == 0)
     {
-      ACE_OS::set_errno_to_last_error ();
+      errno = ::GetLastError ();
 
       if (errno == WAIT_TIMEOUT)
         {
@@ -430,15 +428,10 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
           return 0;
         }
       else
-        {
-          if (ACE::debug ())
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          ASYS_TEXT ("%p\n"),
-                          ASYS_TEXT ("GetQueuedCompletionStatus")));
-            }
-          return -1;
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("GetQueuedCompletionStatus")),
+                          -1);
     }
   else
     {
@@ -447,7 +440,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
 
       // If errors happen, grab the error.
       if (result == FALSE)
-        ACE_OS::set_errno_to_last_error ();
+        errno = ::GetLastError ();
       else
         errno = 0;
 
@@ -487,7 +480,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
 {
   // Grab the event associated with the Proactor
   HANDLE handle = this->get_handle ();
-
+  
   // If Proactor event is valid, signal it
   if (handle != ACE_INVALID_HANDLE &&
       handle != 0)
@@ -501,14 +494,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
                                     ) == FALSE)
     {
       delete result;
-
-      if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("PostQueuedCompletionStatus failed")));
-        }
-      return -1;
+      ACE_ERROR_RETURN ((LM_ERROR, "PostQueuedCompletionStatus failed\n"), -1);
     }
 
   return 0;
@@ -518,19 +504,18 @@ int
 ACE_WIN32_Proactor::post_wakeup_completions (int how_many)
 {
   ACE_WIN32_Wakeup_Completion *wakeup_completion = 0;
-
   for (ssize_t ci = 0; ci < how_many; ci++)
     {
       ACE_NEW_RETURN (wakeup_completion,
                       ACE_WIN32_Wakeup_Completion (this->wakeup_handler_),
                       -1);
-
+      
       if (wakeup_completion->post_completion (this) == -1)
         return -1;
     }
-
+  
   return 0;
-}
+}  
 
 int
 ACE_WIN32_Proactor::wake_up_dispatch_threads (void)
@@ -556,6 +541,8 @@ ACE_WIN32_Proactor::number_of_threads (size_t threads)
   this->number_of_threads_ = threads;
 }
 
+// *********************************************************************
+
 ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer (ACE_Handler &handler,
                                                 const void *act,
                                                 const ACE_Time_Value &tv,
@@ -583,6 +570,8 @@ ACE_WIN32_Asynch_Timer::complete (u_long 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,
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc
deleted file mode 100644
index 2a084e896ae..00000000000
--- a/ace/ace-dll.icc
+++ /dev/null
@@ -1,280 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1")
-	TARG = "aced.dll"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "aced.shr.a"
-}
-
-option
-	 PlatformOptions,
-         incl(searchPath,'H:\ACE_wrappers'),
-       	 define ("__ACE_INLINE__","0"),
-         define("ACE_HAS_DLL","0"),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes)
-         {
-               target type (dll) TARG
-                {
-                       option macros(global)
-                        {
-                             source type(cpp) "ACE.h"
-                             source type(cpp) "OS.h"
-                        }
-                 source type(cpp) "Log_Msg.cpp"
-                 source type(cpp) "ACE.cpp"
-                 source type(cpp) "Activation_Queue.cpp"
-                 source type(cpp) "Active_Map_Manager.cpp"
-                 source type(cpp) "Addr.cpp"
-                 source type(cpp) "Arg_Shifter.cpp"
-                 source type(cpp) "ARGV.cpp"
-                 source type(cpp) "Asynch_IO.cpp"
-                 source type(cpp) "Asynch_IO_Impl.cpp"
-                 source type(cpp) "Basic_Types.cpp"
-                 source type(cpp) "CDR_Stream.cpp"
-                 source type(cpp) "Containers.cpp"
-                 source type(cpp) "CORBA_Handler.cpp"
-                 source type(cpp) "CORBA_Ref.cpp"
-                 source type(cpp) "Date_Time.cpp"
-                 source type(cpp) "DEV.cpp"
-                 source type(cpp) "DEV_Addr.cpp"
-                 source type(cpp) "DEV_Connector.cpp"
-                 source type(cpp) "DEV_IO.cpp"
-                 source type(cpp) "Dirent.cpp"
-                 source type(cpp) "DLL.cpp"
-                 source type(cpp) "Dump.cpp"
-                 source type(cpp) "Dynamic.cpp"
-                 source type(cpp) "Dynamic_Service.cpp"
-                 source type(cpp) "Event_Handler.cpp"
-                 source type(cpp) "Event_Handler_T.cpp"
-                 source type(cpp) "FIFO.cpp"
-                 source type(cpp) "FIFO_Recv.cpp"
-                 source type(cpp) "FIFO_Recv_Msg.cpp"
-                 source type(cpp) "FIFO_Send.cpp"
-                 source type(cpp) "FIFO_Send_Msg.cpp"
-                 source type(cpp) "FILE.cpp"
-                 source type(cpp) "FILE_Addr.cpp"
-                 source type(cpp) "FILE_Connector.cpp"
-                 source type(cpp) "FILE_IO.cpp"
-                 source type(cpp) "Filecache.cpp"
-                 source type(cpp) "Functor.cpp"
-                 source type(cpp) "Future.cpp"
-                 source type(cpp) "Get_Opt.cpp"
-                 source type(cpp) "Handle_Set.cpp"
-                 source type(cpp) "Hash_Map_Manager.cpp"
-                 source type(cpp) "High_Res_Timer.cpp"
-                 source type(cpp) "INET_Addr.cpp"
-                 source type(cpp) "IO_Cntl_Msg.cpp"
-                 source type(cpp) "IO_SAP.cpp"
-                 source type(cpp) "IOStream.cpp"
-                 source type(cpp) "IPC_SAP.cpp"
-                 source type(cpp) "Local_Name_Space.cpp"
-                 source type(cpp) "Local_Tokens.cpp"
-                 source type(cpp) "Log_Record.cpp"
-                 source type(cpp) "LSOCK.cpp"
-                 source type(cpp) "LSOCK_Acceptor.cpp"
-                 source type(cpp) "LSOCK_CODgram.cpp"
-                 source type(cpp) "LSOCK_Connector.cpp"
-                 source type(cpp) "LSOCK_Dgram.cpp"
-                 source type(cpp) "LSOCK_Stream.cpp"
-                 source type(cpp) "Malloc.cpp"
-                 source type(cpp) "Map.cpp"
-                 source type(cpp) "Mem_Map.cpp"
-                 source type(cpp) "Memory_Pool.cpp"
-                 source type(cpp) "Message_Block.cpp"
-                 source type(cpp) "Message_Queue.cpp"
-                 source type(cpp) "Method_Request.cpp"
-                 source type(cpp) "Msg_WFMO_Reactor.cpp"
-                 source type(cpp) "Multiplexor.cpp"
-                 source type(cpp) "Name_Proxy.cpp"
-                 source type(cpp) "Name_Request_Reply.cpp"
-                 source type(cpp) "Name_Space.cpp"
-                 source type(cpp) "Naming_Context.cpp"
-                 source type(cpp) "NT_Service.cpp"
-                 source type(cpp) "Object_Manager.cpp"
-                 source type(cpp) "Obstack.cpp"
-                 source type(cpp) "OS.cpp"
-                 source type(cpp) "Pair.cpp"
-                 source type(cpp) "Parse_Node.cpp"
-                 source type(cpp) "Pipe.cpp"
-                 source type(cpp) "Priority_Reactor.cpp"
-                 source type(cpp) "Proactor.cpp"
-                 source type(cpp) "Process.cpp"
-                 source type(cpp) "Process_Manager.cpp"
-                 source type(cpp) "Profile_Timer.cpp"
-                 source type(cpp) "RB_Tree.cpp"
-                 source type(cpp) "Reactor.cpp"
-                 source type(cpp) "Read_Buffer.cpp"
-                 source type(cpp) "Registry.cpp"
-                 source type(cpp) "Registry_Name_Space.cpp"
-                 source type(cpp) "Remote_Name_Space.cpp"
-                 source type(cpp) "Remote_Tokens.cpp"
-                 source type(cpp) "Sched_Params.cpp"
-                 source type(cpp) "Select_Reactor.cpp"
-                 source type(cpp) "Select_Reactor_Base.cpp"
-                 source type(cpp) "Service_Config.cpp"
-                 source type(cpp) "Service_Manager.cpp"
-                 source type(cpp) "Service_Object.cpp"
-                 source type(cpp) "Service_Repository.cpp"
-                 source type(cpp) "Service_Types.cpp"
-                 source type(cpp) "Shared_Memory.cpp"
-                 source type(cpp) "Shared_Memory_MM.cpp"
-                 source type(cpp) "Shared_Memory_SV.cpp"
-                 source type(cpp) "Shared_Object.cpp"
-                 source type(cpp) "Signal.cpp"
-                 source type(cpp) "SOCK.cpp"
-                 source type(cpp) "SOCK_Acceptor.cpp"
-                 source type(cpp) "SOCK_CODgram.cpp"
-                 source type(cpp) "SOCK_Connector.cpp"
-                 source type(cpp) "SOCK_Dgram.cpp"
-                 source type(cpp) "SOCK_Dgram_Bcast.cpp"
-                 source type(cpp) "SOCK_Dgram_Mcast.cpp"
-                 source type(cpp) "SOCK_IO.cpp"
-                 source type(cpp) "SOCK_Stream.cpp"
-                 source type(cpp) "SPIPE.cpp"
-                 source type(cpp) "SPIPE_Acceptor.cpp"
-                 source type(cpp) "SPIPE_Addr.cpp"
-                 source type(cpp) "SPIPE_Connector.cpp"
-                 source type(cpp) "SPIPE_Stream.cpp"
-                 source type(cpp) "SString.cpp"
-                 source type(cpp) "Stats.cpp"
-                 source type(cpp) "Strategies.cpp"
-                 source type(cpp) "SV_Message.cpp"
-                 source type(cpp) "SV_Message_Queue.cpp"
-                 source type(cpp) "SV_Semaphore_Complex.cpp"
-                 source type(cpp) "SV_Semaphore_Simple.cpp"
-                 source type(cpp) "SV_Shared_Memory.cpp"
-                 source type(cpp) "Svc_Conf_l.cpp"
-                 source type(cpp) "Svc_Conf_y.cpp"
-                 source type(cpp) "Svc_Handler.cpp"
-                 source type(cpp) "Synch.cpp"
-                 source type(cpp) "Synch_Options.cpp"
-                 source type(cpp) "System_Time.cpp"
-                 source type(cpp) "Task.cpp"
-                 source type(cpp) "Thread.cpp"
-                 source type(cpp) "Thread_Manager.cpp"
-                 source type(cpp) "Time_Request_Reply.cpp"
-                 source type(cpp) "Timeprobe.cpp"
-                 source type(cpp) "Timer_Hash.cpp"
-                 source type(cpp) "Timer_Heap.cpp"
-                 source type(cpp) "Timer_List.cpp"
-                 source type(cpp) "Timer_Queue.cpp"
-                 source type(cpp) "Timer_Queue_Adapters.cpp"
-                 source type(cpp) "Timer_Wheel.cpp"
-                 source type(cpp) "TLI.cpp"
-                 source type(cpp) "TLI_Acceptor.cpp"
-                 source type(cpp) "TLI_Connector.cpp"
-                 source type(cpp) "TLI_Stream.cpp"
-                 source type(cpp) "Token.cpp"
-                 source type(cpp) "Token_Collection.cpp"
-                 source type(cpp) "Token_Invariants.cpp"
-                 source type(cpp) "Token_Manager.cpp"
-                 source type(cpp) "Token_Request_Reply.cpp"
-                 source type(cpp) "TP_Reactor.cpp"
-                 source type(cpp) "Trace.cpp"
-                 source type(cpp) "TTY_IO.cpp"
-                 source type(cpp) "Typed_SV_Message.cpp"
-                 source type(cpp) "Typed_SV_Message_Queue.cpp"
-                 source type(cpp) "UNIX_Addr.cpp"
-                 source type(cpp) "UPIPE_Acceptor.cpp"
-                 source type(cpp) "UPIPE_Connector.cpp"
-                 source type(cpp) "UPIPE_Stream.cpp"
-                 source type(cpp) "WFMO_Reactor.cpp"
-                 source type(cpp) "WIN32_Asynch_IO.cpp"
-                 source type(cpp) "WIN32_Proactor.cpp"
-                 source type(cpp) "XtReactor.cpp"
-                 source type(cpp) "Active_Map_Manager_T.cpp"
-                 source type(cpp) "Cache_Hash_T.cpp"
-                 source type(cpp) "Cache_Heap_T.cpp"
-                 source type(cpp) "Cache_Manager_T.cpp"
-                 source type(cpp) "Containers_T.cpp"
-                 source type(cpp) "Dump_T.cpp"
-                 source type(cpp) "Env_Value_T.cpp"
-                 source type(cpp) "Event_Handler_T.cpp"
-                 source type(cpp) "Functor_T.cpp"
-                 source type(cpp) "Hash_Bucket_T.cpp"
-                 source type(cpp) "Hash_Map_Manager_T.cpp"
-                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
-                 source type(cpp) "IOStream_T.cpp"
-                 source type(cpp) "Local_Name_Space_T.cpp"
-                 source type(cpp) "Malloc_T.cpp"
-                 source type(cpp) "Map_T.cpp"
-                 source type(cpp) "Message_Block_T.cpp"
-                 source type(cpp) "Message_Queue_T.cpp"
-                 source type(cpp) "Pair_T.cpp"
-                 source type(cpp) "Select_Reactor_T.cpp"
-                 source type(cpp) "Strategies_T.cpp"
-                 source type(cpp) "Synch_T.cpp"
-                 source type(cpp) "Task_T.cpp"
-                 source type(cpp) "Timeprobe_T.cpp"
-                 source type(cpp) "Timer_Hash_T.cpp"
-                 source type(cpp) "Timer_Heap_T.cpp"
-                 source type(cpp) "Timer_List_T.cpp"
-                 source type(cpp) "Timer_Queue_T.cpp"
-                 source type(cpp) "Timer_Wheel_T.cpp"
-                 // Template implementation files (#pragma implementation)
-                 source type (cpp) "Acceptor.cpp"
-                 source type (cpp) "Active_Map_Manager_T.cpp"
-                 source type (cpp) "Containers.cpp"
-                 source type (cpp) "Asynch_Acceptor.cpp"
-                 source type (cpp) "Auto_Ptr.cpp"
-                 source type (cpp) "CORBA_Ref.cpp"
-                 source type (cpp) "Connector.cpp"
-                 source type (cpp) "Containers_T.cpp"
-                 source type (cpp) "Dump_T.cpp"
-                 source type (cpp) "Env_Value_T.cpp"
-                 source type (cpp) "Event_Handler_T.cpp"
-                 source type (cpp) "Free_List.cpp"
-                 source type (cpp) "Functor_T.cpp"
-                 source type (cpp) "Future.cpp"
-                 source type (cpp) "Hash_Map_Manager_T.cpp"
-                 source type (cpp) "Hash_Purgable_Map_Manager_T.cpp"
-                 source type (cpp) "IOStream_T.cpp"
-                 source type (cpp) "LOCK_SOCK_Acceptor.cpp"
-                 source type (cpp) "Local_Name_Space_T.cpp"
-                 source type (cpp) "Malloc_T.cpp"
-                 source type (cpp) "Managed_Object.cpp"
-                 source type (cpp) "Map_Manager.cpp"
-                 source type (cpp) "Map_T.cpp"
-                 source type (cpp) "Message_Block_T.cpp"
-                 source type (cpp) "Message_Queue_T.cpp"
-                 source type (cpp) "Module.cpp"
-                 source type (cpp) "Pair_T.cpp"
-                 source type (cpp) "RB_Tree.cpp"
-                 source type (cpp) "Select_Reactor_T.cpp"
-                 source type (cpp) "Singleton.cpp"
-                 source type (cpp) "Strategies_T.cpp"
-                 source type (cpp) "Stream.cpp"
-                 source type (cpp) "Stream_Modules.cpp"
-                 source type (cpp) "Svc_Handler.cpp"
-                 source type (cpp) "Synch_T.cpp"
-                 source type (cpp) "Task_T.cpp"
-                 source type (cpp) "Timeprobe_T.cpp"
-                 source type (cpp) "Timer_Hash_T.cpp"
-                 source type (cpp) "Timer_Heap_T.cpp"
-                 source type (cpp) "Timer_List_T.cpp"
-                 source type (cpp) "Timer_Queue_T.cpp"
-                 source type (cpp) "Timer_Wheel_T.cpp"
-                 source type (cpp) "Typed_SV_Message.cpp"
-                 source type (cpp) "Typed_SV_Message_Queue.cpp"
-
-		  // Libraries needed during linking
-		if $__TOS_WIN__ {
-			source type (lib) "advapi32.lib"
-                 	source type (lib) "user32.lib"
-		  	source type (lib) "ws2_32.lib"
-		  	source type (lib) "wsock32.lib"
-		  	source type (lib) "mswsock.lib"
-		}
-		if $__TOS_AIX__ {
-                        source type (lib) "libtli_r.a"
-                        source type (lib) "libpthreads.a"
-                        source type (lib) "libc_r.a"
-                        source type (lib) "libdl.a"
-		}
-        }
-}
diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc
deleted file mode 100644
index 4552416ede5..00000000000
--- a/ace/ace-lib.icc
+++ /dev/null
@@ -1,279 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1")
-	TARG = "aced.lib"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "aced.a"
-}
-
-option
-	 PlatformOptions,
-         incl(searchPath,'H:\ACE_wrappers'),
-       	 define ("__ACE_INLINE__","0"),
-         define("ACE_HAS_DLL","0"),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes)
-         {
-               target type (lib) TARG
-                {
-                       option macros(global)
-                        {
-                             source type(cpp) "ACE.h"
-                             source type(cpp) "OS.h"
-                        }
-                 source type(cpp) "Log_Msg.cpp"
-                 source type(cpp) "ACE.cpp"
-                 source type(cpp) "Activation_Queue.cpp"
-                 source type(cpp) "Active_Map_Manager.cpp"
-                 source type(cpp) "Addr.cpp"
-                 source type(cpp) "Arg_Shifter.cpp"
-                 source type(cpp) "ARGV.cpp"
-                 source type(cpp) "Asynch_IO.cpp"
-                 source type(cpp) "Asynch_IO_Impl.cpp"
-                 source type(cpp) "Basic_Types.cpp"
-                 source type(cpp) "CDR_Stream.cpp"
-                 source type(cpp) "Containers.cpp"
-                 source type(cpp) "CORBA_Handler.cpp"
-                 source type(cpp) "CORBA_Ref.cpp"
-                 source type(cpp) "Date_Time.cpp"
-                 source type(cpp) "DEV.cpp"
-                 source type(cpp) "DEV_Addr.cpp"
-                 source type(cpp) "DEV_Connector.cpp"
-                 source type(cpp) "DEV_IO.cpp"
-                 source type(cpp) "Dirent.cpp"
-                 source type(cpp) "DLL.cpp"
-                 source type(cpp) "Dump.cpp"
-                 source type(cpp) "Dynamic.cpp"
-                 source type(cpp) "Dynamic_Service.cpp"
-                 source type(cpp) "Event_Handler.cpp"
-                 source type(cpp) "Event_Handler_T.cpp"
-                 source type(cpp) "FIFO.cpp"
-                 source type(cpp) "FIFO_Recv.cpp"
-                 source type(cpp) "FIFO_Recv_Msg.cpp"
-                 source type(cpp) "FIFO_Send.cpp"
-                 source type(cpp) "FIFO_Send_Msg.cpp"
-                 source type(cpp) "FILE.cpp"
-                 source type(cpp) "FILE_Addr.cpp"
-                 source type(cpp) "FILE_Connector.cpp"
-                 source type(cpp) "FILE_IO.cpp"
-                 source type(cpp) "Filecache.cpp"
-                 source type(cpp) "Functor.cpp"
-                 source type(cpp) "Future.cpp"
-                 source type(cpp) "Get_Opt.cpp"
-                 source type(cpp) "Handle_Set.cpp"
-                 source type(cpp) "Hash_Map_Manager.cpp"
-                 source type(cpp) "High_Res_Timer.cpp"
-                 source type(cpp) "INET_Addr.cpp"
-                 source type(cpp) "IO_Cntl_Msg.cpp"
-                 source type(cpp) "IO_SAP.cpp"
-                 source type(cpp) "IOStream.cpp"
-                 source type(cpp) "IPC_SAP.cpp"
-                 source type(cpp) "Local_Name_Space.cpp"
-                 source type(cpp) "Local_Tokens.cpp"
-                 source type(cpp) "Log_Record.cpp"
-                 source type(cpp) "LSOCK.cpp"
-                 source type(cpp) "LSOCK_Acceptor.cpp"
-                 source type(cpp) "LSOCK_CODgram.cpp"
-                 source type(cpp) "LSOCK_Connector.cpp"
-                 source type(cpp) "LSOCK_Dgram.cpp"
-                 source type(cpp) "LSOCK_Stream.cpp"
-                 source type(cpp) "Malloc.cpp"
-                 source type(cpp) "Map.cpp"
-                 source type(cpp) "Mem_Map.cpp"
-                 source type(cpp) "Memory_Pool.cpp"
-                 source type(cpp) "Message_Block.cpp"
-                 source type(cpp) "Message_Queue.cpp"
-                 source type(cpp) "Method_Request.cpp"
-                 source type(cpp) "Msg_WFMO_Reactor.cpp"
-                 source type(cpp) "Multiplexor.cpp"
-                 source type(cpp) "Name_Proxy.cpp"
-                 source type(cpp) "Name_Request_Reply.cpp"
-                 source type(cpp) "Name_Space.cpp"
-                 source type(cpp) "Naming_Context.cpp"
-                 source type(cpp) "NT_Service.cpp"
-                 source type(cpp) "Object_Manager.cpp"
-                 source type(cpp) "Obstack.cpp"
-                 source type(cpp) "OS.cpp"
-                 source type(cpp) "Pair.cpp"
-                 source type(cpp) "Parse_Node.cpp"
-                 source type(cpp) "Pipe.cpp"
-                 source type(cpp) "Priority_Reactor.cpp"
-                 source type(cpp) "Proactor.cpp"
-                 source type(cpp) "Process.cpp"
-                 source type(cpp) "Process_Manager.cpp"
-                 source type(cpp) "Profile_Timer.cpp"
-                 source type(cpp) "RB_Tree.cpp"
-                 source type(cpp) "Reactor.cpp"
-                 source type(cpp) "Read_Buffer.cpp"
-                 source type(cpp) "Registry.cpp"
-                 source type(cpp) "Registry_Name_Space.cpp"
-                 source type(cpp) "Remote_Name_Space.cpp"
-                 source type(cpp) "Remote_Tokens.cpp"
-                 source type(cpp) "Sched_Params.cpp"
-                 source type(cpp) "Select_Reactor.cpp"
-                 source type(cpp) "Select_Reactor_Base.cpp"
-                 source type(cpp) "Service_Config.cpp"
-                 source type(cpp) "Service_Manager.cpp"
-                 source type(cpp) "Service_Object.cpp"
-                 source type(cpp) "Service_Repository.cpp"
-                 source type(cpp) "Service_Types.cpp"
-                 source type(cpp) "Shared_Memory.cpp"
-                 source type(cpp) "Shared_Memory_MM.cpp"
-                 source type(cpp) "Shared_Memory_SV.cpp"
-                 source type(cpp) "Shared_Object.cpp"
-                 source type(cpp) "Signal.cpp"
-                 source type(cpp) "SOCK.cpp"
-                 source type(cpp) "SOCK_Acceptor.cpp"
-                 source type(cpp) "SOCK_CODgram.cpp"
-                 source type(cpp) "SOCK_Connector.cpp"
-                 source type(cpp) "SOCK_Dgram.cpp"
-                 source type(cpp) "SOCK_Dgram_Bcast.cpp"
-                 source type(cpp) "SOCK_Dgram_Mcast.cpp"
-                 source type(cpp) "SOCK_IO.cpp"
-                 source type(cpp) "SOCK_Stream.cpp"
-                 source type(cpp) "SPIPE.cpp"
-                 source type(cpp) "SPIPE_Acceptor.cpp"
-                 source type(cpp) "SPIPE_Addr.cpp"
-                 source type(cpp) "SPIPE_Connector.cpp"
-                 source type(cpp) "SPIPE_Stream.cpp"
-                 source type(cpp) "SString.cpp"
-                 source type(cpp) "Stats.cpp"
-                 source type(cpp) "Strategies.cpp"
-                 source type(cpp) "SV_Message.cpp"
-                 source type(cpp) "SV_Message_Queue.cpp"
-                 source type(cpp) "SV_Semaphore_Complex.cpp"
-                 source type(cpp) "SV_Semaphore_Simple.cpp"
-                 source type(cpp) "SV_Shared_Memory.cpp"
-                 source type(cpp) "Svc_Conf_l.cpp"
-                 source type(cpp) "Svc_Conf_y.cpp"
-                 source type(cpp) "Svc_Handler.cpp"
-                 source type(cpp) "Synch.cpp"
-                 source type(cpp) "Synch_Options.cpp"
-                 source type(cpp) "System_Time.cpp"
-                 source type(cpp) "Task.cpp"
-                 source type(cpp) "Thread.cpp"
-                 source type(cpp) "Thread_Manager.cpp"
-                 source type(cpp) "Time_Request_Reply.cpp"
-                 source type(cpp) "Timeprobe.cpp"
-                 source type(cpp) "Timer_Hash.cpp"
-                 source type(cpp) "Timer_Heap.cpp"
-                 source type(cpp) "Timer_List.cpp"
-                 source type(cpp) "Timer_Queue.cpp"
-                 source type(cpp) "Timer_Queue_Adapters.cpp"
-                 source type(cpp) "Timer_Wheel.cpp"
-                 source type(cpp) "TLI.cpp"
-                 source type(cpp) "TLI_Acceptor.cpp"
-                 source type(cpp) "TLI_Connector.cpp"
-                 source type(cpp) "TLI_Stream.cpp"
-                 source type(cpp) "Token.cpp"
-                 source type(cpp) "Token_Collection.cpp"
-                 source type(cpp) "Token_Invariants.cpp"
-                 source type(cpp) "Token_Manager.cpp"
-                 source type(cpp) "Token_Request_Reply.cpp"
-                 source type(cpp) "TP_Reactor.cpp"
-                 source type(cpp) "Trace.cpp"
-                 source type(cpp) "TTY_IO.cpp"
-                 source type(cpp) "Typed_SV_Message.cpp"
-                 source type(cpp) "Typed_SV_Message_Queue.cpp"
-                 source type(cpp) "UNIX_Addr.cpp"
-                 source type(cpp) "UPIPE_Acceptor.cpp"
-                 source type(cpp) "UPIPE_Connector.cpp"
-                 source type(cpp) "UPIPE_Stream.cpp"
-                 source type(cpp) "WFMO_Reactor.cpp"
-                 source type(cpp) "WIN32_Asynch_IO.cpp"
-                 source type(cpp) "WIN32_Proactor.cpp"
-                 source type(cpp) "XtReactor.cpp"
-                 source type(cpp) "Active_Map_Manager_T.cpp"
-                 source type(cpp) "Cache_Hash_T.cpp"
-                 source type(cpp) "Cache_Heap_T.cpp"
-                 source type(cpp) "Cache_Manager_T.cpp"
-                 source type(cpp) "Containers_T.cpp"
-                 source type(cpp) "Dump_T.cpp"
-                 source type(cpp) "Env_Value_T.cpp"
-                 source type(cpp) "Event_Handler_T.cpp"
-                 source type(cpp) "Functor_T.cpp"
-                 source type(cpp) "Hash_Bucket_T.cpp"
-                 source type(cpp) "Hash_Map_Manager_T.cpp"
-                 source type(cpp) "Hash_Purgable_Map_Manager_T.cpp"
-                 source type(cpp) "IOStream_T.cpp"
-                 source type(cpp) "Local_Name_Space_T.cpp"
-                 source type(cpp) "Malloc_T.cpp"
-                 source type(cpp) "Map_T.cpp"
-                 source type(cpp) "Message_Block_T.cpp"
-                 source type(cpp) "Message_Queue_T.cpp"
-                 source type(cpp) "Pair_T.cpp"
-                 source type(cpp) "Select_Reactor_T.cpp"
-                 source type(cpp) "Strategies_T.cpp"
-                 source type(cpp) "Synch_T.cpp"
-                 source type(cpp) "Task_T.cpp"
-                 source type(cpp) "Timeprobe_T.cpp"
-                 source type(cpp) "Timer_Hash_T.cpp"
-                 source type(cpp) "Timer_Heap_T.cpp"
-                 source type(cpp) "Timer_List_T.cpp"
-                 source type(cpp) "Timer_Queue_T.cpp"
-                 source type(cpp) "Timer_Wheel_T.cpp"
-                 // Template implementation files (#pragma implementation)
-                 source type (cpp) "Acceptor.cpp"
-                 source type (cpp) "Active_Map_Manager_T.cpp"
-                 source type (cpp) "Containers.cpp"
-                 source type (cpp) "Asynch_Acceptor.cpp"
-                 source type (cpp) "Auto_Ptr.cpp"
-                 source type (cpp) "CORBA_Ref.cpp"
-                 source type (cpp) "Connector.cpp"
-                 source type (cpp) "Containers_T.cpp"
-                 source type (cpp) "Dump_T.cpp"
-                 source type (cpp) "Env_Value_T.cpp"
-                 source type (cpp) "Event_Handler_T.cpp"
-                 source type (cpp) "Free_List.cpp"
-                 source type (cpp) "Functor_T.cpp"
-                 source type (cpp) "Future.cpp"
-                 source type (cpp) "Hash_Map_Manager_T.cpp"
-                 source type (cpp) "ace/Hash_Purgable_Map_Manager_T.cpp"
-                 source type (cpp) "IOStream_T.cpp"
-                 source type (cpp) "LOCK_SOCK_Acceptor.cpp"
-                 source type (cpp) "Local_Name_Space_T.cpp"
-                 source type (cpp) "Malloc_T.cpp"
-                 source type (cpp) "Managed_Object.cpp"
-                 source type (cpp) "Map_Manager.cpp"
-                 source type (cpp) "Map_T.cpp"
-                 source type (cpp) "Message_Block_T.cpp"
-                 source type (cpp) "Message_Queue_T.cpp"
-                 source type (cpp) "Module.cpp"
-                 source type (cpp) "Pair_T.cpp"
-                 source type (cpp) "RB_Tree.cpp"
-                 source type (cpp) "Select_Reactor_T.cpp"
-                 source type (cpp) "Singleton.cpp"
-                 source type (cpp) "Strategies_T.cpp"
-                 source type (cpp) "Stream.cpp"
-                 source type (cpp) "Stream_Modules.cpp"
-                 source type (cpp) "Svc_Handler.cpp"
-                 source type (cpp) "Synch_T.cpp"
-                 source type (cpp) "Task_T.cpp"
-                 source type (cpp) "Timeprobe_T.cpp"
-                 source type (cpp) "Timer_Hash_T.cpp"
-                 source type (cpp) "Timer_Heap_T.cpp"
-                 source type (cpp) "Timer_List_T.cpp"
-                 source type (cpp) "Timer_Queue_T.cpp"
-                 source type (cpp) "Timer_Wheel_T.cpp"
-                 source type (cpp) "Typed_SV_Message.cpp"
-                 source type (cpp) "Typed_SV_Message_Queue.cpp"
-
-                // Libraries needed during linking
-		if $__TOS_WIN__ {
-			source type (lib) "advapi32.lib"
-                 	source type (lib) "user32.lib"
-		  	source type (lib) "ws2_32.lib"
-		  	source type (lib) "wsock32.lib"
-		  	source type (lib) "mswsock.lib"
-		}
-		if $__TOS_AIX__ {
-                        source type (lib) "libtli_r.a"
-                        source type (lib) "libpthreads.a"
-                        source type (lib) "libc_r.a"
-		}
-        }
-}
diff --git a/ace/ace_bcc.ide b/ace/ace_bcc.ide
new file mode 100644
index 00000000000..85de4a2a42d
--- /dev/null
+++ b/ace/ace_bcc.ide
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 9738415c47a..b988958ce0d 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -1,43 +1,44 @@
-# Microsoft Developer Studio Project File - Name="ACE DLL" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ACE dynamic library" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=ACE DLL - Win32 Debug

+CFG=ACE dynamic library - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "ace_dll.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 Debug"

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE dynamic library - Win32 Debug"

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "ACE DLL - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE

+!MESSAGE 

+!MESSAGE "ACE dynamic library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "ACE dynamic library - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

-!IF  "$(CFG)" == "ACE DLL - Win32 Debug"

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ".\DLL\Debug"

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -47,7 +48,7 @@ CFG=ACE DLL - Win32 Debug
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX /Yc /Yu

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

@@ -63,7 +64,7 @@ LINK32=link.exe
 # ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -78,7 +79,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

@@ -94,7 +95,7 @@ LINK32=link.exe
 # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -109,7 +110,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

@@ -125,7 +126,7 @@ LINK32=link.exe
 # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:I386 /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -140,7 +141,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

@@ -156,26 +157,26 @@ LINK32=link.exe
 # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:I386 /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ".\DLL\Debug"

+# PROP BASE Intermediate_Dir "DLL\Debug"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir ".\DLL\Debug"

+# PROP Intermediate_Dir "DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD MTd c

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -188,7 +189,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -206,8 +207,8 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -220,7 +221,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -238,8 +239,8 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "..\\ /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /MTd /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD MTd c

+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -252,7 +253,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu.pdb" /debug /machine:ALPHA /out:"..\bin\aceud.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -270,8 +271,8 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

+# ADD BASE CPP /Gt0 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -284,668 +285,3762 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\aceu-r.pdb" /machine:ALPHA /out:"..\bin\aceu.dll"

 # SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

-# Name "ACE DLL - Win32 Debug"

-# Name "ACE DLL - Win32 Release"

-# Name "ACE DLL - Win32 Unicode Debug"

-# Name "ACE DLL - Win32 Unicode Release"

-# Name "ACE DLL - Win32 Alpha Debug"

-# Name "ACE DLL - Win32 Alpha Release"

-# Name "ACE DLL - Win32 Alpha Unicode Debug"

-# Name "ACE DLL - Win32 Alpha Unicode Release"

+# Name "ACE dynamic library - Win32 Debug"

+# Name "ACE dynamic library - Win32 Release"

+# Name "ACE dynamic library - Win32 Unicode Debug"

+# Name "ACE dynamic library - Win32 Unicode Release"

+# Name "ACE dynamic library - Win32 Alpha Debug"

+# Name "ACE dynamic library - Win32 Alpha Release"

+# Name "ACE dynamic library - Win32 Alpha Unicode Debug"

+# Name "ACE dynamic library - Win32 Alpha Unicode Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\ACE.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Types.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Based_Pointer_Repository.cpp

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Future.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Template_Instantiations.cpp

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -993,10 +4088,6 @@ SOURCE=.\Asynch_IO.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_IO_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Auto_Ptr.h

 # End Source File

 # Begin Source File

@@ -1005,50 +4096,14 @@ SOURCE=.\Basic_Types.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Based_Pointer_Repository.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Base_Pointer_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cache_Map_Manager_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategy_Utility_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CDR_Stream.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=".\config-win32-borland.h"

-# End Source File

-# Begin Source File

-

 SOURCE=".\config-win32-common.h"

 # End Source File

 # Begin Source File

 

-SOURCE=".\config-win32.h"

-# End Source File

-# Begin Source File

-

 SOURCE=.\config.h

 # End Source File

 # Begin Source File

@@ -1061,10 +4116,6 @@ SOURCE=.\Containers.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Containers_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CORBA_Handler.h

 # End Source File

 # Begin Source File

@@ -1189,10 +4240,6 @@ SOURCE=.\Handle_Set.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Cache_Map_Manager_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Hash_Map_Manager.h

 # End Source File

 # Begin Source File

@@ -1201,10 +4248,6 @@ SOURCE=.\Hash_Map_Manager_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Map_With_Allocator_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\High_Res_Timer.h

 # End Source File

 # Begin Source File

@@ -1325,10 +4368,6 @@ SOURCE=.\Message_Block.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Message_Queue.h

 # End Source File

 # Begin Source File

@@ -1409,10 +4448,6 @@ SOURCE=.\Proactor.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Proactor_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Process.h

 # End Source File

 # Begin Source File

@@ -1681,10 +4716,6 @@ SOURCE=.\Time_Value.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Timeprobe.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Timer_Hash.h

 # End Source File

 # Begin Source File

@@ -1765,10 +4796,6 @@ SOURCE=.\Token_Request_Reply.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TP_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trace.h

 # End Source File

 # Begin Source File

@@ -1813,14 +4840,6 @@ SOURCE=.\WFMO_Reactor.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\WIN32_Asynch_IO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ws2tcpip.h

 # End Source File

 # Begin Source File

@@ -1869,10 +4888,6 @@ SOURCE=.\Asynch_IO.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_IO_Impl.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Atomic_Op.i

 # End Source File

 # Begin Source File

@@ -1885,30 +4900,10 @@ SOURCE=.\Basic_Types.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Cache_Map_Manager_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategy_Utility_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CDR_Stream.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Strategies_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Connector.i

 # End Source File

 # Begin Source File

@@ -1917,10 +4912,6 @@ SOURCE=.\Containers.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Containers_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CORBA_Handler.i

 # End Source File

 # Begin Source File

@@ -2001,14 +4992,6 @@ SOURCE=.\Free_List.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Functor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Functor_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Get_Opt.i

 # End Source File

 # Begin Source File

@@ -2017,10 +5000,6 @@ SOURCE=.\Handle_Set.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Cache_Map_Manager_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Hash_Map_Manager.i

 # End Source File

 # Begin Source File

@@ -2029,10 +5008,6 @@ SOURCE=.\Hash_Map_Manager_T.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Map_With_Allocator_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\High_Res_Timer.i

 # End Source File

 # Begin Source File

@@ -2121,10 +5096,6 @@ SOURCE=.\Message_Block.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Message_Queue.i

 # End Source File

 # Begin Source File

@@ -2445,10 +5416,6 @@ SOURCE=.\Token_Request_Reply.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TP_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trace.i

 # End Source File

 # Begin Source File

@@ -2479,14 +5446,6 @@ SOURCE=.\UPIPE_Stream.i
 

 SOURCE=.\WFMO_Reactor.i

 # End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Asynch_IO.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.i

-# End Source File

 # End Group

 # Begin Group "Template Files"

 

@@ -2494,7 +5453,45 @@ SOURCE=.\WIN32_Proactor.i
 # Begin Source File

 

 SOURCE=.\Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -2509,106 +5506,171 @@ SOURCE=.\Asynch_Acceptor.cpp
 # Begin Source File

 

 SOURCE=.\Auto_Ptr.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Base_Pointer_T.cpp

+SOURCE=.\Connector.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Cache_Map_Manager_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Cached_Connect_Strategy_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Caching_Strategies_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Caching_Utility_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Cleanup_Strategies_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Connector.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Containers_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

 # PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Free_List.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor_T.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Future.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Hash_Cache_Map_Manager_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Hash_Map_Manager_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Map_With_Allocator_T.cpp

+SOURCE=.\Hash_Map_Manager_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Object.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_Manager.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

@@ -2618,17 +5680,51 @@ SOURCE=.\Map_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.cpp

+SOURCE=.\Message_Queue_T.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Message_Queue_T.cpp

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Module.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

@@ -2644,61 +5740,110 @@ SOURCE=.\RB_Tree.cpp
 # Begin Source File

 

 SOURCE=.\Select_Reactor_T.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

 # PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Singleton.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream_Modules.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel_T.cpp

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 # End Source File

 # End Group

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index f540b6f2e83..7932b4fed75 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -1,41 +1,39 @@
-# Microsoft Developer Studio Project File - Name="ACE LIB" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ACE static library" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (ALPHA) Static Library" 0x0604

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=ACE LIB - Win32 PharLap ETS Debug

+CFG=ACE static library - Win32 Alpha Unicode Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "ace_lib.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE LIB - Win32 PharLap ETS Debug"

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE static library - Win32 Alpha Unicode Debug"

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "ACE LIB - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE LIB - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE LIB - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE LIB - Win32 Unicode Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE LIB - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")

-!MESSAGE "ACE LIB - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")

-!MESSAGE "ACE LIB - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")

-!MESSAGE "ACE LIB - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Static Library")

-!MESSAGE "ACE LIB - Win32 PharLap ETS Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE LIB - Win32 PharLap ETS Release" (based on "Win32 (x86) Static Library")

-!MESSAGE

+!MESSAGE 

+!MESSAGE "ACE static library - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE static library - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE static library - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE static library - Win32 Unicode Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE static library - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "ACE static library - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "ACE static library - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "ACE static library - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -48,8 +46,8 @@ CFG=ACE LIB - Win32 PharLap ETS Debug
 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -61,7 +59,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\libace.lib"

 # ADD LIB32 /nologo /out:".\acesd.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -74,8 +72,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -87,7 +85,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\libace-r.lib"

 # ADD LIB32 /nologo /out:".\aces.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -100,8 +98,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Unicode_Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -113,7 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\libace.lib"

 # ADD LIB32 /nologo /out:".\acesud.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -126,8 +124,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Unicode_Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -139,7 +137,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\libace-r.lib"

 # ADD LIB32 /nologo /out:".\acesu.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -152,8 +150,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Lib\Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /nologo /W3 /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

-# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c

+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -161,7 +159,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\acesd.lib"

 # ADD LIB32 /nologo /out:".\acesd.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -174,8 +172,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Lib\Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /nologo /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /FD /I "../" /D "WIN32" /c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "../" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -183,7 +181,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\aces.lib"

 # ADD LIB32 /nologo /out:".\aces.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -196,8 +194,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Unicode_Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /FD /MTd /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c

+# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -205,7 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\acesud.lib"

 # ADD LIB32 /nologo /out:".\acesud.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -218,8 +216,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Unicode_Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 /nologo /Gt0 /W3 /GX /O1 /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /I "../" /D "WIN32" /c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "../" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -227,4455 +225,3744 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:".\acesu.lib"

 # ADD LIB32 /nologo /out:".\acesu.lib"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\LIB\Debug"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:".\acesd.lib"

-# ADD LIB32 /nologo /out:".\acesd.lib"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Release"

-# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\LIB\Release"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo /o".\ace.bsc"

-# ADD BSC32 /nologo /o".\ace.bsc"

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:".\aces.lib"

-# ADD LIB32 /nologo /out:".\aces.lib"

-

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

-# Name "ACE LIB - Win32 Debug"

-# Name "ACE LIB - Win32 Release"

-# Name "ACE LIB - Win32 Unicode Debug"

-# Name "ACE LIB - Win32 Unicode Release"

-# Name "ACE LIB - Win32 Alpha Debug"

-# Name "ACE LIB - Win32 Alpha Release"

-# Name "ACE LIB - Win32 Alpha Unicode Debug"

-# Name "ACE LIB - Win32 Alpha Unicode Release"

-# Name "ACE LIB - Win32 PharLap ETS Debug"

-# Name "ACE LIB - Win32 PharLap ETS Release"

+# Name "ACE static library - Win32 Debug"

+# Name "ACE static library - Win32 Release"

+# Name "ACE static library - Win32 Unicode Debug"

+# Name "ACE static library - Win32 Unicode Release"

+# Name "ACE static library - Win32 Alpha Debug"

+# Name "ACE static library - Win32 Alpha Release"

+# Name "ACE static library - Win32 Alpha Unicode Debug"

+# Name "ACE static library - Win32 Alpha Unicode Release"

 # Begin Group "Source Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter "cpp"

 # Begin Source File

 

 SOURCE=.\ACE.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Types.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Based_Pointer_Repository.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

+

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ENDIF 

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+# End Source File

+# Begin Source File

+

+SOURCE=.\Future.cpp

+

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ENDIF

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

+

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+# PROP BASE Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

+

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+# PROP BASE Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Template_Instantiations.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter "h"

 # Begin Source File

 

 SOURCE=.\Acceptor.h

@@ -4702,11 +3989,11 @@ SOURCE=.\Addr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Arg_Shifter.h

+SOURCE=.\ARGV.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ARGV.h

+SOURCE=.\Array.h

 # End Source File

 # Begin Source File

 

@@ -4730,50 +4017,10 @@ SOURCE=.\Basic_Types.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Based_Pointer_Repository.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Base_Pointer_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cache_Map_Manager_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategy_Utility_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Stream.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cleanup_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=".\config-win32-borland.h"

-# End Source File

-# Begin Source File

-

 SOURCE=".\config-win32-common.h"

 # End Source File

 # Begin Source File

 

-SOURCE=".\config-win32.h"

-# End Source File

-# Begin Source File

-

 SOURCE=.\config.h

 # End Source File

 # Begin Source File

@@ -4786,10 +4033,6 @@ SOURCE=.\Containers.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Containers_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CORBA_Handler.h

 # End Source File

 # Begin Source File

@@ -4894,14 +4137,6 @@ SOURCE=.\Free_List.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Functor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Functor_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Future.h

 # End Source File

 # Begin Source File

@@ -4914,10 +4149,6 @@ SOURCE=.\Handle_Set.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Cache_Map_Manager_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Hash_Map_Manager.h

 # End Source File

 # Begin Source File

@@ -4926,18 +4157,10 @@ SOURCE=.\Hash_Map_Manager_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Map_With_Allocator_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\High_Res_Timer.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\inc_user_config.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\INET_Addr.h

 # End Source File

 # Begin Source File

@@ -5014,18 +4237,10 @@ SOURCE=.\Malloc.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Malloc_Base.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Malloc_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Object.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Map.h

 # End Source File

 # Begin Source File

@@ -5050,19 +4265,11 @@ SOURCE=.\Message_Block.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Message_Queue.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Queue_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Method_Request.h

+SOURCE=.\Method_Object.h

 # End Source File

 # Begin Source File

 

@@ -5070,10 +4277,6 @@ SOURCE=.\Module.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Msg_WFMO_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Multiplexor.h

 # End Source File

 # Begin Source File

@@ -5150,18 +4353,10 @@ SOURCE=.\Profile_Timer.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\RB_Tree.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ReactorEx.h

 # End Source File

 # Begin Source File

@@ -5190,10 +4385,6 @@ SOURCE=.\Sched_Params.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Select_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Select_Reactor_Base.h

 # End Source File

 # Begin Source File

@@ -5214,11 +4405,11 @@ SOURCE=.\Service_Object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Repository.h

+SOURCE=.\Service_Record.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Types.h

+SOURCE=.\Service_Repository.h

 # End Source File

 # Begin Source File

 

@@ -5306,10 +4497,6 @@ SOURCE=.\SString.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Stats.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\stdcpp.h

 # End Source File

 # Begin Source File

@@ -5330,10 +4517,6 @@ SOURCE=.\Stream_Modules.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\streams.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\SV_Message.h

 # End Source File

 # Begin Source File

@@ -5406,10 +4589,6 @@ SOURCE=.\Time_Value.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Timeprobe.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Timer_Hash.h

 # End Source File

 # Begin Source File

@@ -5438,10 +4617,6 @@ SOURCE=.\Timer_Queue.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Timer_Queue_Adapters.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Timer_Queue_T.h

 # End Source File

 # Begin Source File

@@ -5490,10 +4665,6 @@ SOURCE=.\Token_Request_Reply.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TP_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trace.h

 # End Source File

 # Begin Source File

@@ -5506,10 +4677,6 @@ SOURCE=.\Typed_SV_Message.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Typed_SV_Message_Queue.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\UNIX_Addr.h

 # End Source File

 # Begin Source File

@@ -5530,14 +4697,6 @@ SOURCE=.\UPIPE_Stream.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Version.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\WFMO_Reactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\WIN32_Asynch_IO.h

 # End Source File

 # Begin Source File

@@ -5555,7 +4714,7 @@ SOURCE=.\XtReactor.h
 # End Group

 # Begin Group "Inline Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter "i"

 # Begin Source File

 

 SOURCE=.\Acceptor.i

@@ -5566,10 +4725,6 @@ SOURCE=.\ACE.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Activation_Queue.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Active_Map_Manager.i

 # End Source File

 # Begin Source File

@@ -5610,30 +4765,6 @@ SOURCE=.\Basic_Types.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Cache_Map_Manager_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategy_Utility_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Stream.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cleanup_Strategies_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Connector.i

 # End Source File

 # Begin Source File

@@ -5642,10 +4773,6 @@ SOURCE=.\Containers.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Containers_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CORBA_Handler.i

 # End Source File

 # Begin Source File

@@ -5726,14 +4853,6 @@ SOURCE=.\Free_List.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Functor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Functor_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Get_Opt.i

 # End Source File

 # Begin Source File

@@ -5742,10 +4861,6 @@ SOURCE=.\Handle_Set.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Cache_Map_Manager_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Hash_Map_Manager.i

 # End Source File

 # Begin Source File

@@ -5754,10 +4869,6 @@ SOURCE=.\Hash_Map_Manager_T.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Hash_Map_With_Allocator_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\High_Res_Timer.i

 # End Source File

 # Begin Source File

@@ -5818,10 +4929,6 @@ SOURCE=.\Malloc_T.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Object.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Map.i

 # End Source File

 # Begin Source File

@@ -5846,26 +4953,14 @@ SOURCE=.\Message_Block.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Message_Queue.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Queue_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Module.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Msg_WFMO_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Multiplexor.i

 # End Source File

 # Begin Source File

@@ -5878,10 +4973,6 @@ SOURCE=.\Object_Manager.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Obstack.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\OS.i

 # End Source File

 # Begin Source File

@@ -5922,10 +5013,6 @@ SOURCE=.\Profile_Timer.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\RB_Tree.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor.i

 # End Source File

 # Begin Source File

@@ -5946,10 +5033,6 @@ SOURCE=.\Sched_Params.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Select_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Select_Reactor_Base.i

 # End Source File

 # Begin Source File

@@ -5970,11 +5053,11 @@ SOURCE=.\Service_Object.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Repository.i

+SOURCE=.\Service_Record.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Types.i

+SOURCE=.\Service_Repository.i

 # End Source File

 # Begin Source File

 

@@ -6054,18 +5137,6 @@ SOURCE=.\SString.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Stats.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Strategies.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Strategies_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Stream.i

 # End Source File

 # Begin Source File

@@ -6102,10 +5173,6 @@ SOURCE=.\Synch.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Options.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Synch_T.i

 # End Source File

 # Begin Source File

@@ -6126,10 +5193,6 @@ SOURCE=.\Thread_Manager.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Timer_Queue_Adapters.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Timer_Queue_T.i

 # End Source File

 # Begin Source File

@@ -6170,10 +5233,6 @@ SOURCE=.\Token_Request_Reply.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TP_Reactor.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trace.i

 # End Source File

 # Begin Source File

@@ -6202,14 +5261,6 @@ SOURCE=.\UPIPE_Stream.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\WFMO_Reactor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Asynch_IO.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\WIN32_Proactor.i

 # End Source File

 # End Group

@@ -6220,2059 +5271,418 @@ SOURCE=.\WIN32_Proactor.i
 

 SOURCE=.\Acceptor.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Acceptor.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Auto_Ptr.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Base_Pointer_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cached_Connect_Strategy_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

+SOURCE=.\Active_Map_Manager_T.cpp

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Caching_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

+SOURCE=.\Asynch_Acceptor.cpp

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Utility_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Cleanup_Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

+SOURCE=.\Auto_Ptr.cpp

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Containers_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Free_List.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor_T.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Future.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Hash_Cache_Map_Manager_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager_T.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ENDIF

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-# End Source File

-# Begin Source File

-

-SOURCE=.\Hash_Map_With_Allocator_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Object.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

-# PROP Exclude_From_Build 1

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_Manager.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

-SOURCE=.\Message_Block_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

+SOURCE=.\Message_Queue_T.cpp

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Message_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Module.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\RB_Tree.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_T.cpp

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

 

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

+# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

 

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # Begin Source File

 

 SOURCE=.\Singleton.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stream_Modules.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel_T.cpp

-

-!IF  "$(CFG)" == "ACE LIB - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Unicode Release"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Debug"

-

 # PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE LIB - Win32 PharLap ETS Release"

-

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-

-!ENDIF

-

 # End Source File

 # End Group

 # Begin Group "Documentation"

diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index c3b42d8a7eb..cac8478bca0 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -8,7 +8,7 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#if defined (__xlC__) || (__IBMCPP__)
+#if defined (__xlC__)
    // AIX xlC compiler
    //********************************************************************
    //
@@ -19,14 +19,6 @@
 
    // Keep an eye on this as the compiler and standards converge...
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#if defined (__IBMCPP__)
-   #define ACE_TEMPLATES_REQUIRE_SOURCE
-#endif /* __IBMCPP__ */
-
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#undef WIFEXITED
-#undef WEXITSTATUS
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
 
 #  define ACE_TEMPLATES_REQUIRE_PRAGMA
 
@@ -200,25 +192,23 @@
 // 4.3 and up has 1003.1c standard; 4.2 has draft 7
 #if (ACE_AIX_MINOR_VERS >= 3)
 #  define ACE_HAS_PTHREADS_STD
-#  define ACE_HAS_PTHREADS_UNIX98_EXT
 #else
 #  define ACE_HAS_PTHREADS_DRAFT7
-#  define ACE_LACKS_RWLOCK_T
-#  define ACE_LACKS_SETSCHED
-#  define ACE_LACKS_THREAD_STACK_ADDR
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to ace-users@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
 #endif /* ACE_AIX_MINOR_VERS >= 3 */
-
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SIGTHREADMASK
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to ace-users@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SETSCHED
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
+#define ACE_LACKS_THREAD_STACK_ADDR
 
 // By default, tracing code is not compiled.  To compile it in, cause
 // ACE_NTRACE to not be defined, and rebuild ACE.
diff --git a/ace/config-cray.h b/ace/config-cray.h
index 5ad6d571449..076c5394b41 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -24,7 +24,6 @@
     _UNICOS   (defined if running UNICOS or UNICOS/mk)
 
     Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10
-    Compiles on UNICOS 9.0.2.8, but some tests deadlock
 
     Contributed by Doug Anderson <doug@clark.net>
 */
@@ -64,22 +63,9 @@
 
 #define ACE_HAS_PTHREADS
 
-// UNICOS 10 and UNICOS/mk implement a small subset of POSIX Threads,
-// but the prototypes follow the POSIX.1c-1995 definitions.  Earlier
-// UNICOS versions sport Draft 7 threads.
-
-#if _UNICOS > 9
-# define ACE_HAS_PTHREADS_STD  
-#else
-# define ACE_HAS_PTHREADS_DRAFT7
-# define ACE_LACKS_THREAD_STACK_SIZE
-# define ACE_LACKS_THREAD_STACK_ADDR
-  // UNICOS 9 doesn't have this, nor sched.h
-# define SCHED_OTHER 0
-# define SCHED_FIFO 1
-# define SCHED_RR 2
-# define pthread_sigmask sigprocmask
-#endif
+// UNICOS implements a small subset of POSIX Threads, but the prototypes follow
+// the POSIX.1c-1995 definitions
+#define ACE_HAS_PTHREADS_STD  
 
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 78f3c24c554..46de4084b34 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -16,11 +16,6 @@
 # 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_OLD_IOSTREAMS
-// For some reason EGCS doesn't define this in its stdlib.
-# define ACE_LACKS_AUTO_PTR
 
 # if __GNUC__ == 2 && __GNUC_MINOR__ >= 91
 #   define ACE_HAS_USING_KEYWORD
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
index 9e49f971191..a9138e3fe97 100644
--- a/ace/config-ghs-common.h
+++ b/ace/config-ghs-common.h
@@ -17,7 +17,6 @@
 # if defined (__STANDARD_CXX)
     // Green Hills 1.8.9, but not 1.8.8.
 #   define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#   define ACE_LACKS_AUTO_PTR
 #   define ACE_LACKS_CHAR_RIGHT_SHIFTS
 #   define ACE_LACKS_UNBUFFERED_STREAMBUF
 # endif /* __STANDARD_CXX */
@@ -28,7 +27,6 @@
 # define ACE_LACKS_LONGLONG_T
 # define ACE_LACKS_SIGNED_CHAR
 
-
 #else  /* ! ghs */
 # error ace/config-ghs-common.h can only be used with Green Hills compilers!
 #endif /* ! ghs */
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index c399a403fa1..f43e757d156 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -59,8 +59,7 @@
 // Compiler enforces the "One Definition Rule"
 #  define ACE_HAS_ONE_DEFINITION_RULE
 
-// Compiler enforces need for 'template<>" when specializing template
-// classes.
+// Compiler enforces need for 'template<>" when specializing templates
 #  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
 
 // Compiler enforces proper use of 'typename'
diff --git a/ace/config-hpux-11.x-hpc++.h b/ace/config-hpux-11.x-hpc++.h
index 1913e68c707..f050590a332 100644
--- a/ace/config-hpux-11.x-hpc++.h
+++ b/ace/config-hpux-11.x-hpc++.h
@@ -70,9 +70,6 @@
 
 // Compiler supports template specialization.
 #  define ACE_HAS_TEMPLATE_SPECIALIZATION
-// ... and uses the template<> syntax
-#  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION
 
 // Preprocessor needs some help with data types
 #  if defined (__LP64__)
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 3c9e36e8b0f..8f21f48bb87 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -154,6 +154,11 @@
 // Platform has XPG4 wide character support
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
+// Platform lacks readers/writer locks.
+// For now... it does have pthread read/write locks but the code in OS.{h i}
+// doesn't know how to do pthread read/write locks.
+#define ACE_LACKS_RWLOCK_T
+
 // Platform lacks a typedef for timespec_t, but has struct timespec
 #define ACE_LACKS_TIMESPEC_T
 
@@ -210,30 +215,17 @@
 #define ACE_HAS_TLI_PROTOTYPES
 // HP-UX 11.00 (at least at initial releases) has some busted macro defs
 #define ACE_HAS_BROKEN_XTI_MACROS
-// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the
-// errmsg not being const...
-#define ACE_HAS_BROKEN_T_ERROR
 
 /////////////////////////////////////////////////////////////////////////
 //
 // Threads information.
 //
 // Use of threads is controlled by the 'threads' argument to make.  See
-// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set,
-// the default is to enable it, since kernel threads are always available
-// on HP-UX 11, as opposed to 10.x where it was optional software.
+// include/makeinclude/platform_hpux_aCC.GNU for details.
 //
 ////////////////////////////////////////////////////////////////////////
 
 #if defined (ACE_HAS_THREADS)
-#  if (ACE_HAS_THREADS == 0)
-#    undef ACE_HAS_THREADS
-#  endif /* ACE_HAS_THREADS == 0 */
-#else
-#  define ACE_HAS_THREADS
-#endif /* ACE_HAS_THREADS */
-
-#if defined (ACE_HAS_THREADS)
 
 #  if !defined (ACE_MT_SAFE)
 #    define ACE_MT_SAFE 1
@@ -241,7 +233,6 @@
 
 #  define ACE_HAS_PTHREADS
 #  define ACE_HAS_PTHREADS_STD
-#  define ACE_HAS_PTHREADS_UNIX98_EXT
 
 #  define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index c99ba376c7b..133b862d2c9 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -17,7 +17,6 @@
 #define ACE_HAS_STRING_CLASS
 #define IRIX5
 #define ACE_HAS_SIGWAIT
-#define ACE_HAS_DIRENT
 
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
diff --git a/ace/config-linuxppcr5.h b/ace/config-linuxppcr5.h
index a4d90ef7f41..3d8e2680dc2 100644
--- a/ace/config-linuxppcr5.h
+++ b/ace/config-linuxppcr5.h
@@ -12,6 +12,6 @@
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
-// Not needed with glibc 2.1.1:  #define __USE_XOPEN
+#define __USE_XOPEN
 
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 6fd9462d8a3..825c914c20b 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -1,7 +1,7 @@
 // $Id$
 
-// The following configuration file is designed to work for LynxOS,
-// version 2.5.0 and later, using the GNU g++ compiler.
+// The following configuration file is designed to work for LynxOS 2.50
+// platforms using the GNU g++ compiler (version 2.7.2 or later).
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -26,126 +26,189 @@
 #endif /* __GNUG__ */
 
 #if defined (__x86__)
-  // PowerPC libraries don't seem to have alloca (), so only use with x86.
+  // PowerPC libraries don't seem to have alloca ()
 # define ACE_HAS_ALLOCA
 # define ACE_HAS_ALLOCA_H
 # define ACE_HAS_PENTIUM
 #elif defined (__powerpc__)
-  // fork ()/exec () don't seem to work well on PPC.
-# define ACE_LACKS_FORK
   // This doesn't work on LynxOS 3.0.0, because it resets the TimeBaseRegister.
   // # define ACE_HAS_POWERPC_TIMER
 #endif /* __x86__ || __powerpc__ */
 
+// System include files are not in sys/, this gets rid of warning.
+#define __NO_INCLUDE_WARN__
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
+#define ACE_LACKS_GETOPT_PROTO
+#define ACE_HAS_SHM_OPEN
+// LynxOS 2.5.0 does not support MAP_PRIVATE, so map it to MAP_SHARED
+#define ACE_MAP_PRIVATE ACE_MAP_SHARED
+#define ACE_HAS_STDARG_THR_DEST
+
+// Platform supports System V IPC (most versions of UNIX, but not Win32)
+#define ACE_HAS_SYSV_IPC
+
+#define ACE_HAS_LYNXOS_SIGNALS
+
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+
+// Platform supports recvmsg and sendmsg.
+#define ACE_HAS_MSG
+
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+
+// Denotes that GNU has cstring.h as standard, which redefines memchr()
+#define ACE_HAS_GNU_CSTRING_H
+
+// Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
-#define ACE_HAS_BROKEN_READV
-#define ACE_HAS_BROKEN_SETRLIMIT
-#define ACE_HAS_BROKEN_WRITEV
-#define ACE_HAS_CLOCK_GETTIME
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_DIRENT
-#define ACE_HAS_GETRUSAGE
-#define ACE_HAS_GNU_CSTRING_H
-#define ACE_HAS_GPERF
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_LYNXOS_SIGNALS
-#define ACE_HAS_MSG
+
+// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4.
+#define ACE_HAS_CLOCK_GETTIME
+
+// Platform passes timezone into gettimeofday call
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
+
+// Platform does not have const anything
+#define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
+#define ACE_HAS_BROKEN_WRITEV
+#define ACE_HAS_BROKEN_READV
+#define ACE_HAS_BROKEN_SETRLIMIT
+#define ACE_LACKS_SOME_POSIX_PROTOTYPES
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+
+// Platform has union semun defined
+#define ACE_HAS_SEMUN
+
+// Platform contains <poll.h>.
 #define ACE_HAS_POLL
-#define ACE_HAS_POSIX_NONBLOCK
+#define ACE_POLL_IS_BROKEN
+
+// Platform supports POSIX timers via timestruc_t.
 #define ACE_HAS_POSIX_TIME
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_SEMUN
-#define ACE_HAS_SHM_OPEN
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_SIGWAIT
+#define ACE_LACKS_TIMESPEC_T
+
+#define ACE_LACKS_STRCASECMP
+#define ACE_LACKS_MADVISE
+#define ACE_LACKS_GETPGID
+
+// in man pages, but no prototype in headers
+#define ACE_LACKS_MKTEMP
+
+// Platform supports the rusage struct.
+#define ACE_HAS_GETRUSAGE
+
+// Compiler/platform defines the sig_atomic_t typedef.
 #define ACE_HAS_SIG_ATOMIC_T
+
+// Platform supports SVR4 extended signals.
+#define ACE_HAS_SIGINFO_T
+#define ACE_LACKS_SIGINFO_H
+#define ACE_LACKS_UCONTEXT_H
+//#define ACE_HAS_UCONTEXT_T
+//Platform has si_addr, but its not supported currently
+#define ACE_LACKS_SI_ADDR
+
+// Compiler/platform provides the sockio.h file.
 #define ACE_HAS_SOCKIO_H
+
+// Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STDARG_THR_DEST
-#define ACE_HAS_STRBUF_T
+
+// Platform supports STREAMS.
 #define ACE_HAS_STREAMS
+
+// Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
-#define ACE_HAS_SYSV_IPC
+
+// Compiler/platform supports struct strbuf.
+#define ACE_HAS_STRBUF_T
+
+// Compiler/platform supports sys_siglist array.
 #define ACE_HAS_SYS_SIGLIST
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_GETHOSTENT
-#define ACE_LACKS_GETOPT_PROTO
-#define ACE_LACKS_GETPGID
-#define ACE_LACKS_MADVISE
-#define ACE_LACKS_MKTEMP
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SI_ADDR
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES
-#define ACE_LACKS_STRCASECMP
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_MALLOC_ALIGN 8
-// LynxOS, through 3.0.0, does not support MAP_PRIVATE, so map it to
-// MAP_SHARED.
-#define ACE_MAP_PRIVATE ACE_MAP_SHARED
-#define ACE_PAGE_SIZE 4096
-#define ACE_POLL_IS_BROKEN
 
+/* Turn off the following seven defines if you want to disable threading. */
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 # define _REENTRANT
 #endif
 
-#if ACE_MT_SAFE == 1
-  // Platform supports threads.
-# define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_DRAFT4
-# define ACE_HAS_THREADS
-# define ACE_HAS_THREAD_SPECIFIC_STORAGE
-  // Without TSS emulation, you'll only have 3 native TSS keys, on
-  // LynxOS 3.0.0/ppc.
-# define ACE_HAS_TSS_EMULATION
-# define ACE_LACKS_NULL_PTHREAD_STATUS
-# define ACE_LACKS_SETDETACH
-# define ACE_LACKS_THREAD_PROCESS_SCOPING
-# define ACE_LACKS_THREAD_STACK_ADDR
-  // This gets around Lynx broken macro calls resulting in "::0"
-# define _POSIX_THREADS_CALLS
-#endif /* ACE_MT_SAFE */
+// Platform supports threads.
+#define ACE_HAS_THREADS
 
-#define ACE_HAS_AIO_CALLS
-#define ACE_POSIX_AIOCB_PROACTOR
-// 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
-// on SIG Proactor for this platform.
-// #define ACE_POSIX_SIG_PROACTOR
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_DRAFT4
+#define ACE_LACKS_NULL_PTHREAD_STATUS
+#define ACE_LACKS_THREAD_STACK_ADDR
+#define ACE_LACKS_SETDETACH
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+// This gets around Lynx broken macro calls resulting in "::0"
+#define _POSIX_THREADS_CALLS
 
-// Maximum compensation (10 ms) for early return from timed ::select ().
-#if !defined (ACE_TIMER_SKEW)
-# define ACE_TIMER_SKEW 10 * 1000
-#endif /* ACE_TIMER_SKEW */
+// Platform lack reader/writer locks
+#define ACE_LACKS_RWLOCK_T
+
+// Compiler/platform has thread-specific storage
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// Without TSS emulation, you'll only have 3 native TSS keys, on
+// LynxOS 3.0.0/ppc.
+#define ACE_HAS_TSS_EMULATION
+
+#define ACE_HAS_GPERF
+
+#define ACE_HAS_SIGWAIT
+#define ACE_HAS_DIRENT
 
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
+#define ACE_MALLOC_ALIGN 8
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+#define ACE_LACKS_GETHOSTENT
+
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
 # define ACE_USE_RCSID 0
 #endif /* ! ACE_USE_RCSID */
 
-// System include files are not in sys/, this gets rid of warning.
-#define __NO_INCLUDE_WARN__
-
 extern "C"
 {
   int getopt (int, char *const *, const char *);
   int putenv (const char *);
 }
 
+// = Proactor stuff
+
+// Aio works on lynx
+#define ACE_HAS_AIO_CALLS
+
+// 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
+// on SIG Proactor for this platform.
+// #define ACE_POSIX_SIG_PROACTOR
+#define ACE_POSIX_AIOCB_PROACTOR
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 32a1ed81b1a..d6dcc6f1207 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -60,39 +60,9 @@
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
 #   define ACE_HAS_TYPENAME_KEYWORD
-
-//    9: nested comment not allowed.  (/usr/include/pdsc.h!) (nestcomment)
-//  177: variable was declared but never referenced (declbutnotref)
-//  193: zero used for undefined preprocessing identifier (undpreid)
-//  236: controlling expression is constant (boolexprconst)
-//  401: base_class_with_nonvirtual_dtor (basclsnondto)
-//  835: unreferenced_function_param (unrfunprm)
-// 1016: expected type is incompatible with declared type of int (incint)
-// 1136: conversion to smaller size integer could lose data (intconlosbit)
-
-#   pragma message disable basclsnondto
-#   pragma message disable boolexprconst
-#   pragma message disable undpreid
-
-#   if (__DECCXX_VER >= 60190029)
-      // 6.1-029 and later support msg 1136.  Disable it because it
-      // causes warnings from ACE and/or TAO.
-#     pragma message disable intconlosbit
-#   endif /* __DECCXX_VER >= 60190029 */
-
-#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX == 5
-      // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-#     pragma message disable declbutnotref
-#   endif /* DIGITAL_UNIX 5 */
-
-#   if defined (ACE_HAS_EXCEPTIONS)
-#     pragma message disable unrfunprm
-#   endif /* ACE_HAS_EXCEPTIONS */
-
 # else  /* __DECCXX_VER < 60090010 */
 #   define ACE_LACKS_PRAGMA_ONCE
 # endif /* __DECCXX_VER < 60090010 */
-
 #elif defined (__rational__)
 # define ACE_HAS_REENTRANT_FUNCTIONS
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h
deleted file mode 100644
index f1e1c883457..00000000000
--- a/ace/config-pharlap.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// This configuration file is for use with the PharLap Realtime ETS Kernel.
-// It has been tested with PharLap TNT Embedded ToolSuite version 9.1.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-#define ACE_HAS_PHARLAP
-// Some features are only available with the Realtime edition of ETS.
-// Assume that if using ACE, the realtime version is also being used, but
-// allow it to be turned off as well.
-#ifndef ACE_HAS_PHARLAP_RT
-#  define ACE_HAS_PHARLAP_RT
-#else
-#  if (ACE_HAS_PHARLAP_RT == 0)
-#    undef ACE_HAS_PHARLAP_RT
-#  endif
-#endif
-
-// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on
-// WinNT 3.5, Winsock 1.1
-#define ACE_HAS_WINNT4 0
-#define ACE_HAS_WINSOCK2 0
-
-// The TSS implementation doesn't pass muster on the TSS_Test, but it works
-// well with ACE's TSS emulation.
-#define ACE_HAS_TSS_EMULATION
-
-#define ACE_LACKS_MMAP
-#define ACE_LACKS_MPROTECT
-#define ACE_LACKS_MSYNC
-
-// There's no host table, by default. So using "localhost" won't work.
-// If your system does have the ability to use "localhost" and you want to,
-// define it before including this file.
-#if !defined (ACE_LOCALHOST)
-# define ACE_LOCALHOST "127.0.0.1"
-#endif /* ACE_LOCALHOST */
-
-// Don't know how to get the page size at execution time. This is most likely
-// the correct value.
-#define ACE_PAGE_SIZE 4096
-
-// Maximum compensation (10 ms) for early return from timed ::select ().
-#if !defined (ACE_TIMER_SKEW)
-# define ACE_TIMER_SKEW 10 * 1000
-#endif /* ACE_TIMER_SKEW */
-
-// Let the config-win32.h file do its thing
-#undef ACE_CONFIG_H
-#include /**/ "ace/config-win32.h"
-#include /**/ <embkern.h>
-#if defined (ACE_HAS_PHARLAP_RT)
-# include /**/ <embtcpip.h>
-#endif /* ACE_HAS_PHARLAP_RT */
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index c84025bfb64..f1570285a57 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -30,9 +30,7 @@
 // #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
-#define ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#  include <signal.h>        //JINLU
-#undef ACE_DONT_INCLUDE_ACE_SIGNAL_H
+#include <signal.h>          //JINLU
 #include <pna.h>             //JINLU
 #define NSIG _NSIG           //_NSIG = 32 defined in signal.h JINLU
 #define TCP_NODELAY  1       // this will be defined later by pSOS/TM
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 1c5766e8a39..ca9cbe52d16 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -27,8 +27,6 @@
        to work around problems with automatic template instantiation. */
 #   define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 #   define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-// Note that SunC++ 5.0 doesn't yet appear to support 
-// ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION...
 #   define ACE_TEMPLATES_REQUIRE_SOURCE
 #   define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #   define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h
deleted file mode 100644
index 7f63838fb78..00000000000
--- a/ace/config-sunos5.6-sunc++-4.x.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS 5.6
-// platforms using the SunC++ 4.x compiler.
-
-#if !defined (ACE_CONFIG_H)
-
-// ACE_CONFIG_H is defined by the following #included header.
-
-// At this point, there's no difference between our SunOS 5.5 and 5.6
-// configurations.
-#if defined (__SUNPRO_CC)
-# include "ace/config-sunos5.5-sunc++-4.x.h"
-#elif defined (__GNUG__)
-# include "ace/config-sunos5.5-g++.h"
-#else  /* ! __SUNPRO_CC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-sunos5.6.h
-#endif /* ! __SUNPRO_CC__ && ! __GNUG__ */
-
-// Additional SunOS 5.6 capabilities . . .
-#define ACE_HAS_AIO_CALLS
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index a2aad889217..362f5291195 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -26,17 +26,11 @@
     typedef unsigned long t_uscalar_t;
     typedef void          *timeout_id_t;
 # endif /* __GNUC__ <= 2  &&  __GNUC_MINOR__ < 8 */
+#endif /* __GNUG__ */
 
-#elif defined (ghs)
-  // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t,
-  // but /usr/include/sys/int_types.h doesn't #define it because
-  // _NO_LONGLONG is #
-# undef ACE_HAS_PROC_FS
-# undef ACE_HAS_PRUSAGE_T
-
-#elif defined (__KCC)
+#if defined (__KCC)
 typedef unsigned long long uint64_t;
-#endif /* __GNUG__ || ghs || __KCC */
+#endif
 
 // Solaris 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER.
 #undef ACE_HAS_ONLY_SCHED_OTHER
diff --git a/ace/config-visualage.h b/ace/config-visualage.h
deleted file mode 100644
index 8fa97f7fa89..00000000000
--- a/ace/config-visualage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// This configuration file automatically includes the proper
-// configurations for IBM's VisualAge C++ compiler on Win32 and AIX.
-
-#ifdef __TOS_WIN__
-   #include "ace/config-win32.h"
-#elif __TOS_AIX__
-   #include "ace/config-aix-4.x.h"
-#else
-   #include "PLATFORM NOT SPECIFIED"
-#endif /* __TOS_WIN__ */
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 1a66ffab953..641585f1470 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -151,7 +151,6 @@
 
 #define ACE_HAS_STRDUP_EMULATION
 #define ACE_LACKS_MKFIFO
-#define ACE_HAS_BROKEN_ACCEPT_ADDR
 
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index cfd8881314f..d007b40fd2b 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -2,152 +2,63 @@
 // $Id$
 
 // The following configuration file contains the defines
-// common to all Borland compilers.  Do not include this file directly
-// -- just include config-win32-common.h, which includes this file.
+// common to all Borland compilers.
 
 #ifndef ACE_WIN32_BORLAND_H
 #define ACE_WIN32_BORLAND_H
 
-# if defined(__BORLANDC__)
+#if defined(__BORLANDC__)
 
-#   if defined (ACE_LACKS_MODE_MASKS)
-#     undef ACE_LACKS_MODE_MASKS
-#   endif /* defined (ACE_LACKS_MODE_MASKS) */
-#   define ACE_LACKS_MODE_MASKS 1
+#if defined (ACE_LACKS_MODE_MASKS)
+#undef ACE_LACKS_MODE_MASKS
+#endif /* defined (ACE_LACKS_MODE_MASKS) */
 
-#   if defined (ACE_HAS_USER_MODE_MASKS)
-#     undef ACE_HAS_USER_MODE_MASKS
-#   endif /* defined (ACE_HAS_USER_MODE_MASKS) */
-#   define ACE_HAS_USER_MODE_MASKS 1
-
-#   if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#     undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#   endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) */
-#   define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 1
-
-#   if defined (ACE_EXPORT_NESTED_CLASSES)
-#     undef ACE_EXPORT_NESTED_CLASSES
-#   endif /* defined (ACE_EXPORT_NESTED_CLASSES) */
-#   define ACE_EXPORT_NESTED_CLASSES
-
-#   if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
-#     undef ACE_HAS_NONCONST_SELECT_TIMEVAL
-#   endif /* defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) */
-#   define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-
-#   if (__BORLANDC__ < 0x540)
-#     if defined (ACE_HAS_BROKEN_SAP_ANY)
-#       undef ACE_HAS_BROKEN_SAP_ANY
-#     endif /* defined (ACE_HAS_BROKEN_SAP_ANY) */
-#     define ACE_HAS_BROKEN_SAP_ANY 1
-#   endif /* (__BORLANDC__ < 0x540) */
+#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#define ACE_HAS_BROKEN_SAP_ANY
 
 /*
- * Definitions common to Borland C++ 5.x, Borland C++ Builder 3.x,
- * and C++ Builder 4.x.
+ * Definitions common to Borland C++ 5.x and Borland C++ Builder 3.x.
  */
-#   if (__BORLANDC__ >= 0x500)
-#     if !defined (ACE_HAS_WINCE)
-#       if defined (ACE_HAS_SIG_ATOMIC_T)
-#         undef ACE_HAS_SIG_ATOMIC_T
-#       endif /* defined (ACE_HAS_SIG_ATOMIC_T) */
-#       define ACE_HAS_SIG_ATOMIC_T 1
-#     endif /* !defined (ACE_HAS_WINCE) */
-
-#     if defined (ACE_HAS_TYPENAME_KEYWORD)
-#       undef ACE_HAS_TYPENAME_KEYWORD
-#     endif /* defined (ACE_HAS_TYPENAME_KEYWORD) */
-#     define ACE_HAS_TYPENAME_KEYWORD 1
-
-#     if defined (ACE_SIZEOF_LONG_DOUBLE)
-#       undef ACE_SIZEOF_LONG_DOUBLE
-#     endif /* defined (ACE_SIZEOF_LONG_DOUBLE) */
-#     define ACE_SIZEOF_LONG_DOUBLE 10
-
-#     if defined (ACE_HAS_USING_KEYWORD)
-#       undef ACE_HAS_USING_KEYWORD
-#     endif /* defined (ACE_HAS_USING_KEYWORD) */
-#     define ACE_HAS_USING_KEYWORD 1
-
-#     if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#       undef ACE_HAS_STANDARD_CPP_LIBRARY
-#     endif /* defined (ACE_HAS_STANDARD_CPP_LIBRARY) */
-#     define ACE_HAS_STANDARD_CPP_LIBRARY 0
-#   endif /* (__BORLANDC__ >= 0x500) */
+#if (__BORLANDC__ >= 0x500)
+  #if !defined (ACE_HAS_WINCE)
+    #define ACE_HAS_SIG_ATOMIC_T
+  #endif /* !defined (ACE_HAS_WINCE) */
 
-/*
- * Definitions for Borland C++ Builder 3.x and C++ Builder 4.x.
- */
-#   if (__BORLANDC__ >= 0x0530)
+  #define ACE_HAS_TYPENAME_KEYWORD
 
-#     if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#       undef ACE_HAS_STANDARD_CPP_LIBRARY
-#     endif /* defined (ACE_HAS_STANDARD_CPP_LIBRARY) */
-#     define ACE_HAS_STANDARD_CPP_LIBRARY 1
+  #ifdef ACE_SIZEOF_LONG_DOUBLE
+  #undef ACE_SIZEOF_LONG_DOUBLE
+  #endif
+  #define ACE_SIZEOF_LONG_DOUBLE 10
 
-#     if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#       undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-#     endif /* defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) */
-#     define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+  #ifdef ACE_HAS_USING_KEYWORD
+  #undef ACE_HAS_USING_KEYWORD
+  #endif
+  #define ACE_HAS_USING_KEYWORD 1
 
-#   endif /* (__BORLANDC__ >= 0x0530) */
+  #ifdef ACE_HAS_STANDARD_CPP_LIBRARY
+  #undef ACE_HAS_STANDARD_CPP_LIBRARY
+  #endif
+  #define ACE_HAS_STANDARD_CPP_LIBRARY 0
+#endif /* (__BORLANDC__ >= 0x500) */
 
 /*
- * Definitions only for Borland C++ Builder 4.x
+ * Definitions only for Borland C++ Builder 3.x.
  */
-#   if (__BORLANDC__ == 0x0540) 
-
-// Compiler enforces need for 'template<>" when specializing template
-// class methods.
-#     define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 
-
-// Compiler enforces need for 'template<>" when specializing template
-// class methods.
-#     define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION
+#if (__BORLANDC__ >= 0x0530)
 
-#     if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-#       undef ACE_HAS_TEMPLATE_TYPEDEFS
-#     endif /* defined (ACE_HAS_TEMPLATE_TYPEDEFS) */
-#     define ACE_HAS_TEMPLATE_TYPEDEFS 1
+  #ifdef ACE_HAS_STANDARD_CPP_LIBRARY
+  #undef ACE_HAS_STANDARD_CPP_LIBRARY
+  #endif
+  #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 
-#     if defined (ACE_HAS_STRING_CLASS)
-#       undef ACE_HAS_STRING_CLASS
-#     endif /* defined (ACE_HAS_STRING_CLASS) */
-#     define ACE_HAS_STRING_CLASS 1
+  #ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+  #undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+  #endif
+  #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
-#     if defined (ACE_HAS_STDCPP_STL_INCLUDES)
-#       undef ACE_HAS_STDCPP_STL_INCLUDES
-#     endif /* defined (ACE_HAS_STDCPP_STL_INCLUDES) */
-#     define ACE_HAS_STDCPP_STL_INCLUDES 1
+#endif /* (__BORLANDC__ >= 0x0530) */
 
-      /* ACE IOStreams don't work with standard C++ iostreams (yet) */
-#     if defined (ACE_LACKS_ACE_IOSTREAM)
-#       undef ACE_LACKS_ACE_IOSTREAM
-#     endif /* defined (ACE_LACKS_ACE_IOSTREAM) */
-#     define ACE_LACKS_ACE_IOSTREAM 1
-
-      /* previously defined for MSVC */ 
-#     if defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
-#       undef ACE_HAS_WCHAR_TYPEDEFS_USHORT
-#     endif /* defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT) */
-
-      /* previously defined for MSVC */
-#     if defined (ACE_HAS_BROKEN_NAMESPACES)
-#       undef ACE_HAS_BROKEN_NAMESPACES
-#     endif /* defined (ACE_HAS_BROKEN_NAMESPACES) */
-
-      /* previously defined for MSVC */
-#     if defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR)
-#       undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-#     endif /* defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) */
-
-      /* need to ensure these are included before <iomanip> */
-#     include <time.h>
-#     include <stdlib.h>
-
-#   endif /* (__BORLANDC__ == 0x0540) */
-
-# endif /* defined(__BORLANDC__) */
+#endif /* defined(__BORLANDC__) */
 
 #endif /* ACE_WIN32_BORLAND_H */
-
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 907f7ec5b44..ddfc4a3b77b 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -153,7 +153,7 @@ typedef unsigned __int64 ACE_UINT64;
 // Platform support linebuffered streaming is broken
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-// Template specialization is supported.
+// Template specialization is supported
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 // No system support for replacing any previous mappings.
@@ -256,7 +256,7 @@ typedef unsigned __int64 ACE_UINT64;
         #endif /* _MT */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
+#if !defined (ACE_HAS_WINCE)
 #if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0)
         #if !defined(_DLL)
                 // *** DO NOT *** DO NOT *** defeat this error message
@@ -264,7 +264,7 @@ typedef unsigned __int64 ACE_UINT64;
                 #error You must link against (Debug) Multithreaded DLL run-time libraries.
         #endif /* !_DLL */
 #endif  /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */
-#endif /* !ACE_HAS_WINCE && !__BORLANDC__ */
+#endif /* ACE_HAS_WINCE */
 
 // We are using STL's min and max (in algobase.h).  Therefore the
 // macros in window.h are extra
@@ -272,10 +272,6 @@ typedef unsigned __int64 ACE_UINT64;
         #define NOMINMAX
 #endif /* NOMINMAX */
 
-#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE)
-#defined UNICODE
-#endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */
-
 #if defined (_UNICODE)
         #if !defined (UNICODE)
                  #define UNICODE         /* UNICODE is used by Windows headers */
@@ -395,10 +391,7 @@ typedef unsigned __int64 ACE_UINT64;
                 #include /**/ <winsock.h>
         #endif /* _WINSOCKAPI */
 
-        // PharLap ETS has its own winsock lib, so don't grab the one
-        // supplied with the OS.
-        #if defined (_MSC_VER) && !defined (UNDER_CE) && \
-                                  !defined (ACE_HAS_PHARLAP)
+        #if defined (_MSC_VER) && !defined (UNDER_CE)
                 #pragma comment(lib, "wsock32.lib")
         #endif /* _MSC_VER */
 
@@ -431,10 +424,9 @@ typedef unsigned __int64 ACE_UINT64;
 // At least for Win32 - MSVC compiler (ver. 5)
 #define ACE_UINT64_FORMAT_SPECIFIER "%I64u"
 
-// Borland C++ compiler.
-#include /**/ <ace/config-win32-borland.h>
-
-// IBM VisualAge C++ compiler.
-#include /**/ <ace/config-win32-visualage.h>
+/*
+ * Borland Compilers.
+ */
+#include <ace/config-win32-borland.h>
 
 #endif /* ACE_WIN32_COMMON_H */
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
deleted file mode 100644
index 19062e09040..00000000000
--- a/ace/config-win32-visualage.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//Created for IBMCPP
-// The following configuration file contains the defines
-// common to all VisualAge compilers.
-
-#ifndef ACE_WIN32_VISUALAGECPP_H
-#define ACE_WIN32_VISUALAGECPP_H
-
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-
-//These need to be defined for VisualAgeC++
-#define ERRMAX 256 /* Needed for following define */
-#define ACE_LACKS_SYS_NERR /* Needed for sys_nerr in Log_Msg.cpp */
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES /* For signal handling */
-#define ACE_HAS_TYPENAME_KEYWORD
-#define ACE_LACKS_MKTEMP
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#define NSIG 23 /* Maximum no. of signals + 1 */
-
-#undef WIFEXITED
-#undef WEXITSTATUS
-
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_BROKEN_NESTED_TEMPLATES
-
-#define _O_RDWR   O_RDWR
-#define _O_WRONLY O_WRONLY
-#define _O_RDONLY O_RDONLY
-#define _O_APPEND O_APPEND
-#define _O_BINARY O_BINARY
-#define _O_TEXT O_TEXT
-
-#define _endthreadex _endthread
-#define _beginthreadex _beginthread
-
-//Error codes that are in MS Visual C++
-#define EFAULT 99 /* Error code (should be in errno.h) */
-#define ENODEV		19
-#define EPIPE		32
-#define ENAMETOOLONG	38
-
-
-#if defined (ACE_HAS_UNICODE)
- #undef ACE_HAS_UNICODE
-#endif /* ACE_HAS_UNICODE */
-
-#if defined (ACE_HAS_WCHAR_TYPEDEFS_USHORT)
-  #undef ACE_HAS_WCHAR_TYPEDEFS_USHORT
-#endif /* ACE_HAS_WCHAR_TYPEDEFS_USHORT */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-//  #undef ACE_TEMPLATES_REQUIRE_SOURCE
-#endif
-
-#endif /* defined(__IBMCPP__) */
-#endif /* ACE_WIN32_VISUALAGECPP_H */
diff --git a/apps/Gateway/Gateway/Channel.cpp b/apps/Gateway/Gateway/Channel.cpp
deleted file mode 100644
index 99699a6ee87..00000000000
--- a/apps/Gateway/Gateway/Channel.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-// $Id$
-
-#include "Routing_Entry.h"
-#include "Channel_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MUTEX
-
-// = The total number of bytes sent/received on this channel.
-size_t 
-Channel::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-Channel::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-Channel::Channel (ROUTING_TABLE *rt,
-                  Channel_Connector *cc,
-		  ACE_Thread_Manager *thr_mgr,
-		  int socket_queue_size)
-  : ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH> (thr_mgr),
-    routing_table_ (rt),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (Channel::IDLE),
-    connector_ (cc),
-    timeout_ (1),
-    max_timeout_ (Channel::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-Channel::active (int a)
-{
-  this->state (a == 0 ? Channel::IDLE : Channel::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-Channel::active (void)
-{
-  return this->state () == Channel::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-Channel::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-Channel::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-Channel::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-Channel::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-Channel::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-Channel::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-Channel::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect Channel %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-Channel::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of Channel %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, 
-						   this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the Channel object.
-
-int
-Channel::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down Channel %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-Channel::state (Channel::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-Channel::initialize_connection (void)
-{
-  this->state_ = Channel::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_ROUTING_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), -1);
-#endif /* ASSIGN_ROUTING_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-Channel::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'I' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific Channel.
-
-int
-Channel::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Channel's fd = %d\n", this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-Channel::State
-Channel::state (void)
-{
-  return this->state_;
-}
-
-void
-Channel::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-Channel::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-Channel::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-Channel::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-Channel::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the routing table pointer.
-
-Output_Channel::Output_Channel (ROUTING_TABLE *rt,
-                                Channel_Connector *cc,
-				ACE_Thread_Manager *thr_mgr,
-				int socket_queue_size)
-  : Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'O';
-  this->msg_queue ()->high_water_mark (Output_Channel::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the Channel as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Output_Channel::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (Channel::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-int 
-Output_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Output_Channel!\n"), -1);
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-queued at the *front* of
-// the Message_List.
-
-int
-Output_Channel::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (Channel::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-int
-Output_Channel::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;    
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the buffer.
-      // Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending a message when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Output_Channel::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  int           status = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) in handle_output on handle %d\n", this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire message (or we did not fail
-          // due to EWOULDBLOCK) then check if there are more messages on the Message_List.
-          // If there aren't, tell the ACE_Reactor not to notify us anymore (at least
-          // until there are new messages queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may queue if necessary).
-
-int 
-Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control 
-    // then just enqueue and return.
-    return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the routing table pointer and the connector pointer.
-
-Input_Channel::Input_Channel (ROUTING_TABLE *rt,
-                              Channel_Connector *cc,
-			      ACE_Thread_Manager *thr_mgr,
-			      int socket_queue_size)
-  : msg_frag_ (0), 
-    Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'I';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-int 
-Input_Channel::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) put should not be called on Input_Channel!\n"), -1);
-}
-
-int 
-Input_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Input_Channel!\n"), -1);
-}
-
-// Receive a Peer message from peerd.  Handles fragmentation.
-//
-// The routing message returned from recv_peer consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the message structure.
-
-int
-Input_Channel::recv_peer (ACE_Message_Block *&route_addr)
-{ 
-  Peer_Message *peer_msg;
-  size_t len;
-  ssize_t n = 0;
-  ssize_t m = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Peer_Message)), 
-		    -1);
-
-  peer_msg = (Peer_Message *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Peer_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, "attempted to read %d\n", header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire message.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof peer_msg->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  // Try to receive the remainder of the message
-
-  switch (m = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole message.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the message.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the message.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate a routing message header and chain the data portion 
-          // onto its continuation field.
-          ACE_NEW_RETURN (route_addr,
-			  ACE_Message_Block (sizeof (Peer_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Peer_Addr peer_addr (this->id (), peer_msg->header_.routing_id_, 0);
-          // Copy the routing address from the Peer_Message into routing_addr.
-          route_addr->copy ((char *) &peer_addr, sizeof (Peer_Addr));
-
-          // Reset the pointer to indicate we've got an entire message.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 peer_addr.conn_id_, peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		 peer_msg->header_.len_, peer_msg->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 peer_msg->header_.routing_id_, peer_msg->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the 
-// gatewayd, as well as stdio).
-
-int 
-Input_Channel::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *route_addr = 0;
-
-  switch (this->recv_peer (route_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (Channel::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input Channel %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (Channel::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input Channel %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->route_message (route_addr);
-    }
-}
-
-// Route a message to its appropriate destination.
-
-int
-Input_Channel::route_message (ACE_Message_Block *route_addr)
-{
-  // We got a valid message, so determine its virtual routing id,
-  // which is stored in the first of the two message blocks chained together.
-	
-  Peer_Addr *routing_key = (Peer_Addr *) route_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = route_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Routing_Entry *re = 0;
-	
-  if (this->routing_table_->find (*routing_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this message currently\n"));
-	    
-      else		// There are destinations, so forward the message.
-	{
-	  Routing_Entry::ENTRY_SET *esp = re->destinations ();
-	  Routing_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (Channel **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the message portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping messages"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete route_addr;
-	  return 0;
-	}
-    }
-  delete route_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     routing_key->conn_id_, routing_key->logical_id_, routing_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Iterator<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Entry<Peer_Addr, Routing_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Channel.h b/apps/Gateway/Gateway/Channel.h
deleted file mode 100644
index 339716bc55a..00000000000
--- a/apps/Gateway/Gateway/Channel.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL)
-#define _CHANNEL
-
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Routing_Table.h"
-#include "Routing_Entry.h"
-#include "Peer_Message.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MUTEX;
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#else /* ACE_HAS_THREADS */
-
-// Select communication mechanisms.
-#if 0 // defined (ACE_HAS_TLI)
-// Note that due to inconsistencies between the semantics of sockets
-// and TLI with respect to establishing non-blocking connections it's
-// not a good idea to use TLI...
-#include "ace/TLI_Connector.h"
-#define CHANNEL_PEER_STREAM ACE_TLI_STREAM
-#define CHANNEL_PEER_CONNECTOR ACE_TLI_CONNECTOR 
-#else
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#endif /* 0 */
-
-// Note that we only need to make the ACE_Task thread-safe if we
-// are using the multi-threaded Thr_Output_Channel...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH ACE_MT_SYNCH
-#else
-#define SYNCH ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Input_Channel...
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MUTEX;
-#else
-typedef ACE_Null_Mutex MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// Typedef for the routing table.
-typedef Routing_Table<Peer_Addr, Routing_Entry, MUTEX>
-	ROUTING_TABLE;
-
-// Forward declaration.
-class Channel_Connector;
-
-class Channel : public ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>
-  // = TITLE
-  //    Channel contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The Channel classes process messages sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. Channel_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, Channel_Connector
-  //    creates an Channel object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Channels are used by gatewayd
-  //    that to receive, route, and forward messages from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  Channel (ROUTING_TABLE *, 
-	   Channel_Connector *, 
-	   ACE_Thread_Manager * = 0,
-	   int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded Channel (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the Channel.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // Channel is established and active.
-    DISCONNECTING, // Channel is in the process of connecting.
-    FAILED	   // Channel has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get Channel activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based Channel reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform Channel termination.
-
-  ROUTING_TABLE *routing_table_;
-  // Pointer to table that maps a Peer_Addr
-  // to a Set of Channel *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  Channel_Connector *connector_;
-  // Back pointer to Channel_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Input_Channel : public Channel
-  // = TITLE
-  //     Handle reception of Peer messages arriving as events.
-{
-public:
-  Input_Channel (ROUTING_TABLE *, 
-		 Channel_Connector *, 
-		 ACE_Thread_Manager * = 0,
-		 int socket_queue_size = 0);
-  // Constructor sets the routing table pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer messages.
-
-protected:
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive a message from a peer.
-
-  int route_message (ACE_Message_Block *);
-  // Action that receives messages from peerd.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from
-  // peers.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-
-private:
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
-  // This methods should not be called to handle input.
-};
-
-class Output_Channel : public Channel
-  // = TITLE
-  //     Handle transmission of messages to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Output_Channel (ROUTING_TABLE *, 
-		  Channel_Connector *, 
-		  ACE_Thread_Manager * = 0,
-		  int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from peer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-};
-
-#endif /* _CHANNEL */
diff --git a/apps/Gateway/Gateway/Channel_Connector.cpp b/apps/Gateway/Gateway/Channel_Connector.cpp
deleted file mode 100644
index a5394e8b013..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "Channel_Connector.h"
-// $Id$
-
-
-Channel_Connector::Channel_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-Channel_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  Channel *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the Channel.
-
-int
-Channel_Connector::initiate_connection (Channel *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (Channel::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (Channel::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (Channel::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (Channel::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/Channel_Connector.h b/apps/Gateway/Gateway/Channel_Connector.h
deleted file mode 100644
index 3e27f37355a..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL_CONNECTOR)
-#define _CHANNEL_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_Channel.h"
-
-class Channel_Connector : public ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new Channel object to do the dirty work...
-{
-public:
-  Channel_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the Channel.
-  int initiate_connection (Channel *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _CHANNEL_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Concurrency_Strategies.h b/apps/Gateway/Gateway/Concurrency_Strategies.h
deleted file mode 100644
index 28e59a4b2e6..00000000000
--- a/apps/Gateway/Gateway/Concurrency_Strategies.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Concurrency_strategies.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONCURRENCY_STRATEGIES)
-#define _CONCURRENCY_STRATEGIES
-
-#include "ace/Synch.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MAP_MUTEX;
-#else /* ACE_HAS_THREADS */
-
-// Note that we only need to make the ACE_Task thread-safe if we are
-// using the multi-threaded Thr_Consumer_Proxy...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH_STRATEGY ACE_MT_SYNCH
-#else
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Supplier_Proxy.  In this
-// case, we use an RW_Mutex since we'll lookup Consumers far more
-// often than we'll update them.
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MAP_MUTEX;
-#else
-typedef ACE_Null_Mutex MAP_MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// = Forward decls
-class Thr_Consumer_Proxy;
-class Thr_Supplier_Proxy;
-class Consumer_Proxy;
-class Supplier_Proxy;
-
-#if defined (ACE_HAS_THREADS) && (defined (USE_OUTPUT_MT) || defined (USE_INPUT_MT))
-#if defined (USE_OUTPUT_MT)
-typedef Thr_Consumer_Proxy CONSUMER_PROXY;
-#else
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* USE_OUTPUT_MT */
-
-#if defined (USE_INPUT_MT)
-typedef Thr_Supplier_Proxy SUPPLIER_PROXY;
-#else
-typedef Supplier_Proxy SUPPLIER_PROXY;
-#endif /* USE_INPUT_MT */
-#else
-// Instantiate a non-multi-threaded Gateway.
-typedef Supplier_Proxy SUPPLIER_PROXY;
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* ACE_HAS_THREADS */
-
-#endif /* _CONCURRENCY_STRATEGIES */
diff --git a/apps/Gateway/Gateway/Consumer_Entry.cpp b/apps/Gateway/Gateway/Consumer_Entry.cpp
deleted file mode 100644
index c3dcd96ebbf..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Defines an entry in the Consumer Map.
-// $Id$
-
-#include "Consumer_Entry.h"
-
-Consumer_Entry::Consumer_Entry (void)
-{
-  ACE_NEW (this->destinations_, Consumer_Entry::ENTRY_SET);
-}
-
-Consumer_Entry::~Consumer_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Consumer_Entry::ENTRY_SET *
-Consumer_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Consumer_Entry::destinations (Consumer_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
diff --git a/apps/Gateway/Gateway/Consumer_Entry.h b/apps/Gateway/Gateway/Consumer_Entry.h
deleted file mode 100644
index fe502991514..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class IO_Handler;
-
-class Consumer_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Consumer_Map.
-public:
-  Consumer_Entry (void);
-  ~Consumer_Entry (void);
-
-  typedef ACE_Unbounded_Set<IO_Handler *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<IO_Handler *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Consumer_Map.cpp b/apps/Gateway/Gateway/Consumer_Map.cpp
deleted file mode 100644
index 6d16601f949..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (_CONSUMER_MAP_C)
-#define _CONSUMER_MAP_C
-
-#include "Consumer_Map.h"
-
-// Bind the Event_Addr to the INT_ID.
-
-int
-Consumer_Map::bind (Event_Addr event_addr, 
-		    Consumer_Entry *Consumer_Entry)
-{
-  return this->map_.bind (event_addr, Consumer_Entry);
-}
-
-// Find the Consumer_Entry corresponding to the Event_Addr.
-
-int
-Consumer_Map::find (Event_Addr event_addr, 
-		    Consumer_Entry *&Consumer_Entry)
-{
-  return this->map_.find (event_addr, Consumer_Entry);
-}
-
-// Unbind (remove) the Event_Addr from the map.
-
-int
-Consumer_Map::unbind (Event_Addr event_addr)
-{
-  return this->map_.unbind (event_addr);
-}
-
-Consumer_Map_Iterator::Consumer_Map_Iterator (Consumer_Map &rt)
-  : map_iter_ (rt.map_)
-{
-}
-
-int
-Consumer_Map_Iterator::next (Consumer_Entry *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<Event_Addr, Consumer_Entry *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-int
-Consumer_Map_Iterator::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _CONSUMER_MAP_C */
diff --git a/apps/Gateway/Gateway/Consumer_Map.h b/apps/Gateway/Gateway/Consumer_Map.h
deleted file mode 100644
index fd392afaf6e..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Map.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONSUMER_MAP_H)
-#define _CONSUMER_MAP_H
-
-#include "ace/Map_Manager.h"
-#include "Concurrency_Strategies.h"
-#include "Event.h"
-#include "Consumer_Entry.h"
-
-class Consumer_Map
-{
-  // = TITLE
-  //    Define a generic consumer map based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    This class makes it easier to use the Map_Manager.
-public:
-  int bind (Event_Addr event, Consumer_Entry *Consumer_Entry);
-  // Associate Event with the Consumer_Entry.
-
-  int find (Event_Addr event, Consumer_Entry *&Consumer_Entry);
-  // Break any association of EXID.
-
-  int unbind (Event_Addr event);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_;
-  // Map that associates Event Addrs (external ids) with Consumer_Entry *'s
-  // <internal IDs>.
-};
-
-class Consumer_Map_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Consumer Map.
-public:
-  Consumer_Map_Iterator (Consumer_Map &mm);
-  int next (Consumer_Entry *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_iter_;
-  // Map we are iterating over.
-};
-#endif /* _CONSUMER_MAP_H */
diff --git a/apps/Gateway/Gateway/Dispatch_Set.h b/apps/Gateway/Gateway/Dispatch_Set.h
deleted file mode 100644
index a867f1ca5ff..00000000000
--- a/apps/Gateway/Gateway/Dispatch_Set.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Dispatch_Set.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_DISPATCH_SET)
-#define _DISPATCH_SET
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Proxy_Handler;
-
-typedef ACE_Unbounded_Set<Proxy_Handler *> Dispatch_Set;
-typedef ACE_Unbounded_Set_Iterator<Proxy_Handler *> Dispatch_Set_Iterator;
-
-#endif /* _DISPATCH_SET */
diff --git a/apps/Gateway/Gateway/IO_Handler.cpp b/apps/Gateway/Gateway/IO_Handler.cpp
deleted file mode 100644
index ba1b355b3ba..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-// $Id$
-
-#include "Consumer_Entry.h"
-#include "IO_Handler_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MAP_MUTEX
-
-// The total number of bytes sent/received on this channel.
-
-size_t 
-IO_Handler::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-IO_Handler::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-IO_Handler::IO_Handler (Consumer_Map *consumer_map,
-			IO_Handler_Connector *ioc,
-			ACE_Thread_Manager *thr_mgr,
-			int socket_queue_size)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY> (thr_mgr),
-    consumer_map_ (consumer_map),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (IO_Handler::IDLE),
-    connector_ (ioc),
-    timeout_ (1),
-    max_timeout_ (IO_Handler::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-IO_Handler::active (int a)
-{
-  this->state (a == 0 ? IO_Handler::IDLE : IO_Handler::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-IO_Handler::active (void)
-{
-  return this->state () == IO_Handler::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-IO_Handler::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-IO_Handler::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-IO_Handler::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-IO_Handler::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-IO_Handler::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-IO_Handler::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-IO_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect IO_Handler %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-IO_Handler::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of IO_Handler %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer 
-	  (this, 0, this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the IO_Handler object.
-
-int
-IO_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) shutting down IO_Handler %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-IO_Handler::state (IO_Handler::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-IO_Handler::initialize_connection (void)
-{
-  this->state_ = IO_Handler::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_SUPPLIER_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), 
-		      -1);
-#endif /* ASSIGN_SUPPLIER_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-IO_Handler::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'S' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific IO_Handler.
-
-int
-IO_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) IO_Handler's fd = %d\n", 
-	      this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-IO_Handler::State
-IO_Handler::state (void)
-{
-  return this->state_;
-}
-
-void
-IO_Handler::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-IO_Handler::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-IO_Handler::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-IO_Handler::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-IO_Handler::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the consumer map pointer.
-
-Consumer_Handler::Consumer_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'C';
-  this->msg_queue ()->high_water_mark (Consumer_Handler::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the IO_Handler as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Consumer_Handler::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (IO_Handler::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-// Perform a non-blocking put() of event MB.  If we are unable to
-// send the entire event  the remainder is re-queued at the *front* of
-// the Event_List.
-
-int
-Consumer_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the event.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Event_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n = this->send (mb);
-
-  if (n == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (IO_Handler::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-ssize_t
-Consumer_Handler::send (ACE_Message_Block *mb)
-{
-  ssize_t len = mb->length ();
-  ssize_t n = this->peer ().send (mb->rd_ptr (), len);
-
-  if (n <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole event is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending an event when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Consumer_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) in handle_output on handle %d\n", 
-	      this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire event (or we did not
-          // fail due to EWOULDBLOCK) then check if there are more
-          // events on the Event_List.  If there aren't, tell the
-          // ACE_Reactor not to notify us anymore (at least until
-          // there are new events queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send an event to a peer (may queue if necessary).
-
-int 
-Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the event *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up events due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the consumer map pointer and the connector
-// pointer.
-
-Supplier_Handler::Supplier_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : msg_frag_ (0), 
-    IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'S';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-// Receive a Peer event from peerd.  Handles fragmentation.
-//
-// The routing event returned from recv consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the event structure.
-
-int
-Supplier_Handler::recv (ACE_Message_Block *&forward_addr)
-{ 
-  Event *event;
-  ssize_t len;
-  ssize_t n = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Event)), 
-		    -1);
-
-  event = (Event *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Event_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), 
-			      header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "attempted to read %d\n", 
-		      header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire event.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof event->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  ssize_t m = this->peer ().recv (event->buf_ + offset, len);
-
-  // Try to receive the remainder of the event
-
-  switch (m)
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole event.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the event.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the event.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate an event forwarding header and chain the data
-          // portion onto its continuation field.
-          ACE_NEW_RETURN (forward_addr,
-			  ACE_Message_Block (sizeof (Event_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Event_Addr event_addr (this->id (), event->header_.routing_id_, 0);
-          // Copy the forwarding address from the Event_Addr into
-          // forward_addr.
-          forward_addr->copy ((char *) &event_addr, sizeof (Event));
-
-          // Reset the pointer to indicate we've got an entire event.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 event_addr.conn_id_, event->header_.routing_id_, event->header_.len_,
-		 event->header_.len_, event->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 event->header_.routing_id_, event->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer event from the 
-// gatewayd, as well as stdio).
-
-int 
-Supplier_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *forward_addr = 0;
-
-  switch (this->recv (forward_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (IO_Handler::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input IO_Handler %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (IO_Handler::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input IO_Handler %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->forward (forward_addr);
-    }
-}
-
-// Route an event to its appropriate destination.
-
-int
-Supplier_Handler::forward (ACE_Message_Block *forward_addr)
-{
-  // We got a valid event, so determine its virtual routing id,
-  // which is stored in the first of the two event blocks chained
-  // together.
-	
-  Event_Addr *forwarding_key = (Event_Addr *) forward_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = forward_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Consumer_Entry *re = 0;
-	
-  if (this->consumer_map_->find (*forwarding_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this event currently\n"));
-	    
-      else		// There are destinations, so forward the event.
-	{
-	  Consumer_Entry::ENTRY_SET *esp = re->destinations ();
-	  Consumer_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (IO_Handler **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the event portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping events"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete forward_addr;
-	  return 0;
-	}
-    }
-  delete forward_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     forwarding_key->conn_id_, forwarding_key->logical_id_, forwarding_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Entry<Event_Addr, Consumer_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/IO_Handler.h b/apps/Gateway/Gateway/IO_Handler.h
deleted file mode 100644
index 7bda073f09b..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER)
-#define _IO_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Consumer_Map.h"
-#include "Consumer_Entry.h"
-#include "Event.h"
-
-// Forward declaration.
-class IO_Handler_Connector;
-
-class IO_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>
-  // = TITLE
-  //    IO_Handler contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The IO_Handler classes process events sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. IO_Handler_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, IO_Handler_Connector
-  //    creates an IO_Handler object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Handlers are used by gatewayd
-  //    that to receive, route, and forward events from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  IO_Handler (Consumer_Map *, 
-	      IO_Handler_Connector *, 
-	      ACE_Thread_Manager * = 0,
-	      int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded IO_Handler (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the IO_Handler.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // IO_Handler is established and active.
-    DISCONNECTING, // IO_Handler is in the process of connecting.
-    FAILED	   // IO_Handler has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get IO_Handler activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based IO_Handler reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform IO_Handler termination.
-
-  Consumer_Map *consumer_map_;
-  // Pointer to table that maps an event
-  // to a Set of IO_Handler *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  IO_Handler_Connector *connector_;
-  // Back pointer to IO_Handler_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Supplier_Handler : public IO_Handler
-  // = TITLE
-  //     Handle reception of Peer events arriving as events.
-{
-public:
-  Supplier_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-  // Constructor sets the consumer map pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer events.
-
-protected:
-  virtual int recv (ACE_Message_Block *&);
-  // Receive an event from a Supplier.
-
-  int forward (ACE_Message_Block *event);
-  // Forward the Event to a Consumer.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of event fragment to handle non-blocking recv's from
-  // Suppliers.
-};
-
-class Consumer_Handler : public IO_Handler
-  // = TITLE
-  //     Handle transmission of events to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Consumer_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send an event to a Consumer (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from a Consumer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending event when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual ssize_t send (ACE_Message_Block *);
-  // Send an event to a Consumer.
-};
-
-#endif /* _IO_HANDLER */
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.cpp b/apps/Gateway/Gateway/IO_Handler_Connector.cpp
deleted file mode 100644
index 712b348951d..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "IO_Handler_Connector.h"
-// $Id$
-
-
-IO_Handler_Connector::IO_Handler_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-IO_Handler_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  IO_Handler *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the IO_Handler.
-
-int
-IO_Handler_Connector::initiate_connection (IO_Handler *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (IO_Handler::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (IO_Handler::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (IO_Handler::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (IO_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.h b/apps/Gateway/Gateway/IO_Handler_Connector.h
deleted file mode 100644
index 585428c88ee..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER_CONNECTOR)
-#define _IO_HANDLER_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_IO_Handler.h"
-
-class IO_Handler_Connector : public ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new IO_Handler object to do the dirty work...
-{
-public:
-  IO_Handler_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the IO_Handler.
-  int initiate_connection (IO_Handler *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _IO_HANDLER_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile
index fc4d116030b..dadbed2b835 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -65,12 +65,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -90,7 +93,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -113,8 +115,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -216,13 +216,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  File_Parser.cpp Event.h Options.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -245,13 +248,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  File_Parser.h File_Parser.cpp
 .obj/Gateway.o .obj/Gateway.so .shobj/Gateway.o .shobj/Gateway.so: Gateway.cpp \
@@ -264,12 +270,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -289,7 +298,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -312,8 +320,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -421,12 +427,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -446,7 +455,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -469,8 +477,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -573,13 +579,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -598,7 +607,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -627,8 +635,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -649,12 +655,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  Event.h Options.h \
@@ -684,12 +693,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -709,7 +721,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -732,8 +743,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -841,12 +850,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -866,7 +878,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -889,8 +900,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -997,12 +1006,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1022,7 +1034,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1045,8 +1056,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/apps/Gateway/Gateway/Makefile.bor b/apps/Gateway/Gateway/Makefile.bor
deleted file mode 100644
index 1fc1899b603..00000000000
--- a/apps/Gateway/Gateway/Makefile.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-NAME = gatewayd
-OBJFILES = \
-	$(OBJDIR)\Concrete_Connection_Handlers.obj \
-	$(OBJDIR)\Config_Files.obj \
-	$(OBJDIR)\File_Parser.obj \
-	$(OBJDIR)\Gateway.obj \
-	$(OBJDIR)\Event_Channel.obj \
-	$(OBJDIR)\Event_Forwarding_Discriminator.obj \
-	$(OBJDIR)\Options.obj \
-	$(OBJDIR)\Connection_Handler.obj \
-	$(OBJDIR)\Connection_Handler_Acceptor.obj \
-	$(OBJDIR)\Connection_Handler_Connector.obj \
-	$(OBJDIR)\gatewayd.obj
-!include <$(ACE_ROOT)\apps\build.bor>
-
diff --git a/apps/Gateway/Gateway/Peer_Message.h b/apps/Gateway/Gateway/Peer_Message.h
deleted file mode 100644
index d9e65650095..00000000000
--- a/apps/Gateway/Gateway/Peer_Message.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Peer_Message.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// This is the unique connection identifier that denotes a particular
-// Channel in the Gateway.
-typedef short CONN_ID;
-
-class Peer_Addr
-  // = TITLE
-  //     Peer address is used to identify the source/destination of a 
-  //     routing message.
-{
-public:
-  Peer_Addr (CONN_ID cid = -1, u_char lid = 0, u_char pay = 0)
-    : conn_id_ (cid), logical_id_ (lid), payload_ (pay) {}
-
-  int operator== (const Peer_Addr &pa) const
-  {
-    return this->conn_id_ == pa.conn_id_ 
-      && this->logical_id_ == pa.logical_id_
-      && this->payload_ == pa.payload_;
-  }
-
-  CONN_ID conn_id_;
-  // Unique connection identifier that denotes a particular Channel.
-
-  u_char logical_id_;
-  // Logical ID.
-
-  u_char payload_;
-  // Payload type.
-};
-
-
-class Peer_Header
-  // = TITLE
-  //    Fixed sized header.
-{
-public:
-  typedef u_short ROUTING_ID;
-  // Type used to route messages from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  ROUTING_ID routing_id_;
-  // Source ID.
-
-  size_t  len_;
-  // Length of the message in bytes.
-};
-
-class Peer_Message
-  // = TITLE
-  //    Variable-sized message (buf_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Peer message (see Peer protocol specs for
-  // exact #).
-
-  Peer_Header header_;
-  // Message header.
-
-  char buf_[MAX_PAYLOAD_SIZE];
-  // Message payload.
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/Gateway/Gateway/Routing_Entry.cpp b/apps/Gateway/Gateway/Routing_Entry.cpp
deleted file mode 100644
index cc270cfac3a..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Defines an entry in the Routing Table.
-// $Id$
-
-#include "Routing_Entry.h"
-
-Routing_Entry::Routing_Entry (int validity_interval)
-  : validity_interval_ (validity_interval)
-{
-  ACE_NEW (this->destinations_, Routing_Entry::ENTRY_SET);
-}
-
-Routing_Entry::~Routing_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Routing_Entry::ENTRY_SET *
-Routing_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Routing_Entry::destinations (Routing_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
-// Get the current validity interval for this route.
-
-int
-Routing_Entry::validity_interval (void)
-{
-  return this->validity_interval_;
-}
-
-// Set the current validity interval for this route.
-
-void
-Routing_Entry::validity_interval (int vi)
-{
-  this->validity_interval_ = vi;
-}
diff --git a/apps/Gateway/Gateway/Routing_Entry.h b/apps/Gateway/Gateway/Routing_Entry.h
deleted file mode 100644
index ab8e0eee53d..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Channel;
-
-class Routing_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Routing_Table.
-public:
-  Routing_Entry (int validity_interval = 0);
-  ~Routing_Entry (void);
-
-  typedef ACE_Unbounded_Set<Channel *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<Channel *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-  // = Set/get current validity interval for this routing entry.
-  int validity_interval (void);
-  void validity_interval (int);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-
-  int validity_interval_;
-  // The current validity interval of this link.
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Routing_Table.cpp b/apps/Gateway/Gateway/Routing_Table.cpp
deleted file mode 100644
index 3ef2f21bc1f..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-#if !defined (_ROUTING_TABLE_C)
-#define _ROUTING_TABLE_C
-
-
-#include "Routing_Table.h"
-
-/* Bind the EXT_ID to the INT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::bind (EXT_ID ext_id, INT_ID *int_id)
-{
-  return this->map_.bind (ext_id, int_id);
-}
-
-/* Find the INT_ID corresponding to the EXT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::find (EXT_ID ext_id, INT_ID *&int_id)
-{
-  return this->map_.find (ext_id, int_id);
-}
-
-/* Unbind (remove) the EXT_ID from the map. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Table<EXT_ID, INT_ID, LOCK>::unbind (EXT_ID ext_id)
-{
-  return this->map_.unbind (ext_id);
-}
-
-template <class EXT_ID, class INT_ID, class LOCK>
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::Routing_Iterator (Routing_Table<EXT_ID, 
-							  INT_ID, LOCK> &rt,
-							  int ignore_inactive)
-  : map_iter_ (rt.map_), 
-    ignore_inactive_ (ignore_inactive)
-{
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::next (INT_ID *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<EXT_ID, INT_ID *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Skip over inactive entries if necessary.
-      if (temp->int_id_->active () == 0 && this->ignore_inactive_)
-	continue;
-
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _ROUTING_TABLE_C */
diff --git a/apps/Gateway/Gateway/Routing_Table.h b/apps/Gateway/Gateway/Routing_Table.h
deleted file mode 100644
index 84194f13e49..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Table.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_TABLE_H)
-#define _ROUTING_TABLE_H
-
-#include "ace/Map_Manager.h"
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Table
-{
-  // = TITLE
-  //    Define a generic routing table based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    We need to have this table, rather than just using the Map_Manager
-  //    directly in order to ignore "inactive" routing entries...
-public:
-  int bind (EXT_ID ext_id, INT_ID *int_id);
-  // Associate EXT_ID with the INT_ID.
-
-  int find (EXT_ID ext_id, INT_ID *&int_id);
-  // Break any association of EXID.
-
-  int unbind (EXT_ID ext_id);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<EXT_ID, INT_ID *, LOCK> map_;
-  // Map external IDs to internal IDs.
-};
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Routing Table.
-public:
-  Routing_Iterator (Routing_Table<EXT_ID, INT_ID, LOCK> &mm, 
-		    int ignore_inactive = 1);
-  int next (INT_ID *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<EXT_ID, INT_ID *, LOCK> map_iter_;
-  int ignore_inactive_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Routing_Table.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#endif /* _ROUTING_TABLE_H */
diff --git a/apps/Gateway/Gateway/Thr_Channel.cpp b/apps/Gateway/Gateway/Thr_Channel.cpp
deleted file mode 100644
index 26e385e2727..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_Channel.h"
-// $Id$
-
-#include "Channel_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Output_Channel::Thr_Output_Channel (ROUTING_TABLE *rt,
-					Channel_Connector *cc,
-					ACE_Thread_Manager *thr_mgr,
-					int socket_queue_size)
-  : Output_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the Channel as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Output_Channel::handle_input (ACE_HANDLE h)
-{
-  this->Output_Channel::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Output_Channel object and spawn a new
-// thread.
-
-int 
-Thr_Output_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Input_Channels are single-threaded).
-
-int 
-Thr_Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Output_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Output_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send_peer (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Output_Channel %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Input_Channel::Thr_Input_Channel (ROUTING_TABLE *rt,
-				      Channel_Connector *cc,
-				      ACE_Thread_Manager *thr_mgr,
-				      int socket_queue_size)
-  : Input_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Input_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Input_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Input_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Input_Channel %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Channel.h b/apps/Gateway/Gateway/Thr_Channel.h
deleted file mode 100644
index a1dc91b1619..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_CHANNEL)
-#define _THR_CHANNEL
-
-#include "Channel.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Output_Channel : public Output_Channel
-  // = TITLE
-  //    Runs each Output Channel in a separate thread.
-{
-public:
-  Thr_Output_Channel (ROUTING_TABLE *, 
-		      Channel_Connector *, 
-		      ACE_Thread_Manager *,
-		      int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Output_Channel object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Input_Channel : public Input_Channel
-  // = TITLE
-  //    Runs each Input Channel in a separate thread.
-{
-public:
-  Thr_Input_Channel (ROUTING_TABLE *, 
-		     Channel_Connector *, 
-		     ACE_Thread_Manager *,
-		     int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_CHANNEL */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.cpp b/apps/Gateway/Gateway/Thr_IO_Handler.cpp
deleted file mode 100644
index 109cfad9c3f..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_IO_Handler.h"
-// $Id$
-
-#include "IO_Handler_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Handler::Thr_Consumer_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Consumer_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the IO_Handler as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Consumer_Handler::handle_input (ACE_HANDLE h)
-{
-  this->Consumer_Handler::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Handler object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Supplier_Handlers are single-threaded).
-
-int 
-Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Consumer_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Consumer_Handler %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Handler::Thr_Supplier_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Supplier_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Supplier_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Supplier_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Handler %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.h b/apps/Gateway/Gateway/Thr_IO_Handler.h
deleted file mode 100644
index ee056b35361..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "IO_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Handler : public Consumer_Handler
-  // = TITLE
-  //    Runs each Output IO_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Handler object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Handler : public Supplier_Handler
-  // = TITLE
-  //    Runs each Input IO_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp b/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
deleted file mode 100644
index f316e4e82bf..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// $Id$
-
-#include "Event_Channel.h"
-#include "Thr_Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Proxy::Thr_Consumer_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Consumer_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-// This method should be called only when the Consumer shuts down
-// unexpectedly.  This method marks the Proxy_Handler as having failed
-// and deactivates the ACE_Message_Queue (to wake up the thread
-// blocked on <dequeue_head> in svc()).
-// Thr_Output_Handler::handle_close () will eventually try to
-// reconnect...
-
-int 
-Thr_Consumer_Proxy::handle_input (ACE_HANDLE h)
-{
-  // Call down to the <Consumer_Proxy> to handle this first.
-  this->Consumer_Proxy::handle_input (h);
-
-  ACE_Service_Config::reactor ()->remove_handler 
-    (h, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL);
-
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Proxy object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Consumer has shut down unexpectedly).
-  else if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to Consumers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Queue up an event for transmission (must not block since
-// Supplier_Proxys may be single-threaded).
-
-int 
-Thr_Consumer_Proxy::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail 
-    (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit events to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Proxy::svc (void)
-{
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Consumer_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; 
-	   )
-	{
-	  if (this->send (mb) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-	}
-
-      ACE_ASSERT (errno == ESHUTDOWN);
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Consumer_Proxy %d on handle %d\n", 
-		  this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-
-	  ACE_OS::sleep (tv);
-	}
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Proxy::Thr_Supplier_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Supplier_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-int 
-Thr_Supplier_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive events from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Proxy::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Supplier_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes events
-      // for one connection it is OK to call down to the
-      // <Supplier_Proxy::handle_input> method, which blocks on input.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Proxy %d on handle %d\n", 
-		 this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.h b/apps/Gateway/Gateway/Thr_Proxy_Handler.h
deleted file mode 100644
index 275bc87b320..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Proxy_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Proxy : public Consumer_Proxy
-  // = TITLE
-  //    Runs each Output Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Proxy object and spawn a new
-  // thread.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-protected:
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Proxy : public Supplier_Proxy
-  // = TITLE
-  //    Runs each Input Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-protected:
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/cc_config b/apps/Gateway/Gateway/cc_config
deleted file mode 100644
index 96f9ebdedd7..00000000000
--- a/apps/Gateway/Gateway/cc_config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Conn ID  Hostname     Remote Port  Direction  Max Retry Delay  Local Port
-# -------  --------	----         ---------  ---------------  ----------
-   1       tango.cs	10004	     I          32		 20000
-#  2       tango.cs	10004	     O          32               
-   3       merengue.cs	10004	     O          32		 20001
-#  4       mambo.cs	10004	     O          32		 20000
-#  5       lambada.cs	10004	     O          32		 20000
-#  6       tango.cs	10004	     O          32		 20000
-#  7       tango.cs	5001	     I          32               
-#  8       tango.cs	5002	     O          32               
diff --git a/apps/Gateway/Gateway/rt_config b/apps/Gateway/Gateway/rt_config
deleted file mode 100644
index e951a0f09be..00000000000
--- a/apps/Gateway/Gateway/rt_config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Conn ID  Logical ID  Payload  Destinations
-# -------  ----------  -------  ------------  
-# 1        1           0	3,4,5
-  1        1           0	3
-  3        1           0	3           
-#  4        1           0	4
-#  5	   1	       0	5
diff --git a/apps/Gateway/Makefile.bor b/apps/Gateway/Makefile.bor
deleted file mode 100644
index bbe0f9444be..00000000000
--- a/apps/Gateway/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-        cd $(ACE_ROOT)\apps\Gateway\Gateway
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-        cd $(ACE_ROOT)\apps\Gateway\Peer
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/apps/Gateway/Peer/Event.h b/apps/Gateway/Peer/Event.h
deleted file mode 100644
index 5e288edf910..00000000000
--- a/apps/Gateway/Peer/Event.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Event.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (EVENT)
-#define EVENT
-
-#include "ace/OS.h"
-
-// This is the unique connection identifier that denotes a particular
-// Proxy_Handler in the Gateway.
-typedef ACE_INT32 ACE_INT32;
-
-class Event_Key
-  // = TITLE
-  //     Address used to identify the source/destination of an event.
-  //
-  // = DESCRIPTION
-  //     This is really a "virtual forwarding address" thatis used to
-  //     decouple the filtering and forwarding logic of the Event
-  //     Channel from the format of the data.
-{
-public:
-  Event_Key (ACE_INT32 cid = -1, 
-	      u_char sid = 0, 
-	      u_char type = 0)
-    : conn_id_ (cid), 
-      supplier_id_ (sid), 
-      type_ (type) {}
-
-  int operator== (const Event_Key &event_addr) const
-  {
-    return this->conn_id_ == event_addr.conn_id_ 
-      && this->supplier_id_ == event_addr.supplier_id_
-      && this->type_ == event_addr.type_;
-  }
-
-  ACE_INT32 conn_id_;
-  // Unique connection identifier that denotes a particular
-  // Proxy_Handler.
-
-  ACE_INT32 supplier_id_;
-  // Logical ID.
-
-  ACE_INT32 type_;
-  // Event type.
-};
-
-class Event_Header
-  // = TITLE
-  //     Fixed sized header.
-  //
-  // = DESCRIPTION
-  //     This is designed to have a sizeof (16) to avoid alignment
-  //     problems on most platforms.
-{
-public:
-  typedef ACE_INT32 SUPPLIER_ID;
-  // Type used to forward events from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  void decode (void)
-    {
-      this->len_ = ntohl (this->len_);
-      this->supplier_id_ = ntohl (this->supplier_id_);
-      this->type_ = ntohl (this->type_);
-      this->priority_ = ntohl (this->priority_);
-    }
-  // Decode from network byte order to host byte order.
-
-  void encode (void)
-    {
-      this->len_ = htonl (this->len_);
-      this->supplier_id_ = htonl (this->supplier_id_);
-      this->type_ = htonl (this->type_);
-      this->priority_ = htonl (this->priority_);
-    }
-  // Encode from host byte order to network byte order.
-
-  size_t len_;
-  // Length of the data_ payload, in bytes.
-
-  SUPPLIER_ID supplier_id_;
-  // Source ID.
-
-  ACE_INT32 type_;
-  // Event type.
-
-  ACE_INT32 priority_;
-  // Event priority.
-};
-
-class Event
-  // = TITLE
-  //    Variable-sized event (data_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Event.
-
-  Event_Header header_;
-  // Event header.
-
-  char data_[MAX_PAYLOAD_SIZE];
-  // Event data.
-};
-
-#endif /* EVENT */
diff --git a/apps/Gateway/Peer/Gateway_Handler.cpp b/apps/Gateway/Peer/Gateway_Handler.cpp
deleted file mode 100644
index cfc9a7dad6f..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "ace/Get_Opt.h"
-// $Id$
-
-
-#include "Gateway_Handler.h"
-
-Gateway_Handler::Gateway_Handler (ACE_Thread_Manager *)
-  : routing_id_ (0),
-    msg_frag_ (0),
-    total_bytes_ (0)
-{
-  this->msg_queue ()->high_water_mark (Gateway_Handler::QUEUE_SIZE);
-}
-
-int
-Gateway_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %S\n", signum));
-
-  // Shut down the main event loop.
-  ACE_Service_Config::end_reactor_event_loop ();
-  return 0;
-}
-
-// Cache a binding to the HANDLER_MAP.
-
-void
-Gateway_Handler::map (HANDLER_MAP *m)
-{
-  this->map_ = m;
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that turns control
-// over to our application-specific Gateway handler.
-
-int
-Gateway_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "Gateway handler's fd = %d\n", 
-	     this->peer ().get_handle ()));
-
-  // Call down to the base class to activate and register this
-  // handler.
-  if (this->inherited::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enable"), -1);    
-
-  Gateway_Handler *this_ = this;
-
-  // Add ourselves to the map so we can be removed later on.
-  if (this->map_->bind (this->get_handle (), this_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "bind"), -1);    
-
-  char *to = ACE_OS::getenv ("TIMEOUT");
-  int timeout = to == 0 ? 100000 : ACE_OS::atoi (to);
-
-  // Schedule the time between disconnects.  This should really be a
-  // "tunable" parameter.
-  if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, timeout) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
-
-  // If there are messages left in the queue, make sure we 
-  // enable the ACE_Reactor appropriately to get them sent out.
-  if (this->msg_queue ()->is_empty () == 0
-      && ACE_Service_Config::reactor ()->schedule_wakeup (this, 
-							  ACE_Event_Handler::WRITE_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-
-  // First action is to wait to be notified of our routing id.
-  this->do_action_ = &Gateway_Handler::await_route_id;
-  return 0;
-}
-
-// Read messages from stdin and send them to the gatewayd.
-
-int
-Gateway_Handler::xmit_stdin (void)
-{
-  if (this->routing_id_ != -1)
-    {
-      ssize_t n;
-      ACE_Message_Block *mb;
-
-      ACE_NEW_RETURN (mb, 
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      Event *peer_msg = (Event *) mb->rd_ptr ();
-      peer_msg->header_.routing_id_ = this->routing_id_;
-
-      n = ACE_OS::read (ACE_STDIN, peer_msg->buf_, sizeof peer_msg->buf_);
-
-      switch (n)
-	{
-	case 0:
-	  ACE_DEBUG ((LM_DEBUG, "stdin closing down\n"));
-
-	  // Take stdin out of the ACE_Reactor so we stop trying to
-	  // send messages.
-	  if (ACE_Service_Config::reactor ()->remove_handler 
-	      (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n", "remove_handler"));
-	  delete mb;
-	  break;
-	case -1:
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-	  break;
-	default:
-	  peer_msg->header_.len_ = htonl (n);
-	  mb->wr_ptr (sizeof (Peer_Header) + n);
-
-	  if (this->put (mb) == -1)
-	    {
-	      if (errno == EWOULDBLOCK) // The queue has filled up!
-		ACE_ERROR ((LM_ERROR, "%p\n", 
-			   "gateway is flow controlled, so we're dropping messages"));
-	      else
-		ACE_ERROR ((LM_ERROR, "%p\n", "transmission failure in xmit_stdin"));
-	      
-	      // Caller is responsible for freeing a ACE_Message_Block
-	      // if failures occur.
-	      delete mb;
-	    }
-	}
-    }
-  return 0;
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-Taskd at the *front* of
-// the Message_List.
-
-int
-Gateway_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-ACE_Task the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again.
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    return -1;
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "queueing activated on handle %d to routing id %d\n",
-		 this->get_handle (), this->routing_id_));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      if (ACE_Service_Config::reactor ()->schedule_wakeup
-	  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-// Finish sending a message when flow control conditions abate.  This
-// method is automatically called by the ACE_Reactor.
-
-int 
-Gateway_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "in handle_output\n"));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-	{
-	case 0: 	  // Partial send.
-	  ACE_ASSERT (errno == EWOULDBLOCK);
-	  // Didn't write everything this time, come back later...
-	  break;
-
-	case -1:
-	  // Caller is responsible for freeing a ACE_Message_Block if
-	  // failures occur.
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "transmission failure in handle_output"));
-
-	  /* FALLTHROUGH */
-	default: // Sent the whole thing.
-	  
-	  // If we succeed in writing the entire message (or we did
-	  // not fail due to EWOULDBLOCK) then check if there are more
-	  // messages on the Message_List.  If there aren't, tell the
-	  // ACE_Reactor not to notify us anymore (at least until
-	  // there are new messages queued up).
-
-	  if (this->msg_queue ()->is_empty ())
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "queue now empty on handle %d to routing id %d\n",
-			  this->get_handle (), 
-			  this->routing_id_));
-
-	      if (ACE_Service_Config::reactor ()->cancel_wakeup
-		  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-		ACE_ERROR ((LM_ERROR, "%p\n", "cancel_wakeup"));
-	    }
-	}
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "%p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may ACE_Task if necessary).
-
-int 
-Gateway_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); 
-}
-
-// Send an Peer message to gatewayd.
-
-int
-Gateway_Handler::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;	
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < (ssize_t) len)
-    {
-      // Re-adjust pointer to skip over the part we did send.
-      mb->rd_ptr (n);
-      this->total_bytes_ += n;
-    }
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      this->total_bytes_ += n;
-      delete mb;
-      errno = 0;
-    }
-  ACE_DEBUG ((LM_DEBUG, "sent %d bytes, total bytes sent = %d\n",
-	     n, this->total_bytes_));
-  return n;
-}
-
-// Receive an Peer message from gatewayd.  Handles fragmentation.
-
-int
-Gateway_Handler::recv_peer (ACE_Message_Block *&mb)
-{ 
-  Event *peer_msg;
-  size_t       len;
-  ssize_t      n;
-  size_t       offset = 0;
-
-  if (this->msg_frag_ == 0)
-    {
-      ACE_NEW_RETURN (this->msg_frag_,
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      // No existing fragment...
-      if (this->msg_frag_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "out of memory\n"), -1);
-
-      peer_msg = (Event *) this->msg_frag_->rd_ptr ();
-
-      switch (n = this->peer ().recv (peer_msg, sizeof (Peer_Header)))
-	{
-	case sizeof (Peer_Header):
-	  len = ntohl (peer_msg->header_.len_);
-	  if (len <= sizeof peer_msg->buf_)
-	    {
-	      this->msg_frag_->wr_ptr (sizeof (Peer_Header));
-	      break; // The message is within the maximum size range.
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "message too long = %d\n", len));
-	  /* FALLTHROUGH */
-	default:
-	  ACE_ERROR ((LM_ERROR, "invalid length = %d\n", n));
-	  n = -1;
-	  /* FALLTHROUGH */
-	case -1:
-	  /* FALLTHROUGH */
-	case 0:
-	  // Make sure to free up memory on error returns.
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-    }
-  else
-    {
-      offset = this->msg_frag_->length () - sizeof (Peer_Header);
-      len    = peer_msg->header_.len_ - offset;
-    }
-
-  switch (n = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-	{
-          // This shouldn't happen since the ACE_Reactor
-	  // just triggered us to handle pending I/O!
-	  ACE_DEBUG ((LM_DEBUG, "unexpected recv failure\n"));
-	  // Since ACE_DEBUG might change errno, we need to reset it
-	  // here.
-	  errno = EWOULDBLOCK;
-	  return -1;
-        }
-      else
-	/* FALLTHROUGH */;
-
-    case 0: // EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return n;
-
-    default:
-      if (n != (ssize_t) len)
-	// Re-adjust pointer to skip over the part we've read.
-	{
-	  this->msg_frag_->wr_ptr (n);
-	  errno = EWOULDBLOCK;
-	  // Inform caller that we didn't get the whole message.
-	  return -1; 
-	}
-      else
-	{
-	  // Set the write pointer at 1 past the end of the message.
-	  this->msg_frag_->wr_ptr (n);
-
-	  // Set the read pointer to the beginning of the message.
-	  this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-	  mb = this->msg_frag_;
-
-	  // Reset the pointer to indicate we've got an entire
-	  // message.
-	  this->msg_frag_ = 0; 
-	}
-      return n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the
-// gatewayd, as well as stdio).
-
-int 
-Gateway_Handler::handle_input (ACE_HANDLE sd)
-{
-  ACE_DEBUG ((LM_DEBUG, "in handle_input, sd = %d\n", sd));
-  if (sd == ACE_STDIN) // Handle message from stdin.
-    return this->xmit_stdin ();
-  else
-    // Perform the appropriate action depending on the state we are
-    // in.
-    return (this->*do_action_) ();
-}
-
-// Action that receives the route id.  
-
-int
-Gateway_Handler::await_route_id (void)
-{
-  ssize_t n = this->peer ().recv (&this->routing_id_, 
-				  sizeof this->routing_id_);
-
-  if (n != sizeof this->routing_id_)
-    {
-      if (n == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "gatewayd has closed down unexpectedly\n"), -1);
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "%p, bytes received on handle %d = %d\n", 
-			  "recv", this->get_handle (), n), -1);
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG, "assigned routing id %d\n", 
-		this->routing_id_));
-
-  // Transition to the action that waits for Peer messages.
-  this->do_action_ = &Gateway_Handler::await_messages;
-
-  // Reset standard input.
-  ACE_OS::rewind (stdin);
-
-  // Register this handler to receive test messages on stdin.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (ACE_STDIN, this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Action that receives messages.
-
-int
-Gateway_Handler::await_messages (void)
-{
-  ACE_Message_Block *mb = 0;
-  ssize_t n = this->recv_peer (mb);
-
-  switch (n)
-    {
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR, "gatewayd has closed down\n"), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-	// A short-read, we'll come back and finish it up later on!
-	return 0;
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv_peer"), -1);
-      /* NOTREACHED */
-    default:
-      {
-	// We got a valid message, so let's process it now!  At the
-	// moment, we just print out the message contents...
-
-	Event  *peer_msg = (Event *) mb->rd_ptr ();
-	this->total_bytes_ += mb->length ();
-
-#if defined (VERBOSE)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, len = %d, payload = %*s",
-		   peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		   peer_msg->header_.len_, peer_msg->buf_));
-#else
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, cur len = %d, total len = %d\n",
-		    peer_msg->header_.routing_id_, 
-		    peer_msg->header_.len_, 
-		    this->total_bytes_));
-#endif
-	delete mb;
-	return 0;
-      }
-    }
-}
-
-// Periodically send messages via ACE_Reactor timer mechanism.
-
-int
-Gateway_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Unbind ourselves from the map.
-      if (this->map_->unbind (this->get_handle ()) == -1)
-	ACE_ERROR ((LM_ERROR, "%p\n", "unbind"));
-
-      // Shut down the handler.
-      this->handle_close ();
-    }
-  return 0;
-}
-
-// Handle shutdown of the Gateway_Handler object.
-
-int
-Gateway_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutting down Gateway_Handler on handle %d\n", 
-		 this->get_handle ()));
-
-      // Explicitly remove ourselves for handle 0 (the ACE_Reactor
-      // removes this->handle (), note that
-      // ACE_Event_Handler::DONT_CALL instructs the ACE_Reactor *not*
-      // to call this->handle_close(), which would otherwise lead to
-      // recursion!).
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	ACE_ERROR ((LM_ERROR, "handle = %d: %p\n", 
-		   0, "remove_handler"));
-
-      // Deregister this handler with the ACE_Reactor.
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::RWE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "handle = %d: %p\n", 
-			  this->get_handle (), "remove_handler"), -1);
-
-      // Close down the peer.
-      this->peer ().close ();
-    }
-  return 0;
-}
-
-Gateway_Acceptor::Gateway_Acceptor (Gateway_Handler *handler)
-  : gateway_handler_ (handler)
-{
-  this->gateway_handler_->map (&this->map_);
-}
-
-// Note how this method just passes back the pre-allocated
-// Gateway_Handler instead of having the ACE_Acceptor allocate a new
-// one each time!
-
-Gateway_Handler *
-Gateway_Acceptor::make_svc_handler (void)
-{
-  return this->gateway_handler_;
-}
-
-int 
-Gateway_Acceptor::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", signum));
-  return 0;
-}
-
-/* Returns information on the currently active service. */
-
-int
-Gateway_Acceptor::info (char **strp, size_t length) const
-{
-  char buf[BUFSIZ];
-  char addr_str[BUFSIZ];
-
-  ACE_INET_Addr addr;
-
-  if (this->acceptor ().get_local_addr (addr) == -1)
-    return -1;
-  else if (addr.addr_to_string (addr_str, sizeof addr) == -1)
-    return -1;
-
-  ACE_OS::sprintf (buf, "%s\t %s/%s %s",
-	     "Gateway peer daemon", addr_str, "tcp",
-	     "# IRIDIUM SRP traffic generator and data sink\n");
-
-  if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
-    return -1;
-  else
-    ACE_OS::strncpy (*strp, buf, length);
-  return ACE_OS::strlen (buf);
-}
-
-// Hook called by the explicit dynamic linking facility to terminate
-// the peer.
-
-int
-Gateway_Acceptor::fini (void)
-{
-  HANDLER_ITERATOR mi (this->map_);
-  
-  for (MAP_ENTRY *me = 0;
-       mi.next (me) != 0; 
-       mi.advance ())
-    {
-      if (me->int_id_->get_handle () != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "closing down handle %d\n", 
-		      me->int_id_->get_handle ()));
-	  me->int_id_->handle_close ();
-	}
-      else
-	ACE_DEBUG ((LM_DEBUG, "already closed %d\n"));
-      me->int_id_->destroy (); // Will trigger a delete.
-    }
-
-  this->gateway_handler_->destroy (); // Will trigger a delete.
-  return inherited::fini ();
-}
-
-// Hook called by the explicit dynamic linking facility to initialize
-// the peer.
-
-int
-Gateway_Acceptor::init (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "dp:", 0);
-  ACE_INET_Addr addr;
-
-  for (int c; (c = get_opt ()) != -1; )
-    {
-      switch (c)
-	{
-	case 'p': 
-	  addr.set (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'd':
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  if (ACE_Service_Config::reactor ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-    
-  if (this->open (addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Service_Config::reactor ()->register_handler 
-	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
-
-  ACE_Sig_Set sig_set;
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-
-  // Register ourselves to receive SIGINT and SIGQUIT so we can shut
-  // down gracefully via signals.
-  
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, 
-						 this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Dynamically linked factory function that dynamically allocates a
-// new Gateway_Acceptor object.
-
-ACE_Service_Object *
-_alloc_peerd (void)
-{
-  // This function illustrates how we can associate a ACE_Svc_Handler
-  // with the ACE_Acceptor at initialization time.
-  Gateway_Handler *handler;
-  
-  ACE_NEW_RETURN (handler, Gateway_Handler, 0);
-  ACE_Service_Object *temp;
-  
-  ACE_NEW_RETURN (temp, Gateway_Acceptor (handler), 0);
-  return temp;
-}
diff --git a/apps/Gateway/Peer/Gateway_Handler.h b/apps/Gateway/Peer/Gateway_Handler.h
deleted file mode 100644
index 6dc4539e6b7..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-/* These Gateway handler classes process Peer messages sent from the
-   communication gateway daemon (gatewayd) to its various peers, e.g.,
-   CF and ETS, (represented collectively in this prototype as peerd).
-   .  These classes works as follows:
-   
-   1. Gateway_Acceptor creates a listener endpoint and waits passively
-      for gatewayd to connect with it.
-
-   2. When gatewayd connects, Gateway_Acceptor creates an
-      Gateway_Handler object that sends/receives messages from
-      gatewayd.
-
-   3. Gateway_Handler waits for gatewayd to inform it of its routing
-      ID, which is prepended to all outgoing messages send from peerd.
-
-   4. Once the routing ID is set, peerd periodically sends messages to
-      gatewayd.  Peerd also receives and "processes" messages
-      forwarded to it from gatewayd.  In this program, peerd
-      "processes" messages by writing them to stdout. */
-
-#if !defined (GATEWAY_HANDLER)
-#define GATEWAY_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Map_Manager.h"
-#include "Peer_Message.h"
-
-// Forward declaration.
-class Gateway_Handler;
-
-// Maps a ACE_HANDLE onto a Gateway_Handler *.
-typedef ACE_Map_Manager <ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_MAP;
-typedef ACE_Map_Iterator<ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_ITERATOR;
-typedef ACE_Map_Entry <ACE_HANDLE, Gateway_Handler *> MAP_ENTRY;
-
-// Handle Peer messages arriving as events. 
-
-class Gateway_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  Gateway_Handler (ACE_Thread_Manager * = 0);
-
-  virtual int open (void * = 0);
-  // Initialize the handler (called by ACE_Acceptor::handle_input())
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process peer messages.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-  // Periodically send messages via ACE_Reactor timer mechanism.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform object termination.
-
-  void map (HANDLER_MAP *);
-  // Cache a binding to the HANDLER_MAP.
-
-protected:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> inherited;
-
-  // We'll allow up to 16 megabytes to be queued per-output
-  // channel!!!!  This is clearly a policy in search of refinement...
-  enum { QUEUE_SIZE = 1024 * 1024 * 16 };
-
-  int handle_signal (int signum, siginfo_t *, ucontext_t *);
-
-  Peer_Header::ROUTING_ID routing_id_;
-  // Routing ID of the peer (obtained from gatewayd).
-
-  virtual int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive an Peer message from gatewayd.
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send an Peer message to gatewayd.
-
-  int xmit_stdin (void);
-  // Receive a message from stdin and send it to the gateway.
-
-  int (Gateway_Handler::*do_action_) (void);
-  // Pointer-to-member-function for the current action to run in this state.
-
-  int await_route_id (void);
-  // Action that receives the route id.  
-
-  int await_messages (void);
-  // Action that receives messages.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from gateway.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received to the gateway.
-
-  HANDLER_MAP *map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-};
-
-// A factory class that accept connections from gatewayd and
-// dynamically creates a new Gateway_Handler object to do the dirty work.
-
-class Gateway_Acceptor : public ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR>
-{
-public:  
-  // = Initialization methods, called when dynamically linked.
-  Gateway_Acceptor (Gateway_Handler *handler);
-  virtual int init (int argc, char *argv[]);
-  // Initialize the acceptor.
-
-  virtual int info (char **, size_t) const;
-  // Return info about this service.
-
-  virtual int fini (void);
-  // Perform termination.
-
-  virtual Gateway_Handler *make_svc_handler (void);
-  // Factory method that creates the Gateway_Handler once.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Handle various signals (e.g., SIGPIPE)
-
-  HANDLER_MAP map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-  
-  Gateway_Handler *gateway_handler_;
-  // Pointer to memory allocated exactly once.
-
-  typedef ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR> inherited;
-};
-
-// Factory function that allocates a new Peer daemon.
-extern "C" ACE_Service_Object *_alloc_peerd (void);
-
-#endif /* GATEWAY_HANDLER */
-
diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile
index c33b7c7623f..bc08ea314fc 100644
--- a/apps/Gateway/Peer/Makefile
+++ b/apps/Gateway/Peer/Makefile
@@ -55,12 +55,15 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  Options.h ../Gateway/Event.h
@@ -74,12 +77,15 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -99,7 +105,6 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -122,8 +127,6 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/apps/Gateway/Peer/Makefile.bor b/apps/Gateway/Peer/Makefile.bor
deleted file mode 100644
index 7d01fd58d4a..00000000000
--- a/apps/Gateway/Peer/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-NAME = peerd
-OBJFILES = \
-        $(OBJDIR)\Options.obj \
-        $(OBJDIR)\Peer.obj \
-        $(OBJDIR)\peerd.obj
-!include <$(ACE_ROOT)\apps\build.bor>
-
diff --git a/apps/Gateway/Peer/Peer_Message.h b/apps/Gateway/Peer/Peer_Message.h
deleted file mode 100644
index 67f57f148cb..00000000000
--- a/apps/Gateway/Peer/Peer_Message.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Define the Peer message schema (this may change).
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// Fixed sized header.
-
-class Peer_Header
-{
-public:
-// Type used to route messages from gatewayd.
-  typedef short ROUTING_ID;
-
-  enum
-  {
-    INVALID_ID = -1 // No peer may use this number.
-  };
-
-  // Source ID.
-  ROUTING_ID routing_id_;
-
-  // Length of the message in bytes.
-  size_t  len_;
-};
-
-// Variable-sized message (buf_ may be variable-sized between
-// 0 and MAX_PAYLOAD_SIZE).
-
-class Peer_Message
-{
-public:
-  // The maximum size of an Peer message (see Peer protocol specs for exact #).
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-
-  Peer_Header header_;
-
-  // Message payload
-  char buf_[MAX_PAYLOAD_SIZE];
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index 435ee635e1f..54da21ccf9a 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,22 +1,18 @@
-Tue Jun 22 13:42:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * remora/app/Makefile: replaced rm -f with $(RM).
-
 Tue Mar 16 01:08:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * server/Makefile:
-        * server/jaws.dsp: Updated makefiles to build shared library.
+	* server/Makefile:
+	* server/jaws.dsp: Updated makefiles to build shared library.
 
-        * server/svc.conf: Added example settings for using HTTP_Server as
-          a dynamic service.
+	* server/svc.conf: Added example settings for using HTTP_Server as
+	  a dynamic service.
 
-        * server/HTTP_Server.{h,cpp}: Added macros to build dynamic
-          HTTP_Server service.
+	* server/HTTP_Server.{h,cpp}: Added macros to build dynamic
+	  HTTP_Server service.
 
-        * server/main.cpp (main): Since we use static service in JAWS, we
-          must open the service configure without ignoring the static
-          svcs.  Thanks to Bill Rizzi <rizzi@softserv.com> for pointing
-          this out.
+	* server/main.cpp (main): Since we use static service in JAWS, we
+	  must open the service configure without ignoring the static
+	  svcs.  Thanks to Bill Rizzi <rizzi@softserv.com> for pointing
+	  this out.
 
 Mon Feb 01 17:04:39 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/apps/JAWS/Makefile.bor b/apps/JAWS/Makefile.bor
deleted file mode 100644
index f517d4b8872..00000000000
--- a/apps/JAWS/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
- 
-all:
-	cd $(ACE_ROOT)\apps\JAWS\clients
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\apps\JAWS\server
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
index c2a25fd863d..cc406850df6 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
@@ -85,18 +85,8 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void)
         {
           if (this->hashtable_[i])
             {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-              ACE_DES_FREE_TEMPLATE3(this->hashtable_[i],
-                                     this->allocator_->free,
-                                     JAWS_Hash_Bucket_Manager,
-                                     EXT_ID,
-                                     JAWS_Cache_Object *,
-                                     EQ_FUNC);
-#else
-              ACE_DES_FREE(this->hashtable_[i],
-                           this->allocator_->free,
-                           CACHE_BUCKET_MANAGER);
-#endif
+              ACE_DES_FREE (this->hashtable_[i], this->allocator_->free,
+                            CACHE_BUCKET_MANAGER);
               this->hashtable_[i] = 0;
             }
         }
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
index 278d85e00ea..f62c990ba1c 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
@@ -155,13 +155,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
   int_id = this->item_->int_id_;
   int_id->heap_item (0);
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-  ACE_DES_FREE_TEMPLATE4(this->item_, this->allocator_->free,
-                         JAWS_Cache_List_Item,
-                         EXT_ID, FACT, H_FN, E_FN);
-#else
   ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-#endif
   this->item_ = 0;
   return 0;
 }
@@ -175,13 +169,7 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
   this->remove_i ((Cache_List_Item *) item);
   this->item_->int_id_->heap_item (0);
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-  ACE_DES_FREE_TEMPLATE4(this->item_, this->allocator_->free,
-                         JAWS_Cache_List_Item,
-                         EXT_ID, FACT, H_FN, E_FN);
-#else
   ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-#endif
   this->item_ = 0;
 
   return 0;
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
index b50157121a2..27f274429bf 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
@@ -72,13 +72,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
     {
       this->maxsize_ = 0;
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-      ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
-                             JAWS_Cache_Hash,
-                             KEY, HASH_FUNC, EQ_FUNC);
-#else
       ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
       this->hash_ = 0;
       this->hashsize_ = 0;
     }
@@ -144,13 +138,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
       errno = ENOMEM;
       this->maxsize_ = 0;
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-      ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
-                             JAWS_Cache_Hash,
-                             KEY, HASH_FUNC, EQ_FUNC);
-#else
       ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
       this->hash_ = 0;
       this->hashsize_ = 0;
 
@@ -175,25 +163,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
 
   if (this->hash_)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-      ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
-                             JAWS_Cache_Hash,
-                             KEY, HASH_FUNC, EQ_FUNC);
-#else
       ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
       this->hash_ = 0;
     }
 
   if (this->heap_)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-      ACE_DES_FREE_TEMPLATE4(this->heap_, this->allocator_->free,
-                             JAWS_Cache_List,
-                             KEY, FACTORY, HASH_FUNC, EQ_FUNC);
-#else
       ACE_DES_FREE (this->heap_, this->allocator_->free, Cache_Heap);
-#endif
       this->heap_ = 0;
     }
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
index 959f8eec830..864e6290ce4 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
@@ -106,8 +106,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_reinterpret_cast(int, entire_length));
+  ACE_Filecache_Handle handle (filename, entire_length);
 
   int result = handle.error ();
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor b/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor
deleted file mode 100644
index af27229cef2..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-
-NAME = JAWS
-OBJFILES = \
-	$(OBJDIR)\Cache_Manager.obj \
-	$(OBJDIR)\Cache_Object.obj \
-	$(OBJDIR)\Pipeline.obj \
-	$(OBJDIR)\Pipeline_Tasks.obj \
-	$(OBJDIR)\Headers.obj \
-	$(OBJDIR)\Parse_Headers.obj \
-	$(OBJDIR)\Waiter.obj \
-	$(OBJDIR)\Reaper.obj \
-	$(OBJDIR)\Data_Block.obj \
-	$(OBJDIR)\Policy.obj \
-	$(OBJDIR)\Concurrency.obj \
-	$(OBJDIR)\Server.obj \
-	$(OBJDIR)\IO_Acceptor.obj \
-	$(OBJDIR)\IO_Handler.obj \
-	$(OBJDIR)\IO.obj \
-	$(OBJDIR)\Cache_Hash_T.obj \
-	$(OBJDIR)\Cache_Heap_T.obj \
-	$(OBJDIR)\Cache_List_T.obj \
-	$(OBJDIR)\Cache_Manager_T.obj \
-	$(OBJDIR)\Hash_Bucket_T.obj \
-	$(OBJDIR)\Pipeline_Handler_T.obj
-
-CFLAGS = -I$(ACE_ROOT) -I.. -DJAWS_NTRACE=0 -DACE_NLOGGING
-CPPDIR = .
-BINDIR =..\.
-LIBFILES = $(ACE_LIB)
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
-
diff --git a/apps/JAWS/PROTOTYPE/Makefile.bor b/apps/JAWS/PROTOTYPE/Makefile.bor
deleted file mode 100644
index 77f0476e68d..00000000000
--- a/apps/JAWS/PROTOTYPE/Makefile.bor
+++ /dev/null
@@ -1,18 +0,0 @@
-
-NAME = main
-OBJFILES = \
-	$(OBJDIR)\main.obj \
-	$(OBJDIR)\HTTP_10.obj \
-	$(OBJDIR)\HTTP_10_Request.obj \
-	$(OBJDIR)\HTTP_10_Read.obj \
-	$(OBJDIR)\HTTP_10_Parse.obj \
-	$(OBJDIR)\HTTP_10_Write.obj
-
-CFLAGS=-I. -DJAWS_HAS_THREAD_SAFE_ACCEPT
-LIBFILES= \
-        .\HTTPU$(LIB_DECORATOR).lib \
-        .\JAWS$(LIB_DECORATOR).lib \
-        $(ACE_LIB)
-
-!include <$(ACE_ROOT)\apps\build.bor>
-
diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile
index 0263b3c115e..005cb80afab 100644
--- a/apps/JAWS/clients/Blobby/Makefile
+++ b/apps/JAWS/clients/Blobby/Makefile
@@ -46,13 +46,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -76,7 +79,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -99,8 +101,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -194,13 +194,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -238,7 +241,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -278,8 +280,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -334,17 +334,19 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -390,8 +392,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/apps/JAWS/clients/Blobby/Makefile.bor b/apps/JAWS/clients/Blobby/Makefile.bor
deleted file mode 100644
index 881de0e493e..00000000000
--- a/apps/JAWS/clients/Blobby/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-
-NAME = blobby
-OBJFILES = \
-	$(OBJDIR)\Blob.obj \
-	$(OBJDIR)\Blob_Handler.obj \
-	$(OBJDIR)\Options.obj \
-	$(OBJDIR)\blobby.obj
-
-!include <$(ACE_ROOT)\apps\build.bor>
-
diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile
index 2b9e5e27fbb..25c20cba86b 100644
--- a/apps/JAWS/clients/Caching/Makefile
+++ b/apps/JAWS/clients/Caching/Makefile
@@ -47,12 +47,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Synch_T.h \
@@ -86,7 +89,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -107,8 +109,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/apps/JAWS/clients/Caching/Makefile.bor b/apps/JAWS/clients/Caching/Makefile.bor
deleted file mode 100644
index af633030078..00000000000
--- a/apps/JAWS/clients/Caching/Makefile.bor
+++ /dev/null
@@ -1,6 +0,0 @@
-
-NAME = http_client
-OBJFILES = \
-	$(OBJDIR)\http_client.obj \
-	$(OBJDIR)\http_handler.obj
-!include <$(ACE_ROOT)\apps\build.bor>
diff --git a/apps/JAWS/clients/Makefile.bor b/apps/JAWS/clients/Makefile.bor
deleted file mode 100644
index 2a119e447a0..00000000000
--- a/apps/JAWS/clients/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
- 
-all:
-        cd $(ACE_ROOT)\apps\JAWS\clients\Blobby
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-        cd $(ACE_ROOT)\apps\JAWS\clients\Caching
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/apps/JAWS/remora/app/Makefile b/apps/JAWS/remora/app/Makefile
index 7b2a29e119b..1a75b69b87f 100755
--- a/apps/JAWS/remora/app/Makefile
+++ b/apps/JAWS/remora/app/Makefile
@@ -1,14 +1,12 @@
-#### $Id$
-
 include stdmk
 
-EXE = test
+EXE = test 
 
 all: $(EXE)
 
 clean:
-	-$(RM) core *~ *.o *_c.hh *_c.cc *_s.hh *_s.cc $(EXE)
-	-$(RM) -r Templates.DB
+	-rm -f core *~ *.o *_c.hh *_c.cc *_s.hh *_s.cc $(EXE)
+	-rm -rf Templates.DB
 
 remora_c.cc: remora.idl	
 	$(ORBCC) remora.idl
diff --git a/apps/JAWS/server/HTTP_Config.cpp b/apps/JAWS/server/HTTP_Config.cpp
index ec67142c970..dce8ddf8a5e 100644
--- a/apps/JAWS/server/HTTP_Config.cpp
+++ b/apps/JAWS/server/HTTP_Config.cpp
@@ -71,8 +71,8 @@ HTTP_Config_Info::proxy_flag (void) const
   return this->proxy_flag_;
 }
 
-const char *
-HTTP_Config_Info::document_root (const char *dr_string)
+char *
+HTTP_Config_Info::document_root (char *dr_string)
 {
   if (dr_string)
     this->document_root_ = dr_string;
@@ -86,8 +86,8 @@ HTTP_Config_Info::document_root (const char *dr_string)
   return this->document_root_;
 }
 
-const char *
-HTTP_Config_Info::cgi_path (const char *cp_string)
+char *
+HTTP_Config_Info::cgi_path (char *cp_string)
 {
   if (cp_string)
     this->cgi_path_ = cp_string;
@@ -102,8 +102,8 @@ HTTP_Config_Info::cgi_path (const char *cp_string)
   return this->cgi_path_;
 }
 
-const char *
-HTTP_Config_Info::user_dir (const char *ud_string)
+char *
+HTTP_Config_Info::user_dir (char *ud_string)
 {
   if (ud_string)
     this->user_dir_ = ud_string;
@@ -117,8 +117,8 @@ HTTP_Config_Info::user_dir (const char *ud_string)
   return this->user_dir_;
 }
 
-const char *
-HTTP_Config_Info::dir_index (const char *di_string)
+char *
+HTTP_Config_Info::dir_index (char *di_string)
 {
   if (di_string)
     this->dir_index_ = di_string;
diff --git a/apps/JAWS/server/HTTP_Config.h b/apps/JAWS/server/HTTP_Config.h
index 39c76c44d1b..1f978972750 100644
--- a/apps/JAWS/server/HTTP_Config.h
+++ b/apps/JAWS/server/HTTP_Config.h
@@ -68,26 +68,26 @@ public:
 private:
   // = Accesors that can set the data
 
-  const char *document_root (const char *dr_string);
-  const char *cgi_path (const char *cp_string);
-  const char *user_dir (const char *ud_string);
-  const char *dir_index (const char *di_string);
+  char *document_root (char *dr_string);
+  char *cgi_path (char *cp_string);
+  char *user_dir (char *ud_string);
+  char *dir_index (char *di_string);
 
   int proxy_flag (int pf);
 
 private:
   // = Data members
 
-  const char *document_root_;
+  char *document_root_;
   // The directory root from which documents will be fetched
 
-  const char *cgi_path_;
+  char *cgi_path_;
   // The directories from which to expect CGI scripts
 
-  const char *user_dir_;
+  char *user_dir_;
   // Name of the sub-directory where user Web pages are
 
-  const char *dir_index_;
+  char *dir_index_;
   // Name of the Web page to present in place of a directory listing
 
   int proxy_flag_;
diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp
index 0c2bf3405c1..b3d28e4790a 100644
--- a/apps/JAWS/server/HTTP_Response.cpp
+++ b/apps/JAWS/server/HTTP_Response.cpp
@@ -11,11 +11,7 @@
 
 ACE_RCSID(server, HTTP_Response, "$Id$")
 
-#if defined (ACE_JAWS_BASELINE)
-static char * const EMPTY_HEADER = "";
-#else
-static const char * const EMPTY_HEADER = "";
-#endif /* ACE_JAWS_BASELINE */
+static char * const EMPTY_HEADER = (char *)"";
 
 HTTP_Response::HTTP_Response (JAWS_IO &io, HTTP_Request &request)
   : io_(io), request_(request)
@@ -324,7 +320,7 @@ HTTP_Response::build_headers (void)
   if (this->request_.version () == 0
       || ACE_OS::strcmp ("HTTP/0.9", this->request_.version ()) == 0)
     {
-      HTTP_HEADER = EMPTY_HEADER;
+      HTTP_HEADER = (char *) EMPTY_HEADER;
       HTTP_HEADER_LENGTH = 0;
     }
   else
diff --git a/apps/JAWS/server/HTTP_Response.h b/apps/JAWS/server/HTTP_Response.h
index 2bd8d21fbc0..3b9a63b6433 100644
--- a/apps/JAWS/server/HTTP_Response.h
+++ b/apps/JAWS/server/HTTP_Response.h
@@ -66,12 +66,8 @@ private:
   HTTP_Request &request_;
   // The IO and Request objects associated with this re
 
-#if defined (ACE_JAWS_BASELINE)
   char *HTTP_HEADER;
-#else
-  const char *HTTP_HEADER;
-#endif
-  const char *HTTP_TRAILER;
+  char *HTTP_TRAILER;
   int HTTP_HEADER_LENGTH;
   int HTTP_TRAILER_LENGTH;
   // HTTP Headers and trailers.
diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile
index 1c9878f9226..2bd79c0343f 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -65,12 +65,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Asynch_Acceptor.h \
@@ -115,7 +118,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -142,8 +144,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -217,13 +217,16 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  HTTP_Config.h
 .obj/HTTP_Handler.o .obj/HTTP_Handler.so .shobj/HTTP_Handler.o .shobj/HTTP_Handler.so: HTTP_Handler.cpp \
@@ -234,15 +237,17 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -300,8 +305,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -324,12 +327,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -352,12 +358,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -379,7 +388,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -402,8 +410,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -475,12 +481,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -502,7 +511,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -542,8 +550,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -595,15 +601,17 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -653,17 +661,17 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
@@ -690,13 +698,16 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -706,15 +717,17 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -784,8 +797,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -810,12 +821,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -835,7 +849,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -858,8 +871,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/apps/JAWS/server/Makefile.bor b/apps/JAWS/server/Makefile.bor
deleted file mode 100644
index 037d2b2b8fc..00000000000
--- a/apps/JAWS/server/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-
-NAME = main
-OBJFILES = \
-	$(OBJDIR)\HTTP_Server.obj \
-	$(OBJDIR)\HTTP_Config.obj \
-	$(OBJDIR)\HTTP_Handler.obj \
-	$(OBJDIR)\HTTP_Helpers.obj \
-	$(OBJDIR)\JAWS_Pipeline.obj \
-	$(OBJDIR)\JAWS_Concurrency.obj \
-	$(OBJDIR)\HTTP_Request.obj \
-	$(OBJDIR)\HTTP_Response.obj \
-	$(OBJDIR)\Parse_Headers.obj \
-	$(OBJDIR)\IO.obj \
-   $(OBJDIR)\main.obj
-
-!include <$(ACE_ROOT)\apps\build.bor>
-
diff --git a/apps/Makefile.bor b/apps/Makefile.bor
deleted file mode 100644
index bdc3b24ec5a..00000000000
--- a/apps/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
- 
-all:
-	cd $(ACE_ROOT)\apps\gperf
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\apps\Gateway
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\apps\JAWS
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/apps/build.bor b/apps/build.bor
deleted file mode 100644
index b11a02f2ca6..00000000000
--- a/apps/build.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-
-!ifndef CFLAGS
-CFLAGS= $(ACE_CFLAGS)
-!endif
-
-!ifndef CPPDIR
-CPPDIR=.
-!endif
-
-!ifndef LIBFILES
-LIBFILES= $(ACE_LIB)
-!endif
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index b610fa6afa4..3d0827b2c4d 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,22 +1,3 @@
-Thu Jul  1 09:31:32 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* Makefile:
-	  If we are cross compiling we shouldn't compile gperf, it is not
-	  going to help anyway, because we could not run it.
-
-Sun Jun 27 20:40:30 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-	* src/Key_List.cpp: Added some initializers to keep EGCS from
- 	  complaining.
-
-Wed Jun 23 07:24:58 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* src/Key_List.cpp (output_hash_function): Use conditional
-	  compilation rather than a runtime check to test if
- 	  ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE.  This
- 	  suppresses a warning on DEC UNIX.  Thanks to David Levine for
- 	  reporting this.
-
 Fri Jun 18 16:54:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
   
 	* apps/gperf/src/Key_List.cpp (output_lookup_array): Prefixed
diff --git a/apps/gperf/Makefile b/apps/gperf/Makefile
index 24d0d5f2b3f..bd1932f4f94 100644
--- a/apps/gperf/Makefile
+++ b/apps/gperf/Makefile
@@ -10,6 +10,8 @@
 
 INFO  = README
 
+DIRS  =	src
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -17,9 +19,7 @@ INFO  = README
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 ifeq ($(CROSS-COMPILE),)
-  DIRS = src tests
-else
-  DIRS=
+  DIRS += tests
 endif # ! CROSS-COMPILE
 
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
diff --git a/apps/gperf/Makefile.bor b/apps/gperf/Makefile.bor
deleted file mode 100644
index 2831e305908..00000000000
--- a/apps/gperf/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-        cd $(ACE_ROOT)\apps\gperf\src
-        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index f1e27daeeff..99a100bac86 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -87,7 +87,7 @@ char *
 Key_List::special_input (char delimiter)
 {
   int size = 80;
-  char *buf = 0;
+  char *buf;
   ACE_NEW_RETURN (buf,
                   char[size],
                   0);
@@ -124,7 +124,7 @@ Key_List::special_input (char delimiter)
         {
           // Yikes, time to grow the buffer!
 
-          char *temp = 0;
+          char *temp;
           ACE_NEW_RETURN (temp,
                           char[size *= 2],
                           0);
@@ -1119,7 +1119,7 @@ Key_List::output_hash_function (void)
                   max_hash_value <= UCHAR_MAX ? "char" : (max_hash_value <= USHRT_MAX ? "short" : "int"));
 
   ACE_OS::printf ("\n#if defined (ACE_MVS)");
-#if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE
+  if (ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE)
     {
       // We are running in EBCDIC environment.
       for (count = 0; count < ACE_EBCDIC_SIZE; ++count)
@@ -1145,7 +1145,7 @@ Key_List::output_hash_function (void)
  			  Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1);
         }
     }
-#  else
+  else
     {
       // We are running in ASCII environment.
       for (count = 0; count < ACE_EBCDIC_SIZE; ++count)
@@ -1179,7 +1179,6 @@ Key_List::output_hash_function (void)
  			  Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1);
         }
     }
-#endif /* ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE */
    ACE_OS::printf ("\n#endif /* ACE_MVS */");
 
   // Optimize special case of ``-k 1,$''
@@ -1317,12 +1316,12 @@ Key_List::output_lookup_array (void)
     {
       const int DEFAULT_VALUE = -1;
 
-      Duplicate_Entry *duplicates = 0;
+      Duplicate_Entry *duplicates;
       ACE_NEW_RETURN (duplicates,
                       Duplicate_Entry[total_duplicates],
                       -1);
 
-      int *lookup_array = 0;
+      int *lookup_array;
       ACE_NEW_RETURN (lookup_array,
                       int[max_hash_value + 1],
                       -1);
diff --git a/apps/gperf/src/Makefile b/apps/gperf/src/Makefile
index fe300f9d21b..4212852cd1e 100644
--- a/apps/gperf/src/Makefile
+++ b/apps/gperf/src/Makefile
@@ -52,10 +52,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -66,13 +69,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Options.h
 .obj/Gen_Perf.o .obj/Gen_Perf.so .shobj/Gen_Perf.o .shobj/Gen_Perf.so: Gen_Perf.cpp Gen_Perf.h Options.h \
@@ -84,10 +90,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Key_List.h List_Node.h Vectors.h Bool_Array.h
 .obj/Key_List.o .obj/Key_List.so .shobj/Key_List.o .shobj/Key_List.so: Key_List.cpp Key_List.h Options.h \
@@ -99,15 +108,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  List_Node.h Vectors.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -153,13 +164,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Options.h Vectors.h
 .obj/Hash_Table.o .obj/Hash_Table.so .shobj/Hash_Table.o .shobj/Hash_Table.so: Hash_Table.cpp Hash_Table.h \
@@ -168,13 +182,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Options.h List_Node.h
 .obj/Bool_Array.o .obj/Bool_Array.so .shobj/Bool_Array.o .shobj/Bool_Array.so: Bool_Array.cpp Bool_Array.h \
@@ -183,13 +200,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Options.h
 .obj/Vectors.o .obj/Vectors.so .shobj/Vectors.o .shobj/Vectors.so: Vectors.cpp Vectors.h \
@@ -198,13 +218,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/Version.o .obj/Version.so .shobj/Version.o .shobj/Version.so: Version.cpp \
  $(ACE_ROOT)/ace/ACE.h \
@@ -213,12 +236,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/gperf/src/Makefile.bor b/apps/gperf/src/Makefile.bor
deleted file mode 100644
index 95b6cf73277..00000000000
--- a/apps/gperf/src/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-
-NAME = gperf
-
-OBJFILES = \
-        $(OBJDIR)\Options.obj \
-        $(OBJDIR)\Iterator.obj \
-        $(OBJDIR)\Gen_Perf.obj \
-        $(OBJDIR)\Key_List.obj \
-        $(OBJDIR)\List_Node.obj \
-        $(OBJDIR)\Hash_Table.obj \
-        $(OBJDIR)\Bool_Array.obj \
-        $(OBJDIR)\Vectors.obj \
-        $(OBJDIR)\Version.obj \
-        $(OBJDIR)\gperf.obj
-
-CFLAGS = $(ACE_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
-
diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index f48bac44333..0600c7eacc7 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -104,13 +104,16 @@ realclean:
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/bin/ace_ld b/bin/ace_ld
index 2879512b225..f5fd66431e9 100755
--- a/bin/ace_ld
+++ b/bin/ace_ld
@@ -10,28 +10,19 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # full path to perl, as long as it is in the user's PATH.
 # Taken from perlrun man page.
 
-$usage =
-  "usage: $0 [-? | [[-C <compile> --] [-m <munch>] [-n <nm>]] [-f]]] " .
-  "<ld command>\n";
-
-#### To avoid quoting problems on the command line, all arguments
-#### between -C and -- are combined into the single compile command.
-$compile_option = 0;
+$usage = "usage: $0 [-? | [[-c <compile>] [-m <munch>] [-n <nm>]] [-f]]]\n";
 
 ####
 #### process command line args
 ####
 while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ ) {
-    if ( $ARGV[0] eq '-C' ) {
-        $compile_option = 1;
+    if ( $ARGV[0] eq '-c' ) {
         if ( $ARGV[1] !~ /^[-].+$/ ) {
             $compile = $ARGV[1]; shift;
         } else {
             print STDERR "$0:  must provide argument for -c option\n";
             die $usage;
         }
-    } elsif ( $ARGV[0] eq '--' ) {
-        $compile_option = 0;
     } elsif ( $ARGV[0] eq '-m' ) {
         if ( $ARGV[1] !~ /^[-].+$/ ) {
             $munch = $ARGV[1]; shift;
@@ -50,12 +41,8 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ ) {
         print "$usage";
         exit;
     } else {
-        if ($compile_option) {
-          $compile .= " $ARGV[0]";
-        } else {
-          warn "$0:  unknown option $ARGV[0]\n";
-         die $usage;
-        }
+        warn "$0:  unknown option $ARGV[0]\n";
+        die $usage;
     }
     shift;
 }
diff --git a/bin/auto_compile b/bin/auto_compile
index 7fa07f0e947..2351d26abe5 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -57,19 +57,9 @@ $MODULE='ACE_wrappers';
       'TAO/tests/Param_Test , run_test.pl',
       'TAO/tests/Param_Test , run_test.pl -i dii',
       'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
-      'TAO/tests/OctetSeq , run_test.pl',
-      'TAO/tests/Multiple_Inheritance , run_test.pl',
-      'TAO/tests/MT_Client , run_test.pl',
-      'TAO/tests/MT_Server , run_test.pl',
-      'TAO/tests/Faults , run_test.pl',
-      'TAO/tests/NestedUpcall/Simple , run_test.pl',
-      'TAO/tests/NestedUpcall/MT_Client_Test , run_test.pl',
-      'TAO/tests/NestedUpcall/Triangle_Test , run_test.pl',
-      'TAO/tests/POA/Identity , run_test.pl',
-      'TAO/tests/POA/Deactivation , run_test.pl',
-      'TAO/tests/POA/Destruction , run_test.pl',
-      'TAO/tests/IORManipulation , run_test.pl',
-      'TAO/tests/Timeout , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
+      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
       'TAO/examples/POA/Adapter_Activator , run_test.pl',
       'TAO/examples/POA/DSI , run_test.pl',
       'TAO/examples/POA/Default_Servant , run_test.pl',
@@ -82,33 +72,23 @@ $MODULE='ACE_wrappers';
       'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
       'TAO/examples/POA/Loader , run_test.pl',
       'TAO/examples/POA/RootPOA , run_test.pl',
+      'TAO/examples/POA/Identity , run_test.pl',
       'TAO/examples/POA/Adapter_Activator , run_test.pl',
-      'TAO/examples/Simple/bank , run_test.pl',
-      'TAO/examples/Simple/grid , run_test.pl',
-      'TAO/examples/Simple/time-date , run_test.pl',
-      'TAO/examples/Simple/time , run_test.pl',
-      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
-      'TAO/orbsvcs/tests/Trading , run_test.pl',
-      'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
-      'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
-      'TAO/orbsvcs/tests/EC_Basic , run_test.pl',
-      'TAO/orbsvcs/tests/EC_Custom_Marshal , run_test.pl',
-      'TAO/orbsvcs/tests/EC_Throughput , run_test.pl',
-#      'TAO/orbsvcs/tests/EC_Mcast , run_test.pl',
-#      'TAO/orbsvcs/tests/EC_Multiple , run_test.pl',
-      'TAO/orbsvcs/tests/Event_Latency , run_test.pl',
-      'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
-#      'TAO/examples/Simple/chat , run_test.pl',
-      'TAO/orbsvcs/tests/Property , run_test.pl',
-   'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
-      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100'
+      'TAO/tests/MT_Client , run_test.pl',
+      'TAO/tests/MT_Server , run_test.pl',
+      'TAO/tests/OctetSeq , run_test.pl',
+      'TAO/tests/Multiple_Inheritance , run_test.pl',
+      'TAO/tests/NestedUpcall/Reactor , run_test.pl',
+      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100',
+      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl'
 #      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
 #      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
+#      'TAO/orbsvcs/tests/Property , run_test.pl'
     );
 
 
 # We obtain our revision to report errors.
-$REVISION='$Revision$ ';
+$REVISION='$Revision$';
 
 # Find out the command name.
 $CMD = basename($0);
@@ -134,7 +114,7 @@ sub mywarn {
   print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n";
   print MAIL "\n";
   local $m;
-  foreach $m (@msg) {
+  foreach $m (@msg) { 
     print MAIL $m, "\n";
   }
   print MAIL "\nPlease check log files for more info\n";
@@ -231,7 +211,8 @@ $ENV{'ACE_ROOT'} = $CHECKOUT . '/' . $MODULE . '/build/' . $BUILD;
 $ENV{'TAO_ROOT'} = $CHECKOUT . '/' . $MODULE . '/build/' . $BUILD . '/TAO';
 
 @failures = ();
-$MAKEFLAGS .= "";
+@warnings = ();
+$MAKEFLAGS .= " shared_libs_only=1";
 foreach $i (@BUILD_LIST) {
     $date = localtime;
     print LOG "$CMD: =============================================\n";
@@ -241,6 +222,7 @@ foreach $i (@BUILD_LIST) {
 
     local $current_dir = $i;
     local $last_error = "";
+    local $last_warning = "";
     while (<MAKE>) {
 	print LOG $_;
 	chop;
@@ -256,9 +238,9 @@ foreach $i (@BUILD_LIST) {
 	    }
 	}
 	if (m/Warning:/ || m/warning:/) {
-	  if ($last_error ne $current_dir) {
-	    push @failures, "Warning while compiling in $current_dir\n";
-	    $last_error = $current_dir;
+	  if ($last_warning ne $current_dir) {
+	    push @warnings, "Warning while compiling in $current_dir\n";
+	    $last_warning = $current_dir;
 	  }
 	}
     }
@@ -290,7 +272,7 @@ foreach $i (@RUN_LIST) {
     }
     while (<RUN>) {
 	print LOG $_;
-	if (m/Error/ || m/FAILED/ || m/EXCEPTION/) {
+	if (m/^Error/ || m/FAILED/ || m/EXCEPTION/) {
 	    $run_error = 1;
 	}
     }
@@ -302,7 +284,7 @@ foreach $i (@RUN_LIST) {
     print LOG "$CMD: $program finished ", $date, "\n";
 
     if ($run_error != 0) {
-	push @failures,
+	push @failures, 
 	    "errors detected while running $program in $directory";
     }
 }
@@ -311,6 +293,10 @@ if ($#failures >= 0) {
     mydie @failures;
 }
 
+if ($#warnings >= 0) {
+  mywarn @warnings;
+}
+
 close(LOG)
     || mydie "cannot close LOGFILE";
 
diff --git a/bin/check_build_logs b/bin/check_build_logs
deleted file mode 100755
index eb1b166605d..00000000000
--- a/bin/check_build_logs
+++ /dev/null
@@ -1,99 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# Reviews build logs and reports problems, via stdout or mail.
-
-$usage="$0 [-l log directory] [-m mail recipient(s)]\n";
-
-####
-#### Configuration parameters.
-####
-$subject = 'ACE+TAO build results';
-$find = 'find';
-$mail = "mail -s '$subject'";
-
-$ostype = $ENV{'OSTYPE'}  ||  `/bin/uname -s`;
-if ( "$ostype" =~ /(solaris)|(SunOS)/i ) {
-  $find = '/pkg/gnu/bin/find';
-  $mail = "/pkg/mh/bin/mhmail -subject '$subject'";
-}
-
-
-$log_directory = '/project/danzontmp/levine/build-logs';
-$mail_recipients = '';
-
-####
-#### Process command line args.
-####
-while ($#ARGV >= $[) {
-  if ($ARGV[0] eq '-l') {
-    if ($ARGV[1] =~ /^\w+$/) {
-      $log_directory = $ARGV[1];
-      shift;
-    } else {
-      print STDERR "$0:  must provide argument for -l option\n";
-      die $usage;
-    }
-  } elsif ($ARGV[0] eq '-m') {
-    if ($ARGV[1] =~ /^[\w@\.]+$/) {
-      $mail_recipients = $ARGV[1];
-      shift;
-    } else {
-      print STDERR "$0:  must provide argument for -m option\n";
-      die $usage;
-    }
-  } elsif ($ARGV[0] eq '-?') {
-    print "$usage";
-    exit;
-  } else {
-    print "$0: unknown arg: $ARGV[0]\n";
-    print "$usage";
-    exit 1;
-  }
-  shift;
-}
-
-
-####
-#### Find the log files.
-####
-chdir $log_directory  ||
-  die "$0: unable to cd to \"$log_directory\"\n";
-
-($log_files = ( `$find . -name '*.log' -daystart -ctime 0 -print` )) =~
-  tr [\n] [ ];
-
-
-####
-#### Grep the log files for problems.
-####
-@output = ();
-open (EGREP, "egrep -n \'Error|errors|[^a][Ss]top|No rule to make|\(undefined symb\)|[Ww]arn|not exist|core dumped|: #[0-9]|cxx:\' $log_files |")  ||
-  die "$0: unable to open egrep\n";
-while (<EGREP>) {
-  push @output, $_ unless /calls, 0 errors$/  ||  /Found non-pic R_SPARC/;
-}
-close EGREP;
-
-
-####
-#### Produce output, if there were any problems.
-####
-if ($#output > -1) {
-
-  if ("$mail_recipients") {
-    open (MAIL, "| $mail $mail_recipients")  ||
-      die "$0: unable to open pipe to $mail\n";
-    select MAIL;
-  }
-
-  print "This is an automatically generated message.\n\n";
-  print "Log files are in $log_directory.\n\n";
-
-  print @output;
-
-  close MAIL if "$mail_recipients";
-}
diff --git a/bin/libsize.pl b/bin/libsize.pl
deleted file mode 100755
index 3fd3a468b10..00000000000
--- a/bin/libsize.pl
+++ /dev/null
@@ -1,192 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# Provides size breakdown of ACE, TAO, or orbsvcs libs.
-#
-# Assumes (or builds) the lib with debug=0.  Allows other make args,
-# such as -j 4, to be passed on the command line.
-
-$usage =
-  "$0 [-h, for html output] [-s, for shared libs] [-v] [make arguments]\n";
-
-####
-#### Configuration parameters.
-####
-$build_args =
-  'debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0';
-$ACE_COMPONENTS =
-  'OS Utils Logging Threads Demux Connection Sockets IPC Svcconf ' .
-    'Streams Memory Token Other';
-$TAO_COMPONENTS =
-  'POA Pluggable_Protocols Default_Resources Interpretive_Marshaling ' .
-    'IDL_Compiler ORB_Core Dynamic_Any';
-$ORBSVCS_COMPONENTS =
-  'Naming ImplRepo Time Concurrency Property Trader LifeCycle Sched ' .
-    'Event CosEvent Event2 AV';
-
-
-#### The following are only used for VxWorks libraries, and
-#### only if the corresponding environment variable isn't set.
-$default_toolenv = '386';
-$default_wind_base = '/project/doc/pkg/wind';
-$default_host_type = 'sun4-solaris2';
-
-#### Use gmake if it's on the user's PATH, otherwise use make.  Use
-#### sh -c to avoid warning if gmake isn't found.
-$make =
-  system ("sh -c \"gmake --version\" > /dev/null 2>&1")  ?  'make'  :  'gmake';
-
-$ACE_ROOT = $ENV{'ACE_ROOT'}  ||
-  die "$0: ACE_ROOT was not set!\n";
-
-
-$html = $verbose = 0;
-$lib_extension = 'a';
-
-####
-#### Process command line args.
-####
-while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
-  if ($ARGV[0] eq '-h') {
-    $html = 1;
-    chop ($sysname = `uname -s`);
-    chop ($sysrev = `uname -r`);
-    shift;
-  } elsif ($ARGV[0] eq '-s') {
-    $lib_extension = 'so';
-    $build_args =~ s/ static_libs_only=1//;
-    shift;
-  } elsif ($ARGV[0] eq '-v') {
-    $verbose = 1;
-    shift;
-  } elsif ($ARGV[0] eq '-?') {
-    print "$usage";
-    exit;
-  } else {
-    #### Pass remaining args to make.
-  }
-}
-
-$make_args = join (' ', @ARGV) . $build_args;
-
-chop ($pwd = `pwd`);
-
-if ($pwd =~ m%/ace$%) {
-  #### libACE
-  $COMPONENTS = "$ACE_COMPONENTS";
-  $LIB_COMPONENTS = 'ACE_COMPONENTS';
-  $libname = 'ACE';
-} elsif ($pwd =~ m%/tao$%) {
-  $COMPONENTS = "$TAO_COMPONENTS";
-  $LIB_COMPONENTS = 'TAO_COMPONENTS';
-  $libname = 'TAO';
-} elsif ($pwd =~ m%/orbsvcs/orbsvcs$%) {
-  $COMPONENTS = "$ORBSVCS_COMPONENTS";
-  $LIB_COMPONENTS = 'TAO_ORBSVCS';
-  $libname = 'orbsvcs';
-} else {
-  die "$0: unsupported directory; $pwd\n";
-}
-
-$lib = "lib${libname}.$lib_extension";
-
-
-####
-#### Select the size command based on ACE_ROOT setting.
-####
-if ($ACE_ROOT =~ /vxworks/) {
-  $TOOLENV = $ENV{'TOOLENV'}  ||  $default_toolenv;
-  $WIND_BASE = $ENV{'WIND_BASE'}  ||  $default_wind_base;
-  $WIND_HOST_TYPE = $ENV{'WIND_HOST_TYPE'}  ||  $default_host_type;
-  $size = "$WIND_BASE/host/$WIND_HOST_TYPE/bin/size$TOOLENV";
-} elsif ($ACE_ROOT =~ /lynx-ppc/) {
-  $size = '/usr/lynx/3.0.0/ppc/cdk/sunos-xcoff-ppc/bin/size';
-} elsif ($ACE_ROOT =~ /lynx/) {
-  $size = '/usr/lynx/3.0.0/x86/cdk/sunos-coff-x86/bin/size';
-} elsif ($ACE_ROOT =~ /chorus/) {
-  $size = '/project/doc/mvme/green68k/gnu/bin/size';
-} else {
-  $size = 'size';
-}
-
-
-####
-#### Measure the size of the entire library.
-####
-$sizeTotal = build_lib ("$LIB_COMPONENTS=\"$COMPONENTS\"");
-$components = "   <th>Platform\n    <th>Component\n    <th>Total";
-$componentSize = "   <th>Size, bytes\n    <td align=center>$sizeTotal";
-$componentPercentage =
-  "   <th>Percentage of<br>total size\n    <td align=center>100";
-print "Total $sizeTotal (100)\n" unless $html;
-
-
-####
-#### Measure the size of each library component.
-####
-foreach my $i (split (' ', $COMPONENTS)) {
-  $sizeLib = build_lib ("$LIB_COMPONENTS=\"$i\"");
-  $components .= "\n    <th>$i";
-  $componentSize .= "\n    <td align=center>$sizeLib";
-  $thisPercentage = percentage ($sizeLib, $sizeTotal);
-  $componentPercentage .= "\n    <td align=center>$thisPercentage";
-  print "$i $sizeLib ($thisPercentage)\n" unless $html;
-}
-
-####
-#### Produce HTML output, if requested.
-####
-if ($html) {
-  print '<center><table cellpadding=4 border=4>' . "\n";
-  print '  <tr>' . "\n";
-  print "$echoArgs $components\n";
-  print '  <tr>' . "\n";
-  print "    <th rowspan=2>$sysname $sysrev $ACE_ROOT\n";
-  print "$echoArgs $componentSize\n";
-  print '  <tr>' . "\n";
-  print "$echoArgs $componentPercentage\n";
-  print '</table></center><p>' . "\n";
-}
-
-
-####
-#### Build library with componnents specified in argument.
-####
-sub build_lib ()
-{
-  my ($lib_components) = @_;
-
-  unlink "$lib";
-
-  print "$make $make_args $lib_components\n" if $verbose;
-
-  system ("$make $make_args $lib_components >> make.log 2>&1")  &&
-    die "$0: command failed; $make $make_args $lib_components\n";
-
-  my $libSize = 0;
-
-  open (SIZE, "$size $lib |")  ||
-    die "$0: unable to open $size\n";
-  while (<SIZE>) {
-    my (@field) = split;
-    $libSize += $field[3] if $field[3] =~ /\d/;  #### Skip size header line.
-  }
-  close (SIZE);
-
-  $libSize;
-}
-
-
-####
-#### Return percentage of first argument as fraction of second.
-#### Returns a string with two-decimal place precision.
-####
-sub percentage ()
-{
-  my ($size, $total) = @_;
-
-  sprintf ("%.2f", $size * 100 / $total);
-}
diff --git a/config.guess b/config.guess
index 6cb567b8ae6..97222404275 100755
--- a/config.guess
+++ b/config.guess
@@ -1,7 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -37,20 +36,6 @@
 # (but try to keep the structure clean).
 #
 
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
-  if test x"$HOST_CC" != x; then
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
-fi
-
-
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -93,7 +78,7 @@ main:
 	ret \$31,(\$26),1
 	.end main
 EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	${CC-cc} $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		./$dummy
 		case "$?" in
@@ -115,13 +100,7 @@ EOF
 		esac
 	fi
 	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -165,7 +144,7 @@ EOF
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -224,32 +203,6 @@ EOF
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor 
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -283,7 +236,7 @@ EOF
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
+    2020:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
@@ -307,7 +260,7 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
+	${CC-cc} $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
@@ -373,7 +326,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -421,7 +374,7 @@ EOF
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
+	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
               sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>
@@ -453,7 +406,7 @@ EOF
                   exit (0);
               }
 EOF
-	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -485,7 +438,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -495,7 +448,10 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE*:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    *9??*:MPE*:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -514,9 +470,6 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -556,7 +509,7 @@ EOF
 	echo cray2-cray-unicos
         exit 0 ;;
     F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
@@ -569,12 +522,12 @@ EOF
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -599,15 +552,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit 0 ;;
@@ -626,9 +570,8 @@ EOF
 	esac
 
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_help_string=`cd /; ld --help 2>&1`
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -641,36 +584,7 @@ EOF
 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32ppc)
-		# Determine Lib Version
-		cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unkown\n");
-#endif
-  return 0;
-}
-EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			./$dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi	
-		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -692,7 +606,7 @@ EOF
 		.end main
 EOF
 		LIBC=""
-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+		${CC-cc} $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
 			./$dummy
 			case "$?" in
@@ -737,7 +651,7 @@ EOF
   return 0;
 }
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
@@ -780,7 +694,7 @@ EOF
   return 0;
 }
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
@@ -803,14 +717,6 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
-	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
-	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
-	exit 0 ;;
     i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -820,15 +726,18 @@ EOF
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
     pc:*:*:*)
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
@@ -915,7 +824,7 @@ EOF
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
@@ -1049,7 +958,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
diff --git a/config.sub b/config.sub
index 2436b45347a..78d36b15a20 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -98,21 +98,11 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=vxworks
-		basic_machine=$1
-		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=-sco3.2v5
+		os=sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -131,9 +121,6 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -164,21 +151,15 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v)
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| hppa2.0w \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
-		;;
-
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -194,41 +175,25 @@ case $basic_machine in
 	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | hppa2.0w-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	      | f301-* | armv*-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -258,10 +223,6 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -338,10 +299,6 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -360,14 +317,6 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -383,30 +332,13 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -415,13 +347,13 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
 		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
@@ -444,22 +376,6 @@ case $basic_machine in
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -488,10 +404,6 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
@@ -506,22 +418,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)
-		basic_machine=i386-unknown
-		os=-msdos
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
 	netwinder)
 		basic_machine=armv4l-corel
 		os=-linux
@@ -538,10 +438,6 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -567,25 +463,9 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -603,19 +483,19 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | k6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -639,20 +519,12 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -660,10 +532,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -671,13 +539,6 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -722,10 +583,6 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -743,10 +600,6 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -770,14 +623,6 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -785,10 +630,6 @@ case $basic_machine in
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -796,15 +637,6 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
@@ -827,7 +659,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sparc)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -839,16 +671,6 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -902,21 +724,14 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
+	      | -openstep* | -mpeix* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -941,9 +756,6 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-386bsd)
-		os=-bsd
-		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
@@ -975,18 +787,9 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
-	        os=-mint
-		;;
 	-none)
 		;;
 	*)
@@ -1036,15 +839,6 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1057,15 +851,6 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -1129,18 +914,6 @@ case $basic_machine in
 	f301-fujitsu)
 		os=-uxpv
 		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
 	*)
 		os=-none
 		;;
@@ -1162,15 +935,15 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
-			-beos*)
-				vendor=be
-				;;
 			-hpux*)
 				vendor=hp
 				;;
 			-mpeix*)
 				vendor=hp
 				;;
+			-mpeix*)
+				vendor=hp
+				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -1198,15 +971,6 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -*MiNT)
-				vendor=atari
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/configure.in b/configure.in
index 02b6b27f610..bdc03b11319 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl
 dnl $Id$
 
-AC_REVISION($Revision 0.61 $)dnl
+AC_REVISION($Revision 0.60 $)dnl
 
 dnl
 dnl An autoconf script to automatically configure ACE.
@@ -631,24 +631,6 @@ dnl line, then "no_x" is set to "yes."
                esac
               ],)
 
-AC_ARG_ENABLE(fl-reactor,
-              [  --enable-fl-reactor     build support for the FlReactor [default=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
-              ],)
-
 AC_ARG_WITH(gperf,
               [  --with-gperf            compile the gperf program       [default=yes]],
               [
@@ -3285,9 +3267,6 @@ AC_CHECK_FUNC(strrchr, dnl
   ,
   AC_DEFINE(ACE_LACKS_STRRCHR))
 
-AC_CHECK_FUNC(memchr, dnl
-  AC_DEFINE(ACE_HAS_MEMCHR),)
-
 AC_CHECK_FUNC(syscall, dnl
   ,
   AC_DEFINE(ACE_LACKS_SYSCALL))
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 7fc6ba5c9ff..12f0f073311 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -587,7 +587,7 @@ bgcolor="#ffffff">
         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>
+        types.   (CORBA::Boolean is acceptable).  Use <code>int</code>
         or <code>u_int</code> instead for boolean types.<p>
 
     <li>Functions should always return -1 to indicate failure, and
@@ -596,11 +596,6 @@ bgcolor="#ffffff">
     <li>Separate the code of your templates from the code for
         non-parametric classes: some compilers get confused when
         template and non-template code is mixed in the same file.<p>
-
-    <li>It's a good idea to specify the include path (with <code>-I</code>)
-      to include any directory which contains files with template
-      definitions.  The <code>-ptv</code> Digital Unix cxx compiler option
-      may help diagnose missing template instantiation problems.<p>
     </li>
   </ul>
 
@@ -654,73 +649,6 @@ bgcolor="#ffffff">
         <strong><code>ASYS_ONLY_MULTIBYTE_STRING</code></strong>. See
         the end of <a href="../ace/OS.h">OS.h</a> for more details.<p>
 
-    <li>Here is a brief breakdown:<p>
-        <table BORDER=2 CELLSPACING=2 CELLPADDING=0>
-          <tr>
-            <th Align=left>Macro Name</th>
-            <td>NONE </td>
-            <td>UNICODE</td>
-            <td>MOSTLY</td>
-            <td>Remark</td>
-          </tr>
-          <tr>
-            <th align=left><code>ACE_WIDE_STRING</code></th>
-            <td>NOP</td>
-            <td>C 2 W</td>
-            <td>C 2 W</td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr>
-            <th align=left><code>ACE_MULTIBYTE_STRING</code></tr>
-            <td>NOP</td>
-            <td>W 2 C</td>
-            <td>W 2 C</td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr>
-            <th align=left><code>ASYS_WIDE_STRING</code></th>
-            <td>NOP</td>
-            <td>NOP</td>
-            <td>C 2 W</td>
-            <td>Convert char strings to where ASYS_TCHAR strings are
-                expected.</td>
-          </tr>
-          <tr>
-            <th align=left><code>ASYS_MULTIBYTE_STRING</code></th>
-            <td>NOP</td>
-            <td>W 2 C</td>
-            <td>NOP</td>
-            <td>Convert LPTCSTR or LPTSTR strings to where ASYS_TCHAR
-                strings are expected.</td>
-          </tr>
-          <tr>
-            <th align=left><code>ASYS_ONLY_WIDE_STRING</code></th>
-            <td>NOP</td>
-            <td>C 2 W</td>
-            <td>NOP</td>
-            <td>Convert ASYS_TCHAR stirngs to where wchar strings are
-                expected.</td>
-          </tr>
-          <tr>
-            <th align=left><code>ASYS_ONLY_MULTIBYTE_STRING</code></th>
-            <td>NOP</td>
-            <td>NOP</td>
-            <td>W 2 C</td>
-            <td>Convert ASYS_TCHAR strings to where</td>
-          </tr>
-        </table><p>
-        Where:
-
-        <UL>
-          <LI>UNICODE: When <code>UNICODE</code> is defined.
-          <li>MOSTLY: When <code>ACE_HAS_MOSTLY_UNICODE_APIS</code> is
-              defined
-          <li>C: char *
-          <li>W: wchar *
-          <li>T: ASYS_TCHAR*  (T == W) only when MOSTLY is defined,
-              otherwise, (T == C)
-          <li>NOP: No operation.
-        </ul><p>
   </ul><p>
 
   <li><strong>Exceptions</strong><p>
@@ -975,9 +903,7 @@ bgcolor="#ffffff">
 <ul>
   <li>When enhancing, updating, or fixing ACE or TAO, always:<p>
   <ol>
-    <li>Test your change on at least one platform.  All changes
-      <strong>must</strong> be tested with egcs before commiting.
-      That means you may need to test on two platforms.<p>
+    <li>Test your change on at least one platorm.<p>
     <li>Commit your change with a meaningful message.<p>
     <li>An an entry to the appropriate ChangeLog.  TAO and some
       ACE subdirectories, such as <a href="../ASNMP">ASNMP</a>,
diff --git a/docs/tutorials/001/Makefile b/docs/tutorials/001/Makefile
index 8c465a2faf4..59b2b33fda3 100644
--- a/docs/tutorials/001/Makefile
+++ b/docs/tutorials/001/Makefile
@@ -59,14 +59,14 @@ HTML : #
 # necessary to include the source code files since they're commited as-is.
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 # For orthogonality, we have an UNSHAR to match SHAR.
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/002/Makefile b/docs/tutorials/002/Makefile
index f2eca0928bc..ed9fd633fa2 100644
--- a/docs/tutorials/002/Makefile
+++ b/docs/tutorials/002/Makefile
@@ -35,13 +35,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/003/Makefile b/docs/tutorials/003/Makefile
index 874926a64f1..5fc1cd2b358 100644
--- a/docs/tutorials/003/Makefile
+++ b/docs/tutorials/003/Makefile
@@ -37,13 +37,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/004/Makefile b/docs/tutorials/004/Makefile
index 0bfc82e3bd5..67c79a15d9a 100644
--- a/docs/tutorials/004/Makefile
+++ b/docs/tutorials/004/Makefile
@@ -34,13 +34,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Local targets
diff --git a/docs/tutorials/005/Makefile b/docs/tutorials/005/Makefile
index d8f01d76929..f953d329191 100644
--- a/docs/tutorials/005/Makefile
+++ b/docs/tutorials/005/Makefile
@@ -99,13 +99,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/006/Makefile b/docs/tutorials/006/Makefile
index 57a90088d72..ea8bbb401b3 100644
--- a/docs/tutorials/006/Makefile
+++ b/docs/tutorials/006/Makefile
@@ -95,13 +95,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/007/Makefile b/docs/tutorials/007/Makefile
index 7ed33571341..fd4e5498862 100644
--- a/docs/tutorials/007/Makefile
+++ b/docs/tutorials/007/Makefile
@@ -97,13 +97,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/008/Makefile b/docs/tutorials/008/Makefile
index b595ecbc814..d522535c5a9 100644
--- a/docs/tutorials/008/Makefile
+++ b/docs/tutorials/008/Makefile
@@ -55,13 +55,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/009/Makefile b/docs/tutorials/009/Makefile
index b595ecbc814..d522535c5a9 100644
--- a/docs/tutorials/009/Makefile
+++ b/docs/tutorials/009/Makefile
@@ -55,13 +55,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/010/Makefile b/docs/tutorials/010/Makefile
index 41d9ecfb6bd..1731046ff1e 100644
--- a/docs/tutorials/010/Makefile
+++ b/docs/tutorials/010/Makefile
@@ -58,13 +58,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/011/Makefile b/docs/tutorials/011/Makefile
index 41d9ecfb6bd..1731046ff1e 100644
--- a/docs/tutorials/011/Makefile
+++ b/docs/tutorials/011/Makefile
@@ -58,13 +58,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/012/Makefile b/docs/tutorials/012/Makefile
index 41d9ecfb6bd..1731046ff1e 100644
--- a/docs/tutorials/012/Makefile
+++ b/docs/tutorials/012/Makefile
@@ -58,13 +58,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/013/Makefile b/docs/tutorials/013/Makefile
index c150df6639c..ff5998c2045 100644
--- a/docs/tutorials/013/Makefile
+++ b/docs/tutorials/013/Makefile
@@ -56,13 +56,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 .depend : #
 	touch .depend
diff --git a/docs/tutorials/014/Makefile b/docs/tutorials/014/Makefile
index 9ccd4e53357..c403fe186fb 100644
--- a/docs/tutorials/014/Makefile
+++ b/docs/tutorials/014/Makefile
@@ -62,13 +62,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/015/Makefile b/docs/tutorials/015/Makefile
index 5975764d91d..2851bd7ceb8 100644
--- a/docs/tutorials/015/Makefile
+++ b/docs/tutorials/015/Makefile
@@ -24,10 +24,10 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend*
+	rm -f hdr bodies *.pre *.pst .depend*
diff --git a/docs/tutorials/016/Makefile b/docs/tutorials/016/Makefile
index f367f64df66..fd8db566c91 100644
--- a/docs/tutorials/016/Makefile
+++ b/docs/tutorials/016/Makefile
@@ -62,13 +62,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/017/Makefile b/docs/tutorials/017/Makefile
index 21e349dd929..32d54bbfc70 100644
--- a/docs/tutorials/017/Makefile
+++ b/docs/tutorials/017/Makefile
@@ -62,13 +62,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/018/Makefile b/docs/tutorials/018/Makefile
index 97bcfde576f..669b4436100 100644
--- a/docs/tutorials/018/Makefile
+++ b/docs/tutorials/018/Makefile
@@ -62,13 +62,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/019/Makefile b/docs/tutorials/019/Makefile
index 897c0f8d9ac..348bda5f355 100644
--- a/docs/tutorials/019/Makefile
+++ b/docs/tutorials/019/Makefile
@@ -64,13 +64,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && $(RM) hdr bodies *.pre
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/020/Makefile b/docs/tutorials/020/Makefile
index f71ec01f963..f211d39ae14 100644
--- a/docs/tutorials/020/Makefile
+++ b/docs/tutorials/020/Makefile
@@ -64,13 +64,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/021/Makefile b/docs/tutorials/021/Makefile
index 9df7f7c3a25..eb4a321345f 100644
--- a/docs/tutorials/021/Makefile
+++ b/docs/tutorials/021/Makefile
@@ -64,13 +64,13 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && $(RM) hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	$(RM) hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst .depend
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile
index ac0a174adde..3ec23a27930 100644
--- a/examples/ASX/CCM_App/Makefile
+++ b/examples/ASX/CCM_App/Makefile
@@ -54,17 +54,19 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -120,8 +122,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile
index cfaa7b3422a..1d18b763bcd 100644
--- a/examples/ASX/Event_Server/Event_Server/Makefile
+++ b/examples/ASX/Event_Server/Event_Server/Makefile
@@ -51,12 +51,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -88,12 +91,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -127,7 +133,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -156,8 +161,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -240,13 +243,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -258,7 +264,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -313,8 +318,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -372,12 +375,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -396,7 +402,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -451,8 +456,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -540,12 +543,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -565,7 +571,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -588,8 +593,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/ASX/Event_Server/Transceiver/Makefile b/examples/ASX/Event_Server/Transceiver/Makefile
index 50b2c7df44a..784b9dc53ed 100644
--- a/examples/ASX/Event_Server/Transceiver/Makefile
+++ b/examples/ASX/Event_Server/Transceiver/Makefile
@@ -50,12 +50,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -75,7 +78,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -98,8 +100,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/ASX/Message_Queue/Makefile b/examples/ASX/Message_Queue/Makefile
index 572f7dd29bb..1d028bb3265 100644
--- a/examples/ASX/Message_Queue/Makefile
+++ b/examples/ASX/Message_Queue/Makefile
@@ -45,12 +45,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -72,7 +75,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -95,8 +97,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -168,15 +168,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -229,8 +231,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -275,15 +275,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -336,8 +338,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile
index 69061de6b61..d1365f9d361 100644
--- a/examples/ASX/UPIPE_Event_Server/Makefile
+++ b/examples/ASX/UPIPE_Event_Server/Makefile
@@ -51,12 +51,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -86,13 +89,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -105,9 +111,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/UPIPE_Acceptor.h \
  $(ACE_ROOT)/ace/UPIPE_Stream.h \
  $(ACE_ROOT)/ace/Stream.h \
@@ -249,17 +252,19 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -315,8 +320,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -372,12 +375,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -393,7 +399,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -441,8 +446,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -533,12 +536,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -562,7 +568,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -585,8 +590,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index 5b7b33e9227..54d25ee371e 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -117,10 +117,5 @@ private:
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Peer_Router.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Peer_Router.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 #endif /* ACE_HAS_THREADS */
 #endif /* _PEER_ROUTER_H */
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index 861c45bb088..af2efb2ed5f 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -141,7 +141,7 @@ Connection_Handler::handle_input (ACE_HANDLE)
                          this->get_handle ()),
                         -1);
     default:
-      if (((int) buf[0]) == (int) EOF)
+      if (((unsigned int) buf[0]) == EOF)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "(%P|%t) closing log daemon (fd = %d)\n",
                            this->get_handle ()),
diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile
index 4a842b33ffd..960c9f997f6 100644
--- a/examples/Connection/misc/Makefile
+++ b/examples/Connection/misc/Makefile
@@ -56,12 +56,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -81,7 +84,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -104,8 +106,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -214,12 +214,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -239,7 +242,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -262,8 +264,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Connection/non_blocking/CPP-acceptor.h b/examples/Connection/non_blocking/CPP-acceptor.h
index 1adfd51253b..3adc524a48c 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/examples/Connection/non_blocking/CPP-acceptor.h
@@ -84,9 +84,4 @@ private:
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "CPP-acceptor.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CPP-acceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 #endif /* CPP_ACCEPTOR_H */
diff --git a/examples/Connection/non_blocking/CPP-connector.h b/examples/Connection/non_blocking/CPP-connector.h
index 69419de304b..66a75747a51 100644
--- a/examples/Connection/non_blocking/CPP-connector.h
+++ b/examples/Connection/non_blocking/CPP-connector.h
@@ -86,9 +86,4 @@ private:
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "CPP-connector.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CPP-connector.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 #endif /* CPP_CONNECTOR_H */
diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile
index 7ed9f058f47..e9f56e9e59c 100644
--- a/examples/Connection/non_blocking/Makefile
+++ b/examples/Connection/non_blocking/Makefile
@@ -42,13 +42,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.lib.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
-
 #----------------------------------------------------------------------------
 #	Local targets
 #----------------------------------------------------------------------------
@@ -70,12 +63,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -95,7 +91,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -118,8 +113,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -203,12 +196,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -228,7 +224,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -251,8 +246,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -335,12 +328,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -379,7 +375,6 @@ endif
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -419,8 +414,6 @@ endif
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -484,12 +477,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -525,7 +521,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -548,8 +543,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -631,12 +624,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -678,7 +674,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -701,8 +696,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -788,12 +781,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -836,7 +832,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -859,8 +854,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -941,18 +934,24 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i \
  CPP-connector.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -975,7 +974,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -998,8 +996,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1083,20 +1079,26 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  CPP-acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -1120,7 +1122,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1143,8 +1144,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1225,21 +1224,21 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.i \
@@ -1371,21 +1370,21 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
  CPP-acceptor.h \
diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile
index 59529628095..9b97fc4560b 100644
--- a/examples/IOStream/client/Makefile
+++ b/examples/IOStream/client/Makefile
@@ -49,12 +49,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile
index 52d54d02bd8..00c34c1407f 100644
--- a/examples/IOStream/server/Makefile
+++ b/examples/IOStream/server/Makefile
@@ -49,12 +49,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -74,7 +77,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -97,8 +99,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -182,7 +182,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- iostream_server.h \
  $(ACE_ROOT)/ace/IOStream.h \
  $(ACE_ROOT)/ace/IOStream_T.h \
  $(ACE_ROOT)/ace/IOStream_T.i \
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index 0aad9ba5a77..c832ede2b2f 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -7,13 +7,47 @@
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Service_Config.h"
-
-#include "iostream_server.h"
+#include "ace/IOStream.h"
 
 ACE_RCSID(server, iostream_server, "$Id$")
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
+// Declare a new type which will case an ACE_SOCK_Stream to behave
+// like an iostream.  The new ACE_SOCK_IOStream type can be used
+// anywhere an ACE_SOCK_Stream is used.
+
+typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream;
+
+// Need to handle brain-dead C++ compilers.
+#if defined (ACE_HAS_TYPENAME_KEYWORD)
+#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream
+#else
+#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream, ACE_INET_Addr
+#endif /* ACE_HAS_TYPENAME_KEYWORD */
+
+class Handler : public ACE_Svc_Handler<ACE_SOCK_IOSTREAM, ACE_NULL_SYNCH>
+  // = TITLE
+  //     Extend the <ACE_Svc_Handler> template to do our bidding.
+  //
+  // = DESCRIPTION
+  //     Create an <ACE_Svc_Handler> object based on our
+  //     iostream/SOCK_Stream hybrid.  All of this is fairly standard
+  //     until we get to the <handle_input> where we begin using the
+  //     iostream characteristics of the peer.
+{
+public:
+  // = Initialization and termination methods.
+  Handler (void);
+  ~Handler (void);
+
+  // = <Svc_Handler> hooks.
+  virtual int open (void *);
+
+  // = <Event_Handler> hooks.
+  virtual int handle_input (ACE_HANDLE);
+};
+
 int
 Handler::open (void *)
 {
diff --git a/examples/IOStream/server/iostream_server.h b/examples/IOStream/server/iostream_server.h
deleted file mode 100644
index 9851065a89e..00000000000
--- a/examples/IOStream/server/iostream_server.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-// This file defines the class needed for iostream_server.cpp - it's a separate
-// file to satisfy IBM's xlC template instantiation.
-
-#ifndef __IOSTREAM_SERVER_H
-#define __IOSTREAM_SERVER_H
-
-#include "ace/INET_Addr.h"
-#include "ace/IOStream.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-// Declare a new type which will case an ACE_SOCK_Stream to behave
-// like an iostream.  The new ACE_SOCK_IOStream type can be used
-// anywhere an ACE_SOCK_Stream is used.
-
-typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream;
-
-// Need to handle brain-dead C++ compilers.
-#if defined (ACE_HAS_TYPENAME_KEYWORD)
-#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream
-#else
-#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream, ACE_INET_Addr
-#endif /* ACE_HAS_TYPENAME_KEYWORD */
-
-class Handler : public ACE_Svc_Handler<ACE_SOCK_IOSTREAM, ACE_NULL_SYNCH>
-  // = TITLE
-  //     Extend the <ACE_Svc_Handler> template to do our bidding.
-  //
-  // = DESCRIPTION
-  //     Create an <ACE_Svc_Handler> object based on our
-  //     iostream/SOCK_Stream hybrid.  All of this is fairly standard
-  //     until we get to the <handle_input> where we begin using the
-  //     iostream characteristics of the peer.
-{
-public:
-  // = Initialization and termination methods.
-  Handler (void);
-  ~Handler (void);
-
-  // = <Svc_Handler> hooks.
-  virtual int open (void *);
-
-  // = <Event_Handler> hooks.
-  virtual int handle_input (ACE_HANDLE);
-};
-
-#endif /* __IOSTREAM_SERVER_H */
diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile
index 95256a4521a..0e6db30e760 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/Makefile
+++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile
@@ -49,21 +49,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/DEV_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/DEV_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/DEV_Connector.h \
  $(ACE_ROOT)/ace/DEV_IO.h \
  $(ACE_ROOT)/ace/DEV.h \
diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile
index 636f2ce667f..044eb6404da 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/Makefile
+++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile
@@ -54,21 +54,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_SAP.i \
  $(ACE_ROOT)/ace/DEV_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/DEV_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/DEV.i \
  $(ACE_ROOT)/ace/DEV_IO.i \
  $(ACE_ROOT)/ace/DEV_Connector.i \
diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile
index 594b7d9f709..dcf4252d1a9 100644
--- a/examples/IPC_SAP/FIFO_SAP/Makefile
+++ b/examples/IPC_SAP/FIFO_SAP/Makefile
@@ -53,12 +53,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
@@ -75,12 +78,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
@@ -96,12 +102,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
@@ -116,12 +125,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
@@ -136,12 +148,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile
index a7f6a4057ec..0148e08a7e3 100644
--- a/examples/IPC_SAP/FILE_SAP/Makefile
+++ b/examples/IPC_SAP/FILE_SAP/Makefile
@@ -43,21 +43,21 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/FILE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/FILE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/FILE_Connector.h \
  $(ACE_ROOT)/ace/FILE_IO.h \
  $(ACE_ROOT)/ace/FILE.h \
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 03a68823ee6..7b935dbb983 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -14,10 +14,103 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Synch.h"
 
-#include "CPP-inclient.h"
-
 ACE_RCSID(SOCK_SAP, CPP_inclient, "$Id$")
 
+class Options
+  // = TITLE
+  //   Define the options for this test.
+{
+public:
+  Options (void);
+  // Constructor.
+
+  ~Options (void);
+  // Destructor.
+
+  int parse_args (int argc, char *argv[]);
+  // Parse the command-line arguments.
+
+  const ACE_Time_Value &sleep_time (void) const;
+  // Return the amount of time to sleep in order to implement the
+  // proper transmission rates.
+
+  u_short port (void) const;
+  // Port of the server.
+
+  const char *host (void) const;
+  // Host of the server.
+
+  size_t threads (void) const;
+  // Number of threads.
+
+  const char *quit_string (void) const;
+  // String that shuts down the client/server.
+
+  ssize_t read (void *buf, size_t len, size_t &iterations);
+  // Read from the appropriate location.
+
+  size_t message_len (void) const;
+  // Returns the length of the message to send.
+
+  const void *message_buf (void) const;
+  // Returns a pointer to the message.
+
+  ACE_THR_FUNC thr_func (void);
+  // Returns a pointer to the entry point into the thread that runs
+  // the client test function.
+
+private:
+  int init (void);
+  // Initialize the message we're sending to the user and set up the
+  // barrier.
+
+  char *shared_client_test (u_short port,
+                            ACE_SOCK_Stream &cli_stream);
+  // Performs the shared behavior of the oneway and twoway client
+  // tests.
+
+  static void *twoway_client_test (void *);
+  // Performs the twoway test.
+
+  static void *oneway_client_test (void *);
+  // Performs the oneway test.
+
+  const char *host_;
+  // Host of the server.
+
+  u_short port_;
+  // Port of the server.
+
+  ACE_Time_Value sleep_time_;
+  // Sleep_Time value.
+
+  size_t threads_;
+  // Number of threads.
+
+  const char *quit_string_;
+  // String that shuts down the client/server.
+
+  size_t message_len_;
+  // Size of the message we send to the server.
+
+  char *message_buf_;
+  // Pointer to the message we send to the server.
+
+  ACE_HANDLE io_source_;
+  // Are we reading I/O from ACE_STDIN or from our generator?
+
+  size_t iterations_;
+  // Number of iterations.
+
+  char oneway_;
+  // Are we running oneway or twoway?
+
+  // Please leave the ; inside the parenthesis to avoid Green Hills
+  // (and probably other) compiler warning about extra ;.
+  ACE_MT (ACE_Barrier *barrier_;)
+  // Barrier used to synchronize the start of all the threads.
+};
+
 Options::Options (void)
   : host_ (ACE_DEFAULT_SERVER_HOST),
     port_ (ACE_DEFAULT_SERVER_PORT),
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
deleted file mode 100644
index 8b3a9ee4562..00000000000
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-// This file defines the Options class for CPP-inclient. IBM C++ compiler'd
-// template auto-instantiator needs this in a separate file.
-
-#ifndef __CPP_INCLIENT_H
-#define __CPP_INCLIENT_H
-
-#include "ace/OS.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Synch.h"
-
-class Options
-  // = TITLE
-  //   Define the options for this test.
-{
-public:
-  Options (void);
-  // Constructor.
-
-  ~Options (void);
-  // Destructor.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the command-line arguments.
-
-  const ACE_Time_Value &sleep_time (void) const;
-  // Return the amount of time to sleep in order to implement the
-  // proper transmission rates.
-
-  u_short port (void) const;
-  // Port of the server.
-
-  const char *host (void) const;
-  // Host of the server.
-
-  size_t threads (void) const;
-  // Number of threads.
-
-  const char *quit_string (void) const;
-  // String that shuts down the client/server.
-
-  ssize_t read (void *buf, size_t len, size_t &iterations);
-  // Read from the appropriate location.
-
-  size_t message_len (void) const;
-  // Returns the length of the message to send.
-
-  const void *message_buf (void) const;
-  // Returns a pointer to the message.
-
-  ACE_THR_FUNC thr_func (void);
-  // Returns a pointer to the entry point into the thread that runs
-  // the client test function.
-
-private:
-  int init (void);
-  // Initialize the message we're sending to the user and set up the
-  // barrier.
-
-  char *shared_client_test (u_short port,
-                            ACE_SOCK_Stream &cli_stream);
-  // Performs the shared behavior of the oneway and twoway client
-  // tests.
-
-  static void *twoway_client_test (void *);
-  // Performs the twoway test.
-
-  static void *oneway_client_test (void *);
-  // Performs the oneway test.
-
-  const char *host_;
-  // Host of the server.
-
-  u_short port_;
-  // Port of the server.
-
-  ACE_Time_Value sleep_time_;
-  // Sleep_Time value.
-
-  size_t threads_;
-  // Number of threads.
-
-  const char *quit_string_;
-  // String that shuts down the client/server.
-
-  size_t message_len_;
-  // Size of the message we send to the server.
-
-  char *message_buf_;
-  // Pointer to the message we send to the server.
-
-  ACE_HANDLE io_source_;
-  // Are we reading I/O from ACE_STDIN or from our generator?
-
-  size_t iterations_;
-  // Number of iterations.
-
-  char oneway_;
-  // Are we running oneway or twoway?
-
-  // Please leave the ; inside the parenthesis to avoid Green Hills
-  // (and probably other) compiler warning about extra ;.
-  ACE_MT (ACE_Barrier *barrier_;)
-  // Barrier used to synchronize the start of all the threads.
-};
-
-#endif /* __CPP_INCLIENT_H */
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 2324707748c..57abb16864e 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -12,8 +12,6 @@
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 
-#include "CPP-inserver-fancy.h"
-
 ACE_RCSID(SOCK_SAP, CPP_inserver_fancy, "$Id$")
 
 // Forward declaration.
@@ -129,6 +127,40 @@ private:
   // Print the results.
 };
 
+class Options
+  // = TITLE
+  //   Define the options for this test.
+{
+public:
+  Options (void);
+  // Constructor.
+
+  ~Options (void);
+  // Destructor.
+
+  int parse_args (int argc, char *argv[]);
+  // Parse the command-line arguments.
+
+  int verbose (void) const;
+  // Are we running in verbose mode?
+
+  u_short port (void) const;
+  // Port number that we are listening at.
+
+  int reply_message_len (void) const;
+  // Size of the reply message.
+
+private:
+  int verbose_;
+  // Are we running in verbose mode?
+
+  u_short port_;
+  // Port number we listen at.
+
+  size_t reply_message_len_;
+  // Size of the reply message.
+};
+
 u_short
 Options::port (void) const
 {
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h
deleted file mode 100644
index 9edb1d6a1d8..00000000000
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-// This file defines the Options class for CPP-inserver-fancy.
-// IBM C++ compiler'd template auto-instantiator needs this in a separate file.
-
-#ifndef __CPP_INSERVER_FANCY_H
-#define __CPP_INSERVER_FANCY_H
-
-class Options
-  // = TITLE
-  //   Define the options for this test.
-{
-public:
-  Options (void);
-  // Constructor.
-
-  ~Options (void);
-  // Destructor.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the command-line arguments.
-
-  int verbose (void) const;
-  // Are we running in verbose mode?
-
-  u_short port (void) const;
-  // Port number that we are listening at.
-
-  int reply_message_len (void) const;
-  // Size of the reply message.
-
-private:
-  int verbose_;
-  // Are we running in verbose mode?
-
-  u_short port_;
-  // Port number we listen at.
-
-  size_t reply_message_len_;
-  // Size of the reply message.
-};
-
-#endif /* __CPP_INSERVER_FANCY_H */
diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile
index 7e23fb9473f..7747630531b 100644
--- a/examples/IPC_SAP/SOCK_SAP/Makefile
+++ b/examples/IPC_SAP/SOCK_SAP/Makefile
@@ -60,12 +60,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -94,7 +97,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -125,8 +127,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- CPP-inclient.h
+ $(ACE_ROOT)/ace/High_Res_Timer.i
 .obj/CPP-unclient.o .obj/CPP-unclient.so .shobj/CPP-unclient.o .shobj/CPP-unclient.so: CPP-unclient.cpp \
  $(ACE_ROOT)/ace/LSOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
@@ -139,12 +140,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -175,12 +179,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -209,7 +216,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -251,12 +257,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -293,7 +302,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -333,8 +341,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -386,8 +392,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- CPP-inserver-fancy.h
+ $(ACE_ROOT)/ace/Get_Opt.i
 .obj/CPP-inserver-poll.o .obj/CPP-inserver-poll.so .shobj/CPP-inserver-poll.o .shobj/CPP-inserver-poll.so: CPP-inserver-poll.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -399,12 +404,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -429,12 +437,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -470,7 +481,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -507,12 +517,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -544,12 +557,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -575,13 +591,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/C-inserver.o .obj/C-inserver.so .shobj/C-inserver.o .shobj/C-inserver.so: C-inserver.cpp \
  $(ACE_ROOT)/ace/OS.h \
@@ -589,13 +608,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile
index f1b867cae90..0f229d640c4 100644
--- a/examples/IPC_SAP/SPIPE_SAP/Makefile
+++ b/examples/IPC_SAP/SPIPE_SAP/Makefile
@@ -53,18 +53,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
@@ -72,7 +72,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
+ $(ACE_ROOT)/ace/SPIPE_Connector.i \
+ shared.h
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -82,25 +83,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ shared.h
 .obj/consumer_msg.o .obj/consumer_msg.so .shobj/consumer_msg.o .shobj/consumer_msg.so: consumer_msg.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -110,25 +112,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ shared.h
 .obj/consumer_read.o .obj/consumer_read.so .shobj/consumer_read.o .shobj/consumer_read.so: consumer_read.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -138,25 +141,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ shared.h
 .obj/producer_msg.o .obj/producer_msg.so .shobj/producer_msg.o .shobj/producer_msg.so: producer_msg.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -166,18 +170,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
@@ -185,7 +189,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
+ $(ACE_ROOT)/ace/SPIPE_Connector.i \
+ shared.h
 .obj/producer_read.o .obj/producer_read.so .shobj/producer_read.o .shobj/producer_read.so: producer_read.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -195,18 +200,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
@@ -214,7 +219,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
+ $(ACE_ROOT)/ace/SPIPE_Connector.i \
+ shared.h
 .obj/NPClient.o .obj/NPClient.so .shobj/NPClient.o .shobj/NPClient.so: NPClient.cpp \
  $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
@@ -224,18 +230,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
@@ -253,18 +259,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile
index 4e9a3b9a6f9..58ec52914a3 100644
--- a/examples/IPC_SAP/TLI_SAP/Makefile
+++ b/examples/IPC_SAP/TLI_SAP/Makefile
@@ -58,18 +58,24 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i
 .obj/ftp-server.o .obj/ftp-server.so .shobj/ftp-server.o .shobj/ftp-server.so: ftp-server.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread.h \
@@ -79,12 +85,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -100,7 +109,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -131,10 +139,13 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i
 .obj/db-client.o .obj/db-client.so .shobj/db-client.o .shobj/db-client.so: db-client.cpp \
  $(ACE_ROOT)/ace/TLI_Connector.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
@@ -146,18 +157,24 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i
 .obj/db-server.o .obj/db-server.so .shobj/db-server.o .shobj/db-server.so: db-server.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -168,20 +185,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
@@ -198,7 +221,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -234,18 +256,24 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i
 .obj/CPP-server.o .obj/CPP-server.so .shobj/CPP-server.o .shobj/CPP-server.so: CPP-server.cpp \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
@@ -256,20 +284,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i
 .obj/CPP-ATM-client.o .obj/CPP-ATM-client.so .shobj/CPP-ATM-client.o .shobj/CPP-ATM-client.so: CPP-ATM-client.cpp \
  $(ACE_ROOT)/ace/TLI_Connector.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
@@ -281,18 +315,24 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i \
  $(ACE_ROOT)/ace/ATM_Addr.h \
  $(ACE_ROOT)/ace/ATM_Addr.i
 .obj/CPP-ATM-server.o .obj/CPP-ATM-server.so .shobj/CPP-ATM-server.o .shobj/CPP-ATM-server.so: CPP-ATM-server.cpp \
@@ -305,20 +345,26 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/ace/ATM_Addr.h \
  $(ACE_ROOT)/ace/ATM_Addr.i
 
diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile
index 7e0a0b7e8b1..7e8f80affe2 100644
--- a/examples/IPC_SAP/UPIPE_SAP/Makefile
+++ b/examples/IPC_SAP/UPIPE_SAP/Makefile
@@ -47,17 +47,19 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -113,8 +115,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -189,17 +189,19 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -255,8 +257,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -332,17 +332,19 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -398,8 +400,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile
index 52c6e086f15..157deeb006f 100644
--- a/examples/Log_Msg/Makefile
+++ b/examples/Log_Msg/Makefile
@@ -46,13 +46,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/test_ostream.o .obj/test_ostream.so .shobj/test_ostream.o .shobj/test_ostream.so: test_ostream.cpp \
  $(ACE_ROOT)/ace/OS.h \
@@ -60,13 +63,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/test_callback.o .obj/test_callback.so .shobj/test_callback.o .shobj/test_callback.so: test_callback.cpp \
  $(ACE_ROOT)/ace/OS.h \
@@ -74,13 +80,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile
index 6e7fe4fb953..b5953771990 100644
--- a/examples/Logger/Acceptor-server/Makefile
+++ b/examples/Logger/Acceptor-server/Makefile
@@ -47,12 +47,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -77,7 +80,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -100,8 +102,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -184,7 +184,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- server_loggerd.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index e36866352c0..bc9e179878f 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -13,12 +13,23 @@
 #include "ace/Singleton.h"
 #include "ace/streams.h"
 
-#include "server_loggerd.h"
-
 ACE_RCSID(Acceptor_server, server_loggerd, "$Id$")
 
 // ----------------------------------------
 
+class Options
+{
+  // = TITLE
+  //     Keeps track of the options.
+public:
+  void parse_args (int argc, char *argv[]);
+  u_short port (void);
+
+private:
+  u_short port_;
+  // Port number;
+};
+
 // Return the port number.
 
 u_short
@@ -63,6 +74,34 @@ QUIT_HANDLER;
 
 // ----------------------------------------
 
+class Logging_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+// = TITLE
+//     Receive client message from the remote clients.
+//
+// = DESCRIPTION
+//     This class demonstrates how to receive messages from remote
+//     clients using the notification mechanisms in the
+//     <ACE_Reactor>.  In addition, it also illustrates how to
+//     utilize the <ACE_Reactor> timer mechanisms, as well.
+{
+public:
+  // = Initialization and termination methods.
+  Logging_Handler (void);
+
+  // = Hooks for opening and closing handlers.
+  virtual int open (void *);
+
+protected:
+  // = Demultiplexing hooks.
+  virtual int handle_input (ACE_HANDLE);
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+			      const void *arg);
+
+private:
+  char peer_name_[MAXHOSTNAMELEN + 1];
+  // Host we are connected to.
+};
+
 // Specialize a Logging Acceptor.
 typedef ACE_Acceptor <Logging_Handler, ACE_SOCK_ACCEPTOR>
 Logging_Acceptor;
diff --git a/examples/Logger/Acceptor-server/server_loggerd.h b/examples/Logger/Acceptor-server/server_loggerd.h
deleted file mode 100644
index dcb48be907f..00000000000
--- a/examples/Logger/Acceptor-server/server_loggerd.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-// Define classes used with templates in server_loggerd.h.
-
-#ifndef __SERVER_LOGGERD_H
-#define __SERVER_LOGGERD_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-
-class Options
-{
-  // = TITLE
-  //     Keeps track of the options.
-public:
-  void parse_args (int argc, char *argv[]);
-  u_short port (void);
-
-private:
-  u_short port_;
-  // Port number;
-};
-
-
-class Logging_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-// = TITLE
-//     Receive client message from the remote clients.
-//
-// = DESCRIPTION
-//     This class demonstrates how to receive messages from remote
-//     clients using the notification mechanisms in the
-//     <ACE_Reactor>.  In addition, it also illustrates how to
-//     utilize the <ACE_Reactor> timer mechanisms, as well.
-{
-public:
-  // = Initialization and termination methods.
-  Logging_Handler (void);
-
-  // = Hooks for opening and closing handlers.
-  virtual int open (void *);
-
-protected:
-  // = Demultiplexing hooks.
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
-
-private:
-  char peer_name_[MAXHOSTNAMELEN + 1];
-  // Host we are connected to.
-};
-
-#endif /* __SERVER_LOGGERD_H */
diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile
index c22a2ef05e2..302c7032c0b 100644
--- a/examples/Logger/client/Makefile
+++ b/examples/Logger/client/Makefile
@@ -49,12 +49,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile
index 75f2ab4e8fe..e4558e13e79 100644
--- a/examples/Logger/simple-server/Makefile
+++ b/examples/Logger/simple-server/Makefile
@@ -50,12 +50,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -71,7 +74,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -116,8 +118,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -175,12 +175,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
@@ -228,7 +231,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
diff --git a/examples/Map_Manager/Makefile b/examples/Map_Manager/Makefile
index 8c6bf801209..67746856d59 100644
--- a/examples/Map_Manager/Makefile
+++ b/examples/Map_Manager/Makefile
@@ -43,13 +43,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -81,7 +84,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -104,8 +106,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile
index c360bedce4c..90956fe9d9c 100644
--- a/examples/Mem_Map/IO-tests/Makefile
+++ b/examples/Mem_Map/IO-tests/Makefile
@@ -46,13 +46,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile
index 9525957eed1..cf78574091b 100644
--- a/examples/Mem_Map/file-reverse/Makefile
+++ b/examples/Mem_Map/file-reverse/Makefile
@@ -50,12 +50,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i
 
diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile
index 68cf6d5ed55..57f76a2c2f3 100644
--- a/examples/Misc/Makefile
+++ b/examples/Misc/Makefile
@@ -59,12 +59,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -80,8 +83,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Dump_T.h \
- $(ACE_ROOT)/ace/Dump_T.cpp \
- test_dump.h
+ $(ACE_ROOT)/ace/Dump_T.cpp
 .obj/test_get_opt.o .obj/test_get_opt.so .shobj/test_get_opt.o .shobj/test_get_opt.so: test_get_opt.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -90,12 +92,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/test_profile_timer.o .obj/test_profile_timer.so .shobj/test_profile_timer.o .shobj/test_profile_timer.so: test_profile_timer.cpp \
@@ -106,12 +111,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -127,12 +135,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -152,7 +163,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -175,8 +185,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -197,15 +205,17 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -251,8 +261,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -261,21 +271,26 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h
 .obj/test_trace.o .obj/test_trace.so .shobj/test_trace.o .shobj/test_trace.so: test_trace.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -285,12 +300,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -312,71 +324,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp
+ $(ACE_ROOT)/ace/Managed_Object.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Misc/test_dump.cpp b/examples/Misc/test_dump.cpp
index a76f232ac95..a15eac9360c 100644
--- a/examples/Misc/test_dump.cpp
+++ b/examples/Misc/test_dump.cpp
@@ -6,10 +6,47 @@
 
 #include "ace/Dump.h"
 
-#include "test_dump.h"
-
 ACE_RCSID(Misc, test_dump, "$Id$")
 
+class SOCK
+{
+public:
+  SOCK (void) { ACE_REGISTER_OBJECT (SOCK); }
+  ~SOCK (void) { ACE_REMOVE_OBJECT; }
+
+  void dump (void) const {
+    ACE_OS::fprintf (stderr, "hello from SOCK = %lu\n", (u_long) this);
+  }
+
+  // ...
+};
+
+class SOCK_Acceptor : public SOCK
+{
+public:
+  SOCK_Acceptor (void) { ACE_REGISTER_OBJECT (SOCK_Acceptor); }
+  ~SOCK_Acceptor (void) { ACE_REMOVE_OBJECT; }
+
+  void dump (void) const {
+    ACE_OS::fprintf (stderr, "hello from SOCK_Acceptor = %lu\n", (u_long) this);
+  }
+
+  // ...
+};
+
+class SOCK_Stream : public SOCK
+{
+public:
+  SOCK_Stream (void) { ACE_REGISTER_OBJECT (SOCK_Stream); }
+  ~SOCK_Stream (void) { ACE_REMOVE_OBJECT; }
+
+  void dump (void) const {
+    ACE_OS::fprintf (stderr, "hello from SOCK_Stream = %lu\n", (u_long) this);
+  }
+
+  // ...
+};
+
 int
 main (int, char *[])
 {
diff --git a/examples/Misc/test_dump.h b/examples/Misc/test_dump.h
deleted file mode 100644
index b6f9d35affa..00000000000
--- a/examples/Misc/test_dump.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-// Define the classes used with templates in test_dump.cpp
-
-#ifndef __TEST_DUMP_H
-#define __TEST_DUMP_H
-
-#include "ace/Dump.h"
-#include "ace/OS.h"
-
-class SOCK
-{
-public:
-  SOCK (void) { ACE_REGISTER_OBJECT (SOCK); }
-  ~SOCK (void) { ACE_REMOVE_OBJECT; }
-
-  void dump (void) const {
-    ACE_OS::fprintf (stderr, "hello from SOCK = %lu\n", (u_long) this);
-  }
-
-  // ...
-};
-
-class SOCK_Acceptor : public SOCK
-{
-public:
-  SOCK_Acceptor (void) { ACE_REGISTER_OBJECT (SOCK_Acceptor); }
-  ~SOCK_Acceptor (void) { ACE_REMOVE_OBJECT; }
-
-  void dump (void) const {
-    ACE_OS::fprintf (stderr, "hello from SOCK_Acceptor = %lu\n", (u_long) this);
-  }
-
-  // ...
-};
-
-class SOCK_Stream : public SOCK
-{
-public:
-  SOCK_Stream (void) { ACE_REGISTER_OBJECT (SOCK_Stream); }
-  ~SOCK_Stream (void) { ACE_REMOVE_OBJECT; }
-
-  void dump (void) const {
-    ACE_OS::fprintf (stderr, "hello from SOCK_Stream = %lu\n", (u_long) this);
-  }
-
-  // ...
-};
-
-#endif /* __TEST_DUMP_H */
diff --git a/examples/Misc/test_trace.cpp b/examples/Misc/test_trace.cpp
index 1819d60d312..13c5fa0c771 100644
--- a/examples/Misc/test_trace.cpp
+++ b/examples/Misc/test_trace.cpp
@@ -42,8 +42,7 @@ public:
     
     if (depth > 0)
       return recursive (depth - 1);
-    else
-      return 0;
+
     // Destructor of <ACE_Trace> automatically called.
   }
 
diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile
index 34b49b362ec..e6cbd82be6b 100644
--- a/examples/Naming/Makefile
+++ b/examples/Naming/Makefile
@@ -18,7 +18,7 @@ BIN2 = test_non_existent \
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # ! Other
@@ -53,16 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
@@ -145,16 +145,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
@@ -237,16 +237,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile
index 001c0f72e91..40d45ca3fa5 100644
--- a/examples/Reactor/Dgram/Makefile
+++ b/examples/Reactor/Dgram/Makefile
@@ -50,12 +50,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -81,7 +84,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -116,8 +118,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Process.i
 .obj/Dgram.o .obj/Dgram.so .shobj/Dgram.o .shobj/Dgram.so: Dgram.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -128,12 +128,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -159,7 +162,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -182,8 +184,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
diff --git a/examples/Reactor/FIFO/Makefile b/examples/Reactor/FIFO/Makefile
index 9761f8bc545..063e7c8cb62 100644
--- a/examples/Reactor/FIFO/Makefile
+++ b/examples/Reactor/FIFO/Makefile
@@ -50,12 +50,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/FIFO.i \
@@ -71,12 +74,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -96,7 +102,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -119,8 +124,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile
index 097e3c4be80..6217f6639c9 100644
--- a/examples/Reactor/Misc/Makefile
+++ b/examples/Reactor/Misc/Makefile
@@ -54,12 +54,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -86,7 +89,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -120,12 +122,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -145,7 +150,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -168,8 +172,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -193,12 +195,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -218,7 +223,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -241,8 +245,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -310,16 +312,17 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Event_Handler_T.i \
- $(ACE_ROOT)/ace/Event_Handler_T.cpp
+ $(ACE_ROOT)/ace/Event_Handler.i
 .obj/test_reactors.o .obj/test_reactors.so .shobj/test_reactors.o .shobj/test_reactors.so: test_reactors.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -329,12 +332,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -360,7 +366,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -387,8 +392,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Task.h \
@@ -448,12 +451,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -473,7 +479,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -496,8 +501,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -518,12 +521,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -549,7 +555,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -589,8 +594,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -636,13 +639,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/test_early_timeouts.o .obj/test_early_timeouts.so .shobj/test_early_timeouts.o .shobj/test_early_timeouts.so: test_early_timeouts.cpp \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -652,12 +658,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Pipe.h \
@@ -672,13 +681,16 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -700,7 +712,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp
deleted file mode 100644
index 37613f14f38..00000000000
--- a/examples/Reactor/Misc/signal_tester.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Perform an extensive test of the ACE_Reactor's event dispatching
-// $Id$
-
-// mechanisms.  These mechanisms illustrate how signals, I/O, and
-// timeout events can all be handled within the same framework.  In
-// addition, this example illustrates how to use the ACE_Reactor for
-// devices that perform I/O via signals (such as SVR4 message queues).
-
-
-#include "ace/Service_Config.h"
-
-// Used to shut down the event loop.
-static sig_atomic_t done = 0;
-
-// This class illustrates how to handle signal-driven I/O using the
-// ACE_Reactor framework.  Note that signals may be caught and
-// processed without requiring the use of global signal handler
-// functions or global signal handler data.
-
-class Sig_Handler : public ACE_Event_Handler
-{
-public:
-  Sig_Handler (void);
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE);
-  virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_signal (ACE_HANDLE signum, siginfo_t * = 0, 
-			     ucontext_t * = 0);
-
-private:
-  ACE_HANDLE handle_;
-};
-
-// A dummy_handle is required to reserve a slot in the ACE_Reactor's
-// descriptor table.
-
-Sig_Handler::Sig_Handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-  ACE_Sig_Set sig_set;
-
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-  sig_set.sig_add (SIGALRM);  
-
-  // Register the signal handler object to catch the signals.
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-}
-
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-// In a real application, this method would be where the read on the
-// signal-driven I/O device would occur asynchronously.  For now we'll
-// just print a greeting to let you know that everything is working
-// properly!
-
-int 
-Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "handling asynchonrous input...\n"));
-  return 0;
-}
-
-// In a real application, this method would do any cleanup activities
-// required when shutting down the I/O device.
-
-int 
-Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Rearm the alarm.
-      ACE_OS::alarm (4);
-      break;
-    case SIGINT:
-      // Tell the ACE_Reactor to enable the ready bit for
-      // this->handle_.  The ACE_Reactor will subsequently call the
-      // Sig_Handler::handle_input method from within its event loop.
-      return ACE_Service_Config::reactor ()->ready_ops 
-	(this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK);
-    case SIGQUIT:
-      ACE_DEBUG ((LM_DEBUG, "%S: shutting down signal tester\n", signum));
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-		  "%S: not handled, returning to program\n", signum));
-      break;
-    }
-  return 0;
-}
-
-// This class illustrates that the ACE_Reactor can handle signals,
-// STDIO, and timeouts using the same mechanisms.
-
-class STDIN_Handler : public ACE_Event_Handler
-{
-public:
-  STDIN_Handler (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-};
-
-STDIN_Handler::STDIN_Handler (void)
-{
-  if (ACE::register_stdin_handler (this,
-				   ACE_Service_Config::reactor (),
-				   ACE_Service_Config::thr_mgr ()) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
-
-  // Register the STDIN_Handler to be dispatched once every second.
-  else if (ACE_Service_Config::reactor ()->schedule_timer
-	   (this, 0, ACE_Time_Value (1), ACE_Time_Value (1)) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1));
-}
-
-int 
-STDIN_Handler::handle_timeout (const ACE_Time_Value &tv,
-			       const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, "timeout occurred at %d sec, %d usec\n",
-	      tv.sec (), tv.usec ()));
-  return 0;
-}
-
-// Read from input descriptor and write to stdout descriptor.
-
-int 
-STDIN_Handler::handle_input (ACE_HANDLE handle)
-{
-  ssize_t n;
-  char buf[BUFSIZ];
-
-  switch (n = ACE_OS::read (handle, buf, sizeof buf))
-    {
-    case -1:
-      if (errno == EINTR)
-	return 0;
-        /* NOTREACHED */
-      else
-	ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-      /* FALLTHROUGH */
-    case 0:
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default:
-      {
-	ssize_t result = ACE::write_n (ACE_STDOUT, buf, n);
-
-	if (result != n)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write"), 
-			    result == -1 && errno == EINTR ? 0 : -1);
-      }
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv [0]);
-
-  // Signal handler.
-  Sig_Handler sh;
-
-  // Define an I/O handler object.
-  STDIN_Handler ioh;
-
-  // Optionally start the alarm.
-  if (argc > 1)
-    ACE_OS::alarm (4);
-
-  // Loop handling signals and I/O events until SIGQUIT occurs.
-
-  while (daemon.reactor_event_loop_done () == 0)
-    daemon.run_reactor_event_loop ();
-
-  return 0;
-}
diff --git a/examples/Reactor/Misc/test_signals.cpp b/examples/Reactor/Misc/test_signals.cpp
deleted file mode 100644
index 6493667de12..00000000000
--- a/examples/Reactor/Misc/test_signals.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// Test the ability of the Reactor/Signal_Handler to register multiple
-// $Id$
-
-// handler per-signal.
-
-/* This test works as follows:
-	
-	1. To test the "original" semantics of ACE (i.e., only one
-	   ACE_Event_Handler can be registered per signal), you don't
-	   need to do anything special.  Existing programs work the
-	   same since giving the Reactor's constructor a 0 value
-	   (which is the default argument, BTW) instructs it to behave
-	   as before.  When a 0 is given, the ACE_Reactor's
-	   constructor/open method creates an instance of
-	   ACE_Sig_Handler and assigns this to an internal pointer.
-	   This pointer is then used to dispatch all signal-related
-	   methods within the Reactor.  The default ACE_Sig_Handler
-	   only allows *one* ACE_Event_Handler to be registered
-	   per-signal.
-
-	   To run this version of the test do the following:
-  
-	   % ./test-signal
-	   ./test_signals
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_2 (fruity, 0, 0) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 0, 0)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           Note that in this test only one handler (the last one --
-	   "Sig_Handler_2 (fruity)") is actually registered.  BTW, the
-	   core dump is the expected behavior since the default
-	   disposition is restored when there are no more handlers
-	   (see the code below).
-
-	2. To test the "multiple handlers per-signal semantics", you
-	   need to pass the constructor/open method of the ACE_Reactor
-	   a pointer to a an instance of ACE_Sig_Handlers (note the
-	   plural "s").  ACE_Sig_Handlers is a class that derives from
-	   ACE_Sig_Handler.  The difference between these two classes
-	   is that (1) ACE_Sig_Handlers::register_signal allows
-	   multiple ACE_Event_Handlers to be registered per-signal and
-	   (2) it enables SA_RESTART by default.  This class also
-	   implements Detlef Becker's algorithm for integrating ACE
-	   signal handling with 3rd party libraries.
-
-	   To run this version of the test do the following:
-  
-	   % ./test_signals 1
-
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_1 (howdy, 3, 1) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Interrupt occurred in Sig_Handler_1 (doody, 5, 4) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (doody, 5, 4)
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 1
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_1 (howdy, 3, 1) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Quit occurred in Sig_Handler_1 (doody, 5, 4) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (doody, 5, 4)
-	   signal Quit occurred in Sig_Handler_2 (tutty, 7, 6) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (tutty, 7, 6)
-	   signal Quit occurred in Sig_Handler_2 (fruity, 9, 8) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 9, 8)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 3
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           When this test begins all four handlers are registered and
-           dispatched when a SIGINT or SIGQUIT occurs.  After the
-           first SIGINT, the handle_signal method of the Sig_Handler_1
-           objects unregister themselves.  At that point there are 4
-           SIGQUIT handlers left, but only 2 of our SIGINT handlers
-           left (and the 1 external handler).  After the first
-           SIGQUIT, there are no SIGQUIT handlers left since they all
-           deregister themselves (which restores the "SIG_DFL"
-           disposition).  On the second SIGINT there are only 3
-           handlers left (2 of ours and 1 external).  Finally, on the
-           second SIGQUIT we exit and dump core since that's what
-           happens with the default disposition for SIGQUIT. */
-
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-
-class Sig_Handler_1 : public ACE_Event_Handler
-{
-public:
-  Sig_Handler_1 (ACE_Reactor &reactor, char *msg)
-    : msg_ (msg),
-      count_ (0),
-      reactor_ (reactor)
-  {
-    // Register the signal handlers.
-    this->quit_sigkey_ = reactor.register_handler (SIGQUIT, this);
-    this->int_sigkey_ = reactor.register_handler (SIGINT, this);
-
-    if (this->quit_sigkey_ == -1 || this->int_sigkey_ == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_1 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 1 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else if (this->count_ != 2 && signum == SIGINT)
-      {
-	if (this->reactor_.remove_handler (SIGINT, 0, 0,
-					   this->int_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    return 0;
-  }
-
-protected:
-  char *msg_;
-  int count_;
-  int int_sigkey_;
-  int quit_sigkey_;
-  ACE_Reactor &reactor_;
-};
-
-class Sig_Handler_2 : public Sig_Handler_1
-{
-public:
-  Sig_Handler_2 (ACE_Reactor &reactor, char *msg)
-    : Sig_Handler_1 (reactor, msg)
-  {
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_2 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 0 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_2 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else
-      return 0;
-  }
-};
-
-static void
-external_handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nsignal %S occurred in external handler!", signum));
-}
-
-#if !defined (HPUX)
-int 
-main (int argc, char *argv)
-{
-  // If argc > 1 then allow multiple handlers per-signal, else just
-  // allow 1 handler per-signal.
-  ACE_Sig_Handlers multi_handlers;
-
-  ACE_Reactor reactor (argc > 1 ? &multi_handlers: 0);
-
-  if (argc > 1)
-    {
-      // Register an "external" signal handler so that the
-      // ACE_Sig_Handlers code will have something to incorporate!
-      ACE_SignalHandler eh = ACE_SignalHandler (external_handler);
-      ACE_Sig_Action sa (eh);
-
-      sa.register_action (SIGINT);
-    }
-
-  // Create a bevy of handlers.
-  Sig_Handler_1 h1 (reactor, "howdy"), h2 (reactor, "doody");
-  Sig_Handler_2 h3 (reactor, "tutty"), h4 (reactor, "fruity");
-
-  // Wait for user to type SIGINT and SIGQUIT.
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "\nwaiting for SIGINT or SIGQUIT\n"));
-      reactor.handle_events ();
-    }
-  return 0;
-}
-#else
-int
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), -1);
-}
-#endif /* HPUX */
diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile
index 3cecb70f4d8..61ab3cafce9 100644
--- a/examples/Reactor/Multicast/Makefile
+++ b/examples/Reactor/Multicast/Makefile
@@ -49,12 +49,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile
index 31e7b3700b1..e76a96bbdee 100644
--- a/examples/Reactor/Ntalker/Makefile
+++ b/examples/Reactor/Ntalker/Makefile
@@ -48,12 +48,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -92,7 +95,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -123,8 +125,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
 
diff --git a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
index 19a17cb19ee..54240684bd3 100644
--- a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    examples
-//
+// 
 // = FILENAME
 //    test_multithreading.cpp
 //
@@ -19,7 +19,7 @@
 //
 // = AUTHOR
 //    Irfan Pyarali
-//
+// 
 // ============================================================================
 
 #include "ace/Task.h"
@@ -36,10 +36,10 @@ static int interval = 2;
 static int iterations = 10;
 
 // Explain usage and exit.
-static void
+static void 
 print_usage_and_die (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
 	      "usage: \n\t"
 	      "[-t (# of threads - default 1)] \n\t"
 	      "[-h (# of handlers) - default 62] \n\t"
@@ -54,8 +54,8 @@ static void
 parse_args (int argc, char **argv)
 {
   ACE_Get_Opt get_opt (argc, argv, "t:h:s:i:e:");
-  int c;
-
+  int c; 
+  
   while ((c = get_opt ()) != -1)
     switch (c)
       {
@@ -126,17 +126,17 @@ Task_Handler::Task_Handler (size_t number_of_handles,
 {
   ACE_NEW (this->events_, ACE_Auto_Event [number_of_handles]);
 
-  for (size_t i = 1; i <= number_of_handles; i++)
+  for (size_t i = 0; i < number_of_handles; i++)
     {
       if (ACE_Reactor::instance ()->register_handler (this,
 						      this->events_[i].handle ()) == -1)
-	ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with Reactor\n",
-		    "Task_Handler::Task_Handler", i));
+	ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with Reactor\n", 
+		    "Task_Handler::Task_Handler", i));      
     }
   // Make us an active object.
-  if (this->activate (THR_NEW_LWP,
+  if (this->activate (THR_NEW_LWP, 
 		      concurrent_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\t cannot activate task\n",
+    ACE_ERROR ((LM_ERROR, "%p\t cannot activate task\n", 
 		"activate"));
 }
 
@@ -155,52 +155,52 @@ Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
   if (ACE_Reactor::instance ()->remove_handler (siginfo->si_handle_,
 						ACE_Event_Handler::DONT_CALL) == -1)
     return -1;
-  // ACE_ERROR_RETURN ((LM_ERROR,
-  //		       "(%t) %p\tTask cannot be unregistered from Reactor: handle value = %d\n",
+  // ACE_ERROR_RETURN ((LM_ERROR, 
+  //		       "(%t) %p\tTask cannot be unregistered from Reactor: handle value = %d\n", 
   //		       "Task_Handler::handle_signal",
   //		       siginfo->si_handle_), -1);
-
+  
   if (ACE_Reactor::instance ()->register_handler (this,
 						  siginfo->si_handle_) == -1)
     return -1;
-  // ACE_ERROR_RETURN ((LM_ERROR,
-  // 		       "(%t) %p\tTask cannot be registered with Reactor: handle value = %d\n",
+  // ACE_ERROR_RETURN ((LM_ERROR, 
+  // 		       "(%t) %p\tTask cannot be registered with Reactor: handle value = %d\n",  
   //		       "Task_Handler::handle_signal",
   //		       siginfo->si_handle_), -1);
   return 0;
 }
 
-int
+int 
 Task_Handler::handle_close (ACE_HANDLE handle,
 			    ACE_Reactor_Mask close_mask)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%t) handle_close() called: handle value = %d\n",
+  ACE_DEBUG ((LM_DEBUG, "(%t) handle_close() called: handle value = %d\n", 
 	      handle));
   return 0;
 }
 
-int
+int 
 Task_Handler::handle_timeout (const ACE_Time_Value &tv,
 			      const void *arg)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%t) handle_timeout() called: iteration value = %d\n",
+  ACE_DEBUG ((LM_DEBUG, "(%t) handle_timeout() called: iteration value = %d\n", 
 	      int (arg)));
   return 0;
 }
 
-int
+int 
 Task_Handler::signal (size_t index)
 {
   return this->events_[index].signal ();
 }
 
-int
+int 
 main (int argc, char **argv)
 {
   parse_args (argc, argv);
   Task_Handler task (number_of_handles,
 		     concurrent_threads);
-
+  
   ACE_OS::srand (ACE_OS::time (0L));
 
   for (int i = 1; i <= iterations; i++)
@@ -209,11 +209,11 @@ main (int argc, char **argv)
       ACE_OS::sleep (interval);
 
       // Randomly generate events
-      ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));
-      ACE_DEBUG ((LM_DEBUG, "(%t -- main thread) signaling %d events : iteration = %d\n",
+      ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));		
+      ACE_DEBUG ((LM_DEBUG, "(%t -- main thread) signaling %d events : iteration = %d\n", 
 		  number_of_handles_to_signal,
-		  i));
-      ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));
+		  i));		
+      ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));		
 
       // Setup a timer for the task
       if (ACE_Reactor::instance ()->schedule_timer (&task,
@@ -223,7 +223,7 @@ main (int argc, char **argv)
 
       for (int i = 0; i < number_of_handles_to_signal; i++)
 	// Randomly select a handle to signal.
-	task.signal (ACE_OS::rand() % number_of_handles);
+	task.signal (ACE_OS::rand() % number_of_handles);	  
     }
 
   // Sleep for a while
@@ -232,7 +232,7 @@ main (int argc, char **argv)
   // End the Reactor event loop
   ACE_Reactor::end_event_loop ();
 
-  // Wait for all threads to exit
+  // Wait for all threads to exit 
   ACE_Thread_Manager::instance ()->wait ();
 
   // Delete dynamic resources; this is necessary since it will destroy
@@ -243,3 +243,4 @@ main (int argc, char **argv)
 
   return 0;
 }
+
diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile
index 2537a36c254..8937050e2b7 100644
--- a/examples/Service_Configurator/IPC-tests/client/Makefile
+++ b/examples/Service_Configurator/IPC-tests/client/Makefile
@@ -60,12 +60,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -98,12 +101,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -137,12 +143,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -172,12 +181,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
@@ -207,12 +219,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/TLI_Connector.h \
@@ -222,8 +237,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Connector.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/remote_dgram_client_test.o .obj/remote_dgram_client_test.so .shobj/remote_dgram_client_test.o .shobj/remote_dgram_client_test.so: remote_dgram_client_test.cpp \
@@ -234,12 +252,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
@@ -262,12 +283,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/FIFO_Send_Msg.h \
@@ -288,12 +312,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -316,12 +343,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
@@ -333,9 +363,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.i \
@@ -352,12 +379,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile
index 3862dff6368..e23cf3d9b1d 100644
--- a/examples/Service_Configurator/IPC-tests/server/Makefile
+++ b/examples/Service_Configurator/IPC-tests/server/Makefile
@@ -64,12 +64,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -89,7 +92,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -112,8 +114,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -154,12 +154,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -179,7 +182,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -202,8 +204,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -246,12 +246,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -271,7 +274,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -294,8 +296,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -330,12 +330,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -355,7 +358,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -378,8 +380,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -429,12 +429,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -454,7 +457,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -477,8 +479,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -528,12 +528,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -553,7 +556,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -576,8 +578,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -614,12 +614,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -639,7 +642,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -662,8 +664,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -739,12 +739,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -764,7 +767,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -787,8 +789,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -815,12 +815,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -840,7 +843,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -863,8 +865,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -901,12 +901,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -926,7 +929,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -949,8 +951,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -974,7 +974,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ Handle_L_SPIPE.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
 .obj/Handle_Thr_Stream.o .obj/Handle_Thr_Stream.so .shobj/Handle_Thr_Stream.o .shobj/Handle_Thr_Stream.so: Handle_Thr_Stream.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -983,12 +986,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
@@ -999,8 +1005,11 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/TLI.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  Handle_Thr_Stream.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -1024,7 +1033,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1047,8 +1055,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1117,15 +1123,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- Handle_Thr_Stream.i Handle_Thr_Stream.cpp \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i
+ Handle_Thr_Stream.i Handle_Thr_Stream.cpp
 .obj/server_test.o .obj/server_test.so .shobj/server_test.o .shobj/server_test.so: server_test.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -1136,12 +1134,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1161,7 +1162,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1184,8 +1184,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile
index 7bc11361017..68bd6b66f4a 100644
--- a/examples/Service_Configurator/Misc/Makefile
+++ b/examples/Service_Configurator/Misc/Makefile
@@ -56,12 +56,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -81,7 +84,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -104,8 +106,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -127,12 +127,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -152,7 +155,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -175,8 +177,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile
index 7fb08eec0d1..6bb757c1f6e 100644
--- a/examples/Shared_Malloc/Makefile
+++ b/examples/Shared_Malloc/Makefile
@@ -10,7 +10,6 @@
 
 BIN     = test_malloc \
 	  test_persistence \
-	  test_position_independent_malloc \
 	  test_multiple_mallocs
 
 FILES   = Malloc \
@@ -50,16 +49,19 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Malloc.h $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -105,13 +107,17 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i Options.h
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ Options.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Shared_Malloc/test_multiple_mallocs.cpp b/examples/Shared_Malloc/test_multiple_mallocs.cpp
index 568d72f39f7..4a1c8e7d3b4 100644
--- a/examples/Shared_Malloc/test_multiple_mallocs.cpp
+++ b/examples/Shared_Malloc/test_multiple_mallocs.cpp
@@ -1,7 +1,8 @@
 // $Id$
 
-// Test the capability of <ACE_Malloc> to handle multiple mallocs
-// rooted at different base addresses.
+// Test the capabilities of the ACE shared memory manager in terms of
+// its ability to handle multiple mallocs rooted at different base
+// addresses.
 
 #include "ace/Malloc.h"
 #include "ace/Synch.h"
@@ -12,101 +13,56 @@ typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 
 // Default address for shared memory mapped files and SYSV shared
 // memory (defaults to 64 M).
-static void *request_base_addr = ((void *) (64 * 1024 * 1024));
-static const char *request_string = "hello from request repository";
+void *REQUEST_BASE_ADDR = ((void *) (64 * 1024 * 1024));
+const char *REQUEST_STRING = "hello from request repository";
 
 // Default address for shared memory mapped files and SYSV shared
 // memory (defaults to 64 M).
-static void *response_base_addr = ((void *) (128 * 1024 * 1024));
-static const char *response_string = "hello from response repository";
+void *RESPONSE_BASE_ADDR = ((void *) (128 * 1024 * 1024));
+const char *RESPONSE_STRING = "hello from response repository";
 
 int 
 main (int, char *[])
 {
-  ACE_MMAP_Memory_Pool_Options request_options (request_base_addr);
+  ACE_MMAP_Memory_Pool_Options request_options (REQUEST_BASE_ADDR);
 
   // Create an adapter version of an allocator.
-  ACE_Allocator_Adapter<MALLOC> *shmem_request;
+  ACE_Allocator_Adapter<MALLOC> *shmem_request =
+    new ACE_Allocator_Adapter<MALLOC> ("request_file", "RequestLock", &request_options);
 
-  ACE_NEW_RETURN (shmem_request,
-                  ACE_Allocator_Adapter<MALLOC> ("request_file",
-                                                 "RequestLock",
-                                                 &request_options),
-                  1);
-
-  ACE_MMAP_Memory_Pool_Options response_options (response_base_addr);
+  ACE_MMAP_Memory_Pool_Options response_options (RESPONSE_BASE_ADDR);
 
   // Create a non-adapter version of an allocator.
-  MALLOC *shmem_response;
-  ACE_NEW_RETURN (shmem_response,
-                  MALLOC ("response_file",
-                          "ResponseLock",
-                          &response_options),
-                  1);
+  MALLOC *shmem_response = 
+    new MALLOC ("response_file","ResponseLock", &response_options);
+
   void *data = 0; 
 
-  // If we find "foo" then we're running the "second" time, so we must
-  // release the resources.
-  if (shmem_request->find ("foo",
-                           data) == 0)
+  if (shmem_request->find ("foo", data) == 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "%s\n",
-                  data));
+      ACE_OS::printf ("%s\n", data);
       shmem_request->remove ();
     }
-
-  // This is the first time in, so we allocate the memory and bind it
-  // to the name "foo".
   else
     {
-      ACE_ALLOCATOR_RETURN (data,
-                            shmem_request->malloc (ACE_OS::strlen (request_string) + 1),
-                            1);
-      ACE_OS::strcpy ((char *) data,
-                      request_string);
-
-      if (shmem_request->bind ("foo",
-                               data) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "bind"),
-                          1);
+      data = shmem_request->malloc (ACE_OS::strlen (REQUEST_STRING) + 1);
+      ACE_OS::strcpy ((char *) data, REQUEST_STRING);
+      shmem_request->bind ("foo", data);
     }
   data = 0;
 
-  // If we find "foo" then we're running the "second" time, so we must
-  // release the resources.
-  if (shmem_response->find ("foo",
-                            data) == 0)
+  if (shmem_response->find ("foo", data) == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n",
-                  data));
+      ACE_OS::printf ("%s\n", data);
       shmem_response->remove ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "all resources have been released\n"));
     }
-
-  // This is the first time in, so we allocate the memory and bind it
-  // to the name "foo".
   else
     {
-      ACE_ALLOCATOR_RETURN (data,
-                            shmem_response->malloc (ACE_OS::strlen (response_string) + 1),
-                            1);
-      ACE_OS::strcpy ((char *) data,
-                      response_string);
-
-      if (shmem_response->bind ("foo",
-                                data) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "bind"),
-                          1);
+      data = shmem_response->malloc (ACE_OS::strlen (RESPONSE_STRING) + 1);
+      ACE_OS::strcpy ((char *) data, RESPONSE_STRING);
+      shmem_response->bind ("foo", data);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Run again to see results and release resources.\n"));
+      ACE_OS::printf ("Run again to see results and release resources.\n");
     }
 
   return 0;
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 7757ae35ef0..19117721f89 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
-// Test the persistence capabilities of <ACE_Malloc> when configured
-// for mmap-based shared memory management.
+// Test the persistence capabilities of the ACE shared memory manager.
 
 #include "ace/Malloc.h"
 #include "ace/streams.h"
@@ -23,33 +22,31 @@ public:
   Employee (void): name_ (0), id_ (0) {}
 
   Employee (char* name, u_long id) : id_ (id)
-  {
-    this->name_ = (char*) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
-    ACE_OS::strcpy (this->name_, name );
-  }
+    {
+      this->name_ = (char*) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
+      ACE_OS::strcpy (this->name_, name );
+    }
 
   ~Employee (void) { shmem_manager->free (this->name_); }
 
   char *name (void) const    { return this->name_; }
 
   void name (char* name)
-  {
-    if (this->name_)
-      shmem_manager->free (this->name_);
-
-    this->name_ = (char *) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
-
-    ACE_OS::strcpy (this->name_, name);
-  }
+    {
+      if (this->name_)
+        shmem_manager->free (this->name_);
+      this->name_ = (char*) shmem_manager->malloc (ACE_OS::strlen (name) + 1);
+      ACE_OS::strcpy (this->name_, name);
+    }
 
   u_long id (void) const { return id_; }
 
   void id (u_long id) { id_ = id; }
 
   void *operator new (size_t)
-  {
-    return shmem_manager->malloc (sizeof (Employee));
-  }
+    {
+      return shmem_manager->malloc (sizeof (Employee));
+    }
 
   void operator delete (void *pointer) { shmem_manager->free (pointer); }
 
@@ -64,151 +61,149 @@ private:
 class GUI_Handler
 {
 public:
-  GUI_Handler (void) { menu (); }
+  GUI_Handler (void) { menu(); }
 
   ~GUI_Handler (void)
-  {
-    MALLOC::MEMORY_POOL &pool = shmem_manager->memory_pool();
-    pool.sync ();
-  }
+    {
+      MALLOC::MEMORY_POOL &pool = shmem_manager->memory_pool();
+      pool.sync ();
+    }
 
   int service(void)
-  {
-    char option[BUFSIZ];
-    char buf1[BUFSIZ];
-    char buf2[BUFSIZ];
-
-    if (::scanf ("%s", option) <= 0)
-      {
-        ACE_ERROR ((LM_ERROR, "try again\n"));
-        return 0;
-      }
-
-    int result = 0;
-    switch (option[0])
-      {
-      case 'I' :
-      case 'i' :
-        if (::scanf ("%s %s", buf1, buf2) <= 0)
+    {
+      char option[BUFSIZ];
+      char buf1[BUFSIZ];
+      char buf2[BUFSIZ];
+
+      if (::scanf ("%s", option) <= 0)
+        {
+          ACE_ERROR ((LM_ERROR, "try again\n"));
+          return 0;
+        }
+
+      int result = 0;
+      switch (option[0])
+        {
+        case 'I' :
+        case 'i' :
+          if (::scanf ("%s %s", buf1, buf2) <= 0)
+            break;
+          result = insert_employee (buf1, ACE_OS::atoi (buf2));
           break;
-        result = insert_employee (buf1, ACE_OS::atoi (buf2));
-        break;
-      case 'F' :
-      case 'f' :
-        if (::scanf ("%s", buf1) <= 0)
+        case 'F' :
+        case 'f' :
+          if (::scanf ("%s", buf1) <= 0)
+            break;
+          result = find_employee (buf1);
           break;
-        result = find_employee (buf1);
-        break;
-      case 'D' :
-      case 'd' :
-        if (::scanf ("%s", buf1) <= 0)
+        case 'D' :
+        case 'd' :
+          if (::scanf ("%s", buf1) <= 0)
+            break;
+          result = delete_employee (buf1);
           break;
-        result = delete_employee (buf1);
-        break;
-      case 'L' :
-      case 'l' :
-        result = list_employees ();
-        break;
-      case 'Q' :
-      case 'q' :
-        return -1;
-        ACE_NOTREACHED(break);
-      default :
-        cout << "unrecognized command" << endl;
-      }
-    if (result == 0)
-      cout << "Last operation was successful!!" << endl;
-    else
-      cout << "Last operation failed!! " << endl;
-
-    menu ();
-
-    return 0;
-  }
+        case 'L' :
+        case 'l' :
+          result = list_employees ();
+          break;
+        case 'Q' :
+        case 'q' :
+          return -1;
+          ACE_NOTREACHED(break);
+          default :
+          cout << "unrecognized command" << endl;
+        }
+      if (result == 0)
+        cout << "Last operation was successful!!" << endl;
+      else
+        cout << "Last operation failed!! " << endl;
+
+      menu ();
+
+      return 0;
+    }
 
   void menu(void)
-  {
-    cout << endl;
-    cout << "\t**************************                                  " << endl;
-    cout << "\tThe employee database menu                                  " << endl;
-    cout << endl;
-    cout << "\t<I> Insert    <name>   <id>                                 " << endl;
-    cout << "\t<D> Delete    <name>                                        " << endl;
-    cout << "\t<F> Find      <name>                                        " << endl;
-    cout << endl;
-    cout << "\t<L> List all employees                                      " << endl;
-    cout << endl;
-    cout << "\t<Q> Quit " << endl;
-    cout << "\t**************************                                  " << endl;
-  }
+    {
+      cout << endl;
+      cout << "\t**************************                                  " << endl;
+      cout << "\tThe employee database menu                                  " << endl;
+      cout << endl;
+      cout << "\t<I> Insert    <name>   <id>                                 " << endl;
+      cout << "\t<D> Delete    <name>                                        " << endl;
+      cout << "\t<F> Find      <name>                                        " << endl;
+      cout << endl;
+      cout << "\t<L> List all employees                                      " << endl;
+      cout << endl;
+      cout << "\t<Q> Quit " << endl;
+      cout << "\t**************************                                  " << endl;
+    }
 
 private:
   int insert_employee (char* name, u_long id)
-  {
-    if (find_employee (name) == 0)
-      ACE_ERROR_RETURN ((LM_ERROR, "Employee already exists\n"), -1);
+    {
+      if (find_employee (name) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR, "Employee already exists\n"), -1);
 
-    Employee* new_employee = new Employee (name, id);
-    shmem_manager->bind (name, new_employee);
-    return 0;
-  }
+      Employee* new_employee = new Employee (name, id);
+      shmem_manager->bind (name, new_employee);
+      return 0;
+    }
 
   int find_employee (char* name)
-  {
-    void *temp;
-    if (shmem_manager->find (name, temp) == 0)
-      {
-        Employee *employee = (Employee *) temp;
+    {
+      void *temp;
+      if (shmem_manager->find (name, temp) == 0)
+        {
+          Employee *employee = (Employee *) temp;
 
-        ACE_DEBUG ((LM_DEBUG, "The following employee was found.......\n\n"));
-        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
-                    employee->name (), employee->id ()));
-        return 0;
-      }
+          ACE_DEBUG ((LM_DEBUG, "The following employee was found.......\n\n"));
+          ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                      employee->name (), employee->id ()));
+          return 0;
+        }
 
-    return -1;
-  }
+      return -1;
+    }
 
   int list_employees (void)
-  {
-    MALLOC_ITERATOR iterator (*shmem_manager);
-
-    ACE_DEBUG ((LM_DEBUG, "The following employees were found.......\n\n"));
-
-    for (void* temp = 0;
-         iterator.next (temp) != 0;
-         iterator.advance ())
-      {
-        Employee *employee = (Employee *) temp;
-        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
-                    employee->name (), employee->id ()));
-      }
-    return 0;
-  }
+    {
+      MALLOC_ITERATOR iterator (*shmem_manager);
+
+      ACE_DEBUG ((LM_DEBUG, "The following employees were found.......\n\n"));
+
+      for (void* temp = 0;
+          iterator.next (temp) != 0;
+          iterator.advance ())
+        {
+          Employee *employee = (Employee *) temp;
+          ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                      employee->name (), employee->id ()));
+        }
+      return 0;
+    }
 
   int delete_employee (char* name)
-  {
-    void *temp;
+    {
+      void *temp;
 
-    if (shmem_manager->unbind (name, temp) == 0)
-      {
-        Employee *employee = (Employee *) temp;
+      if (shmem_manager->unbind (name, temp) == 0)
+        {
+          Employee *employee = (Employee *) temp;
 
-        ACE_DEBUG ((LM_DEBUG,
-                    "The following employee was found and deleted.......\n\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      "The following employee was found and deleted.......\n\n"));
 
-        ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
-                    employee->name (), employee->id ()));
+          ACE_DEBUG ((LM_DEBUG, "Employee name: %s\nEmployee id:   %d\n",
+                      employee->name (), employee->id ()));
 
-        delete employee;
-        return 0;
-      }
+          delete employee;
+          return 0;
+        }
 
-    ACE_DEBUG ((LM_DEBUG,
-                "There is no employee with name %s",
-                name));
-    return -1;
-  }
+      ACE_DEBUG ((LM_DEBUG, "There is no employee with name %s", name));
+      return -1;
+    }
 };
 
 void
@@ -230,8 +225,7 @@ main (int argc, char *argv[])
   for(;;)
     if (handler.service() == -1)
       {
-        ACE_DEBUG ((LM_DEBUG,
-                    "closing down ....\n"));
+        ACE_DEBUG ((LM_DEBUG, "closing down ....\n"));
         break;
       }
 
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
deleted file mode 100644
index 1b62b6d184b..00000000000
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// $Id$
-
-// Test the capability of <ACE_Malloc> to handle a single malloc that
-// can be rooted at different base addresses each time it's used.
-
-#include "ace/Malloc.h"
-#include "ace/Based_Pointer_T.h"
-#include "ace/Synch.h"
-
-ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$")
-
-typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; 
-
-// Default address for memory-mapped files.
-static void *base_addr = ACE_DEFAULT_BASE_ADDR;
-
-// Some dummy data 
-struct Dummy_Data
-{
-  int i1_;
-  int i2_;
-  int i3_;
-  ACE_Based_Pointer<Dummy_Data> next_;
-};
-
-#if 0
-struct Long_Test 
-{
-  ACE_Based_Pointer<long> bpl_;
-  long array_[10];
-};
-#endif /* 0 */
-
-static void
-print (Dummy_Data *data)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "<<<<\ni1_ = %d, i2_ = %d, i3_ = %d\n",
-              data->i1_, 
-              data->i2_,
-              data->i3_));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "i1_ = %d, i2_ = %d, i3_ = %d\n>>>>\n",
-              data->next_->i1_, 
-              data->next_->i2_,
-              data->next_->i3_));
-}
-
-static void *
-initialize (MALLOC *allocator)
-{
-  void *ptr;
-  ACE_ALLOCATOR_RETURN (ptr,
-                        allocator->malloc (sizeof (Dummy_Data)),
-                        0);
-  Dummy_Data *data1 = new (ptr) Dummy_Data;
-
-  void *gap = 0;
-  ACE_ALLOCATOR_RETURN (gap,
-                        allocator->malloc (sizeof (256)),
-                        0);
-
-  ACE_ALLOCATOR_RETURN (ptr,
-                        allocator->malloc (sizeof (Dummy_Data)),
-                        0);
-  Dummy_Data *data2 = new (ptr) Dummy_Data;
-
-  data1->next_ = data2;
-  data1->next_->i1_ = 111;
-  data1->next_->i2_ = 222;
-  data1->next_->i3_ = 333;
-  data2->next_ = data1;
-  data2->next_->i1_ = -111;
-  data2->next_->i2_ = -222;
-  data2->next_->i3_ = -333;
-
-#if 0
-  // Test in shared memory using long (array/pointer)
-  ACE_ALLOCATOR_RETURN (ptr,
-                        allocator->malloc (sizeof (Long_Test)),
-                        0);
-  Long_Test *lt = new (ptr) Long_Test;
-
-  lt->array_[0] = 1000;
-  lt->array_[1] = 1001;
-  lt->array_[2] = 1002;
-  lt->array_[3] = 1003;
-  lt->array_[4] = 1004;
-  lt->bpl_ = lt->array_;
-
-  long longCont1 = *lt->bpl_;
-  long longCont3 = lt->bpl_[3];
-
-  // Test in local memory using long (array/pointer)
-  ACE_NEW_RETURN (ptr,
-                  long[5],
-                  0);
-  longTest *lt_lcl = new (ptr) Long_Test;
-
-  lt_lcl->array_[0] = 2000;
-  lt_lcl->array_[1] = 2001;
-  lt_lcl->array_[2] = 2002;
-  lt_lcl->array_[3] = 2003;
-  lt_lcl->array_[4] = 2004;
-  lt_lcl->bpl_ = lt_lcl->array_;
-
-  long longCont_lcl1 = *lt_lcl->bpl_;
-  long longCont_lcl4 = lt_lcl->bpl_[4];
-#endif /* 0 */
-
-  allocator->free (gap);
-
-  return data1;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  if (argc > 1)
-    // Override the default base address.
-    base_addr = (void *) ACE_OS::atoi (argv[1]);
-
-  ACE_MMAP_Memory_Pool_Options options (base_addr);
-
-  // Create an allocator.
-  MALLOC *allocator;
-  ACE_NEW_RETURN (allocator,
-                  MALLOC ("dummy_file",
-                          "dummy_lock",
-                          &options),
-                  1);
-  void *data = 0; 
-
-  // This is the first time in, so we allocate the memory and bind it
-  // to the name "foo".
-  if (allocator->find ("foo",
-                       data) == -1)
-    {
-      data = initialize (allocator);
-
-      if (allocator->bind ("foo",
-                           data) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "bind"),
-                          1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Run again to see results and release resources.\n"));
-    }
-  // If we find "foo" then we're running the "second" time, so we must
-  // release the resources.
-  else
-    {
-      // @@ Add a new print statement...
-      print ((Dummy_Data *) data);
-      
-      allocator->free (data);
-      allocator->remove ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "all resources released\n"));
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Based_Pointer<Dummy_Data>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Based_Pointer<Dummy_Data>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Shared_Memory/Makefile b/examples/Shared_Memory/Makefile
index 16bd435d076..95a988f0157 100644
--- a/examples/Shared_Memory/Makefile
+++ b/examples/Shared_Memory/Makefile
@@ -53,12 +53,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
@@ -72,12 +75,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Shared_Memory.h \
  $(ACE_ROOT)/ace/SV_Shared_Memory.i \
diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile
index cd8c26fb2f7..3ca2483ca1d 100644
--- a/examples/System_V_IPC/SV_Message_Queues/Makefile
+++ b/examples/System_V_IPC/SV_Message_Queues/Makefile
@@ -52,12 +52,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -73,7 +76,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -109,12 +111,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Message.h \
  $(ACE_ROOT)/ace/SV_Message.i \
@@ -129,12 +134,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -150,7 +158,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -193,12 +200,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Message.h \
  $(ACE_ROOT)/ace/SV_Message.i \
diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile
index a2760670b16..101e99a227a 100644
--- a/examples/System_V_IPC/SV_Semaphores/Makefile
+++ b/examples/System_V_IPC/SV_Semaphores/Makefile
@@ -47,18 +47,20 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Shared_Memory.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -102,14 +104,16 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
deleted file mode 100644
index b7fe34725e7..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "Semaphore_Test.h"
-// $Id$
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-
-int
-main (void)
-{
-  ACE_SV_Shared_Memory shm_client (SHM_KEY, 
-				   SHMSZ, 
-				   ACE_SV_Shared_Memory::ACE_OPEN);
-  ACE_SV_Semaphore_Simple sem (SEM_KEY_1, 
-			       ACE_SV_Semaphore_Simple::ACE_OPEN, 0, 2);
-
-  char *s = (char *) shm_client.get_segment_ptr ();
-
-  if (sem.acquire (0) < 0)
-    ACE_OS::perror ("client sem.acquire"), ACE_OS::exit (1);
-
-  while (*s != '\0')
-    putchar (*s++);
-
-  putchar ('\n');
-
-  if (sem.release (1) < 0)
-    ACE_OS::perror ("client sem.release"), ACE_OS::exit (1);
-
-  return 0;
-}
-
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
deleted file mode 100644
index f9931705c26..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-#include "ace/Signal.h"
-#include "Semaphore_Test.h"
-
-static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
-static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
-
-extern "C" void 
-cleanup (int)
-{
-  if (shm_server.remove () < 0 || sem.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1));
-  ACE_OS::exit (0);
-}
-
-int
-main (void)
-{
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT);
-
-  char *s = (char *) shm_server.get_segment_ptr ();
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (sem.release (0) < 0)
-    ESD ("server sem.release", done);
-
-  if (sem.acquire (1) < 0)
-    ESD ("server sem.acquire", done);
-
-done:
-  cleanup ();
-  return 0;
-}
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h b/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
deleted file mode 100644
index 72aab815ff8..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Log_Msg.h"
-
-#define SHMSZ 27
-#define SEM_KEY_1 2345
-#define SEM_KEY_2 4321
-#define SHM_KEY 5678
-
-#define ESD(MSG,LABEL) do { ACE_ERROR ((LM_ERROR, MSG)); goto LABEL; } while (0)
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
deleted file mode 100644
index b98c664883b..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Illustrates the use of the Semaphore_Complex class.  Note that it
-// $Id$
-
-// doesn't matter whether the parent or the child creates the
-// semaphore since Semaphore_Complex will correctly serialize the
-// intialization of the mutex and synch objects.
-#include "ace/Malloc.h"
-#include "ace/SV_Semaphore_Complex.h"
-#include "Semaphore_Test.h"
-
-ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple> allocator;
-ACE_SV_Semaphore_Complex *mutex = 0; 
-ACE_SV_Semaphore_Complex *synch = 0; 
-
-/* Pointer to memory shared by both the client and server. */
-static char *shm;
-
-static int
-do_parent (void)
-{
-  char *s = shm;
-
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (mutex->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server mutex.release"), 1);
-
-  if (synch->acquire () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server synch.acquire"), 1);
-  return 0;
-}
-
-static int
-do_child (void)
-{
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  while (mutex->tryacquire () == -1)
-    if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, "spinning in client!\n"));
-    else
-      ACE_ERROR_RETURN ((LM_ERROR, "client mutex.tryacquire"), 1);
-
-  for (char *s = (char *) shm; *s != '\0'; s++)
-    putchar (*s);
-
-  putchar ('\n');
-
-  if (synch->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "client synch.release"), 1);
-  return 0;
-}
-
-int
-main (void)
-{
-  shm = (char *) allocator.malloc (27);
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "fork failed\n"), -1);
-      /* NOTREACHED */
-    case 0:
-      return do_child ();
-    default:
-      {
-	int result = do_parent ();
-
-	if (wait (0) == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "wait"), -1);
-
-	allocator.remove ();
-
-	if (mutex->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mutex.remove"), -1);
-	else if (synch->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "synch.remove"), -1);
-	return result;
-      }
-    }
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
diff --git a/examples/System_V_IPC/SV_Shared_Memory/Makefile b/examples/System_V_IPC/SV_Shared_Memory/Makefile
index 401ebc00183..74678710cbd 100644
--- a/examples/System_V_IPC/SV_Shared_Memory/Makefile
+++ b/examples/System_V_IPC/SV_Shared_Memory/Makefile
@@ -50,12 +50,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Shared_Memory.i \
  SV_Shared_Memory_Test.h
diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile
index 3f49b898e0b..8a2e578e96b 100644
--- a/examples/Threads/Makefile
+++ b/examples/Threads/Makefile
@@ -75,12 +75,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -100,7 +103,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -123,8 +125,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -149,12 +149,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -171,7 +174,6 @@ endif
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -201,8 +203,6 @@ endif
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -224,12 +224,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -249,7 +252,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -289,8 +291,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -339,12 +339,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -367,7 +370,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -407,8 +409,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -465,12 +465,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -493,7 +496,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -533,8 +535,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -594,12 +594,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -619,7 +622,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -642,8 +644,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -667,12 +667,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -692,7 +695,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -715,8 +717,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -744,12 +744,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -766,7 +769,6 @@ endif
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -797,12 +799,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -819,7 +824,6 @@ endif
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -850,12 +854,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -872,7 +879,6 @@ endif
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -909,12 +915,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -934,7 +943,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -957,8 +965,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -984,12 +990,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1009,7 +1018,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1049,8 +1057,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1102,12 +1108,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1127,7 +1136,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1167,8 +1175,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1219,12 +1225,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -1250,7 +1259,6 @@ endif
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1277,8 +1285,6 @@ endif
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Task.h \
@@ -1338,12 +1344,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1363,7 +1372,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1403,8 +1411,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1447,22 +1453,30 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
 .obj/task_five.o .obj/task_five.so .shobj/task_five.o .shobj/task_five.so: task_five.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -1470,13 +1484,12 @@ endif
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1490,22 +1503,29 @@ endif
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1520,20 +1540,6 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1574,12 +1580,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1599,7 +1608,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1622,8 +1630,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1647,12 +1653,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1672,7 +1681,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1712,8 +1720,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1765,12 +1771,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1790,7 +1799,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1813,8 +1821,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1839,12 +1845,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1864,7 +1873,6 @@ endif
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1887,8 +1895,6 @@ endif
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1956,12 +1962,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Thread.i \
  TSS_Data.h \
@@ -1997,12 +2006,15 @@ endif
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2025,7 +2037,6 @@ endif
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -2065,8 +2076,6 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp
index a3d589653a8..6455150ee3c 100644
--- a/examples/Threads/future1.cpp
+++ b/examples/Threads/future1.cpp
@@ -394,32 +394,21 @@ main (int, char *[])
 template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
 template class ACE_Future<const char *>;
 template class ACE_Future<u_long>;
-template class ACE_Future_Rep<const char *>;
+template class ACE_Future_Rep<char const *>;
 template class ACE_Future_Rep<u_long>;
 template class auto_ptr<ACE_Method_Request>;
 template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<const char *> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<const char *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const char *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
 #pragma instantiate ACE_Future<const char *>
 #pragma instantiate ACE_Future<u_long>
-#pragma instantiate ACE_Future_Rep<const char *>
+#pragma instantiate ACE_Future_Rep<char const *>
 #pragma instantiate ACE_Future_Rep<u_long>
 #pragma instantiate auto_ptr<ACE_Method_Request>
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const char *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
 #else
 int
 main (int, char *[])
diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp
index d5d1b510496..0c2831e12ad 100644
--- a/examples/Threads/future2.cpp
+++ b/examples/Threads/future2.cpp
@@ -520,12 +520,6 @@ template class ACE_Future_Rep<char *>;
 template class ACE_Future_Rep<u_long>;
 template class auto_ptr<ACE_Method_Request>;
 template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<char *> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<char *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<char *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
 #pragma instantiate ACE_Future<char *>
@@ -534,14 +528,9 @@ template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
 #pragma instantiate ACE_Future_Rep<u_long>
 #pragma instantiate auto_ptr<ACE_Method_Request>
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<char *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
 #else
 int
 main (int, char *[])
diff --git a/examples/Threads/test_auto_event.cpp b/examples/Threads/test_auto_event.cpp
deleted file mode 100644
index 4f83d50db71..00000000000
--- a/examples/Threads/test_auto_event.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-// This test shows the use of an ACE_Auto_Event as a signaling
-// mechanism. Two threads are created (one a reader, the other a
-// writer). The reader waits till the writer has completed
-// calculations. Upon waking up the reader prints the data calculated
-// by the writer. The writer thread calculates the value and signals
-// the reader when the calculation completes.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-// Shared event between reader and writer.  The ACE_Thread_Mutex is
-// necessary to make sure that only one ACE_Auto_Event is created.
-// The default constructor for ACE_Auto_Event sets it initially into
-// the non-signaled state.
-
-typedef ACE_Singleton <ACE_Auto_Event, ACE_Thread_Mutex> EVENT;
-
-// work time for writer
-static int work_time;
-
-// Reader thread.
-static void *
-reader (void *arg)
-{
-  // Shared data via a reference.
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Wait for writer to complete.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting...... \n"));
-
-  if (EVENT::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-
-  // Read shared data.
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d \n", data));
-
-  return 0;
-}
-
-// Writer thread.
-static void *
-writer (void *arg)
-{
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Calculate (work).
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: working for %d secs\n", work_time));
-  ACE_OS::sleep (work_time);
-
-  // Write shared data.
-  data = 42;
-
-  // Wake up reader.
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: calculation complete, waking reader\n"));
-
-  if (EVENT::instance ()->signal () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-  
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  // Shared data: set by writer, read by reader.
-  int data;
-
-  // Work time for writer.
-  work_time = argc == 2 ? atoi (argv[1]) : 5;
-
-  // threads manager
-  ACE_Thread_Manager& tm = *ACE_Service_Config::thr_mgr ();
-
-  // Create reader thread.
-  if (tm.spawn (reader, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for reader failed"), -1);
-  
-  // Create writer thread.
-  if (tm.spawn (writer, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for writer failed"), -1);
-  
-  // Wait for both.
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier1.cpp b/examples/Threads/test_barrier1.cpp
deleted file mode 100644
index 6b213819ca0..00000000000
--- a/examples/Threads/test_barrier1.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-struct Tester_Args
-  // = TITLE
-  //     These arguments are passed into each test thread.
-{
-  Tester_Args (ACE_Barrier &tb, int i)
-    : tester_barrier_ (tb), 
-      n_iterations_ (i) {}
-
-  ACE_Barrier &tester_barrier_;
-  // Reference to the tester barrier.  This controls each miteration of
-  // the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-};
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-static void *
-tester (Tester_Args *args)
-{
-  // Keeps track of thread exit.
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int iterations = 1; 
-       iterations <= args->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      args->tester_barrier_.wait ();
-    }
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Barrier tester_barrier (n_threads);
-  
-  Tester_Args args (tester_barrier, n_iterations);
-
-  if (ACE_Service_Config::thr_mgr ()->spawn_n 
-      (n_threads, ACE_THR_FUNC (tester), 
-       (void *) &args, THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier2.cpp b/examples/Threads/test_barrier2.cpp
deleted file mode 100644
index 30190ace443..00000000000
--- a/examples/Threads/test_barrier2.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-// generic_worker_task.cpp
-//
-// This test program illustrates how the ACE task workers/barrier
-// synchronization mechanisms work in conjunction with the ACE_Task
-// and the ACE_Thread_Manager.  The manual flag not set simulates
-// user input, if set input comes from stdin until RETURN only is
-// entered which stops all workers via a message block of length
-// 0. This is an alernative shutdown of workers compared to queue
-// deactivate.  The delay_put flag simulates a delay between the
-// shutdown puts. All should work with this flag disabled!  The
-// BARRIER_TYPE is supposed to enable/disable barrier sync on each svc
-// a worker has done.
-
-#include <iostream.h>
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#define BARRIER_TYPE ACE_Null_Barrier
-//#define BARRIER_TYPE ACE_Barrier
-//#ifdef delay_put
-//#define manual
-
-template <class BARRIER>
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-
-  Worker_Task (ACE_Thread_Manager *thr_mgr, 
-	       int n_threads, 
-	       int inp_serialize = 1);
-  
-  virtual int Producer (void);
-  // produce input for workers
-
-  virtual int input (ACE_Message_Block *mb);
-  // Fill one message block via a certain input strategy.
-
-  virtual int output (ACE_Message_Block *mb);
-  // Forward one message block via a certain output strategy to the
-  // next task if any.
-
-  virtual int service (ACE_Message_Block *mb, int iter);
-  // Perform one message block dependant service.
-
-private:
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) {ACE_DEBUG ((LM_DEBUG,"(%t) in close of worker\n")); return 0; }
-  
-  int nt_;
-  // Number of worker threads to run.
-  int inp_serialize_;
-
-  BARRIER barrier_;
-};
-
-template <class BARRIER>
-Worker_Task<BARRIER>::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-				   int n_threads, 
-				   int inp_serialize) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads)
-{
-  nt_ = n_threads;
-  // Create worker threads.
-  inp_serialize_ = inp_serialize;
-
-  // Use the task's message queue for serialization (default) or run
-  // service in the context of the caller thread.
-
-  if (nt_ > 0 && inp_serialize == 1)
-    if (this->activate (THR_NEW_LWP, n_threads) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-
-// Simply enqueue the Message_Block into the end of the queue.
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  int result;
-  if (this->inp_serialize_)
-    result = this->putq (mb, tv); 
-  else
-    {
-      static int iter = 0;
-      result = this->service (mb, iter++);
-
-      if (this->output (mb) < 0)
-	ACE_DEBUG ((LM_DEBUG, "(%t) output not connected!\n"));
-
-      delete mb;
-    }
-  return result;
-}
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::service (ACE_Message_Block *mb, int iter) 
-{
-  int length = mb->length ();
-
-  if (length > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,"(%t) in iteration %d len=%d text got:\n",iter,length));
-      ACE_OS::write (ACE_STDOUT, mb->rd_ptr (), length);
-      ACE_DEBUG ((LM_DEBUG,"\n"));
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us
-  // to the Thread_Manager when the thread begins.
-
-  // Keep looping, reading a message out of the queue, until we get a
-  // message with a length == 0, which signals us to quit.
-
-  for (int iter = 1; ;iter++)
-    {       
-      ACE_Message_Block *mb = 0;
-
-      int result = this->getq (mb);
-
-      if (result == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d\n", "error waiting for message in iteration", iter));
-	  break;
-	}
-
-      int length = mb->length ();
-      this->service (mb,iter);
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d got quit, exit!\n", iter));
-	  delete mb;
-	  break;
-	}
-
-      this->barrier_.wait ();
-      this->output (mb);
-
-      delete mb;
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::Producer (void)
-{
-  // Keep reading stdin, until we reach EOF.
-
-  for (;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-      if (this->input (mb) == -1)
-	return -1;
-    }
-
-  return 0; 
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::output (ACE_Message_Block *mb)
-{
-  return this->put_next (mb);
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::input (ACE_Message_Block *mb)
-{
-  ACE_Message_Block *mb1;
-
-#ifndef manual
-  static int l= 0;
-  char str[]="kalle";
-  strcpy (mb->rd_ptr (),str);
-  int n=strlen (str);
-  if (l==1000)
-    n=1;
-  l++;
-  if (l==0 || (l%100 == 0)) ACE_OS::sleep (5);
-  if (n <= 1)
-#else
-    ACE_DEBUG ((LM_DEBUG,"(%t) press chars and enter to put a new message into task queue ...\n"));
-  if ((n = read (0, mb->rd_ptr (), mb->size ())) <= 1) 
-#endif // manual
-    {
-      // Send a shutdown message to the waiting threads and exit.
-      // cout << "\nvor loop, dump of task msg queue:\n" << endl;
-      // this->msg_queue ()->dump ();
-      for (int i=0;i<nt_;i++)
-	{
-	  ACE_DEBUG ((LM_DEBUG,"(%t) eof, sending block for thread=%d\n",i+1));
-	  mb1 = new ACE_Message_Block (2);
-	  mb1->length (0);
-	  if (this->put (mb1) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-#ifdef delay_put
-	  ACE_OS::sleep (1); // this sleep helps to shutdown correctly -> was an error!
-#endif /* delay_put */
-	}
-      //          cout << "\nnach loop, dump of task msg queue:\n" << endl;
-      //          this->msg_queue ()->dump ();
-      return (-1);
-    }
-  else
-    {
-      // Send a normal message to the waiting threads and continue producing.
-      mb->wr_ptr (n);
-      if (this->put (mb) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-    }
-  return 0; 
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  
-  ACE_DEBUG ((LM_DEBUG,"(%t) worker threads running=%d\n",n_threads));
-
-  
-  Worker_Task<BARRIER_TYPE> *worker_task = 
-    new Worker_Task<BARRIER_TYPE> (ACE_Service_Config::thr_mgr (), 
-				   /*n_threads*/ 0,0); 
-  
-  worker_task->Producer ();
-
-  // Wait for all the threads to reach their exit point.
-  ACE_DEBUG ((LM_DEBUG,"(%t) waiting with thread manager ...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-  ACE_DEBUG ((LM_DEBUG,"(%t) delete worker task ...\n"));
-
-  delete worker_task;
-  ACE_DEBUG ((LM_DEBUG,"(%t) done correct!\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_cancel.cpp b/examples/Threads/test_cancel.cpp
deleted file mode 100644
index a9d12bea579..00000000000
--- a/examples/Threads/test_cancel.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Test out the cooperative thread cancellation mechanisms provided by
-// $Id$
-
-// the ACE_Thread_Manager.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static void *
-worker (int iterations)
-{
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 10) == 0 
-	  && (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0))
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) has been cancelled before iteration!\n", i));
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 2 seconds and then suspend every thread in the group.
-  ACE_OS::sleep (2);
-  thr_mgr->suspend_grp (grp_id);
-
-  // Wait for 2 more seconds and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->resume_grp (grp_id);
-
-  // Wait for 2 more seconds and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->kill_grp (grp_id, SIGINT);
-
-  // Wait for 2 more seconds and then exit (which should kill all the
-  // threads)!
-  ACE_OS::sleep (ACE_Time_Value (2));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future1.cpp b/examples/Threads/test_future1.cpp
deleted file mode 100644
index 79cf0a42b36..00000000000
--- a/examples/Threads/test_future1.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-// 
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT task_count (0);
-
-// a counter for the futures..
-static ATOMIC_INT future_count (0);
-static ATOMIC_INT future_no (0);
-
-// a counter for the capsules..
-static ATOMIC_INT capsule_count (0);
-static ATOMIC_INT capsule_no (0);
-
-// a counter for the method objects...
-static ATOMIC_INT methodobject_count (0);
-static ATOMIC_INT methodobject_no (0);
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  friend class Method_ObjectWork;
-public:
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<const char*> name (void);
-  void end (void);
-
-  float work_i (float, int);
-  const char *name_i (void);
-
-private:
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  :   scheduler_ (new_Scheduler),
-      param_ (new_param),
-      count_ (new_count),
-      future_result_ (new_result)
-{ 
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_work created\n"));
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Method_Object_work will be deleted.\n"));
-}
-
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<const char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<const char*> future_result_;
-};
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<const char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-// open
-int 
-Scheduler::open (void *)
-{
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-// close
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s close\n", this->name_));
-  task_count--;
-  return 0;
-}
-
-// put... ??
-int 
-Scheduler::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-// service..
-int 
-Scheduler::svc (void)
-{
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Destructor automatically deletes it.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  // @@ We should probably do something fun here, like compute the
-  // Fibonacci sequence or something.
-
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-const char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<const char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the Scheduler.
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<const char*> new_future;
-
-      // @@ What happens if new fails here?
-      this->activation_queue_.enqueue 
-	(new Method_Object_name (this, new_future));
-
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) {
-    return this->scheduler_->work (newparam, newcount);
-  }
-  else {
-    ACE_Future<float> new_future;
-
-    this->activation_queue_.enqueue
-      (new Method_Object_work (this, newparam, newcount, new_future));
-    return new_future;
-  }
-}
-
-// @@ These values should be set by the command line options!
-
-// Total number of iterations to <work>
-static int n_iterations = 50000;
-
-// Total number of loops.
-static int n_loops = 100;
-
-int
-main (int, char *[]) 
-{
-  Scheduler *andres, *peter, *helmut, *matias;
-
-  // Create active objects..  
-  // @@ Should "open" be subsumed within the constructor of
-  // Scheduler()?
-  andres = new Scheduler ("andres");
-  andres->open ();
-  peter = new Scheduler ("peter");
-  peter->open ();
-  helmut = new Scheduler ("helmut");
-  helmut->open ();
-
-  // Matias passes all asynchronous method calls on to Andres...
-  matias = new Scheduler ("matias", andres);
-  matias->open ();
-
-  for (int i = 0; i < n_loops; i++) 
-    {
-      {
-	ACE_Future<float> fresulta, fresultb, fresultc, fresultd, fresulte;
-	ACE_Future<const char*> fname;
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) going to do a non-blocking call\n"));
-
-	fresulta = andres->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultb = peter->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultc = helmut->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultd = matias->work (0.02, 100 + (n_iterations * (i % 2)));
-	fname = andres->name ();
-
-	// see if the result is available...
-	if (fresulta.ready ())
-	  ACE_DEBUG ((LM_DEBUG, "(%t) wow.. work is ready.....\n"));
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) non-blocking call done... now blocking...\n"));
-
-	// Save the result of fresulta.
-
-	fresulte = fresulta;
-
-	if (i % 3 == 0) 
-	  {
-	    // Every 3rd time... disconnect the futures...
-	    // but "fresulte" should still contain the result...
-	    fresulta.cancel (10.0);
-	    fresultb.cancel (20.0);
-	    fresultc.cancel (30.0);
-	    fresultd.cancel (40.0);
-	  }
-
-	float resulta = 0, resultb = 0, resultc = 0, resultd = 0, resulte = 0;
-
-	fresulta.get (resulta);
-	fresultb.get (resultb);
-	fresultc.get (resultc);
-	fresultd.get (resultd);
-	fresulte.get (resulte);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) result a %f\n", resulte));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result b %f\n", resulta));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result c %f\n", resultb));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result d %f\n", resultc));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result e %f\n", resultd));
-
-	const char *name;
-
-	fname.get (name);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) name %s\n", name));
-
-      }
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-		  (u_long) task_count,
-		  (u_long) future_count,
-		  (u_long) capsule_count,
-		  (u_long) methodobject_count));
-    }
-
-  // Close things down.
-  andres->end ();
-  peter->end ();
-  helmut->end ();
-  matias->end ();
-
-  ACE_OS::sleep (2);
-  
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-	      (u_long) task_count,
-	      (u_long) future_count,
-	      (u_long) capsule_count,
-	      (u_long) methodobject_count));
-
-  ACE_DEBUG ((LM_DEBUG,"(%t) th' that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future2.cpp b/examples/Threads/test_future2.cpp
deleted file mode 100644
index 19431072202..00000000000
--- a/examples/Threads/test_future2.cpp
+++ /dev/null
@@ -1,524 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-//
-// Modification History
-// Aug. 96; A.Kruse; dev.
-// Aug. 96; D.Schmidt; complete workover
-// 08/27/96; A.Kruse; - the friends of Scheduler are "Method_Object_name"
-//                      and "Method_Object_work".
-//                    - make the methods "work_i" and "name_i" private
-// 09/2/96; D.Schmidt; Integrate with new ACE_Future API and rearrange
-//                     the tests so they are more modular.
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT scheduler_open_count (0);
-
-// forward declarations
-class Method_Object_work;
-class Method_Object_name;
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  // Every method object has to be able to access the private methods.
-
-  friend class Method_Object_work; 
-  friend class Method_Object_name;
-  friend class Method_Object_end;
-public:
-
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  // The method that is used to start the active object.
-
-  // = Here are the methods exported by the class. They return an
-  // <ACE_Future>.
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<char*> name (void);
-  void end (void);
-
-private:
-  virtual int close (u_long flags = 0);
-  // Should not be accessible from outside...  (use end () instead).
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0)
-    { return 0; };
-  // Doesn't have any use for this example.
-
-  virtual int svc (void);
-  // Here the actual servicing of all requests is happening..
-
-  // = Implementation methods.
-  float work_i (float, int);
-  char *name_i (void);
-
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  : scheduler_ (new_Scheduler),
-    param_ (new_param),
-    count_ (new_count),
-    future_result_ (new_result)
-{ 
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-}
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<char*> future_result_;
-};
-
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      " (%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      " (%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-int 
-Scheduler::open (void *)
-{
-  scheduler_open_count++;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s close\n", this->name_));
-  scheduler_open_count--;
-  return 0;
-}
-
-int 
-Scheduler::svc (void)
-{
-  // Main event loop for this active object.
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Smart pointer destructor automatically deletes mo.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the other scheduler
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<char*> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  // This scheduler is inactive... so we execute the user
-	  // request right away...
-	
-	  ACE_Auto_Ptr<ACE_Method_Object> mo (new Method_Object_name (this, new_future));
-
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes mo.
-	}
-      else
-	// @@ What happens if new fails here?
-	this->activation_queue_.enqueue
-	  (new Method_Object_name (this, new_future));
-	
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) 
-    return this->scheduler_->work (newparam, newcount);
-  else 
-    {
-      ACE_Future<float> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  ACE_Auto_Ptr<ACE_Method_Object> mo 
-	    (new Method_Object_work (this, newparam, newcount, new_future));
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes it.
-	}
-      else
-	this->activation_queue_.enqueue
-	  (new Method_Object_work (this, newparam, newcount, new_future));
-
-      return new_future;
-    }
-}
-
-static int 
-determine_iterations (void)
-{
-  int n_iterations;
-
-  ACE_DEBUG ((LM_DEBUG," (%t) determining the number of iterations...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-
-  ACE_Time_Value tstart (ACE_OS::gettimeofday ());
-  ACE_Time_Value tend (ACE_OS::gettimeofday ());
-
-  // Determine the number of iterations... we want so many that the
-  // work () takes about 1 second...
-
-  for (n_iterations = 1;
-       (tend.sec () - tstart.sec ()) < 1;
-       n_iterations *= 2)
-    {
-      tstart = ACE_OS::gettimeofday ();
-
-      worker_a->work (0.1, n_iterations);
-
-      tend = ACE_OS::gettimeofday ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG," (%t) n_iterations %d\n", 
-	      (u_long) n_iterations));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-  return n_iterations;
-}
-
-static void
-test_active_object (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing active object pattern...\n"));
-  // A simple example for the use of the active object pattern and
-  // futures to return values from an active object.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  Scheduler *worker_b = new Scheduler ("worker B");
-
-  // Have worker_c delegate his work to worker_a.
-  Scheduler *worker_c = new Scheduler ("worker C", worker_a);
-
-  // loop 0:
-  // test the Schedulers when they are not active.
-  // now the method objects will be created but since
-  // there is no active thread they will also be
-  // immediately executed, in the "main" thread.
-  // loop 1:
-  // do the same test but with the schedulers
-  // activated
-  for (int i = 0; i < 2; i++)
-    {
-      if (i == 1) 
-	{
-	  worker_a->open ();
-	  worker_b->open ();
-	  worker_c->open ();
-	}
-
-      ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-      ACE_Future<float> fresultb = worker_b->work (0.02, n_iterations);
-      ACE_Future<float> fresultc = worker_c->work (0.03, n_iterations);
-
-      if (i == 0) 
-	{
-	  if (!fresulta.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker A is should be ready!!!\n"));
-	  if (!fresultb.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker B is should be ready!!!\n"));
-	  if (!fresultc.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker C is should be ready!!!\n"));
-	}
-
-      // When the workers are active we will block here until the
-      // results are available.
-
-      float resulta = fresulta;
-      float resultb = fresultb;
-      float resultc = fresultc;
-
-      ACE_Future<char *> fnamea = worker_a->name ();
-      ACE_Future<char *> fnameb = worker_b->name ();
-      ACE_Future<char *> fnamec = worker_c->name ();
-
-      char *namea = fnamea;
-      char *nameb = fnameb;
-      char *namec = fnamec;
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namea, resulta));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  nameb, resultb));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namec, resultc));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d before end ()\n",
-	      (u_long) scheduler_open_count));
-
-  worker_a->end ();
-  worker_b->end ();
-  worker_c->end ();
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d immediately after end ()\n",
-	      (u_long) scheduler_open_count));
-
-  ACE_OS::sleep (2);
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d after waiting\n",
-	      (u_long) scheduler_open_count));
-  // @@ Can we safely delete worker_a, worker_b, and worker_c?
-}
-
-static void
-test_cancellation (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing cancellation of a future...\n"));
-
-  // Now test the cancelling a future.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-
-  // save the result by copying the future
-  ACE_Future<float> fresultb = fresulta;
-
-  // now we cancel the first future.. but the
-  // calculation will still go on...
-  fresulta.cancel (10.0);
-
-  if (!fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should be ready!!!\n"));
-
-  float resulta = fresulta;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result %f\n", resulta));
-
-  if (resulta != 10.0)
-    ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result should be 10.0!!\n", resulta));
-
-  resulta = fresultb;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) true result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-static void
-test_timeout (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing timeout on waiting for the result...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, 2 * n_iterations);
-
-  // Should immediately return... and we should see an error...
-  ACE_Time_Value *delay = new ACE_Time_Value (1);
-
-  float resulta;
-  fresulta.get (resulta, delay);
-
-  if (fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should not be ready!!!\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG," (%t) timed out on future A\n"));
-
-  // now we wait until we are done...
-  fresulta.get (resulta);
-  ACE_DEBUG ((LM_DEBUG, " (%t) result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-int
-main (int, char *[]) 
-{
-  int n_iterations = determine_iterations ();
-
-  test_active_object (n_iterations);
-  test_cancellation (n_iterations);
-  test_timeout (n_iterations);
-
-  ACE_DEBUG ((LM_DEBUG," (%t) that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_manual_event.cpp b/examples/Threads/test_manual_event.cpp
deleted file mode 100644
index 26d477fabc0..00000000000
--- a/examples/Threads/test_manual_event.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// The test shows the use of an ACE_Manual_Event to create a
-// $Id$
-
-// Pseudo_Barrier. Multiple threads are created which do the
-// following:
-//
-//	1. work 
-//	2. synch with other threads
-//	3. more work
-// 
-// ACE_Manual_Event is use to synch with other
-// threads. ACE_Manual_Event::signal() is used for broadcasting.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0;
-
-class Pseudo_Barrier
-  // = TITLE
-  //    A barrier class using ACE manual-reset events.
-  //
-  // = DESCRIPTION
-  //    This is *not* a real barrier. 
-  //    Pseudo_Barrier is more like a ``one shot'' barrier.
-  //    All waiters after the Nth waiter are allowed to go. 
-  //    The barrier does not reset after the Nth waiter.
-  //    For an example of a real barrier, please see class ACE_Barrier.
-{
-public:
-  Pseudo_Barrier (u_long count);
-
-  int wait (void);
-
-private: 
-  ACE_Atomic_Op <ACE_Thread_Mutex, u_long> counter_; 
-  ACE_Manual_Event event_;
-};
-
-Pseudo_Barrier::Pseudo_Barrier (u_long count)
-  : counter_ (count)
-{
-}
-
-int 
-Pseudo_Barrier::wait (void)
-{
-  if (--this->counter_ == 0)
-    return this->event_.signal ();
-  else 
-    return this->event_.wait ();
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  Pseudo_Barrier &barrier = *(Pseudo_Barrier *) arg;
-  
-  // work
-  ACE_DEBUG ((LM_DEBUG, "(%t) working (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (::amount_of_work);
-
-  // synch with everybody else
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others \n"));
-  barrier.wait ();
-
-  // more work
-  ACE_DEBUG ((LM_DEBUG, "(%t) more work (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (amount_of_work);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) dying \n"));
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  int n_threads = argc == 2 ? atoi (argv[1]) : 5;
-
-  ACE_Thread_Manager &tm = *ACE_Service_Config::thr_mgr ();
-  
-  // synch object shared by all threads
-  Pseudo_Barrier barrier (n_threads);
-
-  // create workers
-  if (tm.spawn_n (n_threads, worker, &barrier) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread creates for worker failed"), -1);
-
-  // wait for all workers to exit
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_mutex.cpp b/examples/Threads/test_process_mutex.cpp
deleted file mode 100644
index fb23c8b73be..00000000000
--- a/examples/Threads/test_process_mutex.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Mutexes.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static sig_atomic_t done;
-
-extern "C" void 
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc > 1 ? argv[1] : "hello";
-  int iterations =  argc > 2 ? ACE_OS::atoi (argv[2]) : 100;
-
-  ACE_Process_Mutex pm (name);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < iterations && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_semaphore.cpp b/examples/Threads/test_process_semaphore.cpp
deleted file mode 100644
index d7933897f8e..00000000000
--- a/examples/Threads/test_process_semaphore.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Semaphore.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-static sig_atomic_t done;
-
-extern "C" void
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc == 1 ? "hello" : argv[1];
-
-  ACE_Process_Semaphore pm (1, name);
-
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < 100 && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-
diff --git a/examples/Threads/test_reader_writer.cpp b/examples/Threads/test_reader_writer.cpp
deleted file mode 100644
index ef888133d83..00000000000
--- a/examples/Threads/test_reader_writer.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// This test program verifies the functionality of the ACE_OS
-// $Id$
-
-// implementation of readers/writer locks on Win32 and Posix pthreads.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Default number of iterations.
-static size_t n_iterations = 1000;
-
-// Default number of loops.
-static size_t n_loops = 100;
-
-// Default number of readers.
-static size_t n_readers = 6;
-
-// Default number of writers.
-static size_t n_writers = 2;
-
-// Thread id of last writer.
-volatile static int shared_data;  
-
-// Lock for shared_data.
-static ACE_RW_Mutex rw_mutex;     
-
-// Count of the number of readers and writers.
-ACE_Atomic_Op<ACE_Thread_Mutex, int> current_readers, current_writers;
-
-// Thread manager
-static ACE_Thread_Manager thr_mgr;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "r:w:n:l:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-    {
-    case 'r':
-      n_readers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'w':
-      n_writers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'n':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'l':
-      n_loops = ACE_OS::atoi (get_opt.optarg);
-      break;
-    default:
-      print_usage_and_die ();
-      break;
-  }
-}
-
-// Iterate <n_iterations> each time checking that nobody modifies the data
-// while we have a read lock.
-
-static void *
-reader (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Read_Guard<ACE_RW_Mutex> g(rw_mutex);
-      int n = ++current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) I'm reader number %d\n", n));
-
-      if (current_writers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) writers found!!!\n"));
-	
-      int data = shared_data;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != data)
-            ACE_DEBUG ((LM_DEBUG, 
-			"(%t) somebody changed %d to %d\n", 
-			data, shared_data));
-        }
-
-      --current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with reading guarded data\n"));
-
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> each time modifying the global data
-// and checking that nobody steps on it while we can write it.
-
-static void *
-writer (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Write_Guard<ACE_RW_Mutex> g(rw_mutex);
-
-      ++current_writers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) writing to guarded data\n"));
-
-      if (current_writers > 1)
-        ACE_DEBUG ((LM_DEBUG, "(%t) other writers found!!!\n"));
-
-      if (current_readers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) readers found!!!\n"));
-	
-      int self = (int) ACE_Thread::self ();
-      shared_data = self;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != self)
-            ACE_DEBUG ((LM_DEBUG, "(%t) somebody wrote on my data %d\n", shared_data));
-        }
-
-      --current_writers;
-
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with guarded data\n"));
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Spawn off threads.
-
-int main (int argc, char *argv[])
-{
-  ACE_LOG_MSG->open (argv[0]);
-  parse_args (argc, argv);
-
-  current_readers = 0; // Possibly already done
-  current_writers = 0; // Possibly already done
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) main thread starting\n"));
-
-  if (thr_mgr.spawn_n (n_readers, reader, 0, THR_NEW_LWP) == -1 ||
-      thr_mgr.spawn_n (n_writers, writer, 0, THR_NEW_LWP) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  thr_mgr.wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting main thread\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
-
diff --git a/examples/Threads/test_recursive_mutex.cpp b/examples/Threads/test_recursive_mutex.cpp
deleted file mode 100644
index 1cc2892b2a8..00000000000
--- a/examples/Threads/test_recursive_mutex.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-// This test program verifies the functionality of the ACE_OS
-// implementation of recursive mutexes on Win32 and Posix pthreads.
-
-#include "ace/Service_Config.h"
-#include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Total number of iterations.
-static size_t n_iterations = 1000;
-static size_t n_threads = 4;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-t n_threads] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "n:t:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'n':
-	n_iterations = ACE_OS::atoi (get_opt.optarg);
-	break;
-      case 't':
-	n_threads = ACE_OS::atoi (get_opt.optarg);
-	break;
-      default:
-	print_usage_and_die ();
-	break;
-      }
-}
-
-static void
-recursive_worker (size_t nesting_level, 
-		  ACE_Recursive_Thread_Mutex *rm)
-{
-  if (nesting_level < n_iterations)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%P|%t) = trying to acquire, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-      {
-	// This illustrates the use of the ACE_Guard<LOCK> with an
-	// ACE_Recursive_Thread_Mutex.
-	ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *rm);
-	ACE_DEBUG ((LM_DEBUG,
-		    "(%P|%t) = acquired, nesting = %d, thread id = %u\n",
-		    rm->get_nesting_level (), rm->get_thread_id ()));
-
-	recursive_worker (nesting_level + 1, rm);
-      }
-      ACE_DEBUG ((LM_DEBUG,
-      		  "(%P|%t) = released, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-    }
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  ACE_Recursive_Thread_Mutex *rm = (ACE_Recursive_Thread_Mutex *) arg;
-
-  recursive_worker (0, rm);
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  parse_args (argc, argv);
-  ACE_Recursive_Thread_Mutex rm;
-
-  ACE_Service_Config::thr_mgr ()->spawn_n (n_threads, 
-					   ACE_THR_FUNC (worker), 
-					   (void *) &rm);
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support process mutexes on this platform (yet)\n"), 
-		    -1);
-}
-#endif /* ACE_WIN32 */
diff --git a/examples/Threads/test_task.cpp b/examples/Threads/test_task.cpp
deleted file mode 100644
index 7cd7976d2bb..00000000000
--- a/examples/Threads/test_task.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-#include "ace/Log_Msg.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_four.cpp b/examples/Threads/test_task_four.cpp
deleted file mode 100644
index 64209cb3430..00000000000
--- a/examples/Threads/test_task_four.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// $Id$
-
-// The following test was written by Hamutal Yanay & Ari Erev's
-// (Ari_Erev@comverse.com). 
-//
-// This test program test enhancements to the thread_manager and task
-// classes.  The purpose of these enhancements was to allow the
-// thread_manager to recognize the concept of an ACE_Task and to be
-// able to group ACE_Tasks in groups.
-//
-// There are two main ACE_Tasks in this sample:
-//
-// Invoker_Task - is run from main (). It's purpose is to run a number of 
-//                ACE_Tasks of type Worker_Task. The number can be specified
-//                on the command line.
-//                After starting the tasks, the Invoker_Task groups all the tasks
-//                in one group and then uses the
-//                num_tasks_in_group () to find out if the real number of tasks
-//                that are now running (should be the same as the number of tasks
-//                started).
-//                It also, suspends and resumes all the threads in the group to
-//                test the suspend_grp () and resume_grp () methods.
-//                Then it waits for all the tasks to end.
-// Worker_Task  - ACE_Tasks that are started by the Invoker_Task.
-//                Each Worker_Task can start a number of threads.
-//                The Worker_Task threads perform some work (iteration). The number
-//                of the iterations can be specified on the command line.
-//
-// The command line syntax is:
-//
-// test_task   [num_tasks] [num_threads] [num_iterations]
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Invoker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Invoker_Task (ACE_Thread_Manager *thr_mgr,
-		int n_tasks,
-		int n_threads,
-		int n_iterations);
-  virtual int svc (void);
-  // creats <n_tasks> and wait for them to finish
-
-private:
-  int n_tasks_;
-  // Number of tasks to start.
-  int n_threads_;
-  // Number of threads per task.
-  int n_iterations_;
-  // Number of iterations per thread.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Worker_Task (ACE_Thread_Manager *thr_mgr,
-	       int n_threads,
-	       int n_iterations);  
-  virtual int svc (void);
-  // Does a small work...
-  virtual int open (void * = NULL);
-private:
-  static int workers_count_;
-  int index_;
-  int n_threads_;
-  int n_iterations_;
-
-  // = Not needed for this test.
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-int Worker_Task::workers_count_ = 1;
-
-Worker_Task::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-                          int n_threads,
-                          int n_iterations)
-  : n_threads_ (n_threads), 
-    n_iterations_ (n_iterations), 
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  index_ = workers_count_++;
-}
- 
-int 
-Worker_Task::open (void *)
-{
-  // Create worker threads.
-  int rc = this->activate (THR_NEW_LWP, n_threads_, 0, 0, -1, this);
-
-  if (rc == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-  return rc;
-}
-
-int 
-Worker_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", index_));
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in iteration %d\n", iterations));
-      ACE_OS::sleep (0);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) worker %d ends\n", index_));
-
-  return 0;
-}
-
-Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_tasks,
-			    int n_threads,
-			    int n_iterations)           
-  : n_tasks_ (n_tasks), 
-    n_threads_ (n_threads), 
-    n_iterations_ (n_iterations),
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, 1, 0, 0, -1, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Invoker_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-  Worker_Task **pTask = new Worker_Task* [n_tasks_];
-   
-  for (int task = 0; 
-       task < this->n_tasks_;
-       task++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in task %d\n", task+1));
-      pTask[task] = new Worker_Task (thr_mgr, n_threads_, n_iterations_);
-      pTask[task]->open ();  
-    }
-
-  // Set all tasks to be one group
-  ACE_DEBUG ((LM_DEBUG, " (%t) setting tasks group id\n"));
-  for (task = 0; 
-       task < this->n_tasks_;
-       task++)
-    if (thr_mgr->set_grp (pTask[task], 1) == -1)
-      ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "set_grp"));
-
-  int nTasks = thr_mgr->num_tasks_in_group (1);
-  cout << "Number of tasks in group 1: " << nTasks << endl;
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_grp"));
-
-  // Wait for 5 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (5));
-  
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming group\n"));
-  if (thr_mgr->resume_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_grp"));
-
-
-  // Wait for all the tasks to reach their exit point.
-  thr_mgr->wait ();
-
-  // Note that the ACE_Task::svc_run () method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of tasks and iterations.
-static const int DEFAULT_TASKS = 4;
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_tasks = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_TASKS;
-  int n_threads = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : DEFAULT_ITERATIONS;
-
-  // Since ACE_Thread_Manager can only wait for all threads, we'll have
-  // special manager for the Invoker_Task.
-  ACE_Thread_Manager invoker_manager;
-
-  Invoker_Task invoker (&invoker_manager, 
-			n_tasks, 
-			n_threads,
-			n_iterations); 
-
-  // Wait for 1 second and then suspend the invoker task
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending invoker task\n"));
-
-  if (invoker_manager.suspend_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_task"));
-
-  // Wait for 5 more second and then resume the invoker task.
-  ACE_OS::sleep (ACE_Time_Value (5));
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming invoker task\n"));
-  if (invoker_manager.resume_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_task"));
-
-
-  // Wait for all the threads to reach their exit point.
-  invoker_manager.wait ();
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_one.cpp b/examples/Threads/test_task_one.cpp
deleted file mode 100644
index d0a8a12e6c4..00000000000
--- a/examples/Threads/test_task_one.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp
deleted file mode 100644
index c6ad69511b5..00000000000
--- a/examples/Threads/test_task_three.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This also shows off some
-// Interesting uses of the ACE Log_Msg's ability to print to ostreams.
-// BTW, make sure that you set the out_stream in *every* thread that
-// you want to have write to the output file, i.e.:
-//
-//
-//  if (out_stream)
-//    {
-//      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-//      ACE_LOG_MSG->msg_ostream (out_stream);
-//    }
-
-#include <fstream.h>
-#include "ace/Reactor.h"
-#include "ace/Service_Config.h"
-#include "ace/Task.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-static ofstream *out_stream = 0;
-
-static const int NUM_INVOCATIONS = 100;
-static const int TASK_COUNT = 130;
-
-class Test_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Test_Task (void);
-  ~Test_Task (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  virtual int handle_input (ACE_HANDLE fd);
-
-  ACE_Reactor *r_;
-  int handled_;
-  static int current_count_;
-  static int done_cnt_;
-};
-
-int Test_Task::current_count_ = 0;
-int Test_Task::done_cnt_ = 0;
-
-static ACE_Thread_Mutex lock_;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  this->handled_ = 0;
-  Test_Task::current_count_++;
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Test_Task constructed, current_count_ = %d\n", 
-	      Test_Task::current_count_));
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  ACE_DEBUG ((LM_DEBUG, "Test_Task destroyed, current_count_ = %d\n",
-	      Test_Task::current_count_));
-}
-
-int 
-Test_Task::open (void *args)
-{
-  r_ = (ACE_Reactor *) args;
-  return ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP);
-}
-
-int 
-Test_Task::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-  Test_Task::current_count_--;
-  ACE_DEBUG ((LM_DEBUG, "Test_Task::close () current_count_ = %d.\n", 
-	      Test_Task::current_count_));
-  return 0;
-}
-
-int 
-Test_Task::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-Test_Task::svc (void)
-{
-  // Every thread must register the same stream to write to file.
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  for (int index = 0; index < NUM_INVOCATIONS; index++)
-    {
-      ACE_OS::thr_yield ();
-
-      if (r_->notify (this, ACE_Event_Handler::READ_MASK))
-	{
-	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-	  ACE_DEBUG ((LM_DEBUG, "Test_Task: error notifying reactor!\n"));
-	}
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) returning from svc ()\n"));
-  return 0;
-}
-
-int 
-Test_Task::handle_input (ACE_HANDLE)
-{
-  this->handled_++;
-
-  if (this->handled_ == NUM_INVOCATIONS)
-    {
-      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",
-		  Test_Task::done_cnt_));
-    }
-
-  ACE_OS::thr_yield ();
-  return -1;
-}
-
-static void *
-dispatch (void *arg)
-{
-  // every thread must register the same stream to write to file
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) Dispatcher Thread started!\n"));
-  ACE_Reactor *r = (ACE_Reactor *) arg;
-  int result;
-
-  r->owner (ACE_OS::thr_self ());
-
-  while (1)
-    {
-      result = r->handle_events ();
-      if (result <= 0)
-	ACE_DEBUG ((LM_DEBUG, "Dispatch: handle_events (): %d", result));
-    }
-
-  return 0;
-}
-
-extern "C" void 
-handler (int)
-{
-  *out_stream << flush;
-  out_stream->close ();
-  ACE_OS::exit (42);
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc > 1)
-    {
-      // Send output to file.
-      out_stream = new ofstream ("test_task_three.out", ios::trunc|ios::out);
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  // Register a signal handler.
-  ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT);
-
-  ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
-  ACE_Reactor *reactor2 = new ACE_Reactor ();
-
-  Test_Task t1[TASK_COUNT];
-  Test_Task t2[TASK_COUNT];
-
-  ACE_Thread::spawn (ACE_THR_FUNC (dispatch), reactor2);
-
-  reactor1->owner (ACE_OS::thr_self ());
-
-  for (int index = 0; index < TASK_COUNT; index++)
-    {
-      t1[index].open (reactor1);
-      t2[index].open (reactor2);
-    }
-
-  ACE_OS::sleep (3);
-
-  for (;;)
-    {
-      ACE_Time_Value timeout (2);
-
-      if (reactor1->handle_events (timeout) <= 0)
-	{
-	  if (errno == ETIME)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "no activity within 2 seconds, shutting down\n"));
-	      break;
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "%p error handling events\n", "main"));
-	}
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_two.cpp b/examples/Threads/test_task_two.cpp
deleted file mode 100644
index 9f25962c795..00000000000
--- a/examples/Threads/test_task_two.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This test can spawn off
-// zillions of tasks and then wait for them using both polling and the
-// ACE Thread Manager.
-
-#include "ace/Task.h"
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-static u_long zero = 0;
-static ATOMIC_INT task_count (zero);
-static ATOMIC_INT max_count (zero);
-static ATOMIC_INT wait_count (zero);
-
-static u_long n_threads = 0;
-
-// Default number of tasks.
-static const int default_threads = ACE_DEFAULT_THREADS;
-
-// Default number of times to run the test.
-static const int default_iterations = 1000;
-
-class Task_Test : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-private:
-  static ACE_Thread_Mutex lock_;
-};
-
-ACE_Thread_Mutex Task_Test::lock_;
-
-int 
-Task_Test::open (void *)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) creating Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-
-  return this->activate (THR_BOUND);
-}
-
-int 
-Task_Test::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count--;
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-  wait_count--;
-// delete this;
-  return 0;
-}
-
-int 
-Task_Test::put (ACE_Message_Block *,
-		ACE_Time_Value *)
-{
-  return 0;
-}
-
-int 
-Task_Test::svc (void)
-{
-  wait_count++;
-  max_count++;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: waiting\n"));
-
-  for (;;)
-    if (max_count >= n_threads)
-      break;
-    else
-      ACE_Thread::yield ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: finished waiting\n"));
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : default_threads;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : default_iterations;
-
-  Task_Test **task_array = new Task_Test *[n_threads];
-
-  for (int i = 1; i <= n_iterations; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration = %d, max_count %d\n", 
-		  i, (u_long) max_count));
-      max_count = 0;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) starting %d task%s\n", 
-		  n_threads, n_threads == 1 ? "" : "s"));
-
-      // Launch the new tasks.
-      for (int j = 0; j < n_threads; j++)
-	{
-	  task_array[j] = new Task_Test;
-	  // Activate the task, i.e., make it an active object.
-	  task_array[j]->open ();
-	}
-
-      // Wait for initialization to kick in.
-      while (max_count == 0)
-	ACE_Thread::yield ();
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t) waiting for threads to finish\n"));
-
-      // Wait for the threads to finish this iteration.
-      while (max_count != n_threads && wait_count != 0)
-	ACE_Thread::yield ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d finished, max_count %d, wait_count %d, waiting for tasks to exit\n",
-		  i, (u_long) max_count, (u_long) wait_count));
-
-      // Wait for all the tasks to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-
-      // Delete the existing tasks.
-      for (int k = 0; k < n_threads; k++)
-	delete task_array[k];
-    }
-
-  delete [] task_array;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the test\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_manager.cpp b/examples/Threads/test_thread_manager.cpp
deleted file mode 100644
index 73029d70d88..00000000000
--- a/examples/Threads/test_thread_manager.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-// Test out the group management mechanisms provided by the
-// ACE_Thread_Manager, including the group signal handling, group
-// suspension and resumption, and cooperative thread cancellation
-// mechanisms.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-extern "C" void
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) received signal %d\n", signum));
-}
-
-static void *
-worker (int iterations)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 1000) == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) checking cancellation before iteration %d!\n", 
-		      i));
-	
-	  if (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) has been cancelled before iteration %d!\n", 
-			  i));
-	      break;
-	    }
-	}
-    }
-
-  // Destructor removes thread from Thread_Manager.
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, "(%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "suspend_grp"));
-
-  // Wait for 1 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) resuming group\n"));
-  if (thr_mgr->resume_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "resume_grp"));
-
-  // Wait for 1 more second and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) signaling group\n"));
-  if (thr_mgr->kill_grp (grp_id, SIGINT) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "kill_grp"));
-
-  // Wait for 1 more second and then cancel all the threads.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) cancelling group\n"));
-  if (thr_mgr->cancel_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "cancel_grp"));
-
-  // Perform a barrier wait until all the threads have shut down.
-  thr_mgr->wait ();
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_pool.cpp b/examples/Threads/test_thread_pool.cpp
deleted file mode 100644
index 68741156b83..00000000000
--- a/examples/Threads/test_thread_pool.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// This test program illustrates how the ACE task synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  If the manual flag is not set input comes from
-// stdin until the user enters a return only.  This stops all workers
-// via a message block of length 0. This is an alternative shutdown of
-// workers compared to queue deactivate.
-//
-// This code is original based on a test program written by Karlheinz
-// Dorn.  It was modified to utilize more "ACE" features by Doug Schmidt.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Number of iterations to run the test.
-static size_t n_iterations = 100;
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Thread_Pool (ACE_Thread_Manager *thr_mgr, int n_threads);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-  // This allows the producer to pass messages to the <Thread_Pool>.
-
-private:
-  virtual int close (u_long);
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-};
-
-int 
-Thread_Pool::close (u_long) 
-{ 
-  ACE_DEBUG ((LM_DEBUG, "(%t) close of worker\n"));
-  return 0;
-}
-
-Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, 
-			  int n_threads) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Simply enqueue the Message_Block into the end of the queue.
-
-int
-Thread_Pool::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  return this->putq (mb, tv); 
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Thread_Pool::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  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.
-
-  for (;; count++)
-    {       
-      ACE_Message_Block *mb;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d before getq ()\n", count));
-
-      if (this->getq (mb) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d, got result -1, exiting\n", count));
-	    break;
-	}
-
-      int length = mb->length ();
-
-      if (length > 0)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "(%t) in iteration %d, length = %d, text = \"%*s\"\n",
-		    count, length, length - 1, mb->rd_ptr ()));
-
-      // We're responsible for deallocating this.
-      delete mb;
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) in iteration %d, got NULL message, exiting\n",
-		      count));
-	  break;
-	}
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-  return 0;
-}
-
-static void 
-produce (Thread_Pool &thread_pool)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) producer start, dumping the Thread_Pool\n"));
-  thread_pool.dump ();
-
-  for (int n;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-#if defined (manual)
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) press chars and enter to put a new message into task queue..."));
-      n = ACE_OS::read (ACE_STDIN, mb->rd_ptr (), mb->size ());
-#else // Automatically generate messages.
-      static int count = 0;
-
-      ACE_OS::sprintf (mb->rd_ptr (), "%d\n", count);
-
-      n = ACE_OS::strlen (mb->rd_ptr ());
-
-      if (count == n_iterations)
-	n = 1; // Indicate that we need to shut down.
-      else
-	count++;
-
-      if (count == 0 || (count % 20 == 0))
-	ACE_OS::sleep (1);
-#endif /* manual */
-      if (n > 1)
-        {
-	  // Send a normal message to the waiting threads and continue
-	  // producing.
-	  mb->wr_ptr (n);
-
-	  // Pass the message to the Thread_Pool.
-	  if (thread_pool.put (mb) == -1)
-            ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	}
-      else
-	{
-          // Send a shutdown message to the waiting threads and exit.
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) start loop, dump of task:\n"));
-	  thread_pool.dump ();
-
-	  for (int i = thread_pool.thr_count (); i > 0; i--)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) EOF, enqueueing NULL block for thread = %d\n", 
-			  i));
-
-	      // Enqueue a NULL message to flag each consumer to
-	      // shutdown.
-	      if (thread_pool.put (new ACE_Message_Block) == -1)
-		ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	    }
-
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) end loop, dump of task:\n"));
-	  thread_pool.dump ();
-          break;
-	}
-    }
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : n_iterations;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) argc = %d, threads = %d\n", 
-	      argc, n_threads));
-
-  // Create the worker tasks.
-  Thread_Pool thread_pool (ACE_Service_Config::thr_mgr (), 
-			   n_threads);
-
-  // Create work for the worker tasks to process in their own threads.
-  produce (thread_pool);
-
-  // Wait for all the threads to reach their exit point.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting with thread manager...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying worker tasks and exiting...\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_specific.cpp b/examples/Threads/test_thread_specific.cpp
deleted file mode 100644
index f7a4f6dccf3..00000000000
--- a/examples/Threads/test_thread_specific.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "ace/Service_Config.h"
-// $Id$
-
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Define a class that will be stored in thread-specific data.  Note
-// that as far as this class is concerned it's just a regular C++
-// class.  The ACE_TSS wrapper transparently ensures that
-// objects of this class will be placed in thread-specific storage.
-// All calls on ACE_TSS::operator->() are delegated to the
-// appropriate method in the Errno class.
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) 
-  { 
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1);
-
-    return Errno::flags_;
-  }
-
-  void flags (int f)
-  {
-    ACE_GUARD (ACE_Thread_Mutex, ace_mon, Errno::lock_);
-
-    Errno::flags_ = f;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-static void 
-cleanup (void *ptr)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) in cleanup, ptr = %x\n", ptr));
-
-  delete ptr;
-}
-
-// This worker function is the entry point for each thread.
-
-static void *
-worker (void *c)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int count = int (c);
-
-  ACE_thread_key_t key = 0;
-  int *ip = 0;
-
-  // Make one key that will be available when the thread exits so that
-  // we'll have something to cleanup!
-
-  if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-  ip = new int;
-
-  if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-  for (int i = 0; i < count; i++)
-    {
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 1, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-
-      // Cause an error.
-      ACE_OS::read (ACE_INVALID_HANDLE, 0, 0);
-
-      // The following two lines set the thread-specific state.
-      TSS_Error->error (errno);
-      TSS_Error->line (__LINE__);
-
-      // This sets the static state (note how C++ makes it easy to do
-      // both).
-      TSS_Error->flags (count);
-
-      {
-	// Use the guard to serialize access to cout...
-	ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock, 0);
-
-	cout << "(" << ACE_Thread::self ()
-	     << ") errno = "  << TSS_Error->error () 
-	     << ", lineno = " << TSS_Error->line ()
-	     << ", flags = " << TSS_Error->flags () 
-	     << endl;
-      }
-      key = 0;
-
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 2, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting\n"));
-  return 0;
-}
-
-extern "C" void 
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal = %S\n", signum));
-  ACE_Service_Config::thr_mgr ()->exit (0);
-}
-
-int 
-main (int argc, char *argv[])
-{
-  // The Service_Config must be the first object defined in main...
-  ACE_Service_Config daemon (argv[0]);
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int threads = argc > 1 ? ACE_OS::atoi (argv[1]) : 4;
-  int count = argc > 2 ? ACE_OS::atoi (argv[2]) : 10000;
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) (handler), SIGINT);
-
-#if defined (ACE_HAS_THREADS)
-  if (ACE_Service_Config::thr_mgr ()->spawn_n (threads, 
-					       ACE_THR_FUNC (&worker), 
-					       (void *) count,
-					       THR_BOUND | THR_DETACHED) == -1)
-    ACE_OS::perror ("ACE_Thread_Manager::spawn_n");
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-#else
-  worker ((void *) count);
-#endif /* ACE_HAS_THREADS */
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_token.cpp b/examples/Threads/test_token.cpp
deleted file mode 100644
index 5a51496d011..00000000000
--- a/examples/Threads/test_token.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Test out the ACE Token class.
-// $Id$
-
-#include "ace/Token.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class My_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  My_Task (int n);
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-  virtual int svc (void);
-
-  static void sleep_hook (void *);
-
-private:
-  ACE_Token token_;
-};
-
-My_Task::My_Task (int n)
-{
-  // Make this Task into an Active Object.
-  this->activate (THR_BOUND | THR_DETACHED, n);
-
-  // Wait for all the threads to exit.
-  this->thr_mgr ()->wait ();
-}
-
-void 
-My_Task::sleep_hook (void *)
-{
-  cerr << '(' << ACE_Thread::self () << ')'
-       << " blocking, My_Task::sleep_hook () called" << endl;
-}
-
-// Test out the behavior of the ACE_Token class.
-
-int 
-My_Task::svc (void)
-{
-  for (int i = 0; i < 10000; i++)
-    {
-      // Wait for up to 1 millisecond past the current time to get the token.
-      ACE_Time_Value timeout (ACE_OS::time (0), 1000);
-
-      if (this->token_.acquire (&My_Task::sleep_hook, 0, &timeout) == 1)
-	{
-	  this->token_.acquire ();
-	  this->token_.renew ();
-	  this->token_.release ();
-	  this->token_.release ();
-	}
-      else
-	ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  My_Task tasks (argc > 1 ? atoi (argv[1]) : 4);
-
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "your platform doesn't support threads\n"), -1);
-}
-#endif /* */
diff --git a/examples/Threads/test_tss.cpp b/examples/Threads/test_tss.cpp
deleted file mode 100644
index c81ca41c429..00000000000
--- a/examples/Threads/test_tss.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// Torture test ACE thread-specific storage...
-// $Id$
-
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int        count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void* svc (void *arg);
-
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-int Test_Task::open (void *arg)
-{
-
-  ACE_Thread::spawn (Test_Task::svc, arg);
-
-  return 0;
-}
-
-
-void * 
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss1.cpp b/examples/Threads/test_tss1.cpp
deleted file mode 100644
index 7efdc9dc3ef..00000000000
--- a/examples/Threads/test_tss1.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Detlef Becker
-// 
-// ============================================================================
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static int iterations = 100;
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) { 
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, Errno::lock_, -1));
-
-    return Errno::flags_;
-  }
-  int flags (int f)
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1));
-
-    Errno::flags_ = f;
-    return 0;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-// Keeps track of whether Tester::close () has started.
-static int close_started = 0;
-
-template <ACE_SYNCH_1>
-class Tester: public ACE_Task<ACE_SYNCH_2>
-{
-public:
-  Tester (void) {}
-  ~Tester (void) {}
-
-  virtual int open (void *theArgs = 0);
-  virtual int close (u_long theArg = 0);
-  virtual int put (ACE_Message_Block *theMsgBlock,
-		   ACE_Time_Value *theTimeVal = 0);
-  virtual int svc (void);
-};
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::open (void *)
-{
-  return this->activate ();
-}
-
-template <ACE_SYNCH_1>
-int Tester<ACE_SYNCH_2>::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "close running\n!"));
-  close_started = 1;
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!\n"));
-  TSS_Error->error (7);
-  ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!\n"));
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::svc (void)
-{
-  return 0;
-}
-
-int 
-main (int, char *[])
-{
-  Tester<ACE_MT_SYNCH> tester;
-
-  tester.open ();
-
-  while (!close_started)
-    continue;
-
-  ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!\n"));
-
-  TSS_Error->error (3);
-
-  ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss2.cpp b/examples/Threads/test_tss2.cpp
deleted file mode 100644
index 24a8d958e91..00000000000
--- a/examples/Threads/test_tss2.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void *svc (void *arg);
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-void *
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-Test_Task::open (void *arg)
-{
-  if (ACE_Thread::spawn (Test_Task::svc, arg) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread::spawn"), 0);
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile
index 4d2f103d0d5..96bf4c5a465 100644
--- a/examples/Timer_Queue/Makefile
+++ b/examples/Timer_Queue/Makefile
@@ -60,12 +60,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -81,7 +84,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -133,8 +135,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -188,12 +188,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -209,7 +212,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -278,8 +280,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -330,12 +330,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -355,7 +358,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -395,8 +397,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -455,12 +455,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -486,7 +489,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -526,8 +528,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -583,12 +583,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -614,7 +617,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -654,8 +656,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -712,12 +712,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -743,7 +746,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -783,8 +785,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -841,12 +841,15 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -872,7 +875,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -912,8 +914,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
index 564b075fa8d..9e7d4684b1a 100644
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ b/examples/Web_Crawler/URL_Visitor.cpp
@@ -550,9 +550,9 @@ template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
 template class ACE_NOOP_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
 template class ACE_NOOP_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
 
-template class ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >;
+template class ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >;
 template class ACE_Cached_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX >;
-template class ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int, ACE_SYNCH_NULL_MUTEX >;
+template class ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int, ACE_SYNCH_NULL_MUTEX >;
 template class ACE_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
 template class ACE_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
 template class ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>;
@@ -574,10 +574,10 @@ template class ACE_Hash_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr
 template class ACE_Hash_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Null_Mutex>;
 
-template class ACE_Hash_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>,ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   > , int  > ;
-template class ACE_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  >;
-template class ACE_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> ,ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > ;
-template class ACE_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>  , ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > ;
+template class ACE_Hash_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   > , int  > ;
+template class ACE_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  >;
+template class ACE_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> ,ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > ;
+template class ACE_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>  , ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > ;
 template class ACE_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *,int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>   >;
 
 template class ACE_Recycling_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > ;
@@ -586,7 +586,8 @@ template class ACE_Connector<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, A
 template class ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
 template class ACE_Default_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >;
 template class ACE_Svc_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >;
-template class ACE_Pair_Caching_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>,ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>;
+template class ACE_Caching_Strategy_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>;
+template class ACE_Svc_Caching_Strategy_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>;
 
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *>;
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *, ACE_SYNCH_RW_MUTEX>;
@@ -615,9 +616,9 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handle
 #pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
 #pragma instantiate ACE_NOOP_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
 #pragma instantiate ACE_NOOP_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
-#pragma instantiate ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >
+#pragma instantiate ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >
 #pragma instantiate ACE_Cached_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX >
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >,int, ACE_SYNCH_NULL_MUTEX >
+#pragma instantiate ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >,int, ACE_SYNCH_NULL_MUTEX >
 #pragma instantiate ACE_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
 #pragma instantiate ACE_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
 #pragma instantiate ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>
@@ -639,10 +640,10 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handle
 #pragma instantiate ACE_Hash_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Null_Mutex>
 
-#pragma instantiate ACE_Hash_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   > , int  >  >
-#pragma instantiate ACE_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  >
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> ,ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > 
-#pragma instantiate ACE_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>  , ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Pair_Caching_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > 
+#pragma instantiate ACE_Hash_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   > , int  >  >
+#pragma instantiate ACE_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  >
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> ,ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > 
+#pragma instantiate ACE_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>  , ACE_LRU_Caching_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int , ACE_Svc_Caching_Strategy_Utility <ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int  >   >, int  > 
 
 #pragma instantiate ACE_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *,int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>   >
 #pragma instantiate ACE_Recycling_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > 
@@ -650,7 +651,8 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handle
 #pragma instantiate ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>  >
 #pragma instantiate ACE_Default_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >
 #pragma instantiate ACE_Svc_Cleanup_Strategy<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >
-#pragma instantiate ACE_Pair_Caching_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>,ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>
+#pragma instantiate ACE_Caching_Strategy_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>
+#pragma instantiate ACE_Svc_Caching_Strategy_Utility<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>,ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>, int>
 #pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > * >
 #pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *, ACE_SYNCH_RW_MUTEX>
diff --git a/examples/Web_Crawler/URL_Visitor.h b/examples/Web_Crawler/URL_Visitor.h
index 908ea386456..2ae8bb8dfe4 100644
--- a/examples/Web_Crawler/URL_Visitor.h
+++ b/examples/Web_Crawler/URL_Visitor.h
@@ -285,14 +285,14 @@ public:
                                   ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
                                   ACE_Null_Mutex> 
           CONNECTION_HASH_MAP_REVERSE_ITERATOR;
-  typedef ACE_Pair_Caching_Utility <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, \
+  typedef ACE_Svc_Caching_Strategy_Utility <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, \
                                             ACE_Pair<Svc_Handler *, int>, \
-                                            CONNECTION_HASH_MAP, CONNECTION_HASH_MAP_ITERATOR, int > 
-          CACHING_STRATEGY_UTILITY;
+                                            CONNECTION_HASH_MAP,int > 
+          SVC_CACHING_STRATEGY_UTILITY;
   typedef ACE_LRU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
                                    ACE_Pair<Svc_Handler *, int>,\
                                    CONNECTION_HASH_MAP, int,\
-                                   CACHING_STRATEGY_UTILITY >
+                                   SVC_CACHING_STRATEGY_UTILITY >
           LRU;
   typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler,ACE_SOCK_CONNECTOR, LRU,int, ACE_SYNCH_NULL_MUTEX>
           CACHED_CONNECT_STRATEGY;
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
deleted file mode 100644
index 1a5f061fe48..00000000000
--- a/include/makeinclude/ace_flags.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Flags specific for compiling ACE library and applications
-# with Borland C++Builder
-#
-
-#
-# Compiler flags
-#
-!ifdef STATIC
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=0
-TAO_BUILD_CFLAGS =
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=0
-ORBSVCS_BUILD_CFLAGS =
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=0
-!else
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=1
-TAO_BUILD_CFLAGS = -DTAO_BUILD_DLL
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=1
-ORBSVCS_BUILD_CFLAGS = -DTAO_ORBSVCS_BUILD_DLL=1
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=1
-!endif
-
-#
-# Libraries
-#
-ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
-NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
-TAO_LIB = $(CORE_BINDIR)\tao$(LIB_DECORATOR).lib
-ORBSVCS_LIB = $(CORE_BINDIR)\orbsvcs$(LIB_DECORATOR).lib
-
diff --git a/include/makeinclude/build_core_exe.bor b/include/makeinclude/build_core_exe.bor
deleted file mode 100644
index 2fa7fdbac92..00000000000
--- a/include/makeinclude/build_core_exe.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# 
-# Makefile for building a core executable. A core executable
-# is one that would be part of an ACE/TAO distribution. That
-# is, you would pick it up and take it to another computer.
-#
-
-BINDIR = $(CORE_BINDIR)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/include/makeinclude/build_core_library.bor b/include/makeinclude/build_core_library.bor
deleted file mode 100644
index c1513abb0c3..00000000000
--- a/include/makeinclude/build_core_library.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# 
-# Makefile for building a core library. A core library
-# is one that would be part of an ACE/TAO distribution. That
-# is, you would pick it up and take it to another computer.
-#
-
-BINDIR = $(CORE_BINDIR)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
deleted file mode 100644
index 93be29d69e7..00000000000
--- a/include/makeinclude/build_dll.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Rules for linking a dll
-# 
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# 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
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll
-
-$(TARGET): $(OBJFILES)
-	@$(MAKE_BINDIR)
-	$(LD) @&&!
-	$(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) +
-	$(DLL_STARTUP_OBJ) $(OBJFILES), +
-	$(TARGET),, +
-	$(COMMON_LIBS) $(LIBFILES)
-!
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
-	@$(MAKE_OBJDIR)
-	$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-
-.autodepend
-
diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor
deleted file mode 100644
index f13206e186d..00000000000
--- a/include/makeinclude/build_example.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# Makefile for building the example executables
-#
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
deleted file mode 100644
index d407aaec077..00000000000
--- a/include/makeinclude/build_exe.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# Rules for building an executable
-#
-# Inputs:
-# ~~~~~~~ 
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
-# 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
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME).exe
-
-$(TARGET): $(OBJFILES)
-	@$(MAKE_BINDIR)
-	$(LD) @&&!
-	$(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) +
-	$(EXE_STARTUP_OBJ) $(OBJFILES), +
-	$(TARGET),, +
-	$(COMMON_LIBS) $(LIBFILES)
-!
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
-	@$(MAKE_OBJDIR)
-	$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-
-.autodepend
-
-
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
deleted file mode 100644
index 23b232eb21c..00000000000
--- a/include/makeinclude/build_lib.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Rules for building a static library
-# 
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# 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
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib
-
-$(TARGET): $(OBJFILES)
-	@$(MAKE_BINDIR)
-	$(AR) $(LIB_LFLAGS) $(TARGET) @&&!
-	+-$(**: = &^
-	+-)
-!       
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
-	@$(MAKE_OBJDIR)
-	$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-        
-.autodepend
-
diff --git a/include/makeinclude/build_library.bor b/include/makeinclude/build_library.bor
deleted file mode 100644
index 4fca252a364..00000000000
--- a/include/makeinclude/build_library.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile rules for building a static or dynamic library
-# 
-
-!ifdef STATIC
-!include <$(ACE_ROOT)\include\makeinclude\build_lib.bor>
-!else
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
-!endif
-
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
deleted file mode 100644
index 664cee6b4a1..00000000000
--- a/include/makeinclude/compiler.bor
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Defines specific to a particular version of the compiler
-# 
-# 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
-#
-# Outputs:
-# ~~~~~~~~
-# CC - name of compiler
-# LD - name of linker
-# COMMON_CFLAGS - compiler flags for all targets
-# COMMON_LFLAGS - linker flags for all targets
-# COMMON_LIBS - linker library files for all targets
-# DLL_CFLAGS - compiler flags specific to DLL targets
-# DLL_LFLAGS - linker flags specific to DLL targets
-# DLL_STARTUP_OBJ - start-up object files for DLL targets
-# EXE_CFLAGS - compiler flags specific to EXE targets
-# EXE_LFLAGS - linker flags specific to EXE targets
-# EXE_STARTUP_OBJ - start-up object files for EXE targets
-# LIB_CFLAGS - compiler flags specific to static lib targets
-# LIB_LFLAGS - flags specific to static lib targets (passed to
-#              librarian)
-#
-
-
-!include <$(ACE_ROOT)\include\makeinclude\ace_flags.bor>
-
-#
-# BCB4 Settings (all we have for now)
-#
-
-CC = bcc32
-LD = ilink32
-AR = tlib
-
-#
-# Common flags
-#
-
-!ifdef DEBUG
-DEBUG_CFLAGS = -v -y -Od -r- -vi- -k
-DEBUG_LFLAGS = -v
-!else
-DEBUG_CFLAGS = -O2 -DNDEBUG
-DEBUG_LFLAGS =
-!endif
-
-!ifdef STATIC
-STATIC_CFLAGS =
-STATIC_LFLAGS =
-!else
-STATIC_CFLAGS = -tWR
-STATIC_LFLAGS =
-!endif
-
-THREAD_CFLAGS = -D_MT -tWM
-WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia
-DEFINES_CFLAGS = -DWIN32;_NO_VCL
-QUIET_CFLAGS = -q
-MISC_CFLAGS = -a8
-
-COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
-	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
-	$(MISC_CFLAGS)
-
-COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
-
-#
-# DLL specific flags
-#
-
-DLL_CFLAGS = -tWD
-DLL_LFLAGS = -Tpd -Gi
-!ifdef PASCAL
-DLL_STARTUP_OBJ = c0d32.obj sysinit.obj
-!else
-DLL_STARTUP_OBJ = c0d32.obj
-!endif
-
-#
-# EXE specific flags
-#
-
-EXE_CFLAGS =
-EXE_LFLAGS = -Tpe
-!ifdef PASCAL
-EXE_STARTUP_OBJ = c0x32.obj sysinit.obj
-!else
-EXE_STARTUP_OBJ = c0x32.obj
-!endif
-
-#
-# Static lib specific flags
-#
-
-LIB_CFLAGS =
-!ifdef DEBUG
-LIB_LFLAGS = /C /P2048
-!else
-LIB_LFLAGS = /C /P512
-!endif
-
-#
-# Libraries to be linked
-#
-
-!ifdef STATIC
-!ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.lib cp32mt.lib ws2_32.lib
-!else
-COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib
-!endif
-!else
-!ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.bpi cp32mti.lib ws2_32.lib
-!else
-COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib
-!endif
-!endif
-
diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor
deleted file mode 100644
index 0b20bcbdeb5..00000000000
--- a/include/makeinclude/decorator.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Creates a suffix for decorating output file names
-#
-# Inputs: 
-# ~~~~~~~ 
-# DEBUG - defined if building a debug library/executable
-# STATIC - defined if building a static library 
-# PASCAL - defined if linking against cp32*
-#
-# Outputs:
-# ~~~~~~~~
-# LIB_DECORATOR - suffix to be added to library output file name
-# EXE_DECORATOR - suffix to be added to executable output file name
-#    
-     
-DECO_PREFIX=
-
-# If you want decoration for Borland, set this to something like "B"
-# otherwise, make it blank
-BORLAND_DECO=b
-
-!ifdef BORLAND_DECO
-DECO_PREFIX=_
-!endif
-
-!ifdef PASCAL
-DECO_PREFIX=_
-PASCAL_DECO=p
-!endif
-     
-!ifdef STATIC
-DECO_PREFIX=_
-STATIC_DECO=s
-!endif
-     
-!ifdef DEBUG
-DECO_PREFIX=_
-DEBUG_DECO=d
-!endif
-     
-LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
-
-!ifdef NO_EXE_DECORATION
-EXE_DECORATOR=
-!else
-EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
-!endif
-
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
deleted file mode 100644
index e6fe899eb9e..00000000000
--- a/include/makeinclude/make_flags.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile flags for recursive invocations of make
-#
-
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
deleted file mode 100644
index fa9e1d49898..00000000000
--- a/include/makeinclude/outputdir.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Creates output object and binary file directories
-#
-# Inputs: 
-# ~~~~~~~ 
-# NAME - undecorated name of target
-# DEBUG - defined if building a debug library/executable
-# STATIC - defined if building a static library
-#
-# Outputs:
-# ~~~~~~~~
-# BINDIR - name of directory where binaries are placed
-# MAKE_BINDIR - command to be used for creating BINDIR
-# OBJDIR - name of directory where object fils are placed
-# MAKE_OBJDIR - command to be used for creating OBJDIR
-#
-     
-!ifdef STATIC
-STATIC_DIR=Static
-!else
-STATIC_DIR=Dynamic
-!endif 
-
-!ifdef DEBUG
-DEBUG_DIR=Debug
-!else
-DEBUG_DIR=Release
-!endif
-
-!ifdef PASCAL
-PASCAL_DIR=Pascal
-!else
-PASCAL_DIR=.
-!endif
-     
-# By default binaries are built underneath the current build directory
-!ifndef BASE_BINDIR
-BASE_BINDIR=.
-!endif
-
-# By default object files are built underneath the current build directory
-!ifndef BASE_OBJDIR
-BASE_OBJDIR=.\obj
-!endif
-
-!ifndef BINDIR
-BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
-!endif
-
-!ifndef CORE_BINDIR
-CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
-!endif
-
-MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
-
-OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)
-
-MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)"
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index ae31b487da6..30ae0b98208 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -72,4 +72,5 @@ OCCFLAGS    += -qarch=com
 RANLIB	    = ranlib
 SOFLAGS	    = -p 0
 TEMPINCDIR  = tempinc
+TMPL_OBJS := $(TEMPINCDIR)/*.o
 SOBUILD = 
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index c1bfbd40fad..3a9103b56e6 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -12,15 +12,15 @@ optimize = 1
 debug = 1
 
 CC              = gcc
-CXX             = g++
-CFLAGS          += -W -Wall -Wpointer-arith -pipe
+CXX		= g++
+CFLAGS          += -Wall -Wpointer-arith -pipe
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 DCFLAGS         += -g
 ifeq ($(VERSION),3)
-  LDFLAGS       += -Wl,-rpath $(ACE_ROOT)/ace
+  LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
 endif
 DLD             = $(CXX)
-LD              = $(CXX)
+LD		= $(CXX)
 LIBS            += -lstdc++
 OCFLAGS         += -O2
 PIC             = -fpic
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 61dadd2578a..4f935dc6558 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -26,13 +26,9 @@ HPUX_VERS	:= $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 #
 CC		= /bin/cc
 CXX		= /opt/aCC/bin/aCC
-# CPP_LOCATION is for TAO builds - says where the C preprocessor is
-CPP_LOCATION    = /usr/ccs/lbin/cpp
 #
 # Set the appropriate preprocessor defs for threading based on OS version.
-# If the user has requested building without threads, then don't set any
-# for 10.20, but for 11.00, the default is to use threads, so explicitly
-# turn them off if the user requested build without threads.
+# If the user has requested building without threads, then don't set any.
 #
 ifeq ($(threads),1)
 ifeq ($(word 2,$(HPVERS_WORDS)), 11)
@@ -40,14 +36,11 @@ THR_DEFS	= -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
 else
 THR_DEFS	= -DACE_HAS_THREADS -D_REENTRANT
 endif
-else
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-THR_DEFS	= -DACE_HAS_THREADS=0
-endif
 endif
-
+#
+# Suppress warning 829 (string literal to char * is deprecated)
 # Suppress warning 302 ((...) parameter list is a non-portable feature)
-CCFLAGS		+= $(CFLAGS) $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE +W302
+CCFLAGS		+= $(CFLAGS) $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE +W829,302
 # Additionally, on HP-UX 10.20, suppress 495 to shut up the warnings from
 # the system header files.  667 is also suppressed, but the compiler still
 # tells you there was a future error, but at least you can pick out any real
@@ -64,7 +57,7 @@ PIC		= +Z
 AR		= $(COMPILE.cc) +inst_close $^; /bin/ar
 ARFLAGS		= ruv
 RANLIB		= echo
-LDFLAGS		= -Wl,+s -z
+LDFLAGS		= -Wl,+s
 SOFLAGS		= -b
 
 ifeq ($(distrib),1)
@@ -86,13 +79,10 @@ SOEXT		= sl
 
 ifeq ($(buildbits),32)
 CCFLAGS		+= +DA1.1 +DS1.1
-else
+endif
 ifeq ($(buildbits),64)
 CCFLAGS		+= +DA2.0 +DS2.0
 LDFLAGS		+= -Wl,+vnocompatwarnings
-else
-CCFLAGS         += +DAportable
-endif
 endif
 
 #
diff --git a/include/makeinclude/platform_irix6.x_sgic++.GNU b/include/makeinclude/platform_irix6.x_sgic++.GNU
index bdc9b10fbee..d3edb63bdf7 100644
--- a/include/makeinclude/platform_irix6.x_sgic++.GNU
+++ b/include/makeinclude/platform_irix6.x_sgic++.GNU
@@ -24,7 +24,7 @@ LD		= $(CXX)
 
 # In Irix 6.2 w/o the thread patches this macro should have no effect.
 CPPFLAGS	+= -D_SGI_MP_SOURCE
-OCCFLAGS	+= -O -OPT:Olimit=0
+OCCFLAGS	+= -O
 DCCFLAGS	+= -g
 
 # Enable exceptions even in the o32 bit ABI.
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 5c59e55f48e..f50bb19ba6b 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -8,7 +8,7 @@ optimize = 1
 
 CC      = gcc
 CXX     = g++
-CFLAGS  += -W -Wall -Wpointer-arith -pipe
+CFLAGS  += -Wall -Wpointer-arith -pipe
 CCFLAGS += $(CFLAGS) -fno-implicit-templates
 DCFLAGS += -g
 DLD     = $(CXX)
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 553b1ecc0cf..bd1f539f4bd 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -43,7 +43,7 @@ endif
 
 CC      = gcc
 CXX     = g++
-CFLAGS  += -W -Wall -pipe \
+CFLAGS  += -Wall -pipe \
            -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
            $(PLATFORM_AIO_SUPPORT)
 CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 553b1ecc0cf..bd1f539f4bd 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -43,7 +43,7 @@ endif
 
 CC      = gcc
 CXX     = g++
-CFLAGS  += -W -Wall -pipe \
+CFLAGS  += -Wall -pipe \
            -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
            $(PLATFORM_AIO_SUPPORT)
 CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index 0bef1ac4e2b..51cef29f007 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -13,21 +13,42 @@ CXX             = $(CC)
 ####       instead, change "-pthread" to "-threads".
 CFLAGS          += -pthread
 
+ifndef CXX_VERSION
+  CXX_VERSION := $(shell $(CXX) -V)
+endif # ! CXX_VERSION
+
+CXX_1016 =
+CXX_1136 =
+
+ifneq (,$(optimize))
+  CXX_1016 = ,1016
+endif # optimize
+
+#### 6.1-029 and later support msg 1136.  We disable it by default.
+ifneq (6.0-,$(findstring 6.0-,$(CXX_VERSION)))
+ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION)))
+  ifeq (6.1-029,$(findstring 6.1-029,$(CXX_VERSION)))
+    CXX_1136 = ,1136
+  endif # 6.1-029
+else  # 6.2 or later
+  CXX_1136 = ,1136
+endif # 6.2 or later
+endif # ! 6.0
+
 #### These flags can only be used with cxx Version 6.0 and later.
 #### They are enabled by default; they can be disabled by settting
 #### CXX_VER to CXX_5 either on the make command line, or by
 #### or by setting the CXX_VER environment variable to CXX_5.
+# WARNING_FLAGS +=
+#  193: zero used for undefined preprocessing identifier
+#  236: controlling expression is constant
+#  401: base_class_with_nonvirtual_dtor
+#  835: unreferenced_function_param
+# 1016: expected type is incompatible with declared type of int (in bzero ())
+# 1136: conversion to integral type of smaller size could lose data
 ifneq ($(CXX_VER),CXX_5)
-  WARNING_FLAGS += -w0
-  ifneq (,$(VERBOSE_WARNING))
-    WARNING_FLAGS += -msg_display_number -msg_display_tag
-  endif # VERBOSE_WARNING
-
-  ifneq (,$(optimize))
-    #### See ace/config-osf1-4.0.h for the meaning of this warning.
-    #### It's not necessary on DU 5.0.
-    WARNING_FLAGS += -msg_disable 1016
-  endif # optimize
+  WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag
+  WARNING_FLAGS += -msg_disable 193,236,401,835$(CXX_1016)$(CXX_1136)
 
   ifndef ACE_DU_VERSION
     # In case this file wasn't included by platform_osf1_cxx.GNU:
@@ -63,10 +84,6 @@ ifndef exceptions
   #### Disable the default exception handling of cxx >= 6.0.
   #### This is untested.  exceptions=1 is the default, so it's not used
   #### by default.
-  ifndef CXX_VERSION
-    CXX_VERSION := $(shell $(CXX) -V)
-  endif # ! CXX_VERSION
-
   ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
     CCFLAGS += -nocleanup
   endif # 6.x
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
index 285499f3454..3b1c6fc7fd3 100644
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ b/include/makeinclude/platform_osf1_cxx.GNU
@@ -9,22 +9,27 @@ endif # ACE_DU_VERSION
 
 ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
 else # ! 3.x
 ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+
   CFLAGS += -DDIGITAL_UNIX=4
   ifneq ($(CXX_VER),CXX_5)
     # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
     WARNING_FLAGS += -msg_disable 9
   endif # 6.0 or later
-
 else # ! 4.x
 ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+
   CFLAGS += -DDIGITAL_UNIX=5
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
 
+  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
+    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
+    WARNING_FLAGS += -msg_disable 177
+  endif # 6.0 or later
+
+  SOFLAGS = -shared -use_ld_input $(ACELIB)
 endif # 5.x
 endif # ! 4.x
 endif # ! 3.x
diff --git a/include/makeinclude/platform_psosim_g++.GNU b/include/makeinclude/platform_psosim_g++.GNU
index 3918f3c4122..d2c62859b00 100644
--- a/include/makeinclude/platform_psosim_g++.GNU
+++ b/include/makeinclude/platform_psosim_g++.GNU
@@ -2,7 +2,7 @@
 # PSOSim with GNU g++ 2.7.2
 
 ####
-#### Notes:
+#### Notes: 
 ####
 ####   1) This file assumes that the PSS_ROOT environment variable is set.
 ####
@@ -11,27 +11,27 @@
 ####
 ####
 
-CPU_FAMILY      = psosim
-CPU             = psosim
-CPU_TOOLS       = psosim
-BOARD           = psosim
+CPU_FAMILY	= psosim
+CPU		= psosim
+CPU_TOOLS	= psosim
+BOARD		= psosim
 
 PSS_CFG_DIR     = $(ACE_ROOT)/psosim
-PSS_SYS_DIR     = $(PSS_ROOT)/sys/os
-PSS_SYS_LIBS    = $(PSS_SYS_DIR)/prepc.a $(PSS_SYS_DIR)/psos.a $(PSS_SYS_DIR)/pna.a
-PSS_BSP         = $(PSS_ROOT)/bsps/psosim
-PSS_BSP_LIB     = $(PSS_BSP)/bsp.a
+PSS_SYS_DIR	= $(PSS_ROOT)/sys/os
+PSS_SYS_LIBS	= $(PSS_SYS_DIR)/prepc.a $(PSS_SYS_DIR)/psos.a $(PSS_SYS_DIR)/pna.a
+PSS_BSP		= $(PSS_ROOT)/bsps/psosim
+PSS_BSP_LIB	= $(PSS_BSP)/bsp.a
 
 debug = 1
 optimize = 1
 
 CC              = gcc
 CXX             = g++
-CFLAGS          += -W -Wall -Wpointer-arith -pipe #### -Winline
+CFLAGS          += -Wall -Wpointer-arith -pipe #### -Winline
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 
-# -w suppresses warnings
-# -H tells you which header files are being included
+# -w suppresses warnings 
+# -H tells you which header files are being included 
 # (switch between these)
 #DCFLAGS         += -g
 #DCFLAGS         += -g -H
@@ -41,7 +41,7 @@ DCFLAGS         += -g -w
 DLD             = $(CXX)
 LD              = $(CXX)
 LDFLAGS         += # -z muldefs
-LIBS            += $(PSS_SYS_LIBS) $(PSS_BSP_LIB) $(PSS_CFG_DIR)/acepsos.a -lsocket -lnsl -lm
+LIBS            += $(PSS_SYS_LIBS) $(PSS_BSP_LIB) $(PSS_CFG_DIR)/acepsos.a -lsocket -lnsl -lm 
 OCFLAGS         += -O2
 #OCFLAGS         += -O0
 PIC             = -fpic
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
index 682770780e5..3ddc737adb8 100644
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/include/makeinclude/platform_qnx_neutrino.GNU
@@ -18,7 +18,7 @@ static_libs_only = 1
 
 CC      = /usr/gcc/bin/i386-nto-gcc
 CXX     = /usr/gcc/bin/i386-nto-g++
-CFLAGS  += -pipe -W -Wall -Wpointer-arith -Winline
+CFLAGS  += -pipe -Wall -Wpointer-arith -Winline
 CCFLAGS += $(CFLAGS) -fno-implicit-templates
 DCFLAGS += -g
 DLD     = $(CXX)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 6193bbe8885..bcd304f0aef 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -33,7 +33,7 @@ endif # ! i86pc
 
 CC              = gcc
 CXX             = g++
-CFLAGS          += -W -Wall -Wpointer-arith -pipe #### -Winline
+CFLAGS          += -Wall -Wpointer-arith -pipe #### -Winline
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 DLD             = $(CXX)
 LD              = $(CXX)
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index 285499f3454..3b1c6fc7fd3 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -9,22 +9,27 @@ endif # ACE_DU_VERSION
 
 ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
 else # ! 3.x
 ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+
   CFLAGS += -DDIGITAL_UNIX=4
   ifneq ($(CXX_VER),CXX_5)
     # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
     WARNING_FLAGS += -msg_disable 9
   endif # 6.0 or later
-
 else # ! 4.x
 ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+
   CFLAGS += -DDIGITAL_UNIX=5
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
 
+  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
+    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
+    WARNING_FLAGS += -msg_disable 177
+  endif # 6.0 or later
+
+  SOFLAGS = -shared -use_ld_input $(ACELIB)
 endif # 5.x
 endif # ! 4.x
 endif # ! 3.x
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 76ca934af3c..cd871eebf20 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -39,13 +39,19 @@ ifeq (,$(findstring $(HOST_DIR)/bin,$PATH))
   PATH := $(PATH):$(HOST_DIR)/bin
 endif # PATH
 
-ifeq (,$(PERL_PATH))
-  PERL_PATH = perl
-endif # ! PERL_PATH
+PERL_PATH = perl
+
+ifeq (win32,$(findstring win32,$(WIND_HOST_TYPE)))
+  #### GNU make on WIN32 needs quoted double quotes.
+  ACE_QUOTE ='"'
+else  # ! win32 host
+  ACE_QUOTE ="
+endif # ! win32 host
 
 
 #### BEGIN target CPU-specific settings
 
+
 #### This is kind of messy so that it can support multiple targets.
 #### You'll need to set CPU to a supported CPU using one of these
 #### methods (unless your CPU is a PowerPC 604):
@@ -98,6 +104,7 @@ endif # I80486
 endif # PPC860
 endif # PPC604
 
+
 #### END target CPU-specific settings
 
 
@@ -132,7 +139,7 @@ endif # ! static_libs
 
 CC              = cc$(TOOLENV)
 CFLAGS          += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
-                   -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -W -Wall
+                   -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -Wall
 CCFLAGS         += $(CFLAGS)
 ifeq (,$(rtti))
   #### Don't use RTTI even with egcs, because Tornado 1.0.x libraries
@@ -142,9 +149,9 @@ endif # rtti
 DCFLAGS         += -g
 DLD             = $(LD)
 INCLDIRS        += -I$(WIND_BASE)/target/h
-LD              = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld \
-                  -C $(COMPILE.c) -traditional -- \
-                  -m munch -n nm$(TOOLENV) ld$(TOOLENV)
+LD              = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld -c \
+                  $(ACE_QUOTE)$(COMPILE.c) -traditional$(ACE_QUOTE) \
+                  -m "munch" -n "nm$(TOOLENV)" ld$(TOOLENV)
 LDFLAGS         += -X -r
 #### WindRiver only recommends -O, not -O2, with some CPUs, including
 #### the i386 family.  And -O2 causes some compilation failures.
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index ee1bca15cec..8628c58480c 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -81,10 +81,6 @@ CXX      = $(CC)
 CCFLAGS  += $(CFLAGS) --no_rtti -tnone
 DCFLAGS  += -g
 DLD      = $(CXX)
-#### Set INCLDIRS, so that wrapper_macros.GNU doesn't insert -I.
-#### Otherwise, with GHS on NT host, ACE's Signal.h gets #included
-#### instead of VxWorks' signal.h by target/h/private/sigLibP.h.
-INCLDIRS = -I$(ACE_ROOT)
 LD       = $(CXX)
 LDFLAGS  = --no_auto_instantiation
 OCFLAGS  += -OL -OM
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 756b6efaf48..4af15f05119 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -124,16 +124,7 @@ endif
 ifdef SHLIBBUILD
 	$(SHLIBBUILD)
 else
-ifdef TEMPINCDIR
-	if test -s ./$(TEMPINCDIR)/*.o; \
-        then \
-       	        $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TEMPINCDIR)/*.o $(LDFLAGS) $(LIBS); \
-        else \
-		$(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS); \
-	fi
-else
-	$(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS)
-endif
+	$(SOLINK.cc) -o $@ $(VSHOBJS1) $(TMPL_OBJS) $(LDFLAGS) $(LIBS)
 	-chmod a+rx $@
 endif
 
diff --git a/m4/features.m4 b/m4/features.m4
index 89534fb2318..7e81c3b25e1 100644
--- a/m4/features.m4
+++ b/m4/features.m4
@@ -62,7 +62,6 @@ if test "$ace_has_aio_funcs" = yes; then
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include <iostream.h>
 
 #include <aio.h>
 
@@ -118,19 +117,15 @@ int
 Test_Aio::init (void)
 {
   // Open the output file.
-  this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
+  this->out_fd_ = open ("conftest.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
   if (this->out_fd_ == 0)
     {
-      //cout << "Error : Opening file" << endl;
       return -1;
     }
 
   // Init the buffers.
   this->buffer_write_ = strdup ("Welcome to the world of AIO... AIO Rules !!!");
-  // cout << "The buffer : " << this->buffer_write_ << endl;
   this->buffer_read_ = new char [strlen (this->buffer_write_)];
-
-  return 0;
 }
 
 // Set the necessary things for the AIO stuff.
@@ -191,7 +186,6 @@ Test_Aio::do_aio (void)
       return_val = aio_suspend (list_aiocb,
                                 2,
                                 0);
-      cerr << "Return value :" << return_val << endl;
 
       // Analyze return and error values.
       if (aio_error (list_aiocb [0]) != EINPROGRESS)
@@ -209,8 +203,6 @@ Test_Aio::do_aio (void)
               list_aiocb [0] = 0;
             }
         }
-      else
-        //cout << "AIO in progress" << endl;
 
       if (aio_error (list_aiocb [1]) != EINPROGRESS)
         {
@@ -227,40 +219,30 @@ Test_Aio::do_aio (void)
               list_aiocb [1] = 0;
             }
         }
-      else
-        //cout << "AIO in progress" << endl;
 
       // Is it done?
       if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0))
         done = 1;
     }
-
-  //cout << "Both the AIO operations done." << endl;
-  //cout << "The buffer is :" << this->buffer_read_ << endl;
   
   return 0;
 }
 
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
   Test_Aio test_aio;
 
   if (test_aio.init () != 0)
     {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n");
       return -1;
     }
   
   if (test_aio.do_aio () != 0)
     {
-      //printf ("AIOCB test failed:\n"
-      //        "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); 
       return -1;
     }
-  //printf ("AIOCB test successful:\n"
-  //        "ACE_POSIX_AIOCB_PROACTOR should work in this platform\n");
+
   return 0;
 }
        ],
@@ -285,25 +267,22 @@ main (int argc, char **argv)
 
 #include <aio.h>
 
-
 int file_handle = -1;
 char mb1 [BUFSIZ + 1];
 char mb2 [BUFSIZ + 1];
 aiocb aiocb1, aiocb2;
 sigset_t completion_signal;
 
-// Function prototypes.
+/* Function prototypes. */
 int setup_signal_delivery (void);
 int issue_aio_calls (void);
 int query_aio_completions (void);
 int test_aio_calls (void);
-int setup_signal_handler (void);
-int setup_signal_handler (int signal_number);
 
 int 
 setup_signal_delivery (void)
 {
-  // Make the sigset_t consisting of the completion signal.
+  /* Make the sigset_t consisting of the completion signal. */
   if (sigemptyset (&completion_signal) == -1)
     {
       perror ("Error:Couldnt init the RT completion signal set\n");
@@ -316,20 +295,38 @@ setup_signal_delivery (void)
       return -1;
     }
   
-  // Mask them.
-  if (pthread_sigmask (SIG_BLOCK, &completion_signal, 0) == -1)
+  /* Mask them. */
+  if (sigprocmask (SIG_BLOCK, &completion_signal, 0) == -1)
     {
       perror ("Error:Couldnt maks the RT completion signals\n");
       return -1;
     }
   
-  return setup_signal_handler (SIGRTMIN);
+  /* Setting up the handler(!) for these signals. */
+  struct sigaction reaction;
+  sigemptyset (&reaction.sa_mask);   /* Nothing else to mask. */
+  reaction.sa_flags = SA_SIGINFO;    /* Realtime flag. */
+#if defined (SA_SIGACTION)
+  /* Lynx says, it is better to set this bit to be portable. */
+  reaction.sa_flags &= SA_SIGACTION;
+#endif /* SA_SIGACTION */      
+  reaction.sa_sigaction = 0;         /* No handler. */
+  int sigaction_return = sigaction (SIGRTMIN,
+                                    &reaction,
+                                    0);
+  if (sigaction_return == -1)
+    {
+      perror ("Error:Proactor couldnt do sigaction for the RT SIGNAL");
+      return -1;
+    }
+  
+  return 0;
 }
 
 int
 issue_aio_calls (void)
 {
-  // Setup AIOCB.
+  /* Setup AIOCB. */
   aiocb1.aio_fildes = file_handle;
   aiocb1.aio_offset = 0;
   aiocb1.aio_buf = mb1;
@@ -339,15 +336,15 @@ issue_aio_calls (void)
   aiocb1.aio_sigevent.sigev_signo = SIGRTMIN;
   aiocb1.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb1; 
   
-  // Fire off the aio write.
+  /* Fire off the aio write. */
   if (aio_read (&aiocb1) == -1)
     {
-      // Queueing failed.
+      /* Queueing failed. */
       perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
       return -1;
     }
   
-  // Setup AIOCB.
+  /* Setup AIOCB. */
   aiocb2.aio_fildes = file_handle;
   aiocb2.aio_offset = BUFSIZ + 1;
   aiocb2.aio_buf = mb2;
@@ -357,10 +354,10 @@ issue_aio_calls (void)
   aiocb2.aio_sigevent.sigev_signo = SIGRTMIN;
   aiocb2.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb2; 
   
-  // Fire off the aio write.
+  /* Fire off the aio write. */
   if (aio_read (&aiocb2) == -1)
     {
-      // Queueing failed.
+      /* Queueing failed. */
       perror ("Error:Asynch_Read_Stream: aio_read queueing failed\n");
       return -1;
     }
@@ -376,69 +373,69 @@ query_aio_completions (void)
        number_of_compleions < 2;
        number_of_compleions ++)
     {
-      // Wait for <milli_seconds> amount of time.
-      // @@ Assigning <milli_seconds> to tv_sec.
+      /* Wait for <milli_seconds> amount of time. */
+      /* @@ Assigning <milli_seconds> to tv_sec. */
       timespec timeout;
       timeout.tv_sec = INT_MAX;
       timeout.tv_nsec = 0;
   
-      // To get back the signal info.
+      /* To get back the signal info. */
       siginfo_t sig_info;
       
-      // Await the RT completion signal.
+      /* Await the RT completion signal. */
       int sig_return = sigtimedwait (&completion_signal,
                                      &sig_info,
                                      &timeout);
       
-      // Error case.
-      // If failure is coz of timeout, then return *0* but set
-      // errno appropriately. This is what the WinNT proactor
-      // does.
+      /* Error case. */
+      /* If failure is coz of timeout, then return *0* but set */
+      /* errno appropriately. This is what the WinNT proactor */
+      /* does. */
       if (sig_return == -1)
         {
           perror ("Error:Error waiting for RT completion signals\n");
           return -1;
         }
       
-      // RT completion signals returned.
+      /* RT completion signals returned. */
       if (sig_return != SIGRTMIN)
         {
-          //printf ("Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
-          //        sig_return);
+          printf ("Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
+                  sig_return);
           return -1;
         }
       
-      // @@ Debugging.
-      //printf ("Sig number found in the sig_info block : %d\n",
-      //        sig_info.si_signo);
+      /* @@ Debugging. */
+      printf ("Sig number found in the sig_info block : %d\n",
+              sig_info.si_signo);
   
-      // Is the signo returned consistent?
+      /* Is the signo returned consistent? */
       if (sig_info.si_signo != sig_return)
         {
-          //printf ("Inconsistent signal number (%d) in the signal info block\n",
-          //        sig_info.si_signo);
+          printf ("Inconsistent signal number (%d) in the signal info block\n",
+                  sig_info.si_signo);
           return -1;
         }
   
-      // @@ Debugging.
-      //printf ("Signal code for this signal delivery : %d\n",
-      //        sig_info.si_code);
+      /* @@ Debugging. */
+      printf ("Signal code for this signal delivery : %d\n",
+              sig_info.si_code);
   
-      // Is the signal code an aio completion one?
+      /* Is the signal code an aio completion one? */
       if ((sig_info.si_code != SI_ASYNCIO) &&
           (sig_info.si_code != SI_QUEUE))
         {
-          //printf ("Unexpected signal code (%d) returned on completion querying\n",
-          //        sig_info.si_code);
+          printf ("Unexpected signal code (%d) returned on completion querying\n",
+                  sig_info.si_code);
           return -1;
         }
   
-      // Retrive the aiocb.
+      /* Retrive the aiocb. */
       aiocb* aiocb_ptr = (aiocb *) sig_info.si_value.sival_ptr;
       
-      // Analyze error and return values. Return values are
-      // actually <errno>'s associated with the <aio_> call
-      // corresponding to aiocb_ptr.
+      /* Analyze error and return values. Return values are */
+      /* actually <errno>'s associated with the <aio_> call */
+      /* corresponding to aiocb_ptr. */
       int error_code = aio_error (aiocb_ptr);
       if (error_code == -1)
         {
@@ -448,14 +445,14 @@ query_aio_completions (void)
   
       if (error_code != 0)
         {
-          // Error occurred in the <aio_>call. Return the errno
-          // corresponding to that <aio_> call.
-          //printf ("Error:An AIO call has failed:Error code = %d\n",
-          //        error_code);
+          /* Error occurred in the <aio_>call. Return the errno */
+          /* corresponding to that <aio_> call. */
+          printf ("Error:An AIO call has failed:Error code = %d\n",
+                  error_code);
           return -1;
         }
 
-      // No error occured in the AIO operation.
+      /* No error occured in the AIO operation. */
       int nbytes = aio_return (aiocb_ptr);
       if (nbytes == -1)
         {
@@ -464,15 +461,15 @@ query_aio_completions (void)
         }
       
       if (number_of_compleions == 0)
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb1);
+        /* Print the buffer. */
+        printf ("Number of bytes transferred : %d\n The buffer : %s \n",
+                nbytes,
+                mb1);
       else
-        // Print the buffer.
-        //printf ("Number of bytes transferred : %d\n The buffer : %s \n",
-        //        nbytes,
-        //        mb2);
+        /* Print the buffer. */
+        printf ("Number of bytes transferred : %d\n The buffer : %s \n",
+                nbytes,
+                mb2);
     }
   return 0;
 }
@@ -480,8 +477,8 @@ query_aio_completions (void)
 int
 test_aio_calls (void) 
 {
-  // Set up the input file.
-  // Open file (in SEQUENTIAL_SCAN mode)
+  /* Set up the input file. */
+  /* Open file (in SEQUENTIAL_SCAN mode) */
   file_handle = open ("test_aiosig.cpp", O_RDONLY);
   
   if (file_handle == -1)
@@ -503,45 +500,11 @@ test_aio_calls (void)
 }
 
 int
-setup_signal_handler (int signal_number)
-{
-   // Setting up the handler(!) for these signals.
-  struct sigaction reaction;
-  sigemptyset (&reaction.sa_mask);   // Nothing else to mask.
-  reaction.sa_flags = SA_SIGINFO;    // Realtime flag.
-#if defined (SA_SIGACTION)
-  // Lynx says, it is better to set this bit to be portable.
-  reaction.sa_flags &= SA_SIGACTION;
-#endif /* SA_SIGACTION */      
-  reaction.sa_sigaction = null_handler;     // Null handler.
-  int sigaction_return = sigaction (SIGRTMIN,
-                                    &reaction,
-                                    0);
-  if (sigaction_return == -1)
-    {
-      perror ("Error:Proactor couldnt do sigaction for the RT SIGNAL");
-      return -1;
-    }
-  
-  return 0;
-}
-
-void
-null_handler (int         /* signal_number */,
-              siginfo_t * /* info */,
-              void *      /* context */)
-{
-}
-
-int
 main (int, char *[])
 {
-  if (test_aio_calls () == 0)
-    //printf ("RT SIG test successful:\n"
-    //        "ACE_POSIX_SIG_PROACTOR should work in this platform\n");
+  if (test_aio_calls () != 0)
+    return -1;
   else
-    //printf ("RT SIG test failed:\n"
-    //        "ACE_POSIX_SIG_PROACTOR may not work in this platform\n");
   return 0;
 }
          ],
diff --git a/mkinstalldirs b/mkinstalldirs
index 6b3b5fc5d4d..e69de29bb2d 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/netsvcs/Makefile.bor b/netsvcs/Makefile.bor
deleted file mode 100644
index 5ac8a257adf..00000000000
--- a/netsvcs/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for building the netsvcs
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	cd $(ACE_ROOT)\netsvcs\lib
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\servers
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/netsvcs/build.bor b/netsvcs/build.bor
deleted file mode 100644
index 72036c408fc..00000000000
--- a/netsvcs/build.bor
+++ /dev/null
@@ -1,16 +0,0 @@
-
-!ifndef CFLAGS
-CFLAGS=$(ACE_CFLAGS)
-!endif
-
-!ifndef CPPDIR
-CPPDIR=.
-!endif
-
-!ifndef LIBFILES
-LIBFILES= $(ACE_LIB)
-!endif
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile
index 555289cea0b..0b01959e8b6 100644
--- a/netsvcs/clients/Logger/Makefile
+++ b/netsvcs/clients/Logger/Makefile
@@ -17,7 +17,7 @@ BIN2    = direct_logging \
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Other
@@ -56,12 +56,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -80,13 +83,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/netsvcs/clients/Logger/Makefile.bor b/netsvcs/clients/Logger/Makefile.bor
deleted file mode 100644
index 28ae9437d9c..00000000000
--- a/netsvcs/clients/Logger/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-
-APPS = \
-	direct_logging \
-	indirect_logging
-
-all: $(APPS)
-
-$(APPS):
-	$(MAKE) -f Makefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
-
-OBJFILES=$(OBJDIR)\$(NAME).obj
-
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Makefile.bor b/netsvcs/clients/Makefile.bor
deleted file mode 100644
index a91e169e1ee..00000000000
--- a/netsvcs/clients/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	cd $(ACE_ROOT)\netsvcs\clients\Logger
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Naming
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile
index d4eb6775c08..bde751437cd 100644
--- a/netsvcs/clients/Naming/Client/Makefile
+++ b/netsvcs/clients/Naming/Client/Makefile
@@ -29,7 +29,7 @@ SHLIB2  = libClient_Test.$(SOEXT)
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
   LIB = $(LIB2)
@@ -70,12 +70,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -95,7 +98,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -118,8 +120,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -171,12 +171,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -196,7 +199,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -219,8 +221,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Naming/Client/Makefile.bor b/netsvcs/clients/Naming/Client/Makefile.bor
deleted file mode 100644
index 9f7daeada25..00000000000
--- a/netsvcs/clients/Naming/Client/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-NAME = main
-OBJFILES = \
-        $(OBJDIR)\main.obj \
-        $(OBJDIR)\Client_Test.obj
-
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile
index d2f7cf959f9..721cc72dc54 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile
@@ -29,7 +29,7 @@ SHLIB2  = libDump_Restore.$(SOEXT)
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
   LIB = $(LIB2)
@@ -70,12 +70,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -95,7 +98,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -118,8 +120,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -167,12 +167,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -192,7 +195,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -215,8 +217,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.bor b/netsvcs/clients/Naming/Dump_Restore/Makefile.bor
deleted file mode 100644
index 8bb56bf5f62..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-NAME = main
-OBJFILES = \
-        $(OBJDIR)\main.obj \
-        $(OBJDIR)\Dump_Restore.obj
-
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp b/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
deleted file mode 100644
index fb9c71a5014..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "ace/Naming_Context.h"
-// $Id$
-
-#include "ace/Name_Options.h"
-#include "nametest.h"
-
-void 
-Nametest::listopt (void)
-{
-  cout << "serverport is " 
-       << ACE_Name_Options::instance ()->nameserver_port() 
-       << endl;
-  cout << "serverhost is " 
-       << ACE_Name_Options::instance ()->nameserver_host() 
-       << endl;
-  cout << "process_name is " 
-       << ACE_Name_Options::instance ()->process_name() 
-       << endl;
-  cout << "namespace_dir is " 
-       << ACE_Name_Options::instance ()->namespace_dir() 
-       << endl;
-}
-
-int 
-Nametest::init (int argc, char *argv[])
-{
-  ACE_Server_Record *sr;
-  ACE_Service_Config::svc_rep ()->find ("Name_Server_Proxy", &sr);
-  ACE_Service_Type *st = sr->type ();
-  ACE_Server_Object *so = st->object ();
-dynamic_cast<ACE_Name_Server_Proxy *> (so);
-
-  ACE_Name_Server_Proxy *ns_proxy = ACE_Service_Config::name_server_proxy ();
-  
-  ns_proxy->bind (...);
-
-  this->listopt ();
-
-  ACE_Naming_Context ns_context;
-
-  if (ns_context.open (ACE_Naming_Context::NET_LOCAL) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context.open"), -1);
-
-  const char *mykey = argv[0];
-  char *myvalue = argv[1];
-  char *ns_value = 0;
-  char *ns_type = 0;
-
-  if (ns_context.bind (mykey, myvalue, "ottotype") == -1)
-    cout << "bind failed" << endl;
-  else
-    cout << "bind succeeded" << endl;
-
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.rebind (mykey, myvalue, "newottotype") == -1)
-    cout << "rebind failed" << endl;
-  else
-    cout << "rebind succeeded" << endl;
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.unbind (mykey) == -1)
-    cout << "unbind failed" << endl;
-  else
-    cout << "unbind succeeded" << endl;
-
-  return 0;
-}
-
-int 
-Nametest::fini (void)
-{
-  cout << "Nametest::fini called" << endl;
-  return 0;
-}
-
-int 
-Nametest::info (char **, unsigned) const
-{
-  cout << "Nametest::info called" << endl;
-  return 0;
-}
-
-extern "C" ACE_Service_Object *_alloc(void);
-
-// Factory function that is called automatically when the ACE
-// framework dynamically links this shared object file.
-
-ACE_Service_Object *_alloc (void) 
-{
-  return new Nametest;
-}
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.h b/netsvcs/clients/Naming/Dump_Restore/nametest.h
deleted file mode 100644
index fa0cc5dc05c..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Service_Object.h"
-
-class Nametest : public ACE_Service_Object
-{
-public:
-  virtual int init (int argc, char *argv[]);
-  virtual int fini (void);
-  virtual int info (char **, size_t) const;
-
-  void listopt (void);
-};
-
diff --git a/netsvcs/clients/Naming/Makefile.bor b/netsvcs/clients/Naming/Makefile.bor
deleted file mode 100644
index 81c2f78e587..00000000000
--- a/netsvcs/clients/Naming/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	cd $(ACE_ROOT)\netsvcs\clients\Naming\Client
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/netsvcs/clients/Tokens/Makefile.bor b/netsvcs/clients/Tokens/Makefile.bor
deleted file mode 100644
index 4bdc1900fdb..00000000000
--- a/netsvcs/clients/Tokens/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-	cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock
-	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
-
diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile
index 60b8703b2e1..214c6347ae2 100644
--- a/netsvcs/clients/Tokens/collection/Makefile
+++ b/netsvcs/clients/Tokens/collection/Makefile
@@ -18,7 +18,7 @@ BIN2    = collection
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
@@ -53,13 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -79,7 +82,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -113,8 +115,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Tokens/collection/Makefile.bor b/netsvcs/clients/Tokens/collection/Makefile.bor
deleted file mode 100644
index b16b11fef9b..00000000000
--- a/netsvcs/clients/Tokens/collection/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = collection
-OBJFILES = $(OBJDIR)\collection.obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-        
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile
index 29fb07d179a..680e9aa918b 100644
--- a/netsvcs/clients/Tokens/deadlock/Makefile
+++ b/netsvcs/clients/Tokens/deadlock/Makefile
@@ -18,7 +18,7 @@ BIN2    = deadlock_detection_test
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
@@ -53,13 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Token_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -80,7 +83,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -109,8 +111,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile.bor b/netsvcs/clients/Tokens/deadlock/Makefile.bor
deleted file mode 100644
index 112a766ff2a..00000000000
--- a/netsvcs/clients/Tokens/deadlock/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = deadlock_detection_test
-OBJFILES=$(OBJDIR)\$(NAME).obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile
index 8b75b4c6371..48085803036 100644
--- a/netsvcs/clients/Tokens/invariant/Makefile
+++ b/netsvcs/clients/Tokens/invariant/Makefile
@@ -18,7 +18,7 @@ BIN2    = invariant
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
@@ -53,13 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -87,7 +90,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -116,8 +118,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Tokens/invariant/Makefile.bor b/netsvcs/clients/Tokens/invariant/Makefile.bor
deleted file mode 100644
index 5d01b037b62..00000000000
--- a/netsvcs/clients/Tokens/invariant/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = invariant
-OBJFILES=$(OBJDIR)\$(NAME).obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Tokens/manual/Makefile b/netsvcs/clients/Tokens/manual/Makefile
index 2d8ca80ad6d..ad7c54f1ac4 100644
--- a/netsvcs/clients/Tokens/manual/Makefile
+++ b/netsvcs/clients/Tokens/manual/Makefile
@@ -14,7 +14,7 @@ BIN2    = manual
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
diff --git a/netsvcs/clients/Tokens/manual/Makefile.bor b/netsvcs/clients/Tokens/manual/Makefile.bor
deleted file mode 100644
index a38035e9982..00000000000
--- a/netsvcs/clients/Tokens/manual/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = manual
-OBJFILES = $(OBJDIR)\$(NAME).obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile
index e23b2e26695..28473118278 100644
--- a/netsvcs/clients/Tokens/mutex/Makefile
+++ b/netsvcs/clients/Tokens/mutex/Makefile
@@ -18,7 +18,7 @@ BIN2    = test_mutex
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
@@ -53,13 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -79,7 +82,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -113,8 +115,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Tokens/mutex/Makefile.bor b/netsvcs/clients/Tokens/mutex/Makefile.bor
deleted file mode 100644
index 2e74fc7f2fb..00000000000
--- a/netsvcs/clients/Tokens/mutex/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = test_mutex
-OBJFILES = $(OBJDIR)\$(NAME).obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile
index 7c0e08adc38..3859d16f9ed 100644
--- a/netsvcs/clients/Tokens/rw_lock/Makefile
+++ b/netsvcs/clients/Tokens/rw_lock/Makefile
@@ -18,7 +18,7 @@ BIN2    = rw_locks
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
   BIN = $(BIN2)
 endif # Token
@@ -53,13 +53,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -79,7 +82,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -113,8 +115,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile.bor b/netsvcs/clients/Tokens/rw_lock/Makefile.bor
deleted file mode 100644
index a707e2f688a..00000000000
--- a/netsvcs/clients/Tokens/rw_lock/Makefile.bor
+++ /dev/null
@@ -1,5 +0,0 @@
-
-NAME = rw_locks
-OBJFILES = $(OBJDIR)\$(NAME).obj
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/lib/Client_Logging_Handler.i b/netsvcs/lib/Client_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Client_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile
index 4b7124d93f9..d1f213e99b4 100644
--- a/netsvcs/lib/Makefile
+++ b/netsvcs/lib/Makefile
@@ -60,8 +60,8 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -208,12 +208,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  TS_Clerk_Handler.h \
@@ -239,7 +242,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -262,8 +264,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -359,12 +359,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -389,7 +392,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -412,8 +414,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -514,15 +514,17 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -565,9 +567,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  Name_Handler.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -575,8 +574,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -669,13 +666,16 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -700,10 +700,13 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -720,7 +723,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -743,8 +745,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -822,12 +822,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -851,12 +854,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -879,10 +885,13 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/TLI_Stream.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -899,7 +908,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -922,8 +930,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1003,12 +1009,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  Token_Handler.h \
@@ -1034,7 +1043,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -1057,8 +1065,6 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1159,12 +1165,15 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
  Logging_Strategy.h \
@@ -1180,13 +1189,16 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  Base_Optimizer.cpp
 
diff --git a/netsvcs/lib/Makefile.bor b/netsvcs/lib/Makefile.bor
deleted file mode 100644
index 7a5de6761b2..00000000000
--- a/netsvcs/lib/Makefile.bor
+++ /dev/null
@@ -1,22 +0,0 @@
-
-NAME = netsvcs
-
-OBJFILES = \
-	$(OBJDIR)\TS_Server_Handler.obj \
-	$(OBJDIR)\TS_Clerk_Handler.obj \
-	$(OBJDIR)\Client_Logging_Handler.obj \
-	$(OBJDIR)\Name_Handler.obj \
-	$(OBJDIR)\Log_Message_Receiver.obj \
-	$(OBJDIR)\Server_Logging_Handler.obj \
-	$(OBJDIR)\Token_Handler.obj \
-	$(OBJDIR)\Logging_Strategy.obj \
-	$(OBJDIR)\Base_Optimizer.obj
-
-CFLAGS = $(ACE_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/netsvcs/lib/Server_Logging_Handler.i b/netsvcs/lib/Server_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Server_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile
index 0dae71f70bf..ad3c0c9e143 100644
--- a/netsvcs/servers/Makefile
+++ b/netsvcs/servers/Makefile
@@ -16,7 +16,7 @@ BIN2 = main
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
     BIN = $(BIN2)
@@ -56,12 +56,15 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -81,7 +84,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -104,8 +106,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -226,7 +226,10 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/netsvcs/lib/Server_Logging_Handler_T.h \
  $(ACE_ROOT)/ace/TLI_Acceptor.h \
  $(ACE_ROOT)/ace/TLI.h \
+ $(ACE_ROOT)/ace/TLI.i \
  $(ACE_ROOT)/ace/TLI_Stream.h \
+ $(ACE_ROOT)/ace/TLI_Stream.i \
+ $(ACE_ROOT)/ace/TLI_Acceptor.i \
  $(ACE_ROOT)/netsvcs/lib/Server_Logging_Handler_T.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
diff --git a/netsvcs/servers/Makefile.bor b/netsvcs/servers/Makefile.bor
deleted file mode 100644
index 746ba07d7c2..00000000000
--- a/netsvcs/servers/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-
-NAME = main
-OBJFILES = $(OBJDIRS)\$(NAME).obj
-CFLAGS = -I$(ACE_ROOT)\netsvcs\lib $(ACE_CFLAGS)
-LIBFILES = $(ACE_LIB) $(NETSVCS_LIB)
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/servers/cli.conf b/netsvcs/servers/cli.conf
deleted file mode 100644
index b2d8fbc8194..00000000000
--- a/netsvcs/servers/cli.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# UNIX version
-#
-# These are the services that can be linked into ACE.
-# Note that you can replace the hardcoded "../lib/libnet_svcs" with
-# a relative path if you set your LD search path correctly -- ACE will
-# locate this for you automatically by reading your LD search path!
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-# Activate the Client Logging Daemon.
-dynamic Client_Logging_Service Service_Object * ../lib/libnet_svcs:_make_ACE_Client_Logging_Connector() active "-p 20009 -h merengue"
diff --git a/netsvcs/servers/ntsvc.conf b/netsvcs/servers/ntsvc.conf
deleted file mode 100644
index 94ed5d78c2a..00000000000
--- a/netsvcs/servers/ntsvc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Windows NT version.
-#
-# These are the services that can be linked into ACE.
-# Note that your path needs to include the path for netsvcs.dll
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-dynamic Token_Service Service_Object * netsvcs.dll:_make_ACE_Token_Acceptor() "-p 20202"
-dynamic Name_Server Service_Object * netsvcs.dll:_make_ACE_Name_Acceptor() "-p 20012"
-#dynamic Client_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Client_Logging_Connector() active "-p 20008"
-#dynamic Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
-#dynamic Thr_Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020"
diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile
index f8fb35c632e..b912d3226f7 100644
--- a/performance-tests/Misc/Makefile
+++ b/performance-tests/Misc/Makefile
@@ -17,7 +17,6 @@ BIN = basic_perf \
 #### See below for test_naming.
 
 # Only build static library for optimum run-time speed.
-static_libs_only = 1
 LIB     = libPerf.a
 FILES   = basic_func
 LSRC    = $(addsuffix .cpp,$(FILES))
@@ -32,7 +31,7 @@ BIN2 = test_naming
 
 #### If the ACE library wasn't built with sufficient components, don't
 #### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN += $(BIN2)
 endif # ! Other
@@ -49,13 +48,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.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
-
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -70,58 +62,64 @@ PSRC = $(addsuffix .cpp, $(BIN))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/basic_func.o .obj/basic_func.o .obj/basic_func.o .obj/basic_func.o: basic_func.cpp basic_func.h \
+.obj/basic_func.o .obj/basic_func.so .shobj/basic_func.o .shobj/basic_func.so: basic_func.cpp basic_func.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i
-.obj/basic_perf.o .obj/basic_perf.o .obj/basic_perf.o .obj/basic_perf.o: basic_perf.cpp basic_func.h \
+.obj/basic_perf.o .obj/basic_perf.so .shobj/basic_perf.o .shobj/basic_perf.so: basic_perf.cpp basic_func.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
-.obj/childbirth_time.o .obj/childbirth_time.o .obj/childbirth_time.o .obj/childbirth_time.o: childbirth_time.cpp \
+.obj/childbirth_time.o .obj/childbirth_time.so .shobj/childbirth_time.o .shobj/childbirth_time.so: childbirth_time.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -168,7 +166,7 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/context_switch_time.o .obj/context_switch_time.o .obj/context_switch_time.o .obj/context_switch_time.o: context_switch_time.cpp \
+.obj/context_switch_time.o .obj/context_switch_time.so .shobj/context_switch_time.o .shobj/context_switch_time.so: context_switch_time.cpp \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -178,12 +176,15 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -203,7 +204,6 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -243,8 +243,6 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -294,7 +292,7 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
-.obj/preempt.o .obj/preempt.o .obj/preempt.o .obj/preempt.o: preempt.cpp \
+.obj/preempt.o .obj/preempt.so .shobj/preempt.o .shobj/preempt.so: preempt.cpp \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -304,12 +302,15 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -329,7 +330,6 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -369,8 +369,6 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -416,7 +414,7 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Sched_Params.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
-.obj/test_mutex.o .obj/test_mutex.o .obj/test_mutex.o .obj/test_mutex.o: test_mutex.cpp \
+.obj/test_mutex.o .obj/test_mutex.so .shobj/test_mutex.o .shobj/test_mutex.so: test_mutex.cpp \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -425,17 +423,20 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/test_singleton.o .obj/test_singleton.o .obj/test_singleton.o .obj/test_singleton.o: test_singleton.cpp \
+.obj/test_singleton.o .obj/test_singleton.so .shobj/test_singleton.o .shobj/test_singleton.so: test_singleton.cpp \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -443,12 +444,15 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -475,9 +479,8 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- test_singleton.h
-.obj/test_naming.o .obj/test_naming.o .obj/test_naming.o .obj/test_naming.o: test_naming.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.cpp
+.obj/test_naming.o .obj/test_naming.so .shobj/test_naming.o .shobj/test_naming.so: test_naming.cpp \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -485,8 +488,8 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
diff --git a/performance-tests/Misc/test_singleton.cpp b/performance-tests/Misc/test_singleton.cpp
index 9e8a50b56e1..49c16f5f92a 100644
--- a/performance-tests/Misc/test_singleton.cpp
+++ b/performance-tests/Misc/test_singleton.cpp
@@ -32,8 +32,6 @@
 #include "ace/Synch.h"
 #include "ace/Log_Msg.h"
 
-#include "test_singleton.h"
-
 ACE_RCSID(Misc, test_singleton, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
@@ -68,6 +66,18 @@ Mutex_Singleton::instance (void)
   return Mutex_Singleton::instance_;
 }
 
+class DC_Singleton
+{
+public:
+  DC_Singleton (void) {}
+  void svc (void) {}
+  static DC_Singleton *instance (void);
+
+private:
+  static ACE_Thread_Mutex lock_;
+  static DC_Singleton *instance_;
+};
+
 ACE_Thread_Mutex DC_Singleton::lock_;
 
 DC_Singleton *DC_Singleton::instance_;
diff --git a/performance-tests/Misc/test_singleton.h b/performance-tests/Misc/test_singleton.h
deleted file mode 100644
index 20dcfd2bf32..00000000000
--- a/performance-tests/Misc/test_singleton.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-// Define the DC_Singleton here - it needs to be in a separate file to
-// get picked up correctly on AIX with auto template instantiation using
-// IBM C++ compiler (xlC).
-
-#ifndef __TEST_SINGLETON_H
-#define __TEST_SINGLETON_H
-
-#include "ace/Synch.h"
-
-class DC_Singleton
-{
-public:
-  DC_Singleton (void) {}
-  void svc (void) {}
-  static DC_Singleton *instance (void);
-
-private:
-  static ACE_Thread_Mutex lock_;
-  static DC_Singleton *instance_;
-};
-
-#endif /* __TEST_SINGLETON_H */
diff --git a/performance-tests/UDP/Makefile b/performance-tests/UDP/Makefile
index 5a24c6e19a6..adcc785006d 100644
--- a/performance-tests/UDP/Makefile
+++ b/performance-tests/UDP/Makefile
@@ -48,12 +48,15 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -79,7 +82,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
diff --git a/TAO/examples/Borland/ChatClient.bpr b/tests/Aio_Platform_Test.bpr
index 4016f65fa3b..27888a16835 100644
--- a/TAO/examples/Borland/ChatClient.bpr
+++ b/tests/Aio_Platform_Test.bpr
@@ -11,48 +11,40 @@ BCB = $(MAKEDIR)\..
 # section.
 # ---------------------------------------------------------------------------
 
-VERSION = BCB.04.04
-# ---------------------------------------------------------------------------
-PROJECT = ChatClient.exe
-OBJFILES = obj\ChatClient.obj obj\ChatClientWnd.obj obj\BroadcasterC.obj \
-  obj\BroadcasterS.obj obj\ReceiverC.obj obj\ReceiverS.obj obj\ReceiverImpl.obj
-RESFILES = ChatClient.res
-RESDEPEN = $(RESFILES) ChatClientWnd.dfm
-LIBFILES =
-LIBRARIES = ace_bp.lib tao_bp.lib orbsvcs_bp.lib
-SPARELIBS = Vcl40.lib orbsvcs_bp.lib tao_bp.lib ace_bp.lib
-PACKAGES = Vcl40.bpi Vclx40.bpi vcljpg40.bpi bcbsmp40.bpi Qrpt40.bpi Vcldb40.bpi \
-  ibsmp40.bpi vcldbx40.bpi TeeUI40.bpi teedb40.bpi tee40.bpi nmfast40.bpi \
-  dclocx40.bpi
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Aio_Platform_Test.exe
+OBJFILES = objs\Aio_Platform_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
 DEFFILE =
 # ---------------------------------------------------------------------------
 PATHCPP = .;
-PATHPAS = .;
 PATHASM = .;
+PATHPAS = .;
 PATHRC = .;
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = WIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0
-SYSDEFINES = _RTLDLL;NO_STRICT;USEPACKAGES
-# ---------------------------------------------------------------------------
-CFLAG1 = -I$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. -O2 -Hc \
-  -H=obj\ChatClient.csm -Hh=pch.h -w-rvl -w-rch -w-par -w-obs -w-inl -Ve -a8 -k- \
-  -vi -c -b- -Vx -tW -tWM -D$(SYSDEFINES);$(USERDEFINES)
-PFLAGS = -U$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal;$(RELEASELIBPATH) \
-  -I$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. -N2obj -N0obj \
-  -DWIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0 \
-  -$Y- -$L- -$D- -v -JPHNE -M
-RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.. \
-  -DWIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0
-AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /i..\..\.. /i..\.. /dWIN32 \
-  /dACE_HAS_DLL=1 /dTAO_HAS_DLL=1 /dTAO_ORBSVCS_HAS_DLL=1 /d_DLL /dACE_USE_RCSID=0 \
-  /mx /w2 /zn
-LFLAGS = -L$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal;$(RELEASELIBPATH) -aa \
-  -Tpe -x -Gn
-# ---------------------------------------------------------------------------
-ALLOBJ = c0w32.obj Memmgr.Lib $(PACKAGES) sysinit.obj $(OBJFILES)
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 
@@ -73,7 +65,7 @@ CodePage=1252
 
 [Version Info Keys]
 CompanyName=
-FileDescription=
+FileDescription=Executable (Console)
 FileVersion=1.0.0.0
 InternalName=
 LegalCopyright=
@@ -85,52 +77,27 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\..
-Item1=$(BCB)\include;$(BCB)\include\vcl;..\..\..\..;..\..\..
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
-Count=2
-Item0=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release
-Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\..\bin
-
-[HistoryLists\hlDebugSourcePath]
 Count=1
-Item0=$(BCB)\source\vcl;..
+Item0=$(BCB)\lib
 
 [HistoryLists\hlConditionals]
 Count=1
-Item0=WIN32;ACE_HAS_DLL=1;TAO_HAS_DLL=1;TAO_ORBSVCS_HAS_DLL=1;_DLL;ACE_USE_RCSID=0
+Item0=_NO_VCL
 
 [HistoryLists\hlIntOutputDir]
 Count=1
 Item0=obj
 
-[HistoryLists\hlHostApplication]
-Count=1
-Item0=D:\projects\ACE_wrappers\borland\bin\Naming_Service_bd.exe
-
-[HistoryLists\hlRunParameters]
-Count=2
-Item0=-f..\..\..\bin\chat.ior -nChris
-Item1=-f..\..\..\bin\chat.ior
-
-[HistoryLists\hlFinalOutputDir]
-Count=1
-Item0=..\..\..\..\bin
-
 [Debugging]
 DebugSourceDirs=
 
 [Parameters]
 RunParams=
 HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Compiler]
-InMemoryExe=0
-ShowInfoMsgs=0
 
 !endif
 
@@ -147,10 +114,6 @@ ShowInfoMsgs=0
 BCC32 = bcc32
 !endif
 
-!if !$d(CPP32)
-CPP32 = cpp32
-!endif
-
 !if !$d(DCC32)
 DCC32 = dcc32
 !endif
@@ -166,7 +129,6 @@ LINKER = ilink32
 !if !$d(BRCC32)
 BRCC32 = brcc32
 !endif
-
 # ---------------------------------------------------------------------------
 !if $d(PATHCPP)
 .PATH.CPP = $(PATHCPP)
@@ -202,16 +164,10 @@ $(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
     $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
 
 .cpp.obj:
-    $(BCB)\BIN\$(BCC32) $(CFLAG1) -n$(@D) {$< }
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
 
 .c.obj:
-    $(BCB)\BIN\$(BCC32) $(CFLAG1) -n$(@D) {$< }
-
-.c.i:
-    $(BCB)\BIN\$(CPP32) $(CFLAG1) -n. {$< }
-
-.cpp.i:
-    $(BCB)\BIN\$(CPP32) $(CFLAG1) -n. {$< }
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
 
 .asm.obj:
     $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
@@ -219,6 +175,3 @@ $(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
 .rc.res:
     $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
 # ---------------------------------------------------------------------------
-
-
-
diff --git a/tests/Aio_Platform_Test.icc b/tests/Aio_Platform_Test.icc
deleted file mode 100644
index 7d09ea6653e..00000000000
--- a/tests/Aio_Platform_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Aio_Platform_Test.exe"
-	{
-	   source type (cpp) "Aio_Platform_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Atomic_Op_Test.bpr b/tests/Atomic_Op_Test.bpr
new file mode 100644
index 00000000000..ad9a52149b9
--- /dev/null
+++ b/tests/Atomic_Op_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Atomic_Op_Test.exe
+OBJFILES = objs\Atomic_Op_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp
index 9098ee70eee..3d7ee83e3ad 100644
--- a/tests/Atomic_Op_Test.dsp
+++ b/tests/Atomic_Op_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Atomic_Op_Test - Win32 PharLap ETS Debug

+CFG=Atomic_Op_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Atomic_Op_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Atomic_Op_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Atomic_Op_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Atomic_Op_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Atomic_Op_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Atomic_Op_Test - Win32 Debug"

 # Name "Atomic_Op_Test - Win32 Alpha Debug"

-# Name "Atomic_Op_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -156,6 +125,7 @@ DEP_CPP_ATOMI=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -172,11 +142,6 @@ DEP_CPP_ATOMI=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_ATOMI=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Atomic_Op_Test.icc b/tests/Atomic_Op_Test.icc
deleted file mode 100644
index 0ea8582491a..00000000000
--- a/tests/Atomic_Op_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Atomic_Op_Test.exe"
-	{
-	   source type (cpp) "Atomic_Op_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Barrier_Test.bpr b/tests/Barrier_Test.bpr
new file mode 100644
index 00000000000..deb0e0304d0
--- /dev/null
+++ b/tests/Barrier_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Barrier_Test.exe
+OBJFILES = objs\Barrier_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp
index 1182befc752..b1f1aa35f74 100644
--- a/tests/Barrier_Test.dsp
+++ b/tests/Barrier_Test.dsp
@@ -18,13 +18,13 @@ CFG=Barrier_Test - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Barrier_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Barrier_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Barrier_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Barrier_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Barrier"

-# PROP BASE Intermediate_Dir "Barrier"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Barrier_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Barrier_Test - Win32 Debug"

 # Name "Barrier_Test - Win32 Alpha Debug"

-# Name "Barrier_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -173,6 +142,7 @@ DEP_CPP_BARRI=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_BARRI=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_BARRI=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Barrier_Test.icc b/tests/Barrier_Test.icc
deleted file mode 100644
index 0c93db4235a..00000000000
--- a/tests/Barrier_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Barrier_Test.exe"
-	{
-	   source type (cpp) "Barrier_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Basic_Types_Test.bpr b/tests/Basic_Types_Test.bpr
new file mode 100644
index 00000000000..33c81dd44c8
--- /dev/null
+++ b/tests/Basic_Types_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Basic_Types_Test.exe
+OBJFILES = objs\Basic_Types_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp
index 3d74b532a57..493cab39c42 100644
--- a/tests/Basic_Types_Test.dsp
+++ b/tests/Basic_Types_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Basic_Types_Test - Win32 PharLap ETS Debug

+CFG=Basic_Types_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,19 @@ CFG=Basic_Types_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Basic_Types_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Basic_Types_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Basic_Types_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Basic_Types_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Basic_Ty"

@@ -53,49 +49,12 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 # SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D ACE_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Basic_Types_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Basic_Types_Test - Win32 Debug"

-# Name "Basic_Types_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Basic_Types_Test.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\tests_pharlap_msvc.lnk

-# End Source File

 # End Target

 # End Project

diff --git a/tests/Basic_Types_Test.icc b/tests/Basic_Types_Test.icc
deleted file mode 100644
index e5f8ee7d26a..00000000000
--- a/tests/Basic_Types_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Basic_Types_Test.exe"
-	{
-	   source type (cpp) "Basic_Types_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Buffer_Stream_Test.bpr b/tests/Buffer_Stream_Test.bpr
new file mode 100644
index 00000000000..07f6d1e5376
--- /dev/null
+++ b/tests/Buffer_Stream_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Buffer_Stream_Test.exe
+OBJFILES = objs\Buffer_Stream_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp
index d2517bbaaa9..bf2f8f27f2a 100644
--- a/tests/Buffer_Stream_Test.dsp
+++ b/tests/Buffer_Stream_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Buffer_Stream_Test - Win32 PharLap ETS Debug

+CFG=Buffer_Stream_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Buffer_Stream_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Buffer_Stream_Test.mak"\

+ CFG="Buffer_Stream_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Buffer_Stream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Buffer_Stream_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Buffer_Stream_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Buffer_Stream_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Buffer_Stream_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Buffer_Stream_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Buffer_Stream_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Buffer_Stream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Buffer_Stream_Test - Win32 Debug"

 # Name "Buffer_Stream_Test - Win32 Alpha Debug"

-# Name "Buffer_Stream_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -197,6 +167,7 @@ DEP_CPP_BUFFE=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -238,11 +209,6 @@ DEP_CPP_BUFFE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_BUFFE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Buffer_Stream_Test.icc b/tests/Buffer_Stream_Test.icc
deleted file mode 100644
index a96bd80dd17..00000000000
--- a/tests/Buffer_Stream_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Buffer_Stream_Test.exe"
-	{
-	   source type (cpp) "Buffer_Stream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 377c73e2f16..daf453aaa3c 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -113,8 +113,8 @@ short_stream (void)
 
   if (in_mb->length () != len)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("buffer length not preserved")),
+                       "%p\n",
+                       "buffer length not preserved"),
                       1);
 
   u_long in_chunk, out_chunk;
@@ -125,8 +125,8 @@ short_stream (void)
       out_chunk = u_long (* (out_mb->rd_ptr () + i));
       if (in_chunk != out_chunk )
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("buffer contents not preserved")),
+                           "%p\n",
+                           "buffer contents not preserved"),
                           1);
     }
 
@@ -147,7 +147,7 @@ short_stream (void)
   ACE_CDR::Double d_array1[3];
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Checking operators and arrays\n\n")));
+              "Checking operators and arrays\n\n"));
 
   ACE_InputCDR::to_char tc (ch1);
   is >> tc;
@@ -165,78 +165,78 @@ short_stream (void)
 
   if (ch1 != ch)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("char transfer error")),
+                       "%p\n",
+                       "char transfer error"),
                       1);
 
   if (str1 != str)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("string transfer error")),
+                       "%p\n",
+                       "string transfer error"),
                       1);
 
   if (s1 != s)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("short transfer error")),
+                       "%p\n",
+                       "short transfer error"),
                       1);
 
   if (us1 != us)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("ushort transfer error")),
+                       "%p\n",
+                       "ushort transfer error"),
                       1);
 
   if (l1 != l)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("long transfer error")),
+                       "%p\n",
+                       "long transfer error"),
                       1);
 
   if (ul1 != ul)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("ulong transfer error")),
+                       "%p\n",
+                       "ulong transfer error"),
                       1);
 
   if (f1 != f)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("float transfer error")),
+                       "%p\n",
+                       "float transfer error"),
                       1);
 
   if (d1 != d)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("double transfer error")),
+                       "%p\n",
+                       "double transfer error"),
                       1);
 
   for (i = 0 ; i < 3; i++)
     if (s_array1[i] != s_array[i])
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("short array transfer error")),
+                         "%p\n",
+                         "short array transfer error"),
                         1);
 
   for (i = 0 ; i < 3; i++)
     if (l_array1[i] != l_array[i])
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("long array transfer error")),
+                         "%p\n",
+                         "long array transfer error"),
                         1);
 
   for (i = 0 ; i < 3; i++)
     if (f_array1[i] != f_array[i])
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("float array transfer error")),
+                         "%p\n",
+                         "float array transfer error"),
                         1);
 
   for (i = 0 ; i < 3; i++)
     if (d_array1[i] != d_array[i])
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("double array transfer error")),
+                         "%p\n",
+                         "double array transfer error"),
                         1);
 
   return 0;
@@ -252,7 +252,7 @@ main (int argc, ASYS_TCHAR *argv[])
               ACE::minor_version(),
               ACE::beta_version()));
 
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("dn:l:"));
+  ACE_Get_Opt get_opt (argc, argv, "dn:l:");
   int opt, debug = 0;
 
   while ((opt = get_opt ()) != EOF)
@@ -271,25 +271,25 @@ main (int argc, ASYS_TCHAR *argv[])
           case '?':
           default:
             ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("Usage: %s ")
-                        ASYS_TEXT ("-d debug")
-                        ASYS_TEXT ("-n <num> ")
-                        ASYS_TEXT ("-l <loops> ")
-                        ASYS_TEXT ("\n"),
+                        "Usage: %s "
+                        "-d debug"
+                        "-n <num> "
+                        "-l <loops> "
+                        "\n",
                         argv[0]));
             return -1;
         }
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Testing ACE CDR functions - short stream\n\n")));
+              "Testing ACE CDR functions - short stream\n\n"));
 
   if (short_stream () != 0 )
     return 1;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Short stream - no errors\n\n")
-              ASYS_TEXT ("Testing basic types - long stream\n\n")));
+              "Short stream - no errors\n\n"
+              "Testing basic types - long stream\n\n"));
 
   for (int i = 0; i < nloops; ++i)
     {
@@ -303,12 +303,12 @@ main (int argc, ASYS_TCHAR *argv[])
       if (debug > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Output CDR: \n")));
+                      "Output CDR: \n"));
           ACE_HEX_DUMP ((LM_DEBUG,
                          input.rd_ptr(),
                          64));
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Input CDR: \n")));
+                      "Input CDR: \n"));
           ACE_HEX_DUMP ((LM_DEBUG,
                          input.rd_ptr(),
                          64));
@@ -319,8 +319,8 @@ main (int argc, ASYS_TCHAR *argv[])
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Long stream - no errors\n\n")
-              ASYS_TEXT ("Testing basic types - long stream[2]\n\n")));
+              "Long stream - no errors\n\n"
+              "Testing basic types - long stream[2]\n\n"));
 
   for (int j = 0; j < nloops; ++j)
     {
@@ -334,12 +334,12 @@ main (int argc, ASYS_TCHAR *argv[])
       if (debug > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Output CDR: \n")));
+                      "Output CDR: \n"));
           ACE_HEX_DUMP ((LM_DEBUG,
                          input.rd_ptr(),
                          64));
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Input CDR: \n")));
+                      "Input CDR: \n"));
           ACE_HEX_DUMP ((LM_DEBUG,
                          input.rd_ptr(),
                          64));
@@ -350,7 +350,7 @@ main (int argc, ASYS_TCHAR *argv[])
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Long stream[2] - no errors\n\n")));
+              "Long stream[2] - no errors\n\n"));
 
   ACE_END_TEST;
 
@@ -366,33 +366,33 @@ CDR_Test_Types::test_put (ACE_OutputCDR &cdr)
     {
       if (cdr.write_octet (this->o) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_octet[%d] failed\n"),
+                           "write_octet[%d] failed\n",
                            i),
                           1);
       if (cdr.write_short (this->s) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_short[%d] failed\n"),
+                           "write_short[%d] failed\n",
                            i),
                           1);
       if (cdr.write_octet (this->o) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_octet-2[%d] failed\n"),
+                           "write_octet-2[%d] failed\n",
                            i),
                           1);
       if (cdr.write_long (this->l) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_long[%d] failed\n"),
+                           "write_long[%d] failed\n",
                            i),
                           1);
       if (cdr.write_long (this->l) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_long-2[%d] failed\n"),
+                           "write_long-2[%d] failed\n",
                            i),
                           1);
 
       if (cdr.write_string (this->str) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("write_string[%d] failed\n"),
+                           "write_string[%d] failed\n",
                            i),
                           1);
 
@@ -412,64 +412,64 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const
     {
       if (cdr.read_octet (xo) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_octet[%d] failed\n"),
+                           "read_octet[%d] failed\n",
                            i),
                           1);
       if (xo != this->o)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("octet[%d] differs\n"),
+                           "octet[%d] differs\n",
                            i),
                           1);
       if (cdr.read_short (xs) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_short[%d] failed\n"),
+                           "read_short[%d] failed\n",
                            i), 1);
       if (xs != this->s)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("short[%d] differs\n"),
+                           "short[%d] differs\n",
                            i),
                           1);
       if (cdr.read_octet (xo) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_octet-2[%d] failed\n"),
+                           "read_octet-2[%d] failed\n",
                            i),
                           1);
       if (xo != this->o)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("octet-2[%d] differs\n"),
+                           "octet-2[%d] differs\n",
                            i),
                           1);
       if (cdr.read_long (xl) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_long[%d] failed\n"),
+                           "read_long[%d] failed\n",
                            i),
                           1);
       if (xl != this->l)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("long[%d] differs\n"),
+                           "long[%d] differs\n",
                            i),
                           1);
       if (cdr.read_long (xl) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_long-2[%d] failed\n"),
+                           "read_long-2[%d] failed\n",
                            i),
                           1);
       if (xl != this->l)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("long-2[%d] differs\n"),
+                           "long-2[%d] differs\n",
                            i),
                           1);
 
       ACE_CDR::Char *xstr;
       if (cdr.read_string (xstr) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("read_string2[%d] failed\n"),
+                           "read_string2[%d] failed\n",
                            i),
                           1);
       ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char> auto_xstr (xstr);
       if (ACE_OS::strcmp (auto_xstr.get (), this->str) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("string[%d] differs\n"),
+                           "string[%d] differs\n",
                            i),
                           1);
     }
diff --git a/tests/CDR_Test.dsp b/tests/CDR_Test.dsp
index 8e4c4e4891e..960058c371a 100644
--- a/tests/CDR_Test.dsp
+++ b/tests/CDR_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=CDR_Test - Win32 PharLap ETS Debug

+CFG=CDR_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=CDR_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "CDR_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "CDR_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "CDR_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "CDR_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "CDR_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "CDR_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "CDR_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "CDR_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"CDR_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "CDR_Test - Win32 Debug"

 # Name "CDR_Test - Win32 Alpha Debug"

-# Name "CDR_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -195,8 +163,6 @@ NODEP_CPP_CDR_T=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "CDR_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/CDR_Test.icc b/tests/CDR_Test.icc
deleted file mode 100644
index 90e35af9bbe..00000000000
--- a/tests/CDR_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CDR_Test.exe"
-	{
-	   source type (cpp) "CDR_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Addr_Test.icc b/tests/CLASSIX/CLASSIX_Addr_Test.icc
deleted file mode 100644
index e8bb296faca..00000000000
--- a/tests/CLASSIX/CLASSIX_Addr_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Addr_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Addr_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc b/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc
deleted file mode 100644
index 0e6616500a0..00000000000
--- a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_CLD_Connector_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_CLD_Connector_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc b/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc
deleted file mode 100644
index d17e9fd3189..00000000000
--- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Con_Acc_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Con_Acc_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Group_Test.icc b/tests/CLASSIX/CLASSIX_Group_Test.icc
deleted file mode 100644
index 2dc3fd5b678..00000000000
--- a/tests/CLASSIX/CLASSIX_Group_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Group_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Group_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Notify_Test.icc b/tests/CLASSIX/CLASSIX_Notify_Test.icc
deleted file mode 100644
index f3c29c97ce4..00000000000
--- a/tests/CLASSIX/CLASSIX_Notify_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Notify_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Notify_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_OS_Test.icc b/tests/CLASSIX/CLASSIX_OS_Test.icc
deleted file mode 100644
index 2896c5b3ef3..00000000000
--- a/tests/CLASSIX/CLASSIX_OS_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_OS_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_OS_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Reactor_Test.icc b/tests/CLASSIX/CLASSIX_Reactor_Test.icc
deleted file mode 100644
index 8982535cec4..00000000000
--- a/tests/CLASSIX/CLASSIX_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Reactor_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc
deleted file mode 100644
index b7f06f11b5e..00000000000
--- a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Select_Reactor_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Select_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX/CLASSIX_Stream_Test.icc b/tests/CLASSIX/CLASSIX_Stream_Test.icc
deleted file mode 100644
index 6811d6fdb0b..00000000000
--- a/tests/CLASSIX/CLASSIX_Stream_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Stream_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Stream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Addr_Test.icc b/tests/CLASSIX_Addr_Test.icc
deleted file mode 100644
index e8bb296faca..00000000000
--- a/tests/CLASSIX_Addr_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Addr_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Addr_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_CLD_Connector_Test.icc b/tests/CLASSIX_CLD_Connector_Test.icc
deleted file mode 100644
index 0e6616500a0..00000000000
--- a/tests/CLASSIX_CLD_Connector_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_CLD_Connector_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_CLD_Connector_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Con_Acc_Test.icc b/tests/CLASSIX_Con_Acc_Test.icc
deleted file mode 100644
index d17e9fd3189..00000000000
--- a/tests/CLASSIX_Con_Acc_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Con_Acc_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Con_Acc_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Group_Test.icc b/tests/CLASSIX_Group_Test.icc
deleted file mode 100644
index 2dc3fd5b678..00000000000
--- a/tests/CLASSIX_Group_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Group_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Group_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Notify_Test.icc b/tests/CLASSIX_Notify_Test.icc
deleted file mode 100644
index f3c29c97ce4..00000000000
--- a/tests/CLASSIX_Notify_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Notify_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Notify_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_OS_Test.icc b/tests/CLASSIX_OS_Test.icc
deleted file mode 100644
index 2896c5b3ef3..00000000000
--- a/tests/CLASSIX_OS_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_OS_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_OS_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Reactor_Test.icc b/tests/CLASSIX_Reactor_Test.icc
deleted file mode 100644
index 8982535cec4..00000000000
--- a/tests/CLASSIX_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Reactor_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Select_Reactor_Test.icc b/tests/CLASSIX_Select_Reactor_Test.icc
deleted file mode 100644
index b7f06f11b5e..00000000000
--- a/tests/CLASSIX_Select_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Select_Reactor_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Select_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CLASSIX_Stream_Test.icc b/tests/CLASSIX_Stream_Test.icc
deleted file mode 100644
index 6811d6fdb0b..00000000000
--- a/tests/CLASSIX_Stream_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CLASSIX_Stream_Test.exe"
-	{
-	   source type (cpp) "CLASSIX_Stream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp
deleted file mode 100644
index 4c0bd291a50..00000000000
--- a/tests/CPP_Test.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CPP_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the ACE_SOCK_Acceptor and
-//     AC_SOCK_Connector classes. The test forks two processes or
-//     spawns two threads (depending upon the platform) and then executes
-//     client and server allowing them to connect and exchange
-//     data. No user input is required as far as command line
-//     arguments are concerned.
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/Thread.h"
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"                             
-#include "ace/SOCK_Stream.h"
-#include "ace/INET_Addr.h"
-#include "ace/Handle_Set.h"
-#include "test_config.h"
-
-static void *
-client (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg;
-  ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost");
-  ACE_SOCK_Stream cli_stream;
-  ACE_SOCK_Connector con;
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n"));
-  // Initiate timed, non-blocking connection with server.
-  
-  // Attempt a non-blocking connect to the server, reusing the local
-  // addr if necessary.
-  if (con.connect (cli_stream, server_addr,
-		   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n"));
-
-      // Check if non-blocking connection is in progress, 
-      // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete.
-      ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-
-      if (con.complete (cli_stream, &server_addr, &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0);
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", 
-		    server_addr.get_host_name ()));
-    }
-
-  if (cli_stream.disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable"));    
-
-  // Send data to server (correctly handles "incomplete writes").
-  
-  for (char c = 'a'; c <= 'z'; c++)
-    if (cli_stream.send_n (&c, 1) == -1) 
-      ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_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"));
-
-  char buf[1];
-
-  // Wait for handshake with server.
-  if (cli_stream.recv_n (buf, 1) != 1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n"));
-
-  // Close the connection completely.
-  if (cli_stream.close () == -1) 
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-
-  return 0;
-}
-
-static void *
-server (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg;
-
-  if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable"));
-
-  // Keep these objects out here to prevent excessive constructor
-  // calls...
-  ACE_SOCK_Stream new_stream;                                   
-  ACE_INET_Addr cli_addr;
-  ACE_Handle_Set handle_set;
-  ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-  // Performs the iterative server activities.
-
-  for (;;) 
-    {
-      char buf[BUFSIZ];                                     
-      char t = 'a';
-      
-      handle_set.reset ();
-      handle_set.set_bit (peer_acceptor->get_handle ());
-      
-      int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1,
-				   handle_set,
-				   0, 0, &tv);
-      if (result == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-      else if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n"));
-	  return 0;
-	}
-
-      // Create a new ACE_SOCK_Stream endpoint (note automatic restart
-      // if errno == EINTR).
-      
-      while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", 
-		      cli_addr.get_host_name (), cli_addr.get_port_number ()));
-	  
-	  // Enable non-blocking I/O.
-	  if (new_stream.enable (ACE_NONBLOCK) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0);
-	  
-	  handle_set.reset ();
-	  handle_set.set_bit (new_stream.get_handle ());
-	  
-	  // Read data from client (terminate on error).
-	  
-	  for (ssize_t r_bytes; ;)
-	    {
-	      if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
-				  handle_set,
-				  0, 0, 0) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-	      
-	      while ((r_bytes = new_stream.recv_n (buf, 1)) > 0)
-		{
-		  ACE_ASSERT (t == buf[0]);
-		  t++;
-		}
-	      
-	      if (r_bytes == 0)
-		{
-		  ACE_DEBUG ((LM_DEBUG, 
-			      "(%P|%t) reached end of input, connection closed by client\n"));
-
-		  // Handshake back with client.
-		  if (new_stream.send_n ("", 1) != 1)
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-		  // Close endpoint.
-		  if (new_stream.close () == -1) 
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-		  return 0;
-		}
-	      else if (r_bytes == -1)
-		{
-		  if (errno == EWOULDBLOCK)
-		    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n"));
-		  else
-		    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0);
-		}
-	    }
-	}
-
-      if (result == -1)
-	{
-	  if (errno == EWOULDBLOCK)
-	    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n"));
-	  else
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept"));
-	}
-    }
-  return 0;
-}
-
-static void
-spawn (void)
-{
-  // Acceptor
-  ACE_SOCK_Acceptor peer_acceptor;
-
-  // Create a server address.
-  ACE_INET_Addr server_addr;
-
-  // Bind listener to any port and then find out what the port was.
-  if (peer_acceptor.open (ACE_Addr::sap_any) == -1
-      || peer_acceptor.get_local_addr (server_addr) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open"));
-  else 
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
-		  server_addr.get_port_number ()));
-
-#if !defined (ACE_WIN32) && !defined (VXWORKS)
-      switch (ACE_OS::fork ())
-	{
-	case -1:
-	  ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed"));
-	  exit (-1);
-	case 0: 
-	  ACE_LOG_MSG->sync ("child");
-	  client (&server_addr);
-	default:
-	  server ((void *) &peer_acceptor);
-	  ACE_OS::wait ();
-	}
-#elif defined (ACE_HAS_THREADS)
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      // Wait for the threads to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-#else
-      ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1));
-#endif /* ACE_HAS_THREADS */	
-    }
-}
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("CPP_Test");
-
-  spawn ();
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
deleted file mode 100644
index deaf62256d2..00000000000
--- a/tests/Cache_Map_Manager_Test.cpp
+++ /dev/null
@@ -1,731 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cache_Map_Manager_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <ACE_Cache_Map_Manager> and
-//     <ACE_Hash_Cache_Map_Manager> that illustrates how to use the
-//     forward and reverse iterators, as well as the purging and
-//     caching features.
-//
-// = AUTHOR
-//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "test_config.h"
-#include "ace/Hash_Cache_Map_Manager_T.h"
-#include "ace/Map_Manager.h"
-#include "ace/Caching_Strategies_T.h"
-#include "ace/Functor.h"
-#include "ace/Pair_T.h"
-#include "ace/Synch.h"
-#include "ace/Get_Opt.h"
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-typedef ACE_UINT32 KEY;
-typedef ACE_UINT32 VALUE;
-typedef int ATTR;
-typedef ACE_Pair<VALUE, ATTR> CACHE_VALUE;
-typedef ACE_Hash<KEY> HASH_KEY;
-typedef ACE_Equal_To<KEY> COMPARE_KEYS;
-
-typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_MANAGER;
-
-typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-        HASH_MAP_MANAGER_ITERATOR;
-
-typedef ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_MANAGER;
-
-typedef ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_MANAGER_ITERATOR;
-
-typedef ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-        MAP_MANAGER_REVERSE_ITERATOR;
-
-typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER_ITERATOR, ATTR>
-        HASH_MAP_CACHING_UTILITY;
-
-typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER_ITERATOR, ATTR>
-        MAP_CACHING_UTILITY;
-
-// = Hash_Map_Manager related
-typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-        HASH_MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
-        HASH_MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
-        HASH_MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
-        HASH_MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
-        HASH_MAP_NULL_ADAPTER;
-
-// = Map_Manager related
-typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-        MAP_CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-        MAP_LRU;
-typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-        MAP_LFU;
-typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-        MAP_FIFO;
-typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-        MAP_NULL;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>
-        MAP_LRU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>
-        MAP_LFU_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
-        MAP_FIFO_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>
-        MAP_NULL_ADAPTER;
-
-typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
-        HASH_MAP_CACHE;
-typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER_ITERATOR, MAP_MANAGER_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
-        MAP_CACHE;
-
-static size_t iterations = ACE_MAX_ITERATIONS;
-static size_t no_of_lookups = iterations / 2;
-static int randomize_lookups = 1;
-static int purge_percent = 10;
-static LPCTSTR caching_strategy_type;
-static int caching_strategy_count = 4;
-static KEY pattern[ACE_MAX_ITERATIONS];
-
-static void
-run_iterator_cache (MAP_CACHE &cache)
-{
-  size_t iterations = cache.current_size ();
-  size_t counter = 0;
-  MAP_CACHE::iterator end = cache.end ();
-
-  for (MAP_CACHE::iterator iter = cache.begin ();
-       iter != end;
-       ++iter)
-    {
-      // Debugging info.
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%d|%d)"),
-                  (*iter).first (),
-                  (*iter).second ()));
-
-      ACE_ASSERT ((*iter).first () == (*iter).second ());
-      ++counter;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\n")));
-
-  ACE_UNUSED_ARG (iterations);
-  ACE_ASSERT (counter == iterations);
-}
-
-static void
-run_iterator_hash_cache (HASH_MAP_CACHE &cache)
-{
-  size_t iterations = cache.current_size ();
-  size_t counter = 0;
-  HASH_MAP_CACHE::iterator end = cache.end ();
-
-  for (HASH_MAP_CACHE::iterator iter = cache.begin ();
-       iter != end;
-       ++iter)
-    {
-      // Debugging info.
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%d|%d)"),
-                  (*iter).first (),
-                  (*iter).second ()));
-
-      ACE_ASSERT ((*iter).first () == (*iter).second ());
-      ++counter;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\n")));
-
-  ACE_UNUSED_ARG (iterations);
-  ACE_ASSERT (counter == iterations);
-}
-
-static void
-run_reverse_iterator_cache (MAP_CACHE &cache)
-{
-  size_t counter = cache.current_size ();
-  MAP_CACHE::reverse_iterator  rend = cache.rend ();
-
-  for (MAP_CACHE::reverse_iterator iter = cache.rbegin ();
-       iter != rend;
-       ++iter)
-    {
-      ACE_ASSERT ((*iter).first () == (*iter).second ());
-
-      // Debugging info.
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%d|%d)"),
-                  (*iter).first (),
-                  (*iter).second ()));
-      --counter;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\n")));
-  ACE_ASSERT (counter == 0);
-}
-
-static void
-run_reverse_iterator_hash_cache (HASH_MAP_CACHE &cache)
-{
-  size_t counter = cache.current_size ();
-  HASH_MAP_CACHE::reverse_iterator rend = cache.rend ();
-
-  for (HASH_MAP_CACHE::reverse_iterator iter = cache.rbegin ();
-       iter != rend;
-       ++iter)
-    {
-      ACE_ASSERT ((*iter).first () == (*iter).second ());
-
-      // Debugging info.
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%d|%d)"),
-                  (*iter).first (),
-                  (*iter).second ()));
-      --counter;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\n")));
-  ACE_ASSERT (counter == 0);
-}
-
-static void
-find_test_cache (MAP_CACHE &cache)
-{
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("find\n")));
-
-  for (size_t i = 0; i < no_of_lookups; ++i)
-    {
-      VALUE j;
-      int result = cache.find (pattern[i], j);
-
-      ACE_ASSERT (result != -1);
-      ACE_ASSERT (j == pattern[i]);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%d  "),
-                  j));
-
-      ACE_UNUSED_ARG (result);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
-}
-
-static void
-find_test_hash_cache (HASH_MAP_CACHE &cache)
-{
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("find\n")));
-
-  for (size_t i = 0; i < no_of_lookups; ++i)
-    {
-      VALUE j;
-      int result = cache.find (pattern[i], j);
-
-      ACE_ASSERT (result != -1);
-      ACE_ASSERT (j == pattern[i]);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%d  "),
-                  j));
-
-      ACE_UNUSED_ARG (result);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
-}
-
-static void
-purge_test_cache (MAP_CACHE &cache)
-{
-  // Get the number of entries in the container.
-  size_t current_map_size = cache.current_size ();
-
-  // Find the number of entries which will get purged.
-  size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5);
-
-  // Tell the caching strategy how much to purge.
-  cache.caching_strategy ().purge_percent (purge_percent);
-
-  // Purge from cache.
-  int result = cache.purge ();
-  ACE_ASSERT (result != -1);
-  ACE_UNUSED_ARG (result);
-
-  size_t resultant_size = 0;
-  if (caching_strategy_count == 0)
-    resultant_size = current_map_size;
-  else
-    resultant_size = current_map_size - entries_to_remove;
-  ACE_UNUSED_ARG (resultant_size);
-
-  // Make sure the purge took out the appropriate number of entries.
-  ACE_ASSERT (cache.current_size () == resultant_size);
-}
-
-static void
-purge_test_hash_cache (HASH_MAP_CACHE &cache)
-{
-  // Get the number of entries in the container.
-  size_t current_map_size = cache.current_size ();
-
-  // Find the number of entries which will get purged.
-  size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5);
-
-  // Tell the caching strategy how much to purge.
-  cache.caching_strategy ().purge_percent (purge_percent);
-
-  // Purge from cache.
-  int result = cache.purge ();
-  ACE_ASSERT (result != -1);
-  ACE_UNUSED_ARG (result);
-
-  size_t resultant_size = 0;
-  if (caching_strategy_count == 0)
-    resultant_size = current_map_size;
-  else
-    resultant_size = current_map_size - entries_to_remove;
-  ACE_UNUSED_ARG (resultant_size);
-
-  // Make sure the purge took out the appropriate number of entries.
-  ACE_ASSERT (cache.current_size () == resultant_size);
-}
-
-static void
-functionality_test_cache (MAP_CACHING_STRATEGY &caching_strategy,
-                          int same_pattern)
-{
-  //MAP_LRU lru;
-  MAP_CACHE cache (caching_strategy);
-  KEY i = 0;
-  VALUE j = 0;
-
-  // Add it to the map now.
-  size_t counter = 0;
-  for (;
-       i < iterations;
-       ++i, ++j)
-    {
-      int result = cache.bind (i, j);
-      ACE_ASSERT (result != -1);
-      ACE_UNUSED_ARG (result);
-
-      ACE_DEBUG ((LM_DEBUG, "keys[%d]=%d value=[%d]=%d\n",
-                  i, i, j, j));
-      ++counter;
-      ACE_ASSERT (cache.current_size () == counter);
-    }
-
-  run_iterator_cache (cache);
-  run_reverse_iterator_cache (cache);
-
-  if (same_pattern == 0)
-    {
-      // Obtain a pattern of lookups.
-      size_t total_entries = cache.current_size ();
-      
-      int k = 0; size_t i = 0;
-      for (k = 0; 
-           k < (int) ACE_MAX_ITERATIONS;
-           ++k)
-        {
-          KEY key = i;
-          if (randomize_lookups != 0)
-            pattern[k] = ACE_OS::rand () % total_entries;
-          else
-            pattern[k] = i;
-
-          ++i;
-          ACE_UNUSED_ARG (key);    
-        }
-    }
-
-  find_test_cache (cache);
-  
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Number of entries in cache before purging : %d\n"),
-              cache.current_size ()));
-  
-  purge_test_cache (cache);
-  
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Number of entries in cache after purging : %d\n"),
-              cache.current_size ()));
-
-  run_iterator_cache (cache);
-  run_reverse_iterator_cache (cache);
-}
-
-static void
-functionality_test_hash_cache (HASH_MAP_CACHING_STRATEGY &caching_strategy,
-                               int same_pattern)
-{
-  // HASH_MAP_LRU lru;
-  HASH_MAP_CACHE cache (caching_strategy);
-  KEY i = 0;
-  VALUE j = 0;
-
-  // Add it to the map now.
-  size_t counter = 0;
-  for (;
-       i < iterations;
-       ++i, ++j)
-    {
-      int result = cache.bind (i, j);
-      ACE_ASSERT (result != -1);
-      ACE_UNUSED_ARG (result);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("keys[%d]=%d value=[%d]=%d\n"),
-                  i, i, j, j));
-      ++counter;
-      ACE_ASSERT (cache.current_size () == counter);
-    }
-
-  run_iterator_hash_cache (cache);
-  run_reverse_iterator_hash_cache (cache);
-
-  if (same_pattern == 0)
-    {
-      // Obtain a pattern of lookups.
-      size_t total_entries = cache.current_size ();
-      int k = 0; size_t i = 0;
-      for (k = 0; 
-           k < (int) ACE_MAX_ITERATIONS;
-           ++k)
-        {
-          KEY key = i;
-          if (randomize_lookups != 0)
-            pattern[k] = ACE_OS::rand () % total_entries;
-          else
-            pattern[k] = i;
-
-          ++i;
-          ACE_UNUSED_ARG (key);     
-        }
-    }
-
-  find_test_hash_cache (cache);
-      
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Number of entries in cache before purging : %d\n"),
-              cache.current_size ()));
-
-  purge_test_hash_cache (cache);
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("Number of entries in cache after purging : %d\n"),
-              cache.current_size ()));
-
-  run_iterator_hash_cache (cache);
-  run_reverse_iterator_hash_cache (cache);
-}
-
-static int
-parse_args (int argc, ASYS_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("c:r:i:f:p:"));
-
-  caching_strategy_type = "lru";
-
-  int cc;
-  while ((cc = get_opt ()) != -1)
-    {
-    switch (cc)
-      {
-      case 'c':
-        {
-          caching_strategy_type = get_opt.optarg;
-
-          if (strcmp (caching_strategy_type, "null") == 0) 
-            caching_strategy_count = 0;
-          if (strcmp (caching_strategy_type, "lru") == 0)
-            caching_strategy_count = 1;
-          if (strcmp (caching_strategy_type, "lfu") == 0) 
-            caching_strategy_count = 2;
-          if (strcmp (caching_strategy_type, "fifo") == 0) 
-            caching_strategy_count = 3;
-          break;
-        }
-      case 'i':
-        iterations = ACE_OS::atoi (get_opt.optarg);
-        break;
-      case 'f':
-        no_of_lookups = ACE_OS::atoi (get_opt.optarg);
-        break;
-      case 'r':
-        randomize_lookups = ACE_OS::atoi (get_opt.optarg);
-        break;
-      case 'p':
-        purge_percent = ACE_OS::atoi (get_opt.optarg);
-        break;
-      case '?':
-      case 'h':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("usage: %s ")
-                    ASYS_TEXT ("[-c (caching strategy : lru / lfu / fifo/ null [default = all])] ")
-                    ASYS_TEXT ("[-r (randomize lookups)] ")
-                    ASYS_TEXT ("[-i (iterations)] ")
-                    ASYS_TEXT ("[-p (purge percent)] ")
-                    ASYS_TEXT ("[-f (number of lookups)] \n"),
-                    argv[0]));
-        return -1;
-      }
-    }
-  return 0;
-}
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    return result;
-  
-  ACE_START_TEST (ASYS_TEXT ("Cache_Map_Manager_Test"));
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
-
-  ACE_OS::srand (ACE_static_cast (size_t, ACE_OS::time (0)));
-  
-  HASH_MAP_CACHING_STRATEGY *hash_map_caching_strategy = 0;
-  MAP_CACHING_STRATEGY *map_caching_strategy = 0;
-
-  int same_pattern = 0;
-  switch (caching_strategy_count) 
-    {
-
-    case 0:
-      {
-        ACE_DEBUG ((LM_DEBUG, "Null_Caching_Strategy\n"));
-        map_caching_strategy = new MAP_NULL_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_NULL_ADAPTER;   
-        break;
-      }
-
-     case 1:
-      {
-        ACE_DEBUG ((LM_DEBUG, "LRU_Caching_Strategy\n"));
-        map_caching_strategy = new MAP_LRU_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_LRU_ADAPTER;
-        break;
-      }
-
-    case 2:
-      {
-        ACE_DEBUG ((LM_DEBUG, "LFU_Caching_Strategy\n"));
-        map_caching_strategy = new MAP_LFU_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_LFU_ADAPTER;
-        break;
-      }
-
-    case 3:
-      {
-        ACE_DEBUG ((LM_DEBUG, "FIFO_Caching_Strategy\n"));
-        map_caching_strategy = new MAP_FIFO_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_FIFO_ADAPTER;
-        break;
-      }
-
-    case 4:
-    default:
-      {
-        ACE_DEBUG ((LM_DEBUG, "LRU_Caching_Strategy\n"));
-        caching_strategy_count = 1;
-        map_caching_strategy = new MAP_LRU_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_LRU_ADAPTER;
-        functionality_test_cache (*map_caching_strategy, same_pattern);
-
-        same_pattern = 1;
-
-        functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern);
-        delete map_caching_strategy;
-        delete hash_map_caching_strategy;
-
-        ACE_DEBUG ((LM_DEBUG, "LFU_Caching_Strategy\n"));
-        caching_strategy_count = 2;
-        map_caching_strategy = new MAP_LFU_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_LFU_ADAPTER;
-        functionality_test_cache (*map_caching_strategy, same_pattern);
-        functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern);
-        delete map_caching_strategy;
-        delete hash_map_caching_strategy;
-
-        ACE_DEBUG ((LM_DEBUG, "FIFO_Caching_Strategy\n"));
-        caching_strategy_count = 3;
-        map_caching_strategy = new MAP_FIFO_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_FIFO_ADAPTER;
-        functionality_test_cache (*map_caching_strategy, same_pattern);
-        functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern);
-        delete map_caching_strategy;
-        delete hash_map_caching_strategy;
-
-        ACE_DEBUG ((LM_DEBUG, "Null_Caching_Strategy\n"));
-        caching_strategy_count = 0;
-        map_caching_strategy = new MAP_NULL_ADAPTER;
-        hash_map_caching_strategy = new HASH_MAP_NULL_ADAPTER;
-      }
-
-    }
-
-  functionality_test_cache (*map_caching_strategy, same_pattern);
-  functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern);  
-  delete map_caching_strategy;
-  delete hash_map_caching_strategy;
-
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Pair<VALUE, ATTR>;
-template class ACE_Reference_Pair<KEY, VALUE>;
-template class ACE_Equal_To<KEY>;
-
-template class ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<KEY, CACHE_VALUE>;
-
-template class ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
-template class ACE_Map_Entry<KEY, CACHE_VALUE>;
-
-template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR>;
-template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR>;
-
-template class ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
-template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>;
-template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>;
-
-template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>;
-template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>;
-
-template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>;
-template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>;
-
-template class ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>;
-
-template class ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>;
-template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Pair<VALUE, ATTR>
-#pragma instantiate ACE_Reference_Pair<KEY, VALUE>
-#pragma instantiate ACE_Equal_To<KEY>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<KEY, CACHE_VALUE>
-
-#pragma instantiate ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<KEY, CACHE_VALUE>
-
-#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR>
-#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR>
-
-#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>
-#pragma instantiate ACE_Caching_Strateg_Adaptery<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
-#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>
-
-#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>
-#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>
-
-#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>
-#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>
-
-#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHIN_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHIN_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHIN_STRATEGY, ATTR>
-
-#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Cache_Map_Manager_Test.dsp b/tests/Cache_Map_Manager_Test.dsp
deleted file mode 100644
index 9bcf8eca8e8..00000000000
--- a/tests/Cache_Map_Manager_Test.dsp
+++ /dev/null
@@ -1,194 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Cache_Map_Manager_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=Cache_Map_Manager_Test - Win32 PharLap ETS Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 PharLap ETS Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Cache_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Atomic_O"

-# PROP BASE Intermediate_Dir "Atomic_O"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Cache_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Cache_Map_Manager_Test - Win32 Debug"

-# Name "Cache_Map_Manager_Test - Win32 Alpha Debug"

-# Name "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Cache_Map_Manager_Test.cpp

-

-!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"

-

-DEP_CPP_CACHE=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config.h"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\test_config.h"\

-	

-NODEP_CPP_CACHE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
deleted file mode 100644
index e125d8cce97..00000000000
--- a/tests/Cached_Conn_Test.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cached_Conn_Test.cpp
-//
-// = DESCRIPTION
-//     The test illustrates how the <ACE_Strategy_Connector> works by
-//   showing how you can cache connections on the client using
-//   different caching strategies. Also how connections can be purged
-//   explicitly if needed from the connection cache maintained by the
-//   connector.
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef CACHED_CONNECT_TEST
-#define CACHED_CONNECT_TEST
-
-#include "test_config.h"
-#include "ace/INET_Addr.h"
-#include "ace/Strategies.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Acceptor.h"
-#include "ace/Connector.h"
-#include "ace/Get_Opt.h"
-#include "ace/Caching_Utility_T.h"
-#include "ace/Cached_Connect_Strategy_T.h"
-
-ACE_RCSID(tests, Cached_Conn_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-// Default number of clients/servers.
-static int n_servers = 2000;
-static double purge_percentage = 20;
-static int caching_strategy_type = 1;
-
-typedef size_t ATTRIBUTES;
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-        Svc_Handler;
-typedef ACE_Pair<Svc_Handler *, ATTRIBUTES> 
-        CACHED_HANDLER;
-typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-        REFCOUNTED_HASH_RECYCLABLE_ADDR;
-typedef ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR> H_KEY;
-typedef ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR> C_KEYS;
-
-typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\
-                                ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
-        HASH_MAP;
-typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, \
-                                 ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
-        HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\
-                                         ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
-        HASH_MAP_REVERSE_ITERATOR;
-typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
-        CLEANUP_STRATEGY;
-typedef ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
-        CACHING_UTILITY;
-
-typedef ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-        CACHING_STRATEGY;
-typedef ACE_LRU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-        LRU_CACHING_STRATEGY;
-typedef ACE_LFU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-        LFU_CACHING_STRATEGY;
-typedef ACE_FIFO_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-        FIFO_CACHING_STRATEGY;
-typedef ACE_Null_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-        NULL_CACHING_STRATEGY;
-typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >
-        LRU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
-        LFU_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
-        FIFO_CACHING_STRATEGY_ADAPTER;
-typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
-        NULL_CACHING_STRATEGY_ADAPTER;
-
-typedef ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
-        ACCEPTOR;
-  
-typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
-        STRATEGY_CONNECTOR;
-  
-typedef ACE_NOOP_Creation_Strategy<Svc_Handler>
-        NULL_CREATION_STRATEGY;
-  
-typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
-        NULL_ACTIVATION_STRATEGY;
- 
-typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-        CACHED_CONNECT_STRATEGY;
-
-//====================================================================
-
-
-static int
-cached_connect (STRATEGY_CONNECTOR &con,
-                const ACE_INET_Addr &server_addr)
-{
-  Svc_Handler *svc_handler = 0;
-  
-  // Perform a blocking connect to the server using the Strategy
-  // Connector with a connection caching strategy.  Since we are
-  // connecting to the same <server_addr> these calls will return
-  // the same dynamically allocated <Svc_Handler> for each
-  // <connect>.
-  int result = con.connect (svc_handler,
-                            server_addr);
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("connection failed")),
-                      -1);
-      
-  // Send the data to the server.
-  for (char *c = ACE_ALPHABET; *c != '\0'; c++)
-    if (svc_handler->peer ().send_n (c, 1) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%P|%t) %p\n"),
-                         ASYS_TEXT ("send_n")),
-                        -1);
-      
-  // Svc_Handler is now idle, so mark it as such and let the cache
-  // recycle it.
-  svc_handler->idle (1);
-  return 0;
-}
-
-static int
-server (ACCEPTOR *acceptor)
-{
-  ACE_INET_Addr cli_addr;
-      
-  // Create a new <Svc_Handler> to consume the data.
-  Svc_Handler svc_handler;
-      
-  int result = acceptor->accept (&svc_handler,
-                                 &cli_addr);
-  if (result == -1)
-    {
-      if (errno == EMFILE)
-        return 1;
-          
-      return -1;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
-              cli_addr.get_host_name (),
-              cli_addr.get_port_number ()));
-      
-  char c;
-  char *t = ACE_ALPHABET;
-  ssize_t r_bytes = 0;
-      
-  // Read data from client (terminate on error).
-  while ((r_bytes ==  svc_handler.peer ().recv_n (&c, 1)) > 0)
-    {
-      ACE_ASSERT (*t == c);
-          
-      // We need to guard against cached connections, which
-      // will send multiple sequences of letters from 'a' ->
-      // 'z' through the same connection.
-      if (*t == 'z')
-        t = ACE_ALPHABET;
-      else
-        t++;
-    }
-      
-  if (r_bytes == 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%P|%t) reached end of input, connection cached by client\n")));
-  else if (r_bytes == -1)
-    {
-      if (errno == EWOULDBLOCK)
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("(%P|%t) no input available, going back to reading\n")));
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%t) %p\n"),
-                           ASYS_TEXT ("recv_n")),
-                          -1);
-    }
-
-  return 0;
-}
-
-
-static void
-test_connection_management (CACHING_STRATEGY &caching_strategy)
-{
-  NULL_CREATION_STRATEGY creation_strategy;
-  NULL_ACTIVATION_STRATEGY activation_strategy;     
-      
-  // Configure the Strategy Connector with a strategy that caches
-  // connection.
-  CACHED_CONNECT_STRATEGY caching_connect_strategy (caching_strategy);
-      
-  STRATEGY_CONNECTOR strategy_connector (0,
-                                         &creation_strategy,
-                                         &caching_connect_strategy,
-                                         &activation_strategy);
-      
-  // Set the purging percentage explicitly. By default it is 10%.
-  // Note: The purge_percent could have been set before itself but,
-  // the following has been done just to show how one would explicitly
-  // set the purge_percent at any moment.
-  CACHED_CONNECT_STRATEGY *connect_strategy = 
-    ACE_dynamic_cast (CACHED_CONNECT_STRATEGY *,
-                      strategy_connector.connect_strategy ());
-  
-  connect_strategy->caching_strategy ().purge_percent (purge_percentage);
-      
-  for (int i = 0; i < n_servers; ++i)
-    {
-      // Acceptor
-      ACCEPTOR acceptor;
-      ACE_INET_Addr server_addr;
-          
-      // Bind acceptor to any port and then find out what the port
-      // was.
-      if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
-          || acceptor.acceptor ().get_local_addr (server_addr) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n"),
-                      ASYS_TEXT ("open")));
-          return;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
-                      server_addr.get_port_number ()));
-        }
-          
-      // Run the cached blocking test.
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) *starting cached blocking connect\n")));
-          
-      int result = cached_connect (strategy_connector,
-                                         server_addr);
-      ACE_ASSERT (result != -1);
-          
-      result = server (&acceptor);
-      if (result == 1)
-        {
-          // Close connections which are cached by explicitly purging
-          // the connection cache maintained by the connector.
-          ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n"));
-              
-          int retval = connect_strategy->purge_connections (purge_percentage);
-          ACE_ASSERT (retval != -1);
-        }
-          
-      ACE_ASSERT (result != -1);
-    } 
-}
-  
-
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "s:p:c:");
-      
-  int cc;
-      
-  while ((cc = get_opt ()) != -1)
-    switch (cc)
-      {
-      case 's':
-        n_servers = atoi (get_opt.optarg);
-        break;
-      case 'p':
-        purge_percentage = atoi (get_opt.optarg);
-        break;
-      case 'c': // If Null Caching Strategy then this test will fail!
-        caching_strategy_type = atoi (get_opt.optarg);
-        break;
-      case '?':
-      case 'h':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    "usage: %s "
-                    "[-s (number of servers to connect to)] "
-                    "[-p (purge percent)] "
-                    "[-c (caching_strategy_type 0=NULL , 1=LRU, 2=LFU, 3=FIFO default=LRU)]\n",
-                    argv[0]));
-        return -1;
-      }
-
-  return 0;
-}
-
-int
-main (int argc,
-      ASYS_TCHAR *argv[])
-{
-  ACE_START_TEST (ASYS_TEXT ("Cached_Conn_Test"));
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
-  
-  // Obtain the <number of servers> to connect to. Also the purge
-  // percentage using which the entries in the connection cache of
-  // the connector will be removed.
-  int result = parse_args (argc, argv);
-  ACE_ASSERT (result == 0);
-
-  CACHING_STRATEGY *caching_strategy = 0;
-  switch (caching_strategy_type)
-    {
-    case 0:
-      {      
-        caching_strategy = new NULL_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        break;
-      }
-    case 2:
-      {
-        caching_strategy = new LFU_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        break;
-      }
-       case 3:
-      {
-        caching_strategy = new FIFO_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        break;
-      }
-    case 1:
-    default:
-      {
-        ACE_DEBUG ((LM_DEBUG, "*************LRU Caching Strategy*****************\n"));
-        caching_strategy = new LRU_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        delete caching_strategy;
-        
-        ACE_DEBUG ((LM_DEBUG, "*************LFU Caching Strategy*****************\n"));
-        caching_strategy = new LFU_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        delete caching_strategy;
-
-        ACE_DEBUG ((LM_DEBUG, "*************FIFO Caching Strategy*****************\n"));
-        caching_strategy = new FIFO_CACHING_STRATEGY_ADAPTER;
-        test_connection_management (*caching_strategy);
-        break;
-      }
-    }
-
-  delete caching_strategy;
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
-  ACE_END_TEST;
-  return 0;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_NOOP_Creation_Strategy<Svc_Handler>;
-template class ACE_Concurrency_Strategy<Svc_Handler>;
-template class ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Creation_Strategy<Svc_Handler>;
-template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
-template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>;
-template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_NOOP_Concurrency_Strategy<Svc_Handler>;
-template class ACE_Recycling_Strategy<Svc_Handler>;
-template class ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<Svc_Handler>;
-template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>;
-
-template class ACE_Pair<Svc_Handler *, ATTRIBUTES>;
-template class ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
-template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER>;
-
-template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
-
-// = Caching_Strategy
-template class ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>;
-template class ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
-
-template class ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
-template class ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>;
-template class ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>;
-
-template class ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
-template class ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>;
-
-template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >;
-template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY >;
-template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY >;
-template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<Svc_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<Svc_Handler>
-#pragma instantiate ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<Svc_Handler>
-#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
-#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
-#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
-#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<Svc_Handler>
-#pragma instantiate ACE_Recycling_Strategy<Svc_Handler>
-#pragma instantiate ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
-
-#pragma instantiate ACE_Svc_Tuple<Svc_Handler>
-#pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
-
-#pragma instantiate ACE_Pair<Svc_Handler *, ATTRIBUTES>
-#pragma instantiate ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
-#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER>
-
-#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
-
-// = Caching_Strategy
-#pragma instantiate ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
-
-#pragma instantiate ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
-#pragma instantiate ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>
-#pragma instantiate ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>
-
-#pragma instantiate ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-#pragma instantiate ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>
-
-#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >
-#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY >
-#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY >
-#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* CACHED_CONNECT_TEST */
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index d30b7cd3d12..bdbd04c5ede 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -30,7 +30,7 @@ USELIB("..\ace\aced.lib");
 
 typedef int DATA;
 
-int main (int, ASYS_TCHAR *[])
+int main (int, char *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Collection_Test"));
 
@@ -48,7 +48,7 @@ int main (int, ASYS_TCHAR *[])
            iterator != unbounded_set.end ();
            ++iterator)
         {
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"),
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
                       (*iterator)));
         }
     }
@@ -59,7 +59,7 @@ int main (int, ASYS_TCHAR *[])
         {
           DATA *data = 0;
           iterator.next (data);
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"),
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
                       (*data)));
           iterator.advance ();
         }
@@ -99,7 +99,7 @@ int main (int, ASYS_TCHAR *[])
            i != array1.size ();
            ++i)
         {
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"),
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
                       array1[i]));
           ACE_ASSERT (array1[i] == 4);
         }
@@ -111,7 +111,7 @@ int main (int, ASYS_TCHAR *[])
         {
           DATA *data = 0;
           iterator.next (data);
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"),
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
                       (*data)));
           ACE_ASSERT (*data == 4);
           iterator.advance ();
diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp
index ed0a0a09d86..f5370014d6c 100644
--- a/tests/Collection_Test.dsp
+++ b/tests/Collection_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Collection_Test - Win32 PharLap ETS Debug

+CFG=Collection_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,19 @@ CFG=Collection_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Collection_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collection_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Collection_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -52,41 +48,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Collection_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Collection_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Collection_Test - Win32 Debug"

-# Name "Collection_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Collection_Test.cpp

diff --git a/tests/Collection_Test.icc b/tests/Collection_Test.icc
deleted file mode 100644
index b36c67bb625..00000000000
--- a/tests/Collection_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Collection_Test.exe"
-	{
-	   source type (cpp) "Collection_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Conn_Test.bpr b/tests/Conn_Test.bpr
new file mode 100644
index 00000000000..f460b2c2829
--- /dev/null
+++ b/tests/Conn_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Conn_Test.exe
+OBJFILES = objs\Conn_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 678155b666a..79c48c3ac1e 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -40,16 +40,8 @@ USELIB("..\ace\aced.lib");
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
 // Default number of clients/servers.
-#if defined (ACE_HAS_PHARLAP)
-// PharLap is, by default, resource contrained. Test for something that works
-// on the default configuration.
-static int n_servers = 2;
-static int n_clients = 4;
-#else
 static int n_servers = 4;
 static int n_clients = 10;
-#endif /* ACE_HAS_PHARLAP */
-
 static int n_client_iterations = 2;
 
 Svc_Handler::Svc_Handler (ACE_Thread_Manager *)
@@ -466,7 +458,7 @@ server (void *arg)
 
       if (result == -1)
         {
-          // svc_handler->close (); The ACE_Onsehot_Acceptor closed it.
+          svc_handler->close ();
 
           if (errno == ETIMEDOUT)
             {
diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp
index 5c7e76e493a..14296bea6e4 100644
--- a/tests/Conn_Test.dsp
+++ b/tests/Conn_Test.dsp
@@ -5,26 +5,25 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Conn_Test - Win32 PharLap ETS Debug

+CFG=Conn_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "Conn_Test.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 PharLap ETS Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Conn_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Conn_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Conn_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Conn_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Conn_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Conn_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Conn_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

 # Name "Conn_Test - Win32 Debug"

 # Name "Conn_Test - Win32 Alpha Debug"

-# Name "Conn_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -267,14 +235,12 @@ DEP_CPP_CONN_=\
 	"..\ace\ws2tcpip.h"\

 	".\Conn_Test.h"\

 	".\test_config.h"\

-	

+

 NODEP_CPP_CONN_=\

 	"..\ace\stdcpp.h"\

-	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 PharLap ETS Debug"

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/tests/Conn_Test.icc b/tests/Conn_Test.icc
deleted file mode 100644
index 1ae4651b51f..00000000000
--- a/tests/Conn_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Conn_Test.exe"
-	{
-	   source type (cpp) "Conn_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index a35b9b19a76..73d503e27e6 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -42,36 +42,20 @@ USELIB("..\ace\aced.lib");
 
 #if defined (ACE_WIN32)
 #  define OBJ_SUFFIX ".exe"
-#    if defined (__BORLANDC__)
-#      define OBJ_PREFIX ".\\bor\\bin\\"
-#    else
-#      define OBJ_PREFIX ""
-#    endif /* defined (__BORLANDC__) */
+#  define OBJ_PREFIX ""
 #else
 #  define OBJ_SUFFIX ACE_DLL_SUFFIX
 #  define OBJ_PREFIX "./" ACE_DLL_PREFIX
 #endif /*ACE_WIN32*/
 
 
-char const *
-cdecl_decoration(char const * func_name)
-{
-#if defined(__BORLANDC__)
-  static char decorated_func_name[10*1024];
-  ACE_OS::sprintf(decorated_func_name, "_%s", func_name);
-  return decorated_func_name;
-#else
-  return func_name;
-#endif
-}
-
 // This function returns the Hello object pointer.
 
 extern "C" ACE_Svc_Export Hello *get_hello (void);
 
 Hello *get_hello (void)
 {
-  Hello *hello = 0;
+  Hello *hello;
 
   ACE_NEW_RETURN (hello,
                   Hello,
@@ -83,38 +67,40 @@ Hello *get_hello (void)
 typedef Hello *(*TC) (void);
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 
-  ACE_START_TEST (ASYS_TEXT ("DLL_Test"));
+  ACE_START_TEST ("DLL_Test");
 
 // Protection against this test being run on platforms not supporting Dlls.
 #if defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \
     defined (__hpux)
 
   ACE_DLL dll;
+
   int retval = dll.open (OBJ_PREFIX "DLL_Test" OBJ_SUFFIX);
   if (retval != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
+                       "%p\n",
 		       dll.error ()),
                       -1);
 
   // Just becos the ANSI C++ spec says you can no longer cast a void* to a
-  // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello");
+  // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello"); 
   void * foo;
 
-  char const *cdecl_str = cdecl_decoration("get_hello");
-  foo = dll.symbol (cdecl_str);
+  foo = dll.symbol ("get_hello");
 
   // Cast the void* to long first.
-  long tmp = ACE_reinterpret_cast (long, foo);
+  long tmp = ACE_reinterpret_cast (long, foo);  
+
   TC f = ACE_reinterpret_cast (Hello * (*)(void), tmp);
+
   if (f == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
+                       "%p\n",
 		       dll.error ()),
                       -1);
 
diff --git a/tests/DLL_Test.h b/tests/DLL_Test.h
index bbdc085c520..c319f0fdc57 100644
--- a/tests/DLL_Test.h
+++ b/tests/DLL_Test.h
@@ -27,13 +27,13 @@ public:
   void say_hello (void)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("Hello\n")));
+                  "Hello\n"));
     }
 
   void say_next (void)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("How are you?\n")));
+                  "How are you?\n"));
     }
 };
 
diff --git a/tests/DLL_Test.icc b/tests/DLL_Test.icc
deleted file mode 100644
index 783af1bd1d3..00000000000
--- a/tests/DLL_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "DLL_Test.exe"
-	{
-	   source type (cpp) "DLL_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index e018d3307d0..6450378c6d9 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -26,26 +26,23 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
+static LPCTSTR string_table[] =
+{
+  ASYS_TEXT ("hello"),
+  ASYS_TEXT ("guten Tag"),
+  ASYS_TEXT ("goodbye"),
+  ASYS_TEXT ("auf wiedersehen"),
+  ASYS_TEXT ("funny"),
+  ASYS_TEXT ("lustig"),
+  0
+};
+
 static ACE_Static_Allocator<8192> alloc;
 
 typedef ASYS_TCHAR * STRING;
 typedef ACE_DLList<STRING> STRLIST;
 typedef ACE_DLList_Iterator<STRING> STRLIST_ITERATOR;
 
-static 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 (ASYS_TCHAR *, ASYS_TEXT ("hello")),
-  ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("guten Tag")),
-  ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("goodbye")),
-  ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("auf wiedersehen")),
-  ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("funny")),
-  ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("lustig")),
-  0
-};
-
 static void
 run_iterate (STRLIST &list)
 {
diff --git a/tests/DLList_Test.dsp b/tests/DLList_Test.dsp
index 16ea84fe827..b59cab8c329 100644
--- a/tests/DLList_Test.dsp
+++ b/tests/DLList_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=DLList_Test - Win32 PharLap ETS Debug

+CFG=DLList_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=DLList_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DLList_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLList_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "DLList_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLList_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "DLList_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "DLList_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "DLList_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "DLList_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "DLList_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "DLList_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "DLList_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./DLList_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "DLList_Test - Win32 Debug"

 # Name "DLList_Test - Win32 Alpha Debug"

-# Name "DLList_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\DLList_Test.cpp
 

 !ELSEIF  "$(CFG)" == "DLList_Test - Win32 Alpha Debug"

 

-DEP_CPP_DLLIS=\

+DEP_CPP_BARRI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -173,6 +142,7 @@ DEP_CPP_DLLIS=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_DLLIS=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_DLLIS=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "DLList_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/DLList_Test.icc b/tests/DLList_Test.icc
deleted file mode 100644
index 010a2e759ea..00000000000
--- a/tests/DLList_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "DLList_Test.exe"
-	{
-	   source type (cpp) "DLList_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Dynamic_Priority_Test.bpr b/tests/Dynamic_Priority_Test.bpr
new file mode 100644
index 00000000000..e8cf904574e
--- /dev/null
+++ b/tests/Dynamic_Priority_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Dynamic_Priority_Test.exe
+OBJFILES = objs\Dynamic_Priority_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp
index 900f2b39dba..8348b1cbda4 100644
--- a/tests/Dynamic_Priority_Test.cpp
+++ b/tests/Dynamic_Priority_Test.cpp
@@ -357,7 +357,7 @@ performance_consumer (void * args)
   timer.stop ();
   ACE_Time_Value tv;
   timer.elapsed_time (tv);
-  ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%6u, %6u, %f"),
+  ACE_DEBUG ((LM_INFO, "%6u, %6u, %f",
               local_count,
               tv.msec (),
               (ACE_timer_t) tv.msec () / local_count));
@@ -415,7 +415,7 @@ performance_producer (void *args)
   timer.stop ();
   ACE_Time_Value tv;
   timer.elapsed_time (tv);
-  ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%6u, %6u, %f, "),
+  ACE_DEBUG ((LM_INFO, "%6u, %6u, %f, ",
               local_count,
               tv.msec (),
               (ACE_timer_t) tv.msec () / local_count));
@@ -465,35 +465,35 @@ run_performance_test (u_int min_load,
     {
     case BEST:
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT ("\n\nenqueued, best static time, best static avg, ")
-                  ASYS_TEXT ("dequeued, best static time, best static avg, ")
-                  ASYS_TEXT ("enqueued, best deadline time, best deadline avg, ")
-                  ASYS_TEXT ("dequeued, best deadline time, best deadline avg, ")
-                  ASYS_TEXT ("enqueued, best laxity time, best laxity avg, ")
-                  ASYS_TEXT ("dequeued, best laxity time, best laxity avg\n")));
+                  "\n\nenqueued, best static time, best static avg, "
+                  "dequeued, best static time, best static avg, "
+                  "enqueued, best deadline time, best deadline avg, "
+                  "dequeued, best deadline time, best deadline avg, "
+                  "enqueued, best laxity time, best laxity avg, "
+                  "dequeued, best laxity time, best laxity avg\n"));
       break;
     case WORST:
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT ("\n\nenqueued, worst static time, worst static avg, ")
-                  ASYS_TEXT ("dequeued, worst static time, worst static avg, ")
-                  ASYS_TEXT ("enqueued, worst deadline time, worst deadline avg, ")
-                  ASYS_TEXT ("dequeued, worst deadline time, worst deadline avg, ")
-                  ASYS_TEXT ("enqueued, worst laxity time, worst laxity avg, ")
-                  ASYS_TEXT ("dequeued, worst laxity time, worst laxity avg\n")));
+                  "\n\nenqueued, worst static time, worst static avg, "
+                  "dequeued, worst static time, worst static avg, "
+                  "enqueued, worst deadline time, worst deadline avg, "
+                  "dequeued, worst deadline time, worst deadline avg, "
+                  "enqueued, worst laxity time, worst laxity avg, "
+                  "dequeued, worst laxity time, worst laxity avg\n"));
 
       break;
     case RANDOM:
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT ("\n\nenqueued, random static time, random static avg, ")
-                  ASYS_TEXT ("dequeued, random static time, random static avg, ")
-                  ASYS_TEXT ("enqueued, random deadline time, random deadline avg, ")
-                  ASYS_TEXT ("dequeued, random deadline time, random deadline avg, ")
-                  ASYS_TEXT ("enqueued, random laxity time, random laxity avg, ")
-                  ASYS_TEXT ("dequeued, random laxity time, random laxity avg\n")));
+                  "\n\nenqueued, random static time, random static avg, "
+                  "dequeued, random static time, random static avg, "
+                  "enqueued, random deadline time, random deadline avg, "
+                  "dequeued, random deadline time, random deadline avg, "
+                  "enqueued, random laxity time, random laxity avg, "
+                  "dequeued, random laxity time, random laxity avg\n"));
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("unknown test type %d"),
+                         "unknown test type %d",
                          test_type),
                         -1);
     }
@@ -598,7 +598,7 @@ run_performance_test (u_int min_load,
                 // This should only happen for a *very* large messages
                 // relative to the system's representation size.
                 ACE_ERROR_RETURN ((LM_ERROR,
-                                   ASYS_TEXT ("Insufficient range of random numbers")),
+                                   "Insufficient range of random numbers"),
                                   -1);
               shuffle_index = random_int % load;
 
@@ -617,7 +617,7 @@ run_performance_test (u_int min_load,
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("unknown test type %d"),
+                             "unknown test type %d",
                              test_type),
                             -1);
         }
@@ -637,7 +637,7 @@ run_performance_test (u_int min_load,
 
       // Add a comma delimiter for most recent outputs.
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT (", ")));
+                  ", "));
 
       // Run the performance test producer and consumer on the
       // deadline queue.
@@ -648,7 +648,7 @@ run_performance_test (u_int min_load,
 
       // Add a comma delimiter for most recent outputs.
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT (", ")));
+                  ", "));
 
       // Run the performance test producer and consumer on the laxity
       // queue.
@@ -659,7 +659,7 @@ run_performance_test (u_int min_load,
 
       // Move to the next line of output.
       ACE_DEBUG ((LM_INFO,
-                  ASYS_TEXT ("\n")));
+                  "\n"));
 
       delete [] time_offsets;
 
@@ -693,15 +693,15 @@ main (int, ASYS_TCHAR *[])
   {
     if (ACE_OS::last_error () == EPERM)
       ACE_DEBUG ((LM_MAX,
-                  ASYS_TEXT ("user is not superuser, ")
-                  ASYS_TEXT ("so remain in time-sharing class\n")));
+                  "user is not superuser, "
+                  "so remain in time-sharing class\n"));
     else if (ACE_OS::last_error () == ENOTSUP)
       ACE_DEBUG ((LM_MAX,
-                  ASYS_TEXT ("process scope scheduling is not available, ")
-                  ASYS_TEXT ("so remain in time-sharing class\n")));
+                  "process scope scheduling is not available, "
+                  "so remain in time-sharing class\n"));
     else
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%n: ACE_OS::sched_params failed\n%a")),
+                         "%n: ACE_OS::sched_params failed\n%a"),
                         -1);
   }
 
diff --git a/tests/Dynamic_Priority_Test.dsp b/tests/Dynamic_Priority_Test.dsp
index 30a53be7dd7..47d176c184f 100644
--- a/tests/Dynamic_Priority_Test.dsp
+++ b/tests/Dynamic_Priority_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug

+CFG=Dynamic_Priority_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,20 @@ CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak"\

+ CFG="Dynamic_Priority_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Dynamic_Priority_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -52,41 +49,10 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Dynamic_Priority_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

+# SUBTRACT LINK32 /pdbtype:<none>

 # Begin Target

 

 # Name "Dynamic_Priority_Test - Win32 Debug"

-# Name "Dynamic_Priority_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp .i"

diff --git a/tests/Dynamic_Priority_Test.icc b/tests/Dynamic_Priority_Test.icc
deleted file mode 100644
index 2e32c40956f..00000000000
--- a/tests/Dynamic_Priority_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Dynamic_Priority_Test.exe"
-	{
-	   source type (cpp) "Dynamic_Priority_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Enum_Interfaces_Test.bpr b/tests/Enum_Interfaces_Test.bpr
new file mode 100644
index 00000000000..8d8221e78ed
--- /dev/null
+++ b/tests/Enum_Interfaces_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Enum_Interfaces_Test.exe
+OBJFILES = objs\Enum_Interfaces_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp
index be49c4656a8..353318c69c2 100644
--- a/tests/Enum_Interfaces_Test.dsp
+++ b/tests/Enum_Interfaces_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Enum_Interfaces_Test - Win32 PharLap ETS Debug

+CFG=Enum_Interfaces_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Enum_Interfaces_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak"\

+ CFG="Enum_Interfaces_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Enum_Interfaces_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Enum_Interfaces_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Enum_Interfaces_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Enum_Interfaces_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Enum_Interfaces_Test - Win32 Debug"

 # Name "Enum_Interfaces_Test - Win32 Alpha Debug"

-# Name "Enum_Interfaces_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -157,16 +127,12 @@ DEP_CPP_ENUM_=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_ENUM_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Enum_Interfaces_Test.icc b/tests/Enum_Interfaces_Test.icc
deleted file mode 100644
index e02e53debf8..00000000000
--- a/tests/Enum_Interfaces_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Enum_Interfaces_Test.exe"
-	{
-	   source type (cpp) "Enum_Interfaces_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Env_Value_Test.bpr b/tests/Env_Value_Test.bpr
new file mode 100644
index 00000000000..765f66affb7
--- /dev/null
+++ b/tests/Env_Value_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Env_Value_Test.exe
+OBJFILES = objs\Env_Value_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index e9d0a79b1c0..44a9c94e80a 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -31,7 +31,7 @@ do { \
   ACE_Env_Value<type> val (varname, (defval)); \
   if (val != (expval)) { \
     ACE_ERROR ((LM_ERROR, \
-               ASYS_TEXT ("val %d does not match expected value of %d\n"), \
+               "val %d does not match expected value of %d\n", \
                (int) (type) val, (int) (expval))); \
   } \
   ACE_ASSERT (val == (expval)); \
@@ -46,8 +46,8 @@ int
 main (int argc, ASYS_TCHAR* [])
 {
   ACE_UNUSED_ARG (argc);
-  ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_POSITIVE=10.2"));
-  ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_NEGATIVE=-10.2"));
+  ACE_OS::putenv ("TEST_VALUE_POSITIVE=10.2");
+  ACE_OS::putenv ("TEST_VALUE_NEGATIVE=-10.2");
 #else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 main (int argc, LPTSTR [], LPTSTR envp[])
 {
@@ -81,28 +81,28 @@ main (int argc, LPTSTR [], LPTSTR envp[])
 #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
     {
       // In this case we're the child
-      ACE_START_TEST (ASYS_TEXT ("Env_Value_Test"));
+      ACE_START_TEST ("Env_Value_Test");
 
-      TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 4, 10);
+      TEST_THIS (int, "TEST_VALUE_POSITIVE", 4, 10);
 #if !defined (ACE_LACKS_FLOATING_POINT)
-      TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_POSITIVE"), -1.0, 10.2);
+      TEST_THIS (double, "TEST_VALUE_POSITIVE", -1.0, 10.2);
 #endif /* ! ACE_LACKS_FLOATING_POINT */
-      TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
-      TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
-      TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
-      TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
+      TEST_THIS (long, "TEST_VALUE_POSITIVE", 0, 10);
+      TEST_THIS (unsigned long, "TEST_VALUE_POSITIVE", 0, 10);
+      TEST_THIS (short, "TEST_VALUE_POSITIVE", 0, 10);
+      TEST_THIS (unsigned short, "TEST_VALUE_POSITIVE", 0, 10);
 
-      TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 4, -10);
+      TEST_THIS (int, "TEST_VALUE_NEGATIVE", 4, -10);
 #if !defined (ACE_LACKS_FLOATING_POINT)
-      TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), -1.0, -10.2);
+      TEST_THIS (double, "TEST_VALUE_NEGATIVE", -1.0, -10.2);
 #endif /* ! ACE_LACKS_FLOATING_POINT */
-      TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10L);
-      TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned long) -10);
-      TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10);
-      TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned short) -10);
+      TEST_THIS (long, "TEST_VALUE_NEGATIVE", 0, -10L);
+      TEST_THIS (unsigned long, "TEST_VALUE_NEGATIVE", 0, (unsigned long) -10);
+      TEST_THIS (short, "TEST_VALUE_NEGATIVE", 0, -10);
+      TEST_THIS (unsigned short, "TEST_VALUE_NEGATIVE", 0, (unsigned short) -10);
 
-      const ASYS_TCHAR *defstr = ASYS_TEXT ("Sarah Cleeland is Two!");
-      ACE_Env_Value<const ASYS_TCHAR *> sval (ASYS_TEXT ("This_Shouldnt_Be_Set_Hopefully"),
+      const char *defstr = "Sarah Cleeland is Two!";
+      ACE_Env_Value<const char *> sval ("This_Shouldnt_Be_Set_Hopefully",
                                   defstr);
       ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0);
       ACE_END_TEST;
diff --git a/tests/Env_Value_Test.dsp b/tests/Env_Value_Test.dsp
index 3ce8eb921e6..3adea71ef3e 100644
--- a/tests/Env_Value_Test.dsp
+++ b/tests/Env_Value_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Env_Value_Test - Win32 PharLap ETS Debug

+CFG=Env_Value_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Env_Value_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Env_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Env_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Env_Value_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Env_Value_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Env_Value_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Env_Value_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Env_Value_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Env_Value_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Env_Value_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Env_Value_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Env_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Env_Value_Test - Win32 Debug"

 # Name "Env_Value_Test - Win32 Alpha Debug"

-# Name "Env_Value_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\Env_Value_Test.cpp
 

 !ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 Alpha Debug"

 

-DEP_CPP_ENV_V=\

+DEP_CPP_BARRI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -173,6 +142,7 @@ DEP_CPP_ENV_V=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_ENV_V=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_ENV_V=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Env_Value_Test.icc b/tests/Env_Value_Test.icc
deleted file mode 100644
index 63665aee4a9..00000000000
--- a/tests/Env_Value_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Env_Value_Test.exe"
-	{
-	   source type (cpp) "Env_Value_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp
deleted file mode 100644
index 2c9ba7ca212..00000000000
--- a/tests/Future_Set_Test.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Future_Set_Test.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future Set and illustrates an
-//    implementation of the Active Object pattern, which is available
-//    at <http://www.cs.wustl.edu/~schmidt/Act-Obj.ps.gz>.  The
-//    Active Object itself is very simple -- it determines if numbers
-//    are prime.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se>
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "ace/ACE.h"
-#include "ace/Task.h"
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Future_Set.h"
-#include "ace/Method_Request.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID(tests, Future_Set_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-  USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT;
-
-// A counter for the tasks..
-static ATOMIC_INT task_count (0);
-
-class Prime_Scheduler : public ACE_Task_Base
-{
-  // = TITLE
-  //     Prime number scheduler for the Active Object.
-  //
-  // = DESCRIPTION
-  //     This class also plays the role of the Proxy and the Servant
-  //     in the Active Object pattern.  Naturally, these roles could
-  //     be split apart from the Prime_Scheduler.
-
-  friend class Method_Request_work;
-  friend class Method_Request_name;
-  friend class Method_Request_end;
-public:
-  // = Initialization and termination methods.
-  Prime_Scheduler (const ASYS_TCHAR *,
-                   Prime_Scheduler * = 0);
-  // Constructor.
-
-  virtual int open (void *args = 0);
-  // Initializer.
-
-  virtual int close (u_long flags = 0);
-  // Terminator.
-
-  virtual ~Prime_Scheduler (void);
-  // Destructor.
-
-  // = These methods are part of the Active Object Proxy interface.
-  ACE_Future<u_long> work (u_long param, int count = 1);
-  ACE_Future<const ASYS_TCHAR*> name (void);
-  void end (void);
-
-protected:
-  virtual int svc (void);
-  // Runs the Prime_Scheduler's event loop, which dequeues
-  // <Method_Requests> and dispatches them.
-
-  // = These are the Servant methods that do the actual work.
-  u_long work_i (u_long, int);
-  const ASYS_TCHAR *name_i (void);
-
-private:
-  // = These are the <Prime_Scheduler> implementation details.
-  ASYS_TCHAR *name_;
-  ACE_Activation_Queue activation_queue_;
-  Prime_Scheduler *scheduler_;
-};
-
-class Method_Request_work : public ACE_Method_Request
-{
-  // = TITLE
-  //     Reification of the <work> method.
-public:
-  Method_Request_work (Prime_Scheduler *,
-                       u_long,
-                       int,
-                       ACE_Future<u_long> &);
-  virtual ~Method_Request_work (void);
-
-  virtual int call (void);
-  // This is the entry point into the Active Object method.
-
-private:
-  Prime_Scheduler *scheduler_;
-
-  u_long param_;
-  // Parameter to the method that's used to determine if a number if
-  // prime.
-
-  int count_;
-  // Unused.
-
-  ACE_Future<u_long> future_result_;
-  // Store the result of the Future.
-};
-
-Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler,
-                                          u_long new_param,
-                                          int new_count,
-                                          ACE_Future<u_long> &new_result)
-  : scheduler_ (new_Prime_Scheduler),
-    param_ (new_param),
-    count_ (new_count),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Method_Request_work created\n")));
-}
-
-Method_Request_work::~Method_Request_work (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Method_Request_work will be deleted.\n")));
-}
-
-int
-Method_Request_work::call (void)
-{
-  // Dispatch the Servant's operation and store the result into the
-  // Future.
-  return this->future_result_.set (this->scheduler_->work_i
-                                   (this->param_,
-                                    this->count_));
-}
-
-class Method_Request_name : public ACE_Method_Request
-{
-  // = TITLE
-  //     Reification of the <name> method.
-public:
-  Method_Request_name (Prime_Scheduler *,
-                       ACE_Future<const ASYS_TCHAR*> &);
-  virtual ~Method_Request_name (void);
-
-  virtual int call (void);
-  // This is the entry point into the Active Object method.
-
-private:
-  Prime_Scheduler *scheduler_;
-  ACE_Future<const ASYS_TCHAR*> future_result_;
-};
-
-Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler,
-                                          ACE_Future<const ASYS_TCHAR*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Method_Request_name created\n")));
-}
-
-Method_Request_name::~Method_Request_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Method_Request_name will be deleted.\n")));
-}
-
-int
-Method_Request_name::call (void)
-{
-  // Dispatch the Servant's operation and store the result into the
-  // Future.
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Request_end : public ACE_Method_Request
-{
-  // = TITLE
-  //     Reification of the <end> method.
-public:
-  Method_Request_end (Prime_Scheduler *new_Prime_Scheduler);
-  virtual ~Method_Request_end (void);
-  virtual int call (void);
-
-private:
-  Prime_Scheduler *scheduler_;
-};
-
-Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler)
-  : scheduler_ (scheduler)
-{
-}
-
-Method_Request_end::~Method_Request_end (void)
-{
-}
-
-int
-Method_Request_end::call (void)
-{
-  // Shut down the scheduler.
-  this->scheduler_->close ();
-  return -1;
-}
-
-// Constructor
-Prime_Scheduler::Prime_Scheduler (const ASYS_TCHAR *newname,
-                                  Prime_Scheduler *new_scheduler)
-  : scheduler_ (new_scheduler)
-{
-  ACE_NEW (this->name_,
-           ASYS_TCHAR[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((ASYS_TCHAR *) this->name_,
-                  newname);
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Prime_Scheduler %s created\n"),
-              this->name_));
-}
-
-// Destructor
-
-Prime_Scheduler::~Prime_Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"),
-              this->name_));
-  delete [] this->name_;
-}
-
-// open
-
-int
-Prime_Scheduler::open (void *)
-{
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Prime_Scheduler %s open\n"),
-              this->name_));
-  // Become an Active Object.
-  return this->activate (THR_BOUND | THR_DETACHED);
-}
-
-// close
-
-int
-Prime_Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Prime_Scheduler %s close\n"),
-              this->name_));
-  task_count--;
-  return 0;
-}
-
-// Service..
-
-int
-Prime_Scheduler::svc (void)
-{
-  for (;;)
-    {
-      // Dequeue the next method request (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) calling method request\n")));
-      // Call it.
-      if (mo->call () == -1)
-        break;
-      // Destructor automatically deletes it.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void
-Prime_Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Request_end (this));
-}
-
-// Here's where the Work takes place.  We compute if the parameter is
-// a prime number.
-
-u_long
-Prime_Scheduler::work_i (u_long param,
-                         int count)
-{
-  ACE_UNUSED_ARG (count);
-
-  return ACE::is_prime (param, 2, param / 2);
-}
-
-const ASYS_TCHAR *
-Prime_Scheduler::name_i (void)
-{
-  return this->name_;
-}
-
-ACE_Future<const ASYS_TCHAR *>
-Prime_Scheduler::name (void)
-{
-  if (this->scheduler_)
-    // Delegate to the Prime_Scheduler.
-    return this->scheduler_->name ();
-  else
-    {
-      ACE_Future<const ASYS_TCHAR*> new_future;
-
-      // @@ What happens if new fails here?
-      this->activation_queue_.enqueue
-        (new Method_Request_name (this,
-                                  new_future));
-      return new_future;
-    }
-}
-
-ACE_Future<u_long>
-Prime_Scheduler::work (u_long newparam,
-                       int newcount)
-{
-  if (this->scheduler_) {
-    return this->scheduler_->work (newparam, newcount);
-  }
-  else {
-    ACE_Future<u_long> new_future;
-
-    this->activation_queue_.enqueue
-      (new Method_Request_work (this,
-                                newparam,
-                                newcount,
-                                new_future));
-    return new_future;
-  }
-}
-
-// @@ These values should be set by the command line options!
-
-// Total number of loops.
-static int n_loops = 100;
-
-typedef ACE_Future_Rep<u_long> *u_long_key;
-typedef ACE_Future_Holder<u_long> *u_long_value;
-
-typedef ACE_Future_Rep<const ASYS_TCHAR *> *char_star_key;
-typedef ACE_Future_Holder<const ASYS_TCHAR *> *char_star_value;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-template class ACE_Future_Holder<const ASYS_TCHAR *>;
-template class ACE_Future_Holder<u_long>;
-template class ACE_Future_Observer<const ASYS_TCHAR *>;
-template class ACE_Future_Observer<u_long>;
-template class ACE_Future<const ASYS_TCHAR *>;
-template class ACE_Future<u_long>;
-template class ACE_Future_Rep<const ASYS_TCHAR *>;
-template class ACE_Future_Rep<u_long>;
-template class ACE_Future_Set<const ASYS_TCHAR *>;
-template class ACE_Future_Set<u_long>;
-template class auto_ptr<ACE_Method_Request>;
-template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
-template class ACE_Pointer_Hash<u_long_key>;
-template class ACE_Equal_To<u_long_key>;
-template class ACE_Hash_Map_Entry<u_long_key, u_long_value>;
-template class ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
-template class ACE_Pointer_Hash<char_star_key>;
-template class ACE_Equal_To<char_star_key>;
-template class ACE_Hash_Map_Entry<char_star_key, char_star_value>;
-template class ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#pragma instantiate ACE_Future_Holder<const ASYS_TCHAR *>
-#pragma instantiate ACE_Future_Holder<u_long>
-#pragma instantiate ACE_Future_Observer<const ASYS_TCHAR *>
-#pragma instantiate ACE_Future_Observer<u_long>
-#pragma instantiate ACE_Future<const ASYS_TCHAR *>
-#pragma instantiate ACE_Future<u_long>
-#pragma instantiate ACE_Future_Rep<const ASYS_TCHAR *>
-#pragma instantiate ACE_Future_Rep<u_long>
-#pragma instantiate ACE_Future_Set<const ASYS_TCHAR *>
-#pragma instantiate ACE_Future_Set<u_long>
-#pragma instantiate auto_ptr<ACE_Method_Request>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Pointer_Hash<u_long_key>
-#pragma instantiate ACE_Equal_To<u_long_key>
-#pragma instantiate ACE_Hash_Map_Entry<u_long_key, u_long_value>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Pointer_Hash<char_star_key>
-#pragma instantiate ACE_Equal_To<char_star_key>
-#pragma instantiate ACE_Hash_Map_Entry<char_star_key, char_star_value>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_THREADS */
-
-int
-main (int, ASYS_TCHAR *[])
-{
-  ACE_START_TEST (ASYS_TEXT ("Future_Set_Test"));
-
-#if defined (ACE_HAS_THREADS)
-  // @@ Should make these be <auto_ptr>s...
-  Prime_Scheduler *andres, *peter, *helmut, *matias;
-
-  // Create active objects..
-  ACE_NEW_RETURN (andres,
-                  Prime_Scheduler (ASYS_TEXT ("andres")),
-                  -1);
-  ACE_ASSERT (andres->open () != -1);
-  ACE_NEW_RETURN (peter,
-                  Prime_Scheduler (ASYS_TEXT ("peter")),
-                  -1);
-  ACE_ASSERT (peter->open () != -1);
-  ACE_NEW_RETURN (helmut,
-                  Prime_Scheduler (ASYS_TEXT ("helmut")),
-                  -1);
-  ACE_ASSERT (helmut->open () != -1);
-
-  // Matias passes all asynchronous method calls on to Andres...
-  ACE_NEW_RETURN (matias,
-                  Prime_Scheduler (ASYS_TEXT ("matias"),
-                                   andres),
-                  -1);
-  ACE_ASSERT (matias->open () != -1);
-
-  ACE_Future<u_long> fresulta;
-  ACE_Future<u_long> fresultb;
-  ACE_Future<u_long> fresultc;
-  ACE_Future<u_long> fresultd;
-  ACE_Future<const ASYS_TCHAR *> fname;
-
-  ACE_Future_Set<u_long> fseta;
-  ACE_Future_Set<u_long> fsetb;
-  ACE_Future_Set<u_long> fsetc;
-  ACE_Future_Set<u_long> fsetd;
-  ACE_Future_Set<const ASYS_TCHAR *> fsetname;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) initializing future sets with non-blocking call\n")));
-
-  for (int i = 0; i < n_loops; i++)
-    {
-      // Spawn off the methods, which run in a separate thread as
-      // active object invocations.
-      fresulta = andres->work (9013);
-      fresultb = peter->work (9013);
-      fresultc = helmut->work (9013);
-      fresultd = matias->work (9013);
-      fname = andres->name ();
-
-      fseta.insert (fresulta);
-      fsetb.insert (fresultb);
-      fsetc.insert (fresultc);
-      fsetd.insert (fresultd);
-      fsetname.insert (fname);
-    }
-
-
-  // See if the result is available...
-
-  if (!fseta.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set a is not empty.....\n")));
-
-  if (!fsetb.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set b is not empty.....\n")));
-
-  if (!fsetc.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set c is not empty.....\n")));
-
-  if (!fsetd.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set d is not empty.....\n")));
-
-  if (!fsetname.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set name is not empty.....\n")));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) non-blocking calls done... now blocking...\n")));
-
-  // Save the result of fresulta.
-
-  u_long resulta = 0;
-  u_long resultb = 0;
-  u_long resultc = 0;
-  u_long resultd = 0;
-
-  u_int count = 0;
-  while (fseta.next_readable (fresulta))
-    {
-      fresulta.get (resulta);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) result(%u) a %u\n"),
-                  count,
-                  (u_int) resulta));
-    }
-
-  count = 0;
-  while (fsetb.next_readable (fresultb))
-    {
-      fresultb.get (resultb);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) result(%u) b %u\n"),
-                  count,
-                  (u_int) resultb));
-    }
-
-  count = 0;
-  while (fsetc.next_readable (fresultc))
-    {
-      fresultc.get (resultc);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) result(%u) c %u\n"),
-                  count,
-                  (u_int) resultc));
-    }
-
-  count = 0;
-  while (fsetd.next_readable (fresultd))
-    {
-      fresultd.get (resultd);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) result(%u) d %u\n"),
-                  count,
-                  (u_int) resultd));
-    }
-
-  const ASYS_TCHAR *name;
-  count = 0;
-  while (fsetname.next_readable (fname))
-    {
-      fname.get (name);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%t) result(%u) name %s\n"),
-                  count,
-                  name));
-    }
-
-  if (fseta.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set a is empty.....\n")));
-
-  if (fsetb.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set b is empty.....\n")));
-
-  if (fsetc.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set c is empty.....\n")));
-
-  if (fsetd.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set d is empty.....\n")));
-
-  if (fsetname.is_empty ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) wow.. set name is empty.....\n")));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) task_count %d\n"),
-              task_count.value () ));
-
-  // Close things down.
-  andres->end ();
-  peter->end ();
-  helmut->end ();
-  matias->end ();
-
-  ACE_OS::sleep (2);
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) task_count %d\n"),
-              task_count.value () ));
-
-  ACE_OS::sleep (5);
-
-  delete andres;
-  delete peter;
-  delete helmut;
-  delete matias;
-
-#else
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("threads not supported on this platform\n")));
-#endif /* ACE_HAS_THREADS */
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/Future_Set_Test.dsp b/tests/Future_Set_Test.dsp
deleted file mode 100644
index 80681040d84..00000000000
--- a/tests/Future_Set_Test.dsp
+++ /dev/null
@@ -1,264 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Future_Set_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=Future_Set_Test - Win32 PharLap ETS Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Future_Set_Test.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 PharLap ETS Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Future_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Future_Set_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Future_Set_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Future_Set_Test\Debug"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\Debug"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Future_Set_Test\Alpha Debug"

-# PROP BASE Intermediate_Dir "Future_Set_Test\Alpha Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Future_Set_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Future_Set_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Future_Set_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Future_Set_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Future_Set_Test - Win32 Debug"

-# Name "Future_Set_Test - Win32 Alpha Debug"

-# Name "Future_Set_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Future_Set_Test.cpp

-

-!IF  "$(CFG)" == "Future_Set_Test - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"

-

-DEP_CPP_FUTUR=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Activation_Queue.h"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config.h"\

-	"..\ace\Containers.cpp"\

-	"..\ace\Containers.h"\

-	"..\ace\Containers.i"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Free_List.cpp"\

-	"..\ace\Free_List.h"\

-	"..\ace\Free_List.i"\

-	"..\ace\Future.cpp"\

-	"..\ace\Future.h"\

-	"..\ace\Handle_Set.h"\

-	"..\ace\Handle_Set.i"\

-	"..\ace\Hash_Map_Manager.cpp"\

-	"..\ace\Hash_Map_Manager.h"\

-	"..\ace\IO_Cntl_Msg.h"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Malloc.h"\

-	"..\ace\Malloc.i"\

-	"..\ace\Malloc_T.cpp"\

-	"..\ace\Malloc_T.h"\

-	"..\ace\Malloc_T.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Mem_Map.h"\

-	"..\ace\Mem_Map.i"\

-	"..\ace\Memory_Pool.h"\

-	"..\ace\Memory_Pool.i"\

-	"..\ace\Message_Block.h"\

-	"..\ace\Message_Block.i"\

-	"..\ace\Message_Queue.cpp"\

-	"..\ace\Message_Queue.h"\

-	"..\ace\Message_Queue.i"\

-	"..\ace\Method_Request.h"\

-	"..\ace\Module.cpp"\

-	"..\ace\Module.h"\

-	"..\ace\Module.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\Reactor.h"\

-	"..\ace\Reactor.i"\

-	"..\ace\Reactor_Impl.h"\

-	"..\ace\Service_Config.h"\

-	"..\ace\Service_Config.i"\

-	"..\ace\Service_Object.h"\

-	"..\ace\Service_Object.i"\

-	"..\ace\Service_Types.h"\

-	"..\ace\Service_Types.i"\

-	"..\ace\Shared_Object.h"\

-	"..\ace\Shared_Object.i"\

-	"..\ace\Signal.h"\

-	"..\ace\Signal.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\Strategies.h"\

-	"..\ace\Strategies_T.cpp"\

-	"..\ace\Strategies_T.h"\

-	"..\ace\Stream_Modules.cpp"\

-	"..\ace\Stream_Modules.h"\

-	"..\ace\Stream_Modules.i"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Svc_Conf_Tokens.h"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_Options.h"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\Task.h"\

-	"..\ace\Task.i"\

-	"..\ace\Task_T.cpp"\

-	"..\ace\Task_T.h"\

-	"..\ace\Task_T.i"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Thread_Manager.h"\

-	"..\ace\Thread_Manager.i"\

-	"..\ace\Timer_Queue.h"\

-	"..\ace\Timer_Queue_T.cpp"\

-	"..\ace\Timer_Queue_T.h"\

-	"..\ace\Timer_Queue_T.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\WFMO_Reactor.h"\

-	"..\ace\WFMO_Reactor.i"\

-	"..\ace\ws2tcpip.h"\

-	".\test_config.h"\

-	

-NODEP_CPP_FUTUR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 PharLap ETS Debug"

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/Future_Test.bpr b/tests/Future_Test.bpr
new file mode 100644
index 00000000000..3c694e5d92f
--- /dev/null
+++ b/tests/Future_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Future_Test.exe
+OBJFILES = objs\Future_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 73502edff87..4f61f5c56bc 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -70,7 +70,7 @@ class Prime_Scheduler : public ACE_Task_Base
 public:
   // = Initialization and termination methods.
   Prime_Scheduler (const ASYS_TCHAR *,
-                   Prime_Scheduler * = 0);
+             Prime_Scheduler * = 0);
   // Constructor.
 
   virtual int open (void *args = 0);
@@ -232,7 +232,7 @@ Method_Request_end::call (void)
 
 // Constructor
 Prime_Scheduler::Prime_Scheduler (const ASYS_TCHAR *newname,
-                                  Prime_Scheduler *new_scheduler)
+                      Prime_Scheduler *new_scheduler)
   : scheduler_ (new_scheduler)
 {
   ACE_NEW (this->name_,
@@ -373,39 +373,21 @@ template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
 template class ACE_Future<const ASYS_TCHAR *>;
 template class ACE_Future<int>;
 template class ACE_Future<u_long>;
-template class ACE_Future_Rep<const ASYS_TCHAR *>;
+template class ACE_Future_Rep<ASYS_TCHAR const *>;
 template class ACE_Future_Rep<int>;
 template class ACE_Future_Rep<u_long>;
 template class auto_ptr<ACE_Method_Request>;
 template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
-template class ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Node<ACE_Future_Observer<int> *>;
-template class ACE_Node<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<int> *>;
-template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
 #pragma instantiate ACE_Future<const ASYS_TCHAR *>
 #pragma instantiate ACE_Future<int>
 #pragma instantiate ACE_Future<u_long>
-#pragma instantiate ACE_Future_Rep<const ASYS_TCHAR *>
+#pragma instantiate ACE_Future_Rep<ASYS_TCHAR const *>
 #pragma instantiate ACE_Future_Rep<int>
 #pragma instantiate ACE_Future_Rep<u_long>
 #pragma instantiate auto_ptr<ACE_Method_Request>
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
-#pragma instantiate ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ACE_HAS_THREADS */
@@ -543,8 +525,7 @@ main (int, ASYS_TCHAR *[])
     ACE_Future<int> f1;
     f1.set (100);
 
-    // Note you need to use absolute time, not relative time.
-    ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (10));
+    ACE_Time_Value timeout (1);
     int value = 0;
 
     if (f1.get (value, &timeout) == 0
@@ -556,7 +537,6 @@ main (int, ASYS_TCHAR *[])
                   ASYS_TEXT ("ACE_Future<T>::Set followed by Ace_Future<T>::Get does ")
                   ASYS_TEXT ("not work, broken Ace_Future<> implementation.\n")));
   }
-
   {
     ACE_DEBUG ((LM_DEBUG,
                 ASYS_TEXT ("Checking if Ace_Future<T>::operator= is implemented ")
@@ -579,10 +559,9 @@ main (int, ASYS_TCHAR *[])
     // instance at this moment
 
     // The stuff below might crash the process if the <operator=>
-    // implementation was bad.
+    // implementation was bad
     int value = 0;
-
-    ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (10));
+    ACE_Time_Value timeout (1);
 
     f1.set (100);
     f1.get (value, &timeout);
diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp
index fcae3d09de3..61169ba3aa6 100644
--- a/tests/Future_Test.dsp
+++ b/tests/Future_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Future_Test - Win32 PharLap ETS Debug

+CFG=Future_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Future_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Future_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Future_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Future_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Future_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Future_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Future_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Future_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Future_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Future_Test - Win32 Debug"

 # Name "Future_Test - Win32 Alpha Debug"

-# Name "Future_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -201,6 +170,7 @@ DEP_CPP_FUTUR=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -238,11 +208,6 @@ DEP_CPP_FUTUR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_FUTUR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Future_Test.icc b/tests/Future_Test.icc
deleted file mode 100644
index 6b62f1d82df..00000000000
--- a/tests/Future_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Future_Test.exe"
-	{
-	   source type (cpp) "Future_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Handle_Set_Test.bpr b/tests/Handle_Set_Test.bpr
new file mode 100644
index 00000000000..43cb3771f42
--- /dev/null
+++ b/tests/Handle_Set_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Handle_Set_Test.exe
+OBJFILES = objs\Handle_Set_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index ee4c6c25f7a..0fbf86f8da0 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -104,8 +104,8 @@ test_boundaries (void)
       const int SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS = 1;
       ACE_ASSERT (0 == SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS);
 #else /* ! defined (ACE_PSOS_DIAB) */
-      ACE_ASSERT (0 == ASYS_TEXT ("this shouldn't get called since ")
-                  ASYS_TEXT ("the set is empty!\n"));
+      ACE_ASSERT (0 == ASYS_TEXT ("this shouldn't get called since "
+                                  "the set is empty!\n"));
 #endif /* defined (ACE_PSOS_DIAB) */
     }
 
diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp
index 2f0bedc5649..7770749432d 100644
--- a/tests/Handle_Set_Test.dsp
+++ b/tests/Handle_Set_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Handle_Set_Test - Win32 PharLap ETS Debug

+CFG=Handle_Set_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Handle_Set_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Handle_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Handle_Set_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Handle_Set_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Handle_Set_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Handle_Set_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Handle_Set_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Handle_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Handle_Set_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Handle_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Handle_Set_Test - Win32 Debug"

 # Name "Handle_Set_Test - Win32 Alpha Debug"

-# Name "Handle_Set_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -179,6 +148,7 @@ DEP_CPP_HANDL=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -196,11 +166,6 @@ DEP_CPP_HANDL=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_HANDL=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Handle_Set_Test.icc b/tests/Handle_Set_Test.icc
deleted file mode 100644
index c3b7f53f8ea..00000000000
--- a/tests/Handle_Set_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Handle_Set_Test.exe"
-	{
-	   source type (cpp) "Handle_Set_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Hash_Map_Manager_Test.bpr b/tests/Hash_Map_Manager_Test.bpr
new file mode 100644
index 00000000000..bc596c53ad0
--- /dev/null
+++ b/tests/Hash_Map_Manager_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Hash_Map_Manager_Test.exe
+OBJFILES = objs\Hash_Map_Manager_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index e320f910072..8e91fe5eba7 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -15,7 +15,7 @@
 //      conjunction with the <ACE_Hash_Map_Manager>.
 //
 // = AUTHOR
-//    James Hu <jxh@cs.wustl.edu> and
+//    James Hu <jxh@cs.wustl.edu> and 
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
@@ -32,25 +32,25 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-typedef ACE_Hash_Map_Entry<LPCTSTR,
+typedef ACE_Hash_Map_Entry<LPCTSTR, 
                            LPCTSTR> HASH_STRING_ENTRY;
 
-typedef ACE_Hash_Map_Manager_Ex<LPCTSTR,
-                                LPCTSTR,
-                                ACE_Hash<LPCTSTR>,
-                                ACE_Equal_To<LPCTSTR>,
+typedef ACE_Hash_Map_Manager_Ex<LPCTSTR, 
+                                LPCTSTR, 
+                                ACE_Hash<LPCTSTR>, 
+                                ACE_Equal_To<LPCTSTR>, 
                                 ACE_Null_Mutex> HASH_STRING_MAP;
 
-typedef ACE_Hash_Map_Iterator_Ex<LPCTSTR,
-                                 LPCTSTR,
-                                 ACE_Hash<LPCTSTR>,
-                                 ACE_Equal_To<LPCTSTR>,
+typedef ACE_Hash_Map_Iterator_Ex<LPCTSTR, 
+                                 LPCTSTR, 
+                                 ACE_Hash<LPCTSTR>, 
+                                 ACE_Equal_To<LPCTSTR>, 
                                  ACE_Null_Mutex> HASH_STRING_ITER;
 
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<LPCTSTR,
-                                         LPCTSTR,
-                                         ACE_Hash<LPCTSTR>,
-                                         ACE_Equal_To<LPCTSTR>,
+typedef ACE_Hash_Map_Reverse_Iterator_Ex<LPCTSTR, 
+                                         LPCTSTR, 
+                                         ACE_Hash<LPCTSTR>, 
+                                         ACE_Equal_To<LPCTSTR>, 
                                          ACE_Null_Mutex> HASH_STRING_REVERSE_ITER;
 
 struct String_Table
@@ -61,19 +61,19 @@ struct String_Table
 
 static String_Table string_table[] =
 {
-  {
-    ACE_TEXT ("hello"),
-    ACE_TEXT ("guten Tag")
+  { 
+    ASYS_TEXT ("hello"),
+    ASYS_TEXT ("guten Tag")
   },
-  {
-    ACE_TEXT ("goodbye"),
-    ACE_TEXT ("auf wiedersehen")
+  { 
+    ASYS_TEXT ("goodbye"),
+    ASYS_TEXT ("auf wiedersehen")
   },
-  {
-    ACE_TEXT ("funny"),
-    ACE_TEXT ("lustig")
+  { 
+    ASYS_TEXT ("funny"),
+    ASYS_TEXT ("lustig")
   },
-  {
+  { 
     0,
     0
   }
@@ -105,7 +105,7 @@ run_test (void)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("%p failed for %s \n"),
                          ASYS_TEXT ("bind"),
-                         ASYS_MULTIBYTE_STRING (string_table[i].key_)), -1);
+                         string_table[i].key_), -1);
 
   LPCTSTR entry;
 
@@ -115,12 +115,12 @@ run_test (void)
                    entry) == 0)
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("`%s' found `%s'\n"),
-                  ASYS_MULTIBYTE_STRING (string_table[i].key_),
+                  string_table[i].key_,
                   entry));
     else
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("`%s' not found\n"),
-                         ASYS_MULTIBYTE_STRING (string_table[i].key_)),
+                         string_table[i].key_),
                         -1);
 
   // Check the <trybind> operation.
@@ -149,8 +149,8 @@ run_test (void)
         ACE_DEBUG ((LM_DEBUG,
                     ASYS_TEXT ("iterating (%d): [%s, %s]\n"),
                     i,
-                    ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->ext_id_),
-                    ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->int_id_)));
+                    (LPCTSTR) entry->ext_id_,
+                    (LPCTSTR) entry->int_id_));
         i++;
       }
   }
@@ -163,12 +163,12 @@ run_test (void)
                    entry) == 0)
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("`%s' found `%s'\n"),
-                  ASYS_MULTIBYTE_STRING (string_table[i].key_),
-                  ASYS_MULTIBYTE_STRING (entry)));
+                  string_table[i].key_,
+                  entry));
     else if (i != 2)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("`%s' not found\n"),
-                         ASYS_MULTIBYTE_STRING (string_table[i].key_)),
+                         string_table[i].key_),
                         -1);
 
   // Let's test the iterator backwards.
@@ -183,8 +183,8 @@ run_test (void)
         ACE_DEBUG ((LM_DEBUG,
                     ASYS_TEXT ("iterating (%d): [%s, %s]\n"),
                     i,
-                    ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->ext_id_),
-                    ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->int_id_)));
+                    (LPCTSTR) entry->ext_id_,
+                    (LPCTSTR) entry->int_id_));
         i++;
       }
   }
diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp
index b2fb5a1ab47..7f4a301458e 100644
--- a/tests/Hash_Map_Manager_Test.dsp
+++ b/tests/Hash_Map_Manager_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Hash_Map_Manager_Test - Win32 PharLap ETS Debug

+CFG=Hash_Map_Manager_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Hash_Map_Manager_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak"\

+ CFG="Hash_Map_Manager_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Hash_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Hash_Map_Manager_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Hash_Map_Manager_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Hash_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Hash_Map_Manager_Test - Win32 Debug"

 # Name "Hash_Map_Manager_Test - Win32 Alpha Debug"

-# Name "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -186,6 +156,7 @@ DEP_CPP_HASH_=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -205,15 +176,10 @@ DEP_CPP_HASH_=\
 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

-	".\test_config.h"\

-	

-NODEP_CPP_HASH_=\

-	"..\ace\stdcpp.h"\

 	".\Hash_Map_Manager_Test.h"\

+	".\test_config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/Hash_Map_Manager_Test.icc b/tests/Hash_Map_Manager_Test.icc
deleted file mode 100644
index a9245ae17ed..00000000000
--- a/tests/Hash_Map_Manager_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Hash_Map_Manager_Test.exe"
-	{
-	   source type (cpp) "Hash_Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp
index b20f86304d4..804d7da0ba4 100644
--- a/tests/High_Res_Timer_Test.cpp
+++ b/tests/High_Res_Timer_Test.cpp
@@ -47,8 +47,8 @@ check (const u_int interval, const u_int measured)
   else
     {
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("The measured time of %u differs from ")
-                  ASYS_TEXT ("the interval of %u by %u percent.\n"),
+                  ASYS_TEXT ("The measured time of %u differs from "
+                             "the interval of %u by %u percent.\n"),
                   measured, interval, percentage_difference));
       return 1;
     }
@@ -78,8 +78,8 @@ main (int argc, ASYS_TCHAR *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("High_Res_Timer_Test"));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ")
-                        ASYS_TEXT ("1/microsecond\n"),
+  ACE_DEBUG ((LM_DEBUG, "The ACE_High_Res_Timer scale factor is %u "
+                        "1/microsecond\n",
               ACE_High_Res_Timer::global_scale_factor ()));
 
   u_int errors = 0;
@@ -105,11 +105,11 @@ main (int argc, ASYS_TCHAR *argv[])
         {
           const ACE_Time_Value interval (0, intervals[i]);
           const ACE_Time_Value measured = time_interval (interval);
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"),
+          ACE_DEBUG ((LM_DEBUG, "interval: %u usec, measured: %u usec%s\n",
                       interval.sec () * 1000000 + interval.usec (),
                       measured.sec () * 1000000 + measured.usec (),
                       intervals[i] <= TIMER_RESOLUTION  ?
-                      ASYS_TEXT (" (interval and measured may differ)")  :  ASYS_TEXT ("")));
+                      " (interval and measured may differ)"  :  ""));
 
           if (intervals[i] > TIMER_RESOLUTION)
             {
diff --git a/tests/High_Res_Timer_Test.dsp b/tests/High_Res_Timer_Test.dsp
index cacae79bd3d..66e0a101307 100644
--- a/tests/High_Res_Timer_Test.dsp
+++ b/tests/High_Res_Timer_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=High_Res_Timer_Test - Win32 PharLap ETS Debug

+CFG=High_Res_Timer_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=High_Res_Timer_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "High_Res_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "High_Res_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "High_Res_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "High_Res_Timer_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "High_Res_Timer_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "High_Res_Timer_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "High_Res_Timer_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "High_Res_Timer_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "High_Res_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "High_Res_Timer_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./High_Res_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "High_Res_Timer_Test - Win32 Debug"

 # Name "High_Res_Timer_Test - Win32 Alpha Debug"

-# Name "High_Res_Timer_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\High_Res_Timer_Test.cpp
 

 !ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 Alpha Debug"

 

-DEP_CPP_HIGH_=\

+DEP_CPP_BARRI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -173,6 +142,7 @@ DEP_CPP_HIGH_=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_HIGH_=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_HIGH_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/High_Res_Timer_Test.icc b/tests/High_Res_Timer_Test.icc
deleted file mode 100644
index f703ae217df..00000000000
--- a/tests/High_Res_Timer_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "High_Res_Timer_Test.exe"
-	{
-	   source type (cpp) "High_Res_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/IOStream_Test.bpr b/tests/IOStream_Test.bpr
new file mode 100644
index 00000000000..ddfccd82dfb
--- /dev/null
+++ b/tests/IOStream_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = IOStream_Test.exe
+OBJFILES = objs\IOStream_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index b7867aa97dc..b9673a8a00c 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -184,14 +184,13 @@ client (void *arg = 0)
 
   if (connector.connect (server, addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT (" (%t) %p\n"),
-                       ASYS_TEXT ("Failed to connect to server thread")),
+                       " (%t) %p\n",
+                       "Failed to connect to server thread"),
                       0);
 
   // Send a string to the server which it can interpret as a qchar[]
   const char *str = "\"This is a test     string.\"";
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) Client Sending: (%s)\n"),
-              ASYS_WIDE_STRING (str)));
+  ACE_DEBUG ((LM_DEBUG, " (%P|%t) Client Sending: (%s)\n", str));
   server << str << endl;
 
   // Allow the server to get the string and echo it to the user. (The
@@ -204,8 +203,8 @@ client (void *arg = 0)
 
   str = "\"THIS IS A     TEST STRING.\"";
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Client Sending: (%s)\n"),
-              ASYS_WIDE_STRING (str)));
+              " (%P|%t) Client Sending: (%s)\n",
+              str));
   server << str << endl;
 
   // Again, give the server time to display the happenings to the
@@ -217,7 +216,7 @@ client (void *arg = 0)
   // the server.
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Client Receiving\n")));
+              " (%P|%t) Client Receiving\n"));
 
   ACE_Time_Value timeout (2);
   ACE_Time_Value *timeoutp = &timeout;
@@ -235,13 +234,13 @@ client (void *arg = 0)
       if (eof)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT (" (%P|%t) Unrecoverable stream error/eof\n")));
+                      " (%P|%t) Unrecoverable stream error/eof\n"));
           break;
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT (" (%P|%t) Recoverable stream error/timed out)\n")));
+                      " (%P|%t) Recoverable stream error/timed out)\n"));
           server.clear (0);
         }
     }
@@ -252,7 +251,7 @@ client (void *arg = 0)
   server >> d;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Client Received: int %d float %f long %d float %f double %f\n"),
+              " (%P|%t) Client Received: int %d float %f long %d float %f double %f\n",
               i,
               f1,
               (int) l,
@@ -299,8 +298,8 @@ server (void *arg = 0)
 
   if (acceptor->get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("get_local_addr")),
+                       "%p\n",
+                       "get_local_addr"),
                       0);
 
 #if defined (ACE_HAS_THREADS)
@@ -308,14 +307,14 @@ server (void *arg = 0)
                                               (void *) &server_addr,
                                               THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT (" (%t) %p\n"),
-                       ASYS_TEXT ("spawing client thread")),
+                       " (%t) %p\n",
+                       "spawing client thread"),
                       0);
 #endif /* ACE_HAS_THREADS */
 
   if (acceptor->accept (client_handler) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT (" (%P|%t) Failed to accept new client_handler")),
+                       " (%P|%t) Failed to accept new client_handler"),
                       0);
 
   // Read a qbuf[] from the client.  Notice that all of the client's
@@ -325,8 +324,8 @@ server (void *arg = 0)
   client_handler >> qbuf;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Server Received: (\"%s\")\n"),
-              ASYS_WIDE_STRING ((char *) qbuf)));
+              " (%P|%t) Server Received: (\"%s\")\n",
+              qbuf));
 
   // Give the client time to announce the next test to the user.
   ACE_OS::sleep (2);
@@ -349,7 +348,7 @@ server (void *arg = 0)
       if (buf.length () > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "%s ",
-                    ASYS_WIDE_STRING (buf.c_str ())));
+                    buf.c_str ()));
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -358,7 +357,7 @@ server (void *arg = 0)
   char buf[BUFSIZ];
   ACE_OS::memset (buf, 0, sizeof buf);
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Server Received: (")));
+              " (%P|%t) Server Received: ("));
 
   while (ACE_OS::strlen (buf) == 0
          || buf[ACE_OS::strlen (buf) - 1] != '"')
@@ -366,12 +365,12 @@ server (void *arg = 0)
       if (! (client_handler >> buf))
         break;
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s "),
-                  ASYS_WIDE_STRING (buf)));
+                  "%s ",
+                  buf));
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (")\n")));
+              ")\n"));
 #endif /* ACE_HAS_STRING_CLASS */
 
   // Send some non-textual data to the client.  We use a single
@@ -381,11 +380,11 @@ server (void *arg = 0)
   // command or the implicit <<endl.
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Server sleeping\n")));
+              " (%P|%t) Server sleeping\n"));
   ACE_OS::sleep (5);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Server Sending:  1 .12342134 666555444 23.45 -46.5e9 \n")));
+              " (%P|%t) Server Sending:  1 .12342134 666555444 23.45 -46.5e9 \n"));
   client_handler << 1 << " ";
   client_handler << .12342134 << " ";
   client_handler << 666555444 << " ";
@@ -404,7 +403,7 @@ server (void *arg = 0)
   client_handler >> i >> f1 >> l >> f2 >> d;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT (" (%P|%t) Server Received: int %d float %g long %d float %g double %g\n"),
+              " (%P|%t) Server Received: int %d float %g long %d float %g double %g\n",
               i,
               f1,
               (int) l,
@@ -429,16 +428,15 @@ spawn (void)
 
   if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT (" (%P|%t) %p\n"),
-                       ASYS_TEXT ("open")),
+                       " (%P|%t) %p\n",
+                       "open"),
                       -1);
 #if defined (ACE_HAS_THREADS)
   else if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (server),
                                                   &acceptor,
                                                   THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("spawning server thread")),
+                       "%p\n", "spawning server thread"),
                       -1);
 
   // Wait for the client and server thread to exit.
@@ -450,8 +448,8 @@ spawn (void)
     {
     case -1:
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("%p\n%a"),
-                  ASYS_TEXT ("fork failed")));
+                  "%p\n%a",
+                  "fork failed"));
       ACE_OS::_exit (-1);
     case 0: // In child
       {
@@ -460,8 +458,8 @@ spawn (void)
 
         if (acceptor.get_local_addr (server_addr) == -1)
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("%p\n"),
-                      ASYS_TEXT ("get_local_addr")));
+                      "%p\n",
+                      "get_local_addr"));
         else
           client ((void *) &server_addr);
         ACE_END_LOG;
@@ -476,7 +474,7 @@ spawn (void)
     }
 #else
   ACE_ERROR_RETURN ((LM_INFO,
-                     ASYS_TEXT ("threads *and* processes not supported on this platform\n")),
+                     "threads *and* processes not supported on this platform\n"),
                     -1);
 #endif /* ACE_HAS_THREADS */
 
@@ -487,16 +485,16 @@ spawn (void)
 #endif /* !ACE_LACKS_ACE_IOSTREAM */
 
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("IOStream_Test"));
+  ACE_START_TEST ("IOStream_Test");
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
-  ACE_INIT_LOG (ASYS_TEXT ("IOStream_Test-children"));
+  ACE_INIT_LOG ("IOStream_Test-children");
   spawn ();
 #else
   ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("ACE_IOSTREAM not supported on this platform\n")));
+              "ACE_IOSTREAM not supported on this platform\n"));
 #endif /* !ACE_LACKS_ACE_IOSTREAM */
   ACE_END_TEST;
   return 0;
diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp
index 587d5507ccf..8f157a849b0 100644
--- a/tests/IOStream_Test.dsp
+++ b/tests/IOStream_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=IOStream_Test - Win32 PharLap ETS Debug

+CFG=IOStream_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=IOStream_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "IOStream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "IOStream_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "IOStream_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "IOStream_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "IOStream_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "IOStream_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "IOStream_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./IOStream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "IOStream_Test - Win32 Debug"

 # Name "IOStream_Test - Win32 Alpha Debug"

-# Name "IOStream_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -222,6 +191,7 @@ DEP_CPP_IOSTR=\
 	"..\ace\SOCK_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -263,11 +233,6 @@ DEP_CPP_IOSTR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_IOSTR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/IOStream_Test.icc b/tests/IOStream_Test.icc
deleted file mode 100644
index a02572c7eca..00000000000
--- a/tests/IOStream_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "IOStream_Test.exe"
-	{
-	   source type (cpp) "IOStream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/MM_Shared_Memory_Test.bpr b/tests/MM_Shared_Memory_Test.bpr
new file mode 100644
index 00000000000..9d7acdedd0e
--- /dev/null
+++ b/tests/MM_Shared_Memory_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = MM_Shared_Memory_Test.exe
+OBJFILES = objs\MM_Shared_Memory_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp
index 9623c77b2ee..46a4a6dda29 100644
--- a/tests/MM_Shared_Memory_Test.dsp
+++ b/tests/MM_Shared_Memory_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MM_Shared_Memory_Test - Win32 PharLap ETS Debug

+CFG=MM_Shared_Memory_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=MM_Shared_Memory_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak"\

+ CFG="MM_Shared_Memory_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MM_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "MM_Shared_Memory_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MM_Shared_Memory_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "MM_Shared_Memory_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "MM_Shared_Memory_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "MM_Shared_Memory_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "MM_Shared_Memory_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MM_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "MM_Shared_Memory_Test - Win32 Debug"

 # Name "MM_Shared_Memory_Test - Win32 Alpha Debug"

-# Name "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -176,6 +146,7 @@ DEP_CPP_MM_SH=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -194,11 +165,6 @@ DEP_CPP_MM_SH=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MM_SH=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/MM_Shared_Memory_Test.icc b/tests/MM_Shared_Memory_Test.icc
deleted file mode 100644
index 5cb87f2c105..00000000000
--- a/tests/MM_Shared_Memory_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MM_Shared_Memory_Test.exe"
-	{
-	   source type (cpp) "MM_Shared_Memory_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/MT_Reactor_Timer_Test.bpr b/tests/MT_Reactor_Timer_Test.bpr
new file mode 100644
index 00000000000..f5190627c5d
--- /dev/null
+++ b/tests/MT_Reactor_Timer_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = MT_Reactor_Timer_Test.exe
+OBJFILES = objs\MT_Reactor_Timer_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp
index 2118f309808..398a863645e 100644
--- a/tests/MT_Reactor_Timer_Test.cpp
+++ b/tests/MT_Reactor_Timer_Test.cpp
@@ -133,7 +133,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv,
   ACE_GUARD_RETURN (ACE_Thread_Mutex, id_lock, this->lock_, 0);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("%T (%t): Timer #%d (id #%d) expired\n"),
+              "%T (%t): Timer #%d (id #%d) expired\n",
               time_tag,
               this->timer_id_[time_tag]));
 
diff --git a/tests/MT_Reactor_Timer_Test.dsp b/tests/MT_Reactor_Timer_Test.dsp
index 394e76b8ba1..5e349f72108 100644
--- a/tests/MT_Reactor_Timer_Test.dsp
+++ b/tests/MT_Reactor_Timer_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MT_Reactor_Timer_Test - Win32 PharLap ETS Debug

+CFG=MT_Reactor_Timer_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=MT_Reactor_Timer_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_Reactor_Timer_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Reactor_Timer_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "MT_Reactor_Timer_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "MT_Reactor_Timer_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "MT_Reactor_Timer_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "MT_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "MT_Reactor_Timer_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "MT_Reactor_Timer_Test - Win32 Debug"

 # Name "MT_Reactor_Timer_Test - Win32 Alpha Debug"

-# Name "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\MT_Reactor_Timer_Test.cpp
 

 !ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Alpha Debug"

 

-DEP_CPP_MT_RE=\

+DEP_CPP_BARRI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -173,6 +142,7 @@ DEP_CPP_MT_RE=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_MT_RE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MT_RE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/MT_Reactor_Timer_Test.icc b/tests/MT_Reactor_Timer_Test.icc
deleted file mode 100644
index d391eaf0b86..00000000000
--- a/tests/MT_Reactor_Timer_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MT_Reactor_Timer_Test.exe"
-	{
-	   source type (cpp) "MT_Reactor_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/MT_SOCK_Test.bpr b/tests/MT_SOCK_Test.bpr
new file mode 100644
index 00000000000..b9ccb4f06cb
--- /dev/null
+++ b/tests/MT_SOCK_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = MT_SOCK_Test.exe
+OBJFILES = objs\MT_SOCK_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp
index 0ccee16001f..5962024d646 100644
--- a/tests/MT_SOCK_Test.dsp
+++ b/tests/MT_SOCK_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MT_SOCK_Test - Win32 PharLap ETS Debug

+CFG=MT_SOCK_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=MT_SOCK_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "MT_SOCK_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_SOCK_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "MT_SOCK_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "MT_SOCK_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_SOCK_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "MT_SOCK_Test - Win32 Debug"

 # Name "MT_SOCK_Test - Win32 Alpha Debug"

-# Name "MT_SOCK_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\MT_SOCK_Test.cpp

@@ -211,8 +180,6 @@ NODEP_CPP_MT_SO=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/MT_SOCK_Test.icc b/tests/MT_SOCK_Test.icc
deleted file mode 100644
index 5c1ef1c81d0..00000000000
--- a/tests/MT_SOCK_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MT_SOCK_Test.exe"
-	{
-	   source type (cpp) "MT_SOCK_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Makefile b/tests/Makefile
index c8cc327f25b..c5d627dc120 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,6 @@ BIN =   Aio_Platform_Test \
         Barrier_Test \
         Basic_Types_Test \
         Buffer_Stream_Test \
-	Cache_Map_Manager_Test \
         CDR_Test \
         Collection_Test \
         Conn_Test \
@@ -23,14 +22,12 @@ BIN =   Aio_Platform_Test \
         Enum_Interfaces_Test \
         Env_Value_Test \
         Future_Test \
-        Future_Set_Test \
         Handle_Set_Test \
         High_Res_Timer_Test \
         OrdMultiSet_Test \
         Hash_Map_Manager_Test \
         IOStream_Test \
         Map_Test \
-        Map_Manager_Test \
         Mem_Map_Test \
         MM_Shared_Memory_Test \
         MT_Reactor_Timer_Test \
@@ -79,6 +76,8 @@ BIN =   Aio_Platform_Test \
         UPIPE_SAP_Test \
         Upgradable_RW_Test
 
+#        Map_Manager_Test \
+
 BIN2 =  Naming_Test \
         Thread_Pool_Reactor_Test \
         XtReactor_Test \
@@ -87,7 +86,7 @@ BIN2 =  Naming_Test \
 
 #### If the ACE library wasn't built with all components, don't
 #### try to build certain tests.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
+ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
 ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
   BIN += $(BIN2)
 endif # ! Other
@@ -290,8 +289,7 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- test_config.h \
+ $(ACE_ROOT)/ace/Version.h test_config.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -439,114 +437,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
  $(ACE_ROOT)/ace/Stream.cpp
-.obj/Cache_Map_Manager_Test.o .obj/Cache_Map_Manager_Test.so .shobj/Cache_Map_Manager_Test.o .shobj/Cache_Map_Manager_Test.so: Cache_Map_Manager_Test.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- test_config.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Caching_Strategies_T.h \
- $(ACE_ROOT)/ace/Caching_Utility_T.h \
- $(ACE_ROOT)/ace/Caching_Utility_T.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
- $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Caching_Strategies_T.i \
- $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
 .obj/CDR_Test.o .obj/CDR_Test.so .shobj/CDR_Test.o .shobj/CDR_Test.so: CDR_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -831,8 +721,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Conn_Test.h
+ $(ACE_ROOT)/ace/Get_Opt.i Conn_Test.h
 .obj/DLList_Test.o .obj/DLList_Test.so .shobj/DLList_Test.o .shobj/DLList_Test.so: DLList_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -927,8 +816,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- DLL_Test.h \
- $(ACE_ROOT)/ace/DLL.h \
+ DLL_Test.h $(ACE_ROOT)/ace/DLL.h \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
@@ -1145,137 +1033,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Future_Set_Test.o .obj/Future_Set_Test.so .shobj/Future_Set_Test.o .shobj/Future_Set_Test.so: Future_Set_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Future.h \
- $(ACE_ROOT)/ace/Future.cpp \
- $(ACE_ROOT)/ace/Future_Set.h \
- $(ACE_ROOT)/ace/Future_Set.cpp \
- $(ACE_ROOT)/ace/Method_Request.h \
- $(ACE_ROOT)/ace/Activation_Queue.h \
- $(ACE_ROOT)/ace/Activation_Queue.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
 .obj/Handle_Set_Test.o .obj/Handle_Set_Test.so .shobj/Handle_Set_Test.o .shobj/Handle_Set_Test.so: Handle_Set_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1383,8 +1140,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/OrdMultiSet_Test.o .obj/OrdMultiSet_Test.so .shobj/OrdMultiSet_Test.o .shobj/OrdMultiSet_Test.so: OrdMultiSet_Test.cpp \
  $(ACE_ROOT)/ace/inc_user_config.h \
- test_config.h \
- $(ACE_ROOT)/ace/OS.h \
+ test_config.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1889,9 +1645,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Caching_Strategies_T.h \
- $(ACE_ROOT)/ace/Caching_Utility_T.h \
- $(ACE_ROOT)/ace/Caching_Utility_T.i \
- $(ACE_ROOT)/ace/Caching_Utility_T.cpp \
+ $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.h \
+ $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.i \
+ $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.cpp \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \
  $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \
@@ -3549,8 +3305,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- RB_Tree_Test.h
+ $(ACE_ROOT)/ace/RB_Tree.cpp
 .obj/Reactors_Test.o .obj/Reactors_Test.so .shobj/Reactors_Test.o .shobj/Reactors_Test.so: Reactors_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -3746,8 +3501,7 @@ realclean: clean
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- test_config.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ test_config.h $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp
 .obj/Reactor_Notify_Test.o .obj/Reactor_Notify_Test.so .shobj/Reactor_Notify_Test.o .shobj/Reactor_Notify_Test.so: Reactor_Notify_Test.cpp test_config.h \
@@ -5462,8 +5216,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Process.i
 .obj/Time_Value_Test.o .obj/Time_Value_Test.so .shobj/Time_Value_Test.o .shobj/Time_Value_Test.so: Time_Value_Test.cpp \
  $(ACE_ROOT)/ace/inc_user_config.h \
- test_config.h \
- $(ACE_ROOT)/ace/OS.h \
+ test_config.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c0d9ba5f09..fcc11f677b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,7 +56,6 @@ check_PROGRAMS = \
         Barrier_Test \
         Basic_Types_Test \
         Buffer_Stream_Test \
-	Cache_Map_Manager_Test \
         CDR_Test \
         Collection_Test \
         Conn_Test \
@@ -133,7 +132,7 @@ Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
 CDR_Test_SOURCES = CDR_Test.cpp
 
-Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp
+# Cache_Manager_Test_SOURCES = Cache_Manager_Test.cpp
 
 Collection_Test_SOURCES = Collection_Test.cpp
 
@@ -244,7 +243,8 @@ TSS_Test_SOURCES = TSS_Test.cpp \
 
 Task_Test_SOURCES = Task_Test.cpp
 
-Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp
+Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp \
+                              Thread_Manager_Test.h
 
 Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp
 
diff --git a/tests/Makefile.bor b/tests/Makefile.bor
deleted file mode 100644
index d895c168c90..00000000000
--- a/tests/Makefile.bor
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Makefile for building the ACE tests
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-TESTS = \
-	Aio_Platform_Test \
-	Atomic_Op_Test \
-	Barrier_Test \
-	Basic_Types_Test \
-	Buffer_Stream_Test \
-	CDR_Test \
-	Collection_Test \
-	Conn_Test \
-	DLList_Test \
-	DLL_Test \
-	Dynamic_Priority_Test \
-	Enum_Interfaces_Test \
-	Env_Value_Test \
-	Future_Test \
-	Handle_Set_Test \
-	High_Res_Timer_Test \
-	Hash_Map_Manager_Test \
-	IOStream_Test \
-	Map_Test \
-	Mem_Map_Test \
-	MM_Shared_Memory_Test \
-	MT_Reactor_Timer_Test \
-	MT_SOCK_Test \
-	Mem_Map_Test \
-	Message_Block_Test \
-	Message_Queue_Notifications_Test \
-	Message_Queue_Test \
-	Naming_Test \
-	New_Fail_Test \
-	Notify_Performance_Test \
-	OrdMultiSet_Test \
-	Pipe_Test \
-	Priority_Buffer_Test \
-	Priority_Reactor_Test \
-	Priority_Task_Test \
-	Process_Mutex_Test \
-	Process_Strategy_Test \
-	RB_Tree_Test \
-	Reactor_Exceptions_Test \
-	Reactor_Notify_Test \
-	Reactor_Performance_Test \
-	Reactor_Timer_Test \
-	Reactors_Test \
-	Reader_Writer_Test \
-	Recursive_Mutex_Test \
-	Reverse_Lock_Test \
-	SOCK_Connector_Test \
-	SOCK_Send_Recv_Test \
-	SOCK_Test \
-	SPIPE_Test \
-	SString_Test \
-	SV_Shared_Memory_Test \
-	Semaphore_Test \
-	Service_Config_Test \
-	Sigset_Ops_Test \
-	Simple_Message_Block_Test \
-	Svc_Handler_Test \
-	TSS_Test \
-	Task_Test \
-	Thread_Manager_Test \
-	Thread_Mutex_Test \
-	Thread_Pool_Test \
-	Time_Service_Test \
-	Time_Value_Test \
-	Timeprobe_Test \
-	Timer_Queue_Test \
-	Tokens_Test \
-	UPIPE_SAP_Test \
-	Upgradable_RW_Test \
-	XtReactor_Test
-
-#	Map_Manager_Test \
-
-all_tests: $(TESTS)
-
-$(TESTS):
-	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
-
-OBJFILES = $(OBJDIR)\$(NAME).obj
-
-CFLAGS = $(ACE_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/tests/Map_Manager_Test.bpr b/tests/Map_Manager_Test.bpr
new file mode 100644
index 00000000000..fb1c5de2b92
--- /dev/null
+++ b/tests/Map_Manager_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Map_Manager_Test.exe
+OBJFILES = objs\Map_Manager_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 0b6fb1dae66..b316cd7b260 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -37,31 +37,31 @@ USELIB("..\ace\aced.lib");
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
 typedef ACE_Null_Mutex MUTEX;
-typedef ACE_UINT32 TYPE;
-typedef ACE_Active_Map_Manager_Key
+typedef size_t TYPE;
+typedef ACE_Active_Map_Manager_Key 
         ACTIVE_KEY;
-typedef ACE_Hash<TYPE>
+typedef ACE_Hash<TYPE> 
         HASH_KEY;
-typedef ACE_Equal_To<TYPE>
+typedef ACE_Equal_To<TYPE> 
         COMPARE_KEYS;
 
-typedef ACE_Map_Manager <TYPE, TYPE, MUTEX>
+typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> 
         MAP_MANAGER;
-typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX>
+typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> 
         ITERATOR;
-typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX>
+typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> 
         REVERSE_ITERATOR;
-typedef ACE_Map_Entry <TYPE, TYPE>
+typedef ACE_Map_Entry <TYPE, TYPE> 
         ENTRY;
-typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> 
         HASH_MAP_MANAGER;
-typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> 
         HASH_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> 
         HASH_REVERSE_ITERATOR;
-typedef ACE_Hash_Map_Entry <TYPE, TYPE>
+typedef ACE_Hash_Map_Entry <TYPE, TYPE> 
         HASH_ENTRY;
-typedef ACE_Active_Map_Manager <TYPE>
+typedef ACE_Active_Map_Manager <TYPE> 
         ACTIVE_MAP_MANAGER;
 
 typedef ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
@@ -71,7 +71,7 @@ typedef ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KE
 typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
         CACHE_REV_ITER_IMPL;
 typedef int ATTR;
-typedef ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
+typedef ACE_Null_Caching_Strategy_Utility <TYPE, TYPE, CACHE_MAP_IMPL, ATTR>
         NULL_UTILITY;
 typedef ACE_Null_Caching_Strategy<TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>
         NULL_CACHING_STRATEGY;
@@ -85,9 +85,7 @@ test_cache_map_manager (size_t table_size,
                         size_t iterations,
                         int test_iterators)
 {
-  NULL_CACHING_STRATEGY null_caching_strategy;
-  CACHE_MAP_MANAGER map (null_caching_strategy,
-                         table_size);
+  CACHE_MAP_MANAGER map (table_size);
   TYPE i;
   TYPE j;
   ssize_t k;
@@ -212,9 +210,7 @@ test_hash_cache_map_manager (size_t table_size,
                              size_t iterations,
                              int test_iterators)
 {
-  NULL_CACHING_STRATEGY null_caching_strategy;
-  HASH_CACHE_MAP_MANAGER map (null_caching_strategy,
-                              table_size);
+  HASH_CACHE_MAP_MANAGER map (table_size);
   TYPE i;
   TYPE j;
   ssize_t k;
@@ -843,16 +839,14 @@ run_test (void (*ptf) (size_t, size_t, int),
 
   timer.elapsed_time (et);
 
-  ASYS_TCHAR *test_iterators_string = 0;
+  LPCTSTR test_iterators_string = 0;
 
   if (test_iterators)
     test_iterators_string =
-      ACE_const_cast (ASYS_TCHAR*,
-                      ASYS_TEXT ( "includes executing iterators"));
+      ASYS_TEXT ("includes executing iterators");
   else
     test_iterators_string =
-      ACE_const_cast (ASYS_TCHAR*,
-                      ASYS_TEXT ("doesn't include executing iterators"));
+      ASYS_TEXT ("doesn't include executing iterators");
 
   ACE_DEBUG ((LM_DEBUG,
               ASYS_TEXT ("time to test a map of size %d for %d iterations using %s (%s)\n"),
@@ -931,14 +925,13 @@ main (int argc, ASYS_TCHAR *argv[])
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Equal_To<TYPE>;
-template class ACE_Pair<TYPE, ATTR >;
-template class ACE_Reference_Pair<TYPE, TYPE>;
+template class ACE_Pair<TYPE, ATTR>;
 template class ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
 template class ACE_Hash_Map_Entry<TYPE, TYPE>;
+template class ACE_Equal_To<TYPE>;
 template class ACE_Map_Manager<TYPE, TYPE, MUTEX>;
 template class ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX>;
 template class ACE_Map_Iterator<TYPE, TYPE, MUTEX>;
@@ -950,26 +943,27 @@ template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
 template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>;
-template class ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >;
+template class ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >;
+template class ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >;
+template class ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >;
 template class ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >;
-template class ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>;
-template class ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>;
-template class ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR> ;
-template class ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ;
-template class ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ;
-template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+template class ACE_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>;
+template class ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>;
+template class ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >;
+template class ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR,  ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >, ATTR  > ;
+template class ACE_Cache_Map_Manager <TYPE, TYPE, ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR,  ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >, ATTR> ;
+template class ACE_Cache_Map_Iterator <TYPE, TYPE, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >,  ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR,  ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >, ATTR> ;
+template class ACE_Reference_Pair<size_t, size_t>;
+template class ACE_Cache_Map_Reverse_Iterator<size_t,size_t,ACE_Hash_Map_Reverse_Iterator_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,ACE_Null_Caching_Strategy<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int,ACE_Null_Caching_Strategy_Utility<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int> >,int>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Equal_To<TYPE>
 #pragma instantiate ACE_Pair<TYPE, ATTR >
-#pragma instantiate ACE_Reference_Pair<TYPE, TYPE>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
 #pragma instantiate ACE_Hash_Map_Entry<TYPE, TYPE>
+#pragma instantiate ACE_Equal_To<TYPE>
 #pragma instantiate ACE_Map_Manager<TYPE, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Iterator<TYPE, TYPE, MUTEX>
@@ -981,15 +975,17 @@ template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NU
 #pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>
-#pragma instantiate ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >
+#pragma instantiate ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >
 #pragma instantiate ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >
-#pragma instantiate ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
-#pragma instantiate ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>
-#pragma instantiate ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
-#pragma instantiate ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>
+#pragma instantiate ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>
+#pragma instantiate ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >
+#pragma instantiate ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR > 
+#pragma instantiate ACE_Cache_Map_Manager <TYPE, TYPE, ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR ,  ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >, ATTR> 
+#pragma instantiate ACE_Cache_Map_Iterator <TYPE, TYPE, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >,  ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR,  ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>  >, ATTR> 
+#pragma instantiate ACE_Reference_Pair<size_t,size_t>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<size_t,size_t,ACE_Hash_Map_Reverse_Iterator_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,ACE_Null_Caching_Strategy<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int,ACE_Null_Caching_Strategy_Utility<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int> >,int>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp
index a5bf1d051ba..1dc3c8ef04f 100644
--- a/tests/Map_Manager_Test.dsp
+++ b/tests/Map_Manager_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Map_Manager_Test - Win32 PharLap ETS Debug

+CFG=Map_Manager_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Map_Manager_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Manager_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Map_Manager_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Map_Manager_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Map_Manager_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Map_Manager_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Map_Manager_Test - Win32 Debug"

 # Name "Map_Manager_Test - Win32 Alpha Debug"

-# Name "Map_Manager_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -193,6 +162,7 @@ DEP_CPP_MAP_M=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -215,11 +185,6 @@ DEP_CPP_MAP_M=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MAP_M=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Map_Manager_Test.icc b/tests/Map_Manager_Test.icc
deleted file mode 100644
index af813897c7d..00000000000
--- a/tests/Map_Manager_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Map_Manager_Test.exe"
-	{
-	   source type (cpp) "Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index 4dd11067862..f59178295ee 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -48,25 +48,25 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>,
 typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER;
 
 static void
-functionality_test (MAP &map,
+functionality_test (MAP &map, 
                     size_t iterations)
 {
   size_t counter;
   VALUE i;
   KEY *original_keys = new KEY[iterations];
   KEY *modified_keys = new KEY[iterations];
-
+  
   // Setup the keys to have some initial data.
-  for (i = 0;
-       i < iterations;
+  for (i = 0; 
+       i < iterations; 
        ++i)
     {
       original_keys[i].size (sizeof i / sizeof (KEY::TYPE));
       ACE_OS::memcpy (&original_keys[i][0],
-                      &i,
-                      sizeof i);
+                      &i, 
+                      sizeof i);      
     }
-
+  
   // Make a copy of the keys so that we can compare with the original
   // keys later.
   for (i = 0; i < iterations; ++i)
@@ -82,7 +82,7 @@ functionality_test (MAP &map,
       ++counter;
       ACE_ASSERT (map.current_size () == counter);
     }
-
+    
   // Forward iteration...
   {
     counter = 0;
@@ -98,7 +98,7 @@ functionality_test (MAP &map,
         KEY original_key;
         ACE_ASSERT (map.recover_key (entry.first (),
                                      original_key) == 0);
-
+        
         // Make sure recovering keys work.
         ACE_ASSERT (original_keys[entry.second ()] == original_key);
 
@@ -123,9 +123,9 @@ functionality_test (MAP &map,
 
   // Reverse iteration...
   {
-    counter = iterations;
+    counter = iterations;    
     MAP::reverse_iterator end = map.rend ();
-
+    
     for (MAP::reverse_iterator iter = map.rbegin ();
          iter != end;
          ++iter)
@@ -137,7 +137,7 @@ functionality_test (MAP &map,
         KEY original_key;
         ACE_ASSERT (map.recover_key (entry.first (),
                                      original_key) == 0);
-
+        
         // Make sure recovering keys work.
         ACE_ASSERT (original_keys[entry.second ()] == original_key);
 
@@ -154,7 +154,7 @@ functionality_test (MAP &map,
                     original_value,
                     entry.second ()));
       }
-
+    
     ACE_DEBUG ((LM_DEBUG,
                 ASYS_TEXT ("\n")));
     ACE_ASSERT (counter == 0);
@@ -183,7 +183,7 @@ functionality_test (MAP &map,
 }
 
 static void
-insert_test (MAP &map,
+insert_test (MAP &map, 
              size_t iterations,
              KEY *keys)
 {
@@ -198,7 +198,7 @@ insert_test (MAP &map,
 }
 
 static void
-find_test (MAP &map,
+find_test (MAP &map, 
            size_t iterations,
            KEY *keys)
 {
@@ -212,7 +212,7 @@ find_test (MAP &map,
 }
 
 static void
-unbind_test (MAP &map,
+unbind_test (MAP &map, 
              size_t iterations,
              KEY *keys)
 {
@@ -288,90 +288,45 @@ main (int argc, ASYS_TCHAR *argv[])
   if (functionality_tests)
     {
       // Functionality test of the maps.
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nMap Manager functionality test\n")));
+      ACE_DEBUG ((LM_DEBUG, "\nMap Manager functionality test\n"));
       functionality_test (map1, iterations);
-
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nHash Map Manager functionality test\n")));
+      
+      ACE_DEBUG ((LM_DEBUG, "\nHash Map Manager functionality test\n"));
       functionality_test (map2, iterations);
-
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nActive Map Manager functionality test\n")));
+      
+      ACE_DEBUG ((LM_DEBUG, "\nActive Map Manager functionality test\n"));
       functionality_test (map3, iterations);
-
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
+      
+      ACE_DEBUG ((LM_DEBUG, "\n"));        
     }
 
   // Performance test of the maps.
   KEY *keys = new KEY[iterations];
-
+      
   // Map Manager
-  performance_test (&insert_test,
-                    map1,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Map Manager (insert test)"));
-  performance_test (&find_test,
-                    map1,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Map Manager (find test)"));
-  performance_test (&unbind_test,
-                    map1,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Map Manager (unbind test)"));
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
+  performance_test (&insert_test, map1, iterations, keys, table_size, "Map Manager (insert test)");                    
+  performance_test (&find_test,   map1, iterations, keys, table_size, "Map Manager (find test)");                    
+  performance_test (&unbind_test, map1, iterations, keys, table_size, "Map Manager (unbind test)");                    
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));  
 
   // Hash Map Manager
-  performance_test (&insert_test,
-                    map2,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Hash Map Manager (insert test)"));
-  performance_test (&find_test,
-                    map2,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Hash Map Manager (find test)"));
-  performance_test (&unbind_test,
-                    map2,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Hash Map Manager (unbind test)"));
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
+  performance_test (&insert_test, map2, iterations, keys, table_size, "Hash Map Manager (insert test)");                    
+  performance_test (&find_test,   map2, iterations, keys, table_size, "Hash Map Manager (find test)");                    
+  performance_test (&unbind_test, map2, iterations, keys, table_size, "Hash Map Manager (unbind test)");                    
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));  
 
   // Active Map Manager
-  performance_test (&insert_test,
-                    map3,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Active Map Manager (insert test)"));
-  performance_test (&find_test,
-                    map3,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Active Map Manager (find test)"));
-  performance_test (&unbind_test,
-                    map3,
-                    iterations,
-                    keys,
-                    table_size,
-                    ASYS_TEXT ("Active Map Manager (unbind test)"));
+  performance_test (&insert_test, map3, iterations, keys, table_size, "Active Map Manager (insert test)");                    
+  performance_test (&find_test,   map3, iterations, keys, table_size, "Active Map Manager (find test)");                    
+  performance_test (&unbind_test, map3, iterations, keys, table_size, "Active Map Manager (unbind test)");                    
 
   delete[] keys;
 
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
   ACE_END_TEST;
-
+  
   return 0;
 }
 
@@ -386,7 +341,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 template class ACE_Array<char>;
 template class ACE_Array_Base<char>;
 
-// Common
+// Common 
 template class ACE_Reference_Pair<const KEY, VALUE>;
 
 // Map and iterator classes.
@@ -408,7 +363,7 @@ template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_N
 template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
 template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
 template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;
+template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;                            
 
 // Hash Map Manager related.
 template class ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>;
@@ -442,7 +397,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 #pragma instantiate ACE_Array<char>
 #pragma instantiate ACE_Array_Base<char>
 
-// Common
+// Common 
 #pragma instantiate ACE_Reference_Pair<const KEY, VALUE>
 
 // Map and iterator classes.
@@ -464,7 +419,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 #pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>
+#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>                            
 
 // Hash Map Manager related.
 #pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>
diff --git a/tests/Map_Test.dsp b/tests/Map_Test.dsp
index 77d933de1fe..e2d8e7fe05d 100644
--- a/tests/Map_Test.dsp
+++ b/tests/Map_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Map_Test - Win32 PharLap ETS Debug

+CFG=Map_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Map_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Map_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Map_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Map_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Map_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Map_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Map_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Map_Test - Win32 Debug"

 # Name "Map_Test - Win32 Alpha Debug"

-# Name "Map_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\Map_Test.cpp
 

 !ELSEIF  "$(CFG)" == "Map_Test - Win32 Alpha Debug"

 

-DEP_CPP_MAP_T=\

+DEP_CPP_MAP_M=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -151,6 +120,8 @@ DEP_CPP_MAP_T=\
 	"..\ace\Free_List.i"\

 	"..\ace\Handle_Set.h"\

 	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map.cpp"\

+	"..\ace\Hash_Map.h"\

 	"..\ace\High_Res_Timer.h"\

 	"..\ace\High_Res_Timer.i"\

 	"..\ace\Log_Msg.h"\

@@ -191,6 +162,7 @@ DEP_CPP_MAP_T=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -213,13 +185,6 @@ DEP_CPP_MAP_T=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MAP_T=\

-	"..\ace\Hash_Map.cpp"\

-	"..\ace\Hash_Map.h"\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Map_Test.icc b/tests/Map_Test.icc
deleted file mode 100644
index 1ac3b09db52..00000000000
--- a/tests/Map_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Map_Test.exe"
-	{
-	   source type (cpp) "Map_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Mem_Map_Test.bpr b/tests/Mem_Map_Test.bpr
new file mode 100644
index 00000000000..d346ac21888
--- /dev/null
+++ b/tests/Mem_Map_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Mem_Map_Test.exe
+OBJFILES = objs\Mem_Map_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp
index bfb390d3120..7c45b928480 100644
--- a/tests/Mem_Map_Test.cpp
+++ b/tests/Mem_Map_Test.cpp
@@ -63,7 +63,7 @@ reverse_file (ACE_HANDLE file_handle,
 static int
 create_test_file (int line_length, int num_lines)
 {
-  char *mybuf = 0;
+  char *mybuf;
 
   ACE_NEW_RETURN (mybuf, char[line_length + 1], -1);
   char *c = ACE_ALPHABET;
diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp
index b89066391f5..46536ca5f3e 100644
--- a/tests/Mem_Map_Test.dsp
+++ b/tests/Mem_Map_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Mem_Map_Test - Win32 PharLap ETS Debug

+CFG=Mem_Map_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Mem_Map_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Mem_Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Mem_Map_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Mem_Map_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Mem_Map_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Mem_Map_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Mem_Map_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Mem_Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Mem_Map_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Mem_Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Mem_Map_Test - Win32 Debug"

 # Name "Mem_Map_Test - Win32 Alpha Debug"

-# Name "Mem_Map_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -155,16 +124,12 @@ DEP_CPP_MEM_M=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MEM_M=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Mem_Map_Test.icc b/tests/Mem_Map_Test.icc
deleted file mode 100644
index 00a3e8c9dc6..00000000000
--- a/tests/Mem_Map_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Mem_Map_Test.exe"
-	{
-	   source type (cpp) "Mem_Map_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Message_Block_Test.bpr b/tests/Message_Block_Test.bpr
new file mode 100644
index 00000000000..ac203124fa8
--- /dev/null
+++ b/tests/Message_Block_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Message_Block_Test.exe
+OBJFILES = objs\Message_Block_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 74392c98e15..17cfad35927 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -264,12 +264,12 @@ ACE_Cached_Allocator<MEMORY_CHUNK,
 struct
 {
   ACE_Allocator *strategy_;
-  const ASYS_TCHAR *name_;
+  LPCTSTR name_;
   ACE_Profile_Timer::ACE_Elapsed_Time et_;
 } alloc_struct[ACE_ALLOC_STRATEGY_NO] =
 {
-  { NULL, ASYS_TEXT ("Default"), {0,0,0} },
-  { &mem_allocator, ASYS_TEXT ("Cached Memory"), {0,0,0} }
+  { NULL, ASYS_TEXT ("Default") },
+  { &mem_allocator, ASYS_TEXT ("Cached Memory") }
 };
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp
index 28c46aea16c..e22cfe4c147 100644
--- a/tests/Message_Block_Test.dsp
+++ b/tests/Message_Block_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Block_Test - Win32 PharLap ETS Debug

+CFG=Message_Block_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Message_Block_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Message_Block_Test.mak"\

+ CFG="Message_Block_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Message_Block_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Block_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Message_Block_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Message_Block_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Message_Block_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Message_Block_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Message_Block_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Message_Block_Test - Win32 Debug"

 # Name "Message_Block_Test - Win32 Alpha Debug"

-# Name "Message_Block_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -201,6 +171,7 @@ DEP_CPP_MESSA=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -239,11 +210,6 @@ DEP_CPP_MESSA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MESSA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Message_Block_Test.icc b/tests/Message_Block_Test.icc
deleted file mode 100644
index bc1d3d8508b..00000000000
--- a/tests/Message_Block_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Block_Test.exe"
-	{
-	   source type (cpp) "Message_Block_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Message_Queue_Notifications_Test.bpr b/tests/Message_Queue_Notifications_Test.bpr
new file mode 100644
index 00000000000..d452a2a8667
--- /dev/null
+++ b/tests/Message_Queue_Notifications_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Message_Queue_Notifications_Test.cpp.exe
+OBJFILES = objs\Message_Queue_Notifications_Test.cpp.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp
index 98157288de9..c21abfccc0b 100644
--- a/tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/Message_Queue_Notifications_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Queue_Notifications_Test - Win32 PharLap ETS Debug

+CFG=Message_Queue_Notifications_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Message_Queue_Notifications_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak"\

+ CFG="Message_Queue_Notifications_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Notifications_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Message_Queue_Notifications_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Message_Queue_Notifications_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Message_Queue_Notifications_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Message_Queue_Notifications_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Message_Queue_Notifications_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Notifications_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Message_Queue_Notifications_Test - Win32 Debug"

 # Name "Message_Queue_Notifications_Test - Win32 Alpha Debug"

-# Name "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -201,6 +171,7 @@ DEP_CPP_MESSA=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -239,11 +210,6 @@ DEP_CPP_MESSA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MESSA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Message_Queue_Notifications_Test.icc b/tests/Message_Queue_Notifications_Test.icc
deleted file mode 100644
index 1b4f8b21ae2..00000000000
--- a/tests/Message_Queue_Notifications_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Queue_Notifications_Test.exe"
-	{
-	   source type (cpp) "Message_Queue_Notifications_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Message_Queue_Test.bpr b/tests/Message_Queue_Test.bpr
new file mode 100644
index 00000000000..46e7f95026d
--- /dev/null
+++ b/tests/Message_Queue_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Message_Queue_Test.exe
+OBJFILES = objs\Message_Queue_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 3e27c5858ae..7e94c5ab486 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -45,7 +45,7 @@ static const int MAX_MESSAGES = 10000;
 static const int MAX_MESSAGE_SIZE = 32;
 static const char test_message[] = "ACE_Message_Queue Test Message";
 
-static int max_messages = MAX_MESSAGES;
+static int messages = MAX_MESSAGES;
 
 // Dynamically allocate to avoid a static.
 static ACE_High_Res_Timer *timer = 0;
@@ -197,7 +197,7 @@ single_thread_performance_test (int queue_type = 0)
   else
     {
       ACE_NEW_RETURN (msgq,
-                      ACE_Message_Queue_Vx (max_messages,
+                      ACE_Message_Queue_Vx (messages,
                                             MAX_MESSAGE_SIZE),
                       -1);
       message = "ACE_Message_Queue_Vx, single thread test";
@@ -208,26 +208,26 @@ single_thread_performance_test (int queue_type = 0)
       ACE_NEW_RETURN (msgq,
                       ACE_Message_Queue_NT,
                       -1);
-      message = ASYS_TEXT ("ACE_Message_Queue_NT, single thread test");
+      message = "ACE_Message_Queue_NT, single thread test";
     }
 #endif /* VXWORKS */
 
   // Create the messages.  Allocate off the heap in case messages
   // is large relative to the amount of stack space available.
-  ACE_Message_Block **send_block = 0;
+  ACE_Message_Block **send_block;
   ACE_NEW_RETURN (send_block,
-                  ACE_Message_Block *[max_messages],
+                  ACE_Message_Block *[messages],
                   -1);
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     ACE_NEW_RETURN (send_block[i],
                     ACE_Message_Block (test_message,
                                        MAX_MESSAGE_SIZE),
                     -1);
 
-  ACE_Message_Block **receive_block_p = 0;
+  ACE_Message_Block **receive_block_p;
   ACE_NEW_RETURN (receive_block_p,
-                  ACE_Message_Block *[max_messages],
+                  ACE_Message_Block *[messages],
                   -1);
 
 #if defined (VXWORKS)
@@ -236,10 +236,10 @@ single_thread_performance_test (int queue_type = 0)
   // stack space available.
   ACE_Message_Block *receive_block;
   ACE_NEW_RETURN (receive_block,
-                  ACE_Message_Block[max_messages],
+                  ACE_Message_Block[messages],
                   -1);
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     {
       receive_block[i].init (MAX_MESSAGE_SIZE);
 
@@ -252,7 +252,7 @@ single_thread_performance_test (int queue_type = 0)
   timer->start ();
 
   // Send/receive the messages.
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     {
       if (msgq->enqueue_tail (send_block[i]) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -274,9 +274,9 @@ single_thread_performance_test (int queue_type = 0)
   ACE_DEBUG ((LM_INFO,
               ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
               message,
-              max_messages,
+              messages,
               tv.msec (),
-              (double) tv.msec () / max_messages));
+              (double) tv.msec () / messages));
   timer->reset ();
 
   delete [] receive_block_p;
@@ -284,7 +284,7 @@ single_thread_performance_test (int queue_type = 0)
   delete [] receive_block;
 #endif /* VXWORKS */
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     delete send_block[i];
   delete [] send_block;
   delete msgq;
@@ -300,9 +300,9 @@ receiver (void *arg)
                           arg);
   int i;
 
-  ACE_Message_Block **receive_block_p = 0;
+  ACE_Message_Block **receive_block_p;
   ACE_NEW_RETURN (receive_block_p,
-                  ACE_Message_Block *[max_messages],
+                  ACE_Message_Block *[messages],
                   (void *) -1);
 
 #if defined (VXWORKS)
@@ -311,10 +311,10 @@ receiver (void *arg)
   // space available.
   ACE_Message_Block *receive_block;
   ACE_NEW_RETURN (receive_block,
-                  ACE_Message_Block[max_messages],
+                  ACE_Message_Block[messages],
                   (void *) -1);
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     {
       receive_block[i].init (MAX_MESSAGE_SIZE);
 
@@ -324,7 +324,7 @@ receiver (void *arg)
     }
 #endif /* VXWORKS */
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     if (queue_wrapper->q_->dequeue_head (receive_block_p[i]) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("%p\n"),
@@ -350,7 +350,7 @@ sender (void *arg)
   timer->start ();
 
   // Send the messages.
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     if (queue_wrapper->q_->
         enqueue_tail (queue_wrapper->send_block_[i]) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -375,10 +375,10 @@ performance_test (int queue_type = 0)
   // the _receiver_ is done.
   ACE_Message_Block **send_block = 0;
   ACE_NEW_RETURN (send_block,
-                  ACE_Message_Block *[max_messages],
+                  ACE_Message_Block *[messages],
                   -1);
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     ACE_NEW_RETURN (send_block[i],
                     ACE_Message_Block (test_message,
                                        MAX_MESSAGE_SIZE),
@@ -394,7 +394,7 @@ performance_test (int queue_type = 0)
   else
     {
       ACE_NEW_RETURN (queue_wrapper.q_,
-                      ACE_Message_Queue_Vx (max_messages,
+                      ACE_Message_Queue_Vx (messages,
                                             MAX_MESSAGE_SIZE),
                       -1);
       message = "ACE_Message_Queue_Vx";
@@ -430,15 +430,15 @@ performance_test (int queue_type = 0)
   timer->elapsed_time (tv);
   ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
               message,
-              max_messages,
+              messages,
               tv.msec (),
-              (double) tv.msec () / max_messages));
+              (double) tv.msec () / messages));
   timer->reset ();
 
   delete queue_wrapper.q_;
   queue_wrapper.q_ = 0;
 
-  for (i = 0; i < max_messages; ++i)
+  for (i = 0; i < messages; ++i)
     delete send_block[i];
   delete [] send_block;
 
@@ -459,7 +459,7 @@ main (int argc, ASYS_TCHAR *argv[])
                   ASYS_TEXT ("%s/n"),
                   usage));
     else
-      max_messages = ACE_OS::atoi (argv[1]);
+      messages = ACE_OS::atoi (argv[1]);
 
 #if !defined (VXWORKS)
   // The iterator test occasionally causes a page fault or a hang on
diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp
index e003350194d..305c9ac5bc9 100644
--- a/tests/Message_Queue_Test.dsp
+++ b/tests/Message_Queue_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Queue_Test - Win32 PharLap ETS Debug

+CFG=Message_Queue_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Message_Queue_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Message_Queue_Test.mak"\

+ CFG="Message_Queue_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Message_Queue_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Message_Queue_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Message_Queue_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Message_Queue_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Message_Queue_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Message_Queue_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Message_Queue_Test - Win32 Debug"

 # Name "Message_Queue_Test - Win32 Alpha Debug"

-# Name "Message_Queue_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -194,6 +164,7 @@ DEP_CPP_MESSA=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -223,11 +194,6 @@ DEP_CPP_MESSA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_MESSA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Message_Queue_Test.icc b/tests/Message_Queue_Test.icc
deleted file mode 100644
index 21674f92c35..00000000000
--- a/tests/Message_Queue_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Queue_Test.exe"
-	{
-	   source type (cpp) "Message_Queue_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Naming_Test.bpr b/tests/Naming_Test.bpr
new file mode 100644
index 00000000000..77ba28a0916
--- /dev/null
+++ b/tests/Naming_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Naming_Test.exe
+OBJFILES = objs\Naming_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index 937a5411cf8..b1be2e29b13 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    tests
-//
+// 
 // = FILENAME
 //    Naming_Test.cpp
 //
@@ -15,7 +15,7 @@
 //
 // = AUTHOR
 //    Prashant Jain and Irfan Pyarali
-//
+// 
 // ============================================================================
 
 #include "test_config.h"
@@ -34,19 +34,18 @@ static char name[BUFSIZ];
 static char value[BUFSIZ];
 static char type[BUFSIZ];
 
-static void
+static void 
 print_time (ACE_Profile_Timer &timer,
 	    const char *test)
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   timer.stop ();
   timer.elapsed_time (et);
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n     *****  %s  *****     \n"), test));
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
+  
+  ACE_DEBUG ((LM_DEBUG, "\n     *****  %s  *****     \n", test));
+  ACE_DEBUG ((LM_DEBUG, "real time = %f secs, user time = %f secs, system time = %f secs\n",
 	      et.real_time, et.user_time, et.system_time));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n\n"),
+  ACE_DEBUG ((LM_DEBUG, "time per call = %f usecs\n\n", 
 	      (et.real_time / double (ACE_NS_MAX_ENTRIES)) * 1000000));
 }
 
@@ -57,14 +56,14 @@ test_bind (ACE_Naming_Context &ns_context)
   randomize (array, sizeof array / sizeof (int));
 
   // do the binds
-  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
+  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) 
     {
       ACE_OS::sprintf (name, "%s%d", "name", array[i]);
       ACE_WString w_name (name);
-
+      
       ACE_OS::sprintf (value, "%s%d", "value", array[i]);
       ACE_WString w_value (value);
-
+      
       ACE_OS::sprintf (type, "%s%d", "type", array [i]);
       ACE_ASSERT (ns_context.bind (w_name, w_value, type) != -1);
     }
@@ -77,9 +76,9 @@ test_find_failure (ACE_Naming_Context &ns_context)
   ACE_WString w_name (name);
   ACE_WString w_value;
   char *l_type = 0;
-
+      
   // Do the finds.
-  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
+  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) 
     ACE_ASSERT (ns_context.resolve (w_name, w_value, l_type) == -1);
 }
 
@@ -90,7 +89,7 @@ test_rebind (ACE_Naming_Context &ns_context)
   randomize (array, sizeof array / sizeof (int));
 
   // do the rebinds
-  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
+  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) 
     {
       ACE_OS::sprintf (name, "%s%d", "name", array[i]);
       ACE_WString w_name (name);
@@ -110,7 +109,7 @@ test_unbind (ACE_Naming_Context &ns_context)
   randomize (array, sizeof array / sizeof (int));
 
   // do the unbinds
-  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
+  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) 
     {
       ACE_OS::sprintf (name, "%s%d", "name", array[i]);
       ACE_WString w_name (name);
@@ -128,13 +127,13 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
   randomize (array, sizeof array / sizeof (int));
 
   // do the finds
-  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++)
+  for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) 
     {
       if (sign == 1)
 	{
 	  ACE_OS::sprintf (temp_val, "%s%d", "value", array[i]);
 	  ACE_OS::sprintf (temp_type, "%s%d", "type", array[i]);
-	}
+	}	  
       else
 	{
 	  ACE_OS::sprintf (temp_val, "%s%d", "value", -array[i]);
@@ -143,11 +142,11 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
 
       ACE_OS::sprintf (name, "%s%d", "name", array[i]);
 
-      ACE_WString w_name (name);
+      ACE_WString w_name (name);      
       ACE_WString w_value;
       char *type_out = 0;
       ACE_WString val (temp_val);
-
+      
       ACE_ASSERT (ns_context.resolve (w_name, w_value, type_out) == result);
 
       char *l_value = w_value.char_rep ();
@@ -158,11 +157,10 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
 	  if (ns_context.name_options ()->debug ())
 	    {
 	      if (type_out)
-		ACE_DEBUG ((LM_DEBUG,
-                            ASYS_TEXT ("Name: %s\tValue: %s\tType: %s\n"),
+		ACE_DEBUG ((LM_DEBUG, "Name: %s\tValue: %s\tType: %s\n",
 			    name, l_value, type_out));
 	      else
-		ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Name: %s\tValue: %s\n"),
+		ACE_DEBUG ((LM_DEBUG, "Name: %s\tValue: %s\n",
 			    name, l_value));
 	    }
 
@@ -174,14 +172,14 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
 	}
 
       delete[] l_value;
-    }
+    }  
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
   TCHAR temp_file [BUFSIZ];
-  ACE_START_TEST (ASYS_TEXT ("Naming_Test"));
+  ACE_START_TEST ("Naming_Test");
 
   ACE_Naming_Context *ns_context;
   ACE_NEW_RETURN (ns_context, ACE_Naming_Context, -1);
@@ -197,23 +195,22 @@ main (int argc, ASYS_TCHAR *argv[])
   if (unicode && name_options->use_registry () == 1)
     {
       name_options->namespace_dir (ACE_TEXT ("Software\\ACE\\Name Service"));
-      name_options->database (ACE_TEXT ("Version 1"));
+      name_options->database (ACE_TEXT ("Version 1"));  
     }
   else
     {
       ACE_OS::strcpy (temp_file, ACE::basename (name_options->process_name (),
 						ACE_DIRECTORY_SEPARATOR_CHAR));
       ACE_OS::strcat (temp_file, ACE_TEXT ("XXXXXX"));
-
+      
       // Set the database name using mktemp to generate a unique file name
       name_options->database (ACE_OS::mktemp (temp_file));
     }
 
   ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) != -1);
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time to test %d iterations using %s\n"),
-	      ACE_NS_MAX_ENTRIES, name_options->use_registry () ?
-              ASYS_TEXT ("Registry") : ASYS_TEXT ("ACE")));
+  ACE_DEBUG ((LM_DEBUG, "time to test %d iterations using %s\n", 
+	      ACE_NS_MAX_ENTRIES, name_options->use_registry () ? "Registry" : "ACE"));
 
   ACE_Profile_Timer timer;
 
@@ -244,7 +241,7 @@ main (int argc, ASYS_TCHAR *argv[])
 
   timer.start ();
   // Remove all bindings from database
-  test_unbind (*ns_context);
+  test_unbind (*ns_context); 
   print_time (timer, "Unbinds");
 
   ACE_OS::sprintf (temp_file, ACE_TEXT ("%s%s%s"),
@@ -256,7 +253,7 @@ main (int argc, ASYS_TCHAR *argv[])
 
   // Remove any existing files.  No need to check return value here
   // since we don't care if the file doesn't exist.
-  ACE_OS::unlink (temp_file);
+  ACE_OS::unlink (temp_file);  
 
   ACE_END_TEST;
   return 0;
diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp
index 7cd3a67f5eb..3cdd126c4a4 100644
--- a/tests/Naming_Test.dsp
+++ b/tests/Naming_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Naming_Test - Win32 PharLap ETS Debug

+CFG=Naming_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Naming_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Naming_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Naming_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Naming_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Naming_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Naming_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Naming_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Naming_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Naming_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Naming_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Naming_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Naming_Test - Win32 Debug"

 # Name "Naming_Test - Win32 Alpha Debug"

-# Name "Naming_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -206,6 +175,7 @@ DEP_CPP_NAMIN=\
 	"..\ace\SOCK_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -229,11 +199,6 @@ DEP_CPP_NAMIN=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_NAMIN=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Naming_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Naming_Test.icc b/tests/Naming_Test.icc
deleted file mode 100644
index 82bef6c6916..00000000000
--- a/tests/Naming_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Naming_Test.exe"
-	{
-	   source type (cpp) "Naming_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
index 82b6d5db501..bec580eda47 100644
--- a/tests/New_Fail_Test.cpp
+++ b/tests/New_Fail_Test.cpp
@@ -76,8 +76,8 @@ main (int, ASYS_TCHAR *[])
   // conditions, exceptions can be disabled when the port is complete.
 #if (defined (__SUNPRO_CC) || defined (__GNUG__)) && \
     !defined (ACE_HAS_EXCEPTIONS)
-  ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Out-of-memory will throw an unhandled exception\n")));
-  ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Rebuild with exceptions=1 to prevent this, but it may impair performance.\n")));
+  ACE_DEBUG ((LM_NOTICE, "Out-of-memory will throw an unhandled exception\n"));
+  ACE_DEBUG ((LM_NOTICE, "Rebuild with exceptions=1 to prevent this, but it may impair performance.\n"));
 
   // Use the static function addresses, to prevent warnings about the
   // functions not being used.
@@ -102,14 +102,14 @@ main (int, ASYS_TCHAR *[])
       if (i == MAX_ALLOCS_IN_TEST)
         {
           ACE_ERROR((LM_WARNING,
-                     ASYS_TEXT ("Test didn't exhaust all available memory\n")));
+                     "Test didn't exhaust all available memory\n"));
           --i;    // Back up to valid pointer for deleting
         }
       else
         {
           ACE_ASSERT (blocks[i] == 0);
           ACE_ASSERT (errno == ENOMEM);
-          ACE_DEBUG((LM_DEBUG, ASYS_TEXT ("ACE_NEW failed properly at block %d\n"), i));
+          ACE_DEBUG((LM_DEBUG, "ACE_NEW failed properly at block %d\n", i));
         }
 
       // Free the memory to try ACE_NEW_RETURN
@@ -126,14 +126,14 @@ main (int, ASYS_TCHAR *[])
       if (i == MAX_ALLOCS_IN_TEST)
         {
           ACE_ERROR((LM_WARNING,
-                     ASYS_TEXT ("Test didn't exhaust all available memory\n")));
+                     "Test didn't exhaust all available memory\n"));
           --i;    // Back up to valid pointer
         }
       else
         {
           ACE_ASSERT (blocks[i] == 0);
           ACE_ASSERT (errno == ENOMEM);
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_NEW_RETURN failed properly at block %d\n"),
+          ACE_DEBUG ((LM_DEBUG, "ACE_NEW_RETURN failed properly at block %d\n",
                       i));
         }
       while (i >= 0)
@@ -145,10 +145,10 @@ main (int, ASYS_TCHAR *[])
   catch (...)
     {
       ACE_ERROR ((LM_ERROR,
-        ASYS_TEXT ("Caught exception during test; ")
-        ASYS_TEXT ("ACE_bad_alloc not defined correctly, or\n")));
+        "Caught exception during test; "
+        "ACE_bad_alloc not defined correctly, or\n"));
       ACE_ERROR ((LM_ERROR,
-        ASYS_TEXT ("ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n")));
+        "ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n"));
       status = 1;        // Mark test failure
     }
 #endif /* ACE_HAS_EXCEPTIONS */
diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp
index 6df059c43e5..d7b105d4684 100644
--- a/tests/New_Fail_Test.dsp
+++ b/tests/New_Fail_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=New_Fail_Test - Win32 PharLap ETS Debug

+CFG=New_Fail_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,19 @@ CFG=New_Fail_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "New_Fail_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "New_Fail_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "New_Fail_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -52,41 +48,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "New_Fail_Test - Win32 Debug"

-# Name "New_Fail_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\New_Fail_Test.cpp

diff --git a/tests/Notify_Performance_Test.bpr b/tests/Notify_Performance_Test.bpr
new file mode 100644
index 00000000000..ba68871003c
--- /dev/null
+++ b/tests/Notify_Performance_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Notify_Performance_Test.exe
+OBJFILES = objs\Notify_Performance_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index 1f752964c49..403fed63084 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -118,7 +118,7 @@ create_reactor (void)
 static void
 print_results (ACE_Profile_Timer::ACE_Elapsed_Time &et)
 {
-  const ASYS_TCHAR *reactor_type = 0;
+  LPCTSTR reactor_type = 0;
   if (opt_wfmo_reactor)
     reactor_type = ASYS_TEXT ("WFMO_Reactor");
   else if (opt_select_reactor)
diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp
index 27a264ce9e6..a25c0eac5ca 100644
--- a/tests/Notify_Performance_Test.dsp
+++ b/tests/Notify_Performance_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Notify_Performance_Test - Win32 PharLap ETS Debug

+CFG=Notify_Performance_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Notify_Performance_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Notify_Performance_Test.mak"\

+ CFG="Notify_Performance_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Notify_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Notify_Performance_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Notify_Performance_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Notify_Performance_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Notify_Performance_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Notify_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Notify_Performance_Test - Win32 Debug"

 # Name "Notify_Performance_Test - Win32 Alpha Debug"

-# Name "Notify_Performance_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Notify_Performance_Test.cpp

@@ -242,8 +212,6 @@ NODEP_CPP_NOTIF=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/Notify_Performance_Test.icc b/tests/Notify_Performance_Test.icc
deleted file mode 100644
index 2ff67813697..00000000000
--- a/tests/Notify_Performance_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Notify_Performance_Test.exe"
-	{
-	   source type (cpp) "Notify_Performance_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/OrdMultiSet_Test.bpr b/tests/OrdMultiSet_Test.bpr
new file mode 100644
index 00000000000..401ebfc3c6f
--- /dev/null
+++ b/tests/OrdMultiSet_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = OrdMultiSet_Test.exe
+OBJFILES = objs\OrdMultiSet_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/OrdMultiSet_Test.dsp b/tests/OrdMultiSet_Test.dsp
index 809b5c593c1..5cc8ee8e185 100644
--- a/tests/OrdMultiSet_Test.dsp
+++ b/tests/OrdMultiSet_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=OrdMultiSet_Test - Win32 PharLap ETS Debug

+CFG=OrdMultiSet_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=OrdMultiSet_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "OrdMultiSet_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "OrdMultiSet_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "OrdMultiSet_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "OrdMultiSet_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "OrdMultiSet_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "OrdMultiSet_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "OrdMultiSet_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "OrdMultiSet_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "OrdMultiSet_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "OrdMultiSet_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./OrdMultiSet_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "OrdMultiSet_Test - Win32 Debug"

 # Name "OrdMultiSet_Test - Win32 Alpha Debug"

-# Name "OrdMultiSet_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +100,7 @@ SOURCE=.\OrdMultiSet_Test.cpp
 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 Alpha Debug"

 

-DEP_CPP_ORDMU=\

+DEP_CPP_BARRI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -173,6 +142,7 @@ DEP_CPP_ORDMU=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +161,6 @@ DEP_CPP_ORDMU=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_ORDMU=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/OrdMultiSet_Test.icc b/tests/OrdMultiSet_Test.icc
deleted file mode 100644
index b74e8f468b4..00000000000
--- a/tests/OrdMultiSet_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "OrdMultiSet_Test.exe"
-	{
-	   source type (cpp) "OrdMultiSet_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Pipe_Test.bpr b/tests/Pipe_Test.bpr
new file mode 100644
index 00000000000..4e66963d621
--- /dev/null
+++ b/tests/Pipe_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Pipe_Test.exe
+OBJFILES = objs\Pipe_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index 8d4f1d9717e..84bbefad8ce 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -83,14 +83,14 @@ open (ACE_Pipe &pipe,
 #endif /* ! ACE_LACKS_FORK */
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
 #if defined (ACE_LACKS_FORK)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 
-  ACE_START_TEST (ASYS_TEXT ("Pipe_Test"));
-  ACE_ERROR ((LM_INFO, ASYS_TEXT ("fork is not supported on this platform\n")));
+  ACE_START_TEST ("Pipe_Test");
+  ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n"));
   ACE_END_TEST;
 #else  /* ! ACE_LACKS_FORK */
   parse_args (argc, argv);
diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp
index 27618a64644..3844eea981e 100644
--- a/tests/Pipe_Test.dsp
+++ b/tests/Pipe_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Pipe_Test - Win32 PharLap ETS Debug

+CFG=Pipe_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=Pipe_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Pipe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Pipe_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Pipe_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Pipe_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Pipe_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Pipe_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Pipe_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Pipe_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Pipe_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Pipe_Test - Win32 Debug"

 # Name "Pipe_Test - Win32 Alpha Debug"

-# Name "Pipe_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -159,16 +127,12 @@ DEP_CPP_PIPE_=\
 	"..\ace\Process.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_PIPE_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Pipe_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Pipe_Test.icc b/tests/Pipe_Test.icc
deleted file mode 100644
index bc6ad7d05d5..00000000000
--- a/tests/Pipe_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Pipe_Test.exe"
-	{
-	   source type (cpp) "Pipe_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Priority_Buffer_Test.bpr b/tests/Priority_Buffer_Test.bpr
new file mode 100644
index 00000000000..f62700b8586
--- /dev/null
+++ b/tests/Priority_Buffer_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Priority_Buffer_Test.exe
+OBJFILES = objs\Priority_Buffer_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp
index 008126d39b7..cd5553d6b2d 100644
--- a/tests/Priority_Buffer_Test.dsp
+++ b/tests/Priority_Buffer_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Buffer_Test - Win32 PharLap ETS Debug

+CFG=Priority_Buffer_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Priority_Buffer_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Priority_Buffer_Test.mak"\

+ CFG="Priority_Buffer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Buffer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Priority_Buffer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Buffer_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Priority_Buffer_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Priority_Buffer_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Priority_Buffer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Priority_Buffer_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Buffer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Priority_Buffer_Test - Win32 Debug"

 # Name "Priority_Buffer_Test - Win32 Alpha Debug"

-# Name "Priority_Buffer_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -194,6 +164,7 @@ DEP_CPP_PRIOR=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -223,11 +194,6 @@ DEP_CPP_PRIOR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_PRIOR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Priority_Buffer_Test.icc b/tests/Priority_Buffer_Test.icc
deleted file mode 100644
index cfd3a72b880..00000000000
--- a/tests/Priority_Buffer_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Buffer_Test.exe"
-	{
-	   source type (cpp) "Priority_Buffer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Priority_Reactor_Test.bpr b/tests/Priority_Reactor_Test.bpr
new file mode 100644
index 00000000000..9034417e64f
--- /dev/null
+++ b/tests/Priority_Reactor_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Priority_Reactor_Test.exe
+OBJFILES = objs\Priority_Reactor_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 08a91bb1f65..59b5f132e8b 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -92,14 +92,14 @@ Read_Handler::open (void *)
 {
   if (this->peer ().enable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) Read_Handler::open, ")
-                       ASYS_TEXT ("cannot set non blocking mode")),
+                       "(%P|%t) Read_Handler::open, "
+                       "cannot set non blocking mode"),
                       -1);
 
   if (reactor ()->register_handler (this, READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) Read_Handler::open, ")
-                       ASYS_TEXT ("cannot register handler")),
+                       "(%P|%t) Read_Handler::open, "
+                       "cannot register handler"),
                       -1);
 
   // A number larger than the actual number of priorities, so some
@@ -110,8 +110,8 @@ Read_Handler::open (void *)
   started_++;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) created svc_handler for handle %d ")
-              ASYS_TEXT ("with priority %d\n"),
+              "(%P|%t) created svc_handler for handle %d "
+              "with priority %d\n",
               get_handle (),
               priority ()));
   return 0;
@@ -134,19 +134,19 @@ Read_Handler::handle_input (ACE_HANDLE h)
         return 0;
 
       if (result != 0)
-        ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) %p\n"),
-                    ASYS_TEXT ("Read_Handler::handle_input")));
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) %p\n",
+                    "Read_Handler::handle_input"));
       waiting_--;
 
       if (waiting_ == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Last svc_handler closed, shutting down\n")));
+                      "Last svc_handler closed, shutting down\n"));
           ACE_Reactor::instance()->end_event_loop();
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) Read_Handler::handle_input closing down\n")));
+                  "(%P|%t) Read_Handler::handle_input closing down\n"));
       return -1;
     }
 
@@ -174,8 +174,8 @@ Write_Handler::svc (void)
       if (this->peer ().send_n (ACE_ALPHABET,
                                 sizeof (ACE_ALPHABET) - 1) == -1)
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n"),
-                      ASYS_TEXT ("send_n")));
+                      "(%P|%t) %p\n",
+                      "send_n"));
       ACE_OS::sleep (pause);
     }
 
@@ -189,7 +189,7 @@ client (void *arg)
   ACE_INET_Addr *connection_addr =
     ACE_reinterpret_cast (ACE_INET_Addr *, arg);
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) running client\n")));
+              "(%P|%t) running client\n"));
   CONNECTOR connector;
 
   Write_Handler *writer = 0;
@@ -214,7 +214,7 @@ client (void *arg)
           options.timeout (tmp);
           writer = 0;
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%P|%t) still trying to connect\n")));
+                      "(%P|%t) still trying to connect\n"));
         }
       else
         {
@@ -225,23 +225,23 @@ client (void *arg)
           writer->destroy ();
 
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%P|%t) finishing client\n")));
+                      "(%P|%t) finishing client\n"));
           return 0;
         }
     }
 
   ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT ("(%P|%t) failed to connect after %d retries\n"),
+              "(%P|%t) failed to connect after %d retries\n",
               max_retries));
   return 0;
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Priority_Reactor_Test"));
+  ACE_START_TEST ("Priority_Reactor_Test");
 
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("dc:l:m:t:"));
+  ACE_Get_Opt getopt (argc, argv, "dc:l:m:t:");
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -250,26 +250,26 @@ main (int argc, ASYS_TCHAR *argv[])
         opt_priority_reactor = 0;
         break;
       case 'c':
-        opt_nchildren = ACE_OS::atoi (getopt.optarg);
+        opt_nchildren = atoi (getopt.optarg);
         break;
       case 'l':
-        opt_nloops = ACE_OS::atoi (getopt.optarg);
+        opt_nloops = atoi (getopt.optarg);
         break;
       case 'm':
-        max_retries = ACE_OS::atoi (getopt.optarg);
+        max_retries = atoi (getopt.optarg);
         break;
       case 't':
-        opt_max_duration = ACE_OS::atoi (getopt.optarg);
+        opt_max_duration = atoi (getopt.optarg);
         break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("Usage: Priority_Reactor_Test ")
-                           ASYS_TEXT ("   [-d] (disable priority reactor)\n")
-                           ASYS_TEXT ("   [-c nchildren] (number of threads/processes)\n")
-                           ASYS_TEXT ("   [-l loops] (number of loops per child)\n")
-                           ASYS_TEXT ("   [-m maxretries] (attempts to connect)\n")
-                           ASYS_TEXT ("   [-t max_time] (limits test duration)\n")),
+                           "Usage: Priority_Reactor_Test "
+                           "   [-d] (disable priority reactor)\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);
       }
@@ -305,12 +305,12 @@ main (int argc, ASYS_TCHAR *argv[])
   if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("open")),
+                       "(%P|%t) %p\n",
+                       "open"),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
+              "(%P|%t) starting server at port %d\n",
               server_addr.get_port_number ()));
 
   ACE_INET_Addr connection_addr (server_addr.get_port_number (),
@@ -326,8 +326,8 @@ main (int argc, ASYS_TCHAR *argv[])
            (void *) &connection_addr,
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n%a"),
-                    ASYS_TEXT ("thread create failed")));
+                    "(%P|%t) %p\n%a",
+                    "thread create failed"));
     }
 #elif !defined (ACE_LACKS_FORK)
   for (i = 0; i < opt_nchildren; ++i)
@@ -336,7 +336,7 @@ main (int argc, ASYS_TCHAR *argv[])
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("fork failed")));
+                      "(%P|%t) %p\n%a", "fork failed"));
           exit (-1);
           /* NOTREACHED */
         case 0:
@@ -351,7 +351,7 @@ main (int argc, ASYS_TCHAR *argv[])
     }
 #else
   ACE_ERROR ((LM_ERROR,
-              ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1));
+              "(%P|%t) only one thread may be run in a process on this platform\n%a", 1));
 #endif /* ACE_HAS_THREADS */
 
   ACE_Time_Value tv (opt_max_duration);
@@ -363,12 +363,12 @@ main (int argc, ASYS_TCHAR *argv[])
   if (Read_Handler::get_countdown () != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) running out of time, ")
-                  ASYS_TEXT ("probably due to failed connections.\n")));
+                  "(%P|%t) running out of time, "
+                  "probably due to failed connections.\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) waiting for the children...\n")));
+              "(%P|%t) waiting for the children...\n"));
 
 #if defined (ACE_HAS_THREADS)
   ACE_Thread_Manager::instance ()->wait ();
@@ -377,7 +377,7 @@ main (int argc, ASYS_TCHAR *argv[])
     {
       pid_t pid = ACE_OS::wait();
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) child %d terminated\n"),
+                  "(%P|%t) child %d terminated\n",
                   pid));
     }
 #else
diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp
index 432971f992b..e1c34f6804b 100644
--- a/tests/Priority_Reactor_Test.dsp
+++ b/tests/Priority_Reactor_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Reactor_Test - Win32 PharLap ETS Debug

+CFG=Priority_Reactor_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Priority_Reactor_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak"\

+ CFG="Priority_Reactor_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Priority_Reactor_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Priority_Reactor_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Priority_Reactor_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Priority_Reactor_Test - Win32 Debug"

 # Name "Priority_Reactor_Test - Win32 Alpha Debug"

-# Name "Priority_Reactor_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Priority_Reactor_Test.cpp

@@ -279,8 +249,6 @@ NODEP_CPP_PRIOR=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/Priority_Reactor_Test.icc b/tests/Priority_Reactor_Test.icc
deleted file mode 100644
index 46831825cc0..00000000000
--- a/tests/Priority_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Reactor_Test.exe"
-	{
-	   source type (cpp) "Priority_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Priority_Task_Test.bpr b/tests/Priority_Task_Test.bpr
new file mode 100644
index 00000000000..b33850de2ef
--- /dev/null
+++ b/tests/Priority_Task_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Priority_Task_Test.exe
+OBJFILES = objs\Priority_Task_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index cebda8e419c..2e28752babe 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -29,7 +29,7 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-static const ASYS_TCHAR *usage = ASYS_TEXT ("usage: %s [-d]\n");
+static LPCTSTR usage = ASYS_TEXT ("usage: %s [-d]\n");
 
 #if defined (ACE_HAS_THREADS)
 
@@ -235,7 +235,7 @@ main (int argc, ASYS_TCHAR *argv[])
 #endif /* ACE_HAS_THREADS */
 
   // Re-enable LM_DEBUG messages.
-  ACE_Log_Msg::instance ()->priority_mask
+  ACE_Log_Msg::instance ()->priority_mask 
     (ACE_Log_Msg::instance ()->priority_mask () | LM_DEBUG);
 
   ACE_END_TEST;
diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp
index 39d76d8c2df..4ead2caa20c 100644
--- a/tests/Priority_Task_Test.dsp
+++ b/tests/Priority_Task_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Task_Test - Win32 PharLap ETS Debug

+CFG=Priority_Task_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Priority_Task_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Priority_Task_Test.mak"\

+ CFG="Priority_Task_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Priority_Task_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Task_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Priority_Task_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Priority_Task_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Priority_Task_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Priority_Task_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Priority_Task_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Priority_Task_Test - Win32 Debug"

 # Name "Priority_Task_Test - Win32 Alpha Debug"

-# Name "Priority_Task_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -199,6 +169,7 @@ DEP_CPP_PRIOR=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -236,11 +207,6 @@ DEP_CPP_PRIOR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_PRIOR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Priority_Task_Test.icc b/tests/Priority_Task_Test.icc
deleted file mode 100644
index c2b446c877c..00000000000
--- a/tests/Priority_Task_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Task_Test.exe"
-	{
-	   source type (cpp) "Priority_Task_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Process_Mutex_Test.bpr b/tests/Process_Mutex_Test.bpr
new file mode 100644
index 00000000000..c5df004a995
--- /dev/null
+++ b/tests/Process_Mutex_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Process_Mutex_Test.exe
+OBJFILES = objs\Process_Mutex_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index 58f905b3d25..065c9f20ada 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -32,11 +32,6 @@ USELIB("..\ace\aced.lib");
 static int release_mutex = 1;
 static int child_process = 0;
 static const char *mutex_name = ACE_DEFAULT_MUTEX_A;
-#if defined (__Lynx__)
-  static const unsigned int processes = 4;
-#else  /* ! __Lynx__ */
-  static const unsigned int processes = ACE_MAX_PROCESSES;
-#endif /* ! __Lynx__ */
 
 // Explain usage and exit.
 static void
@@ -103,14 +98,14 @@ acquire_release (void)
 #endif /* ! ACE_LACKS_FORK */
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
 #if defined (ACE_LACKS_FORK)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 
-  ACE_START_TEST (ASYS_TEXT ("Process_Mutex_Test"));
-  ACE_ERROR ((LM_INFO, ASYS_TEXT ("fork is not supported on this platform\n")));
+  ACE_START_TEST ("Process_Mutex_Test");
+  ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n"));
   ACE_END_TEST;
 #else  /* ! ACE_LACKS_FORK */
 
@@ -125,7 +120,7 @@ main (int argc, ASYS_TCHAR *argv[])
     }
   else
     {
-      ACE_START_TEST (ASYS_TEXT ("Process_Mutex_Test"));
+      ACE_START_TEST ("Process_Mutex_Test");
       ACE_INIT_LOG ("Process_Mutex_Test-children");
 
       ACE_Process_Options options;
@@ -140,11 +135,12 @@ main (int argc, ASYS_TCHAR *argv[])
                               ACE_TEXT (" -c -n %s"),
                               ACE_WIDE_STRING (mutex_name));
 
-      // Spawn processes that will contend for the lock.
-      ACE_Process servers[processes];
+      // Spawn ACE_MAX_PROCESSES processes that will contend for the
+      // lock.
+      ACE_Process servers[ACE_MAX_PROCESSES];
       size_t i;
 
-      for (i = 0; i < processes; i++)
+      for (i = 0; i < ACE_MAX_PROCESSES; i++)
         {
           ACE_ASSERT (servers[i].spawn (options) != -1);
           ACE_DEBUG ((LM_DEBUG,
@@ -152,7 +148,7 @@ main (int argc, ASYS_TCHAR *argv[])
                       servers[i].getpid ()));
         }
 
-      for (i = 0; i < processes; i++)
+      for (i = 0; i < ACE_MAX_PROCESSES; i++)
         {
           // Wait for the process we created to exit.
           ACE_ASSERT (servers[i].wait () != -1);
diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp
index a3b97aef63d..990469f8d02 100644
--- a/tests/Process_Mutex_Test.dsp
+++ b/tests/Process_Mutex_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Process_Mutex_Test - Win32 PharLap ETS Debug

+CFG=Process_Mutex_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Process_Mutex_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Process_Mutex_Test.mak"\

+ CFG="Process_Mutex_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Process_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Process_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Mutex_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Process_Mutex_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Process_Mutex_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Process_Mutex_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Process_Mutex_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Process_Mutex_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Process_Mutex_Test - Win32 Debug"

 # Name "Process_Mutex_Test - Win32 Alpha Debug"

-# Name "Process_Mutex_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -160,6 +130,7 @@ DEP_CPP_PROCE=\
 	"..\ace\Process.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -176,11 +147,6 @@ DEP_CPP_PROCE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_PROCE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Process_Mutex_Test.icc b/tests/Process_Mutex_Test.icc
deleted file mode 100644
index 33ae797b3bf..00000000000
--- a/tests/Process_Mutex_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Process_Mutex_Test.exe"
-	{
-	   source type (cpp) "Process_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Process_Strategy_Test.bpr b/tests/Process_Strategy_Test.bpr
new file mode 100644
index 00000000000..f895e9baaa1
--- /dev/null
+++ b/tests/Process_Strategy_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Process_Strategy_Test.exe
+OBJFILES = objs\Process_Strategy_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 6c7e52b43e8..c60e343395c 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -135,7 +135,7 @@ Options::concurrency_strategy (void)
   return this->concurrency_strategy_;
 }
 
-const ASYS_TCHAR *
+const char *
 Options::filename (void)
 {
   return this->filename_;
@@ -161,32 +161,32 @@ Options::~Options (void)
 }
 
 int
-Options::parse_args (int argc, ASYS_TCHAR *argv[])
+Options::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("p:c:f:"));
+  ACE_Get_Opt get_opt (argc, argv, "p:c:f:");
 
-  this->filename_ = ASYS_TEXT (ACE_TEMP_FILE_NAME_A);
+  this->filename_ = ACE_TEMP_FILE_NAME_A;
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
       {
       case 'c':
         if (ACE_OS::strcmp (get_opt.optarg,
-                            ASYS_TEXT ("REACTIVE")) == 0)
+                            "REACTIVE") == 0)
           OPTIONS::instance ()->concurrency_type (Options::REACTIVE);
 #if !defined (ACE_LACKS_FORK)
         else if (ACE_OS::strcmp (get_opt.optarg,
-                                 ASYS_TEXT ("PROCESS")) == 0)
+                                 "PROCESS") == 0)
           OPTIONS::instance ()->concurrency_type (Options::PROCESS);
 #endif /* !ACE_LACKS_FORK */
 #if defined (ACE_HAS_THREADS)
         else if (ACE_OS::strcmp (get_opt.optarg,
-                                 ASYS_TEXT ("THREAD")) == 0)
+                                 "THREAD") == 0)
           OPTIONS::instance ()->concurrency_type (Options::THREAD);
 #endif /* ACE_HAS_THREADS */
         else
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("WARNING: concurrency strategy \"%s\" is not supported\n"),
+                      "WARNING: concurrency strategy \"%s\" is not supported\n",
                       get_opt.optarg));
         break;
       case 'f':
@@ -194,22 +194,22 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
         break;
       default:
         ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("usage: %n [-f (filename)] [-c (concurrency strategy)]\n%a"), 1));
+                    "usage: %n [-f (filename)] [-c (concurrency strategy)]\n%a", 1));
         /* NOTREACHED */
       }
 
   // Initialize the file lock.  Note that this object lives beyond the
   // lifetime of the Acceptor.
-  if (this->file_lock_.open (ASYS_ONLY_WIDE_STRING (this->filename_),
+  if (this->file_lock_.open (ACE_WIDE_STRING (this->filename_),
                              O_RDWR | O_CREAT,
                              ACE_DEFAULT_FILE_PERMS) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) opening %s on handle %d.\n"),
+              "(%P|%t) opening %s on handle %d.\n",
               this->filename_,
               this->file_lock_.get_handle ()));
 
@@ -220,8 +220,8 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[])
                      (const void *) &count,
                      sizeof count) != sizeof count)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n"),
-                ASYS_TEXT ("write")));
+                "(%P|%t) %p\n",
+                "write"));
 
   // Initialize the Concurrency strategy.
   switch (this->concurrency_type_)
@@ -283,7 +283,7 @@ Options::concurrency_type (Options::Concurrency_Type cs)
 Counting_Service::Counting_Service (ACE_Thread_Manager *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) creating the Counting_Service\n")));
+              "(%P|%t) creating the Counting_Service\n"));
 }
 
 // Read the current value from the shared file and return it to the
@@ -295,7 +295,7 @@ Counting_Service::read (void)
   ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) reading on handle %d.\n"),
+              "(%P|%t) reading on handle %d.\n",
               OPTIONS::instance ()->file_lock ().get_handle ()));
 
   int count;
@@ -304,8 +304,8 @@ Counting_Service::read (void)
                      sizeof count,
                      0) != sizeof count)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("read")),
+                       "(%P|%t) %p\n",
+                       "read"),
                       -1);
   char buf[BUFSIZ];
 
@@ -313,13 +313,13 @@ Counting_Service::read (void)
                            "count = %d\n",
                            count);
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) count = %d\n"),
+              "(%P|%t) count = %d\n",
               count));
 
   if (this->peer ().send_n (buf, n) != n)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("send_n")),
+                       "(%P|%t) %p\n",
+                       "send_n"),
                       -1);
   return 0;
 }
@@ -332,7 +332,7 @@ Counting_Service::inc (void)
   ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) incrementing on handle %d.\n"),
+              "(%P|%t) incrementing on handle %d.\n",
               OPTIONS::instance ()->file_lock ().get_handle ()));
 
   int count;
@@ -341,12 +341,12 @@ Counting_Service::inc (void)
                      sizeof count,
                      0) != sizeof count)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("read")),
+                       "(%P|%t) %p\n",
+                       "read"),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) incrementing count from %d to %d\n"),
+              "(%P|%t) incrementing count from %d to %d\n",
               count,
               count + 1));
   count++;
@@ -356,8 +356,8 @@ Counting_Service::inc (void)
                       sizeof count,
                       0) != sizeof count)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("write")),
+                       "(%P|%t) %p\n",
+                       "write"),
                       -1);
   return 0;
 }
@@ -371,7 +371,7 @@ Counting_Service::handle_input (ACE_HANDLE)
   char buf[BUFSIZ];
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) reading from peer on %d\n"),
+              "(%P|%t) reading from peer on %d\n",
               this->peer ().get_handle ()));
 
   size_t len;
@@ -389,7 +389,7 @@ Counting_Service::handle_input (ACE_HANDLE)
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) %d bytes of input on %d is %*s\n"),
+                  "(%P|%t) %d bytes of input on %d is %*s\n",
                   bytes,
                   this->peer ().get_handle (),
                   bytes,
@@ -405,7 +405,7 @@ Counting_Service::handle_input (ACE_HANDLE)
         return this->inc ();
       else
         ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("(%P|%t) no match...\n")));
+                    "(%P|%t) no match...\n"));
       return 0;
     }
 }
@@ -414,7 +414,7 @@ int
 Counting_Service::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) handling thread\n")));
+              "(%P|%t) handling thread\n"));
 
   while (this->handle_input () >= 0)
     continue;
@@ -440,7 +440,7 @@ int
 Counting_Service::open (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) opening service\n")));
+              "(%P|%t) opening service\n"));
 
   if (OPTIONS::instance ()->concurrency_type () == Options::PROCESS)
     {
@@ -451,7 +451,7 @@ Counting_Service::open (void *)
         continue;
 
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) About to exit from the child\n")));
+                  "(%P|%t) About to exit from the child\n"));
 
       // Exit the child.
       ACE_OS::exit (0);
@@ -482,12 +482,12 @@ client (void *arg)
   for (i = 0; i < ACE_MAX_ITERATIONS; i++)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) client iteration %d\n"),
+                  "(%P|%t) client iteration %d\n",
                   i));
       if (connector.connect (stream, server_addr) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("open")),
+                           "%p\n",
+                           "open"),
                           0);
       command = "inc";
       command_len = ACE_OS::strlen (command);
@@ -496,8 +496,8 @@ client (void *arg)
                        &command_len, sizeof command_len,
                        command, command_len) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("send")),
+                           "%p\n",
+                           "send"),
                           0);
       command = "read";
       command_len = ACE_OS::strlen (command);
@@ -506,23 +506,23 @@ client (void *arg)
                        &command_len, sizeof command_len,
                        command, command_len) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("send")),
+                           "%p\n",
+                           "send"),
                           0);
       else if (stream.recv (buf, sizeof buf) <= 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("recv")),
+                           "%p\n",
+                           "recv"),
                           0);
 
       //      ACE_DEBUG ((LM_DEBUG,
-      //                  ASYS_TEXT ("(%P|%t) client iteration %d, buf = %s\n"),
+      //                  "(%P|%t) client iteration %d, buf = %s\n",
       //                  i, buf));
 
       if (stream.close () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("close")),
+                           "%p\n",
+                           "close"),
                           0);
     }
 
@@ -532,20 +532,20 @@ client (void *arg)
 
   if (connector.connect (stream, server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       0);
   else if (stream.send (4,
                         &command_len, sizeof command_len,
                         command, command_len) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("send")),
+                       "%p\n",
+                       "send"),
                       0);
   else if ((bytes_read = stream.recv (buf, sizeof buf)) <= 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("recv")),
+                       "%p\n",
+                       "recv"),
                       0);
   else
     {
@@ -556,7 +556,7 @@ client (void *arg)
       size_t count = ACE_OS::atoi (ACE_OS::strrchr (buf, ' '));
 
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) count = %d\n"),
+                  "(%P|%t) count = %d\n",
                   count));
       // Make sure that the count is correct.
       ACE_ASSERT (count == ACE_MAX_ITERATIONS);
@@ -564,8 +564,8 @@ client (void *arg)
 
   if (stream.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("close")),
+                       "%p\n",
+                       "close"),
                       0);
 
   // Remove the filename.
@@ -590,14 +590,14 @@ server (void *)
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Process_Strategy_Test"));
+  ACE_START_TEST ("Process_Strategy_Test");
 
   if (OPTIONS::instance ()->parse_args (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("parse_args")),
+                       "%p\n",
+                       "parse_args"),
                       -1);
 
   ACCEPTOR acceptor;
@@ -613,13 +613,13 @@ main (int argc, ASYS_TCHAR *argv[])
                      OPTIONS::instance ()->concurrency_strategy ()) == -1
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("open")),
+                       "%p\n",
+                       "open"),
                       -1);
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
+                  "(%P|%t) starting server at port %d\n",
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
@@ -631,8 +631,8 @@ main (int argc, ASYS_TCHAR *argv[])
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n%a"),
-                      ASYS_TEXT ("fork failed")));
+                      "(%P|%t) %p\n%a",
+                      "fork failed"));
           exit (-1);
           /* NOTREACHED */
         case 0:
@@ -650,22 +650,22 @@ main (int argc, ASYS_TCHAR *argv[])
            (void *) 0,
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n%a"),
-                    ASYS_TEXT ("thread create failed")));
+                    "(%P|%t) %p\n%a",
+                    "thread create failed"));
 
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (client),
            (void *) &server_addr,
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n%a"),
-                    ASYS_TEXT ("thread create failed")));
+                    "(%P|%t) %p\n%a",
+                    "thread create failed"));
 
       // Wait for the threads to exit.
       ACE_Thread_Manager::instance ()->wait ();
 #else
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"),
+                  "(%P|%t) only one thread may be run in a process on this platform\n%a",
                   1));
 #endif /* ACE_HAS_THREADS */
     }
diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp
index ee5311aa4ec..c0cb0f5a996 100644
--- a/tests/Process_Strategy_Test.dsp
+++ b/tests/Process_Strategy_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Process_Strategy_Test - Win32 PharLap ETS Debug

+CFG=Process_Strategy_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Process_Strategy_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Process_Strategy_Test.mak"\

+ CFG="Process_Strategy_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Process_Strategy_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Process_Strategy_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Strategy_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Process_Strategy_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Process_Strategy_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Process_Strategy_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Process_Strategy_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Process_Strategy_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Strategy_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Process_Strategy_Test - Win32 Debug"

 # Name "Process_Strategy_Test - Win32 Alpha Debug"

-# Name "Process_Strategy_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -223,6 +193,7 @@ DEP_CPP_PROCE=\
 	"..\ace\SOCK_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -265,11 +236,6 @@ DEP_CPP_PROCE=\
 	".\Process_Strategy_Test.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_PROCE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Process_Strategy_Test.h b/tests/Process_Strategy_Test.h
index 48b3f29d3bf..7944355255b 100644
--- a/tests/Process_Strategy_Test.h
+++ b/tests/Process_Strategy_Test.h
@@ -100,7 +100,7 @@ public:
   ~Options (void);
   // Destructor.
 
-  int parse_args (int argc, ASYS_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Read command-line arguments and initialize options.
 
   enum Concurrency_Type
@@ -117,7 +117,7 @@ public:
   ACE_File_Lock &file_lock (void);
   // Returns the file lock.
 
-  const ASYS_TCHAR *filename (void);
+  const char *filename (void);
   // Returns the filename that we're using as the lock.
 
   ACE_Concurrency_Strategy <Counting_Service> *concurrency_strategy (void);
@@ -134,7 +134,7 @@ private:
   // Activation strategy that either forks a new process or spawns a
   // new thread for each client connection.
 
-  const ASYS_TCHAR *filename_;
+  const char *filename_;
   // Name of the counting file.
 };
 
diff --git a/tests/Process_Strategy_Test.icc b/tests/Process_Strategy_Test.icc
deleted file mode 100644
index 6d635f45967..00000000000
--- a/tests/Process_Strategy_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Process_Strategy_Test.exe"
-	{
-	   source type (cpp) "Process_Strategy_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Purgable_Map_Manager_Test.icc b/tests/Purgable_Map_Manager_Test.icc
deleted file mode 100644
index 0ffd1a6e76b..00000000000
--- a/tests/Purgable_Map_Manager_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Purgable_Map_Manager_Test.exe"
-	{
-	   source type (cpp) "Purgable_Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/RB_Tree_Test.dsp b/tests/RB_Tree_Test.dsp
index 597c7471a12..e5098eeed62 100644
--- a/tests/RB_Tree_Test.dsp
+++ b/tests/RB_Tree_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=RB_Tree_Test - Win32 PharLap ETS Debug

+CFG=RB_Tree_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=RB_Tree_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "RB_Tree_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "RB_Tree_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "RB_Tree_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "RB_Tree_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "RB_Tree_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "RB_Tree_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "RB_Tree_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./RB_Tree_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "RB_Tree_Test - Win32 Debug"

 # Name "RB_Tree_Test - Win32 Alpha Debug"

-# Name "RB_Tree_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -131,7 +100,7 @@ SOURCE=.\RB_Tree_Test.cpp
 

 !ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 Alpha Debug"

 

-DEP_CPP_RB_TR=\

+DEP_CPP_ATOMI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -156,6 +125,7 @@ DEP_CPP_RB_TR=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -172,11 +142,6 @@ DEP_CPP_RB_TR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_RB_TR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/RB_Tree_Test.icc b/tests/RB_Tree_Test.icc
deleted file mode 100644
index 647fe72248e..00000000000
--- a/tests/RB_Tree_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "RB_Tree_Test.exe"
-	{
-	   source type (cpp) "RB_Tree_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reactor_Exceptions_Test.bpr b/tests/Reactor_Exceptions_Test.bpr
new file mode 100644
index 00000000000..996473f56c4
--- /dev/null
+++ b/tests/Reactor_Exceptions_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reactor_Exceptions_Test.exe
+OBJFILES = objs\Reactor_Exceptions_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp
index fa7f3797c4e..cc4905525fa 100644
--- a/tests/Reactor_Exceptions_Test.cpp
+++ b/tests/Reactor_Exceptions_Test.cpp
@@ -107,29 +107,9 @@ public:
   virtual int handle_events (ACE_Time_Value *max_wait_time)
   {
     int ret = 0;
-
     try
       {
-#       if defined (__BORLANDC__)
-        // BCB does not catch structured exceptions with catch (...).
-        // Actually, the ANSI spec says that system exceptions are not
-        // supposed to be caught with catch.  Borland may add this, and
-        // make it "switchable" in the future...
-        try
-        {
-#       endif /* defined (__BORLANDC__) */
-
         ret = ACE_Reactor::handle_events (max_wait_time);
-
-#       if defined (__BORLANDC__)
-        }
-        __except (EXCEPTION_EXECUTE_HANDLER)
-        {
-          // Probably should handle the details of the exception
-          // and throw something that represents the structured exception
-          throw "Win32 Structured Exception";
-        }
-#       endif /* defined (__BORLANDC__) */
       }
     catch (...)
       {
@@ -138,7 +118,6 @@ public:
         ret = -1;
         // do your thing, etc.
       }
-//}
     return ret;
   }
 
diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp
index 9488855d57d..390cf40a25c 100644
--- a/tests/Reactor_Exceptions_Test.dsp
+++ b/tests/Reactor_Exceptions_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Exceptions_Test - Win32 PharLap ETS Debug

+CFG=Reactor_Exceptions_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Reactor_Exceptions_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak"\

+ CFG="Reactor_Exceptions_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Exceptions_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reactor_Exceptions_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Reactor_Exceptions_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reactor_Exceptions_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Reactor_Exceptions_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Reactor_Exceptions_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Exceptions_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reactor_Exceptions_Test - Win32 Debug"

 # Name "Reactor_Exceptions_Test - Win32 Alpha Debug"

-# Name "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -188,6 +158,7 @@ DEP_CPP_REACT=\
 	"..\ace\SOCK_Dgram.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -210,11 +181,6 @@ DEP_CPP_REACT=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_REACT=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Reactor_Exceptions_Test.icc b/tests/Reactor_Exceptions_Test.icc
deleted file mode 100644
index be4e903690f..00000000000
--- a/tests/Reactor_Exceptions_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Exceptions_Test.exe"
-	{
-	   source type (cpp) "Reactor_Exceptions_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reactor_Notify_Test.bpr b/tests/Reactor_Notify_Test.bpr
new file mode 100644
index 00000000000..c92c8070ff5
--- /dev/null
+++ b/tests/Reactor_Notify_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reactor_Notify_Test.exe
+OBJFILES = objs\Reactor_Notify_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp
index 5879c6e1bef..b00202452ac 100644
--- a/tests/Reactor_Notify_Test.cpp
+++ b/tests/Reactor_Notify_Test.cpp
@@ -217,7 +217,7 @@ run_test (int disable_notify_pipe)
 {
   // Create special reactors with the appropriate flags enabled.
 
-  ACE_Select_Reactor *reactor_impl = 0;
+  ACE_Select_Reactor *reactor_impl;
   if (disable_notify_pipe)
     ACE_NEW (reactor_impl,
              ACE_Select_Reactor (0, 0, 1));
diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp
index 65242b86f93..0cf81ae9d61 100644
--- a/tests/Reactor_Notify_Test.dsp
+++ b/tests/Reactor_Notify_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Notify_Test - Win32 PharLap ETS Debug

+CFG=Reactor_Notify_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Reactor_Notify_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reactor_Notify_Test.mak"\

+ CFG="Reactor_Notify_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Notify_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reactor_Notify_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Notify_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Reactor_Notify_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reactor_Notify_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Reactor_Notify_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Reactor_Notify_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Notify_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reactor_Notify_Test - Win32 Debug"

 # Name "Reactor_Notify_Test - Win32 Alpha Debug"

-# Name "Reactor_Notify_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -199,6 +169,7 @@ DEP_CPP_REACT=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -236,11 +207,6 @@ DEP_CPP_REACT=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_REACT=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Reactor_Notify_Test.icc b/tests/Reactor_Notify_Test.icc
deleted file mode 100644
index 60e80213aa5..00000000000
--- a/tests/Reactor_Notify_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Notify_Test.exe"
-	{
-	   source type (cpp) "Reactor_Notify_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reactor_Performance_Test.bpr b/tests/Reactor_Performance_Test.bpr
new file mode 100644
index 00000000000..a4c7e76c6b3
--- /dev/null
+++ b/tests/Reactor_Performance_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reactor_Performance_Test.exe
+OBJFILES = objs\Reactor_Performance_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 20db2146afc..bff9127cca0 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -111,8 +111,8 @@ Read_Handler::handle_input (ACE_HANDLE handle)
             return 0;
           else
             {
-              ACE_ERROR ((LM_ERROR, ASYS_TEXT ("handle_input: %p (errno: %d)\n"),
-                          ASYS_TEXT ("recv"), errno));
+              ACE_ERROR ((LM_ERROR, "handle_input: %p (errno: %d)\n",
+                          "recv", errno));
 
               // This will cause handle_close to get called.
               return -1;
diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp
index 25a849ec724..14a7f5d8795 100644
--- a/tests/Reactor_Performance_Test.dsp
+++ b/tests/Reactor_Performance_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Performance_Test - Win32 PharLap ETS Debug

+CFG=Reactor_Performance_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Reactor_Performance_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reactor_Performance_Test.mak"\

+ CFG="Reactor_Performance_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reactor_Performance_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Performance_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reactor_Performance_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Reactor_Performance_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reactor_Performance_Test - Win32 Debug"

 # Name "Reactor_Performance_Test - Win32 Alpha Debug"

-# Name "Reactor_Performance_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Reactor_Performance_Test.cpp

@@ -280,8 +250,6 @@ NODEP_CPP_REACT=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/Reactor_Performance_Test.icc b/tests/Reactor_Performance_Test.icc
deleted file mode 100644
index 1c8c6bf81bf..00000000000
--- a/tests/Reactor_Performance_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Performance_Test.exe"
-	{
-	   source type (cpp) "Reactor_Performance_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reactor_Timer_Test.bpr b/tests/Reactor_Timer_Test.bpr
new file mode 100644
index 00000000000..c93f847366b
--- /dev/null
+++ b/tests/Reactor_Timer_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reactor_Timer_Test.exe
+OBJFILES = objs\Reactor_Timer_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp
index 11b90d10433..d5ad3530091 100644
--- a/tests/Reactor_Timer_Test.dsp
+++ b/tests/Reactor_Timer_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Timer_Test - Win32 PharLap ETS Debug

+CFG=Reactor_Timer_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Reactor_Timer_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reactor_Timer_Test.mak"\

+ CFG="Reactor_Timer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reactor_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Reactor_Timer_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reactor_Timer_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Reactor_Timer_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reactor_Timer_Test - Win32 Debug"

 # Name "Reactor_Timer_Test - Win32 Alpha Debug"

-# Name "Reactor_Timer_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -178,6 +148,7 @@ DEP_CPP_REACT=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -198,11 +169,6 @@ DEP_CPP_REACT=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_REACT=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Reactor_Timer_Test.icc b/tests/Reactor_Timer_Test.icc
deleted file mode 100644
index 7803cfb2fea..00000000000
--- a/tests/Reactor_Timer_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Timer_Test.exe"
-	{
-	   source type (cpp) "Reactor_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reactors_Test.bpr b/tests/Reactors_Test.bpr
new file mode 100644
index 00000000000..9a0ed9a81c2
--- /dev/null
+++ b/tests/Reactors_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reactors_Test.exe
+OBJFILES = objs\Reactors_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp
index 639702d3425..3102b9c0bdb 100644
--- a/tests/Reactors_Test.dsp
+++ b/tests/Reactors_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactors_Test - Win32 PharLap ETS Debug

+CFG=Reactors_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Reactors_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactors_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reactors_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactors_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Reactors_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reactors_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Reactors_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Reactors_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Reactors_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactors_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reactors_Test - Win32 Debug"

 # Name "Reactors_Test - Win32 Alpha Debug"

-# Name "Reactors_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -197,6 +166,7 @@ DEP_CPP_REACT=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -234,11 +204,6 @@ DEP_CPP_REACT=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_REACT=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Reactors_Test.icc b/tests/Reactors_Test.icc
deleted file mode 100644
index 08ee8110b58..00000000000
--- a/tests/Reactors_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactors_Test.exe"
-	{
-	   source type (cpp) "Reactors_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reader_Writer_Test.bpr b/tests/Reader_Writer_Test.bpr
new file mode 100644
index 00000000000..b3fdb6e01f2
--- /dev/null
+++ b/tests/Reader_Writer_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Reader_Writer_Test.exe
+OBJFILES = objs\Reader_Writer_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp
index 094092618dd..f7e0f55fec8 100644
--- a/tests/Reader_Writer_Test.dsp
+++ b/tests/Reader_Writer_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reader_Writer_Test - Win32 PharLap ETS Debug

+CFG=Reader_Writer_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Reader_Writer_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reader_Writer_Test.mak"\

+ CFG="Reader_Writer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reader_Writer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Reader_Writer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reader_Writer_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Reader_Writer_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reader_Writer_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Reader_Writer_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Reader_Writer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Reader_Writer_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reader_Writer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Reader_Writer_Test - Win32 Debug"

 # Name "Reader_Writer_Test - Win32 Alpha Debug"

-# Name "Reader_Writer_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -175,6 +145,7 @@ DEP_CPP_READE=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -193,11 +164,6 @@ DEP_CPP_READE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_READE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Reader_Writer_Test.icc b/tests/Reader_Writer_Test.icc
deleted file mode 100644
index 1066d73ee30..00000000000
--- a/tests/Reader_Writer_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reader_Writer_Test.exe"
-	{
-	   source type (cpp) "Reader_Writer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Recursive_Mutex_Test.bpr b/tests/Recursive_Mutex_Test.bpr
new file mode 100644
index 00000000000..a474eb051e4
--- /dev/null
+++ b/tests/Recursive_Mutex_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Recursive_Mutex_Test.exe
+OBJFILES = objs\Recursive_Mutex_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index 999525d2b3e..07642ee03d4 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -36,8 +36,6 @@ USELIB("..\ace\aced.lib");
 #if defined (CHORUS)
   // Chorus can't handle 100 iterations:
   //   [amThrd.C:154]: Failed to allocate an AmActor
-  // NOTE: this was before we set the stack size, below.  It
-  //   might work with the default n_iterations now.
   static size_t n_iterations = 45;
 #else  /* ! CHORUS */
   static size_t n_iterations = 100;
@@ -71,7 +69,7 @@ static void *
 worker (void *arg)
 {
   ACE_Recursive_Thread_Mutex *rm =
-    ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *,
+    ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *, 
                           arg);
   recursive_worker (0, rm);
   return 0;
@@ -86,21 +84,9 @@ main (int, ASYS_TCHAR *[])
 
 #if defined (ACE_HAS_THREADS)
   ACE_Recursive_Thread_Mutex rm;
-
-  size_t stack_sizes [ACE_MAX_THREADS];
-  for (unsigned int i = 0; i < ACE_MAX_THREADS; ++i)
-    stack_sizes[i] = 100000;
-
   ACE_Thread_Manager::instance ()->spawn_n (n_threads,
                                             ACE_THR_FUNC (worker),
-                                            (void *) &rm,
-                                            THR_NEW_LWP | THR_JOINABLE,
-                                            ACE_DEFAULT_THREAD_PRIORITY,
-                                            -1, /* grp_id */
-                                            0,  /* task base */
-                                            0,  /* thread handles array */
-                                            0,  /* stack array */
-                                            stack_sizes);
+                                            (void *) &rm);
   ACE_Thread_Manager::instance ()->wait ();
 #else
   ACE_ERROR ((LM_ERROR,
diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp
index 6117cce0dc0..6fafb0242bd 100644
--- a/tests/Recursive_Mutex_Test.dsp
+++ b/tests/Recursive_Mutex_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Recursive_Mutex_Test - Win32 PharLap ETS Debug

+CFG=Recursive_Mutex_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Recursive_Mutex_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak"\

+ CFG="Recursive_Mutex_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Recursive_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Recursive_Mutex_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Recursive_Mutex_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Recursive_Mutex_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Recursive_Mutex_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Recursive_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Recursive_Mutex_Test - Win32 Debug"

 # Name "Recursive_Mutex_Test - Win32 Alpha Debug"

-# Name "Recursive_Mutex_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -175,6 +145,7 @@ DEP_CPP_RECUR=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -193,11 +164,6 @@ DEP_CPP_RECUR=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_RECUR=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Recursive_Mutex_Test.icc b/tests/Recursive_Mutex_Test.icc
deleted file mode 100644
index 765c7537b05..00000000000
--- a/tests/Recursive_Mutex_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Recursive_Mutex_Test.exe"
-	{
-	   source type (cpp) "Recursive_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp
index 671cb750973..2d179e58411 100644
--- a/tests/Reverse_Lock_Test.dsp
+++ b/tests/Reverse_Lock_Test.dsp
@@ -4,32 +4,29 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Reverse_Lock_Test - Win32 PharLap ETS Debug

+CFG=Reverse_Lock_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "Reverse_Lock_Test.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 PharLap ETS Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Thread_M"

@@ -51,40 +48,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Reverse_Lock_Test - Win32 Debug"

-# Name "Reverse_Lock_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Reverse_Lock_Test.cpp

diff --git a/tests/SOCK_Connector_Test.bpr b/tests/SOCK_Connector_Test.bpr
new file mode 100644
index 00000000000..181fcf94b39
--- /dev/null
+++ b/tests/SOCK_Connector_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = SOCK_Connector_Test.exe
+OBJFILES = objs\SOCK_Connector_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index 171ee42777c..9605321d521 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -172,8 +172,8 @@ fail_no_listener_nonblocking (void)
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("Test not executed fully; ")
-                  ASYS_TEXT ("expected EWOULDBLOCK, %p (%d)\n"),
+                  ASYS_TEXT ("Test not executed fully; "
+                             "expected EWOULDBLOCK, %p (%d)\n"),
                   ASYS_TEXT ("not"), errno));
       status = -1;
     }
diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp
index c8b21ce7018..05596e23a7c 100644
--- a/tests/SOCK_Connector_Test.dsp
+++ b/tests/SOCK_Connector_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug

+CFG=SOCK_Connector_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,20 @@ CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak"\

+ CFG="SOCK_Connector_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Connector_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "SOCK_Connector_Test\Debug"

@@ -54,41 +51,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Connector_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SOCK_Connector_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SOCK_Connector_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SOCK_Connector_Test"

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Connector_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "SOCK_Connector_Test - Win32 Debug"

-# Name "SOCK_Connector_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

diff --git a/tests/SOCK_Connector_Test.icc b/tests/SOCK_Connector_Test.icc
deleted file mode 100644
index 65474d09c4f..00000000000
--- a/tests/SOCK_Connector_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SOCK_Connector_Test.exe"
-	{
-	   source type (cpp) "SOCK_Connector_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp
index 30588d96484..b458f56528a 100644
--- a/tests/SOCK_Send_Recv_Test.cpp
+++ b/tests/SOCK_Send_Recv_Test.cpp
@@ -45,9 +45,9 @@ static int Test_Result = 0;        // Change to non-zero if test fails
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *    remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *, arg);
+  ACE_INET_Addr *    remote_addr = (ACE_INET_Addr *) arg;
   ACE_INET_Addr      server_addr (remote_addr->get_port_number (),
-                                  ACE_LOCALHOST);
+                                  ASYS_TEXT ("localhost"));
   ACE_SOCK_Stream    cli_stream;
   ACE_SOCK_Connector con;
   ACE_Time_Value     timeout (ACE_DEFAULT_TIMEOUT);
@@ -156,8 +156,6 @@ server (void *arg)
   // will be detected and read into a ACE-allocated buffer.  Use a
   // 5 second timeout to give the client a chance to send it all.
 
-  ACE_OS::sleep (5);
-
   iovec iov[3];
   unsigned char buff[255];
   ssize_t len;
@@ -171,7 +169,7 @@ server (void *arg)
 
   iov[2].iov_base = ACE_reinterpret_cast (char *, &buff[175]);
   iov[2].iov_len = 80;
-
+  
   len = sock_str.recvv_n (iov, 3);
   if (len == -1)
     {
@@ -179,7 +177,6 @@ server (void *arg)
                   ASYS_TEXT ("Test 1, recvv failed")));
       Test_Result = 1;
     }
-
   ACE_ASSERT (len == 255);
   for (i = 0; i < 255; i++)
     if (buff[i] != i)
@@ -228,23 +225,19 @@ spawn (void)
           /* NOTREACHED */
         case 0:
           client (&server_addr);
-          ACE_OS::exit (0);
+          exit (0);
           /* NOTREACHED */
         default:
-          server (ACE_reinterpret_cast (void *, &peer_acceptor));
+          server ((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),
-           THR_NEW_LWP | THR_DETACHED) == -1)
+          (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
 
       if (ACE_Thread_Manager::instance ()->spawn
-          (ACE_THR_FUNC (client),
-           ACE_reinterpret_cast (void *, &server_addr),
-           THR_NEW_LWP | THR_DETACHED) == -1)
+          (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed")));
 
       // Wait for the threads to exit.
diff --git a/tests/SOCK_Send_Recv_Test.dsp b/tests/SOCK_Send_Recv_Test.dsp
index 69063cf3034..8a3b828651f 100644
--- a/tests/SOCK_Send_Recv_Test.dsp
+++ b/tests/SOCK_Send_Recv_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug

+CFG=SOCK_Send_Recv_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,20 @@ CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak"\

+ CFG="SOCK_Send_Recv_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -52,41 +49,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "SOCK_Send_Recv_Test - Win32 Debug"

-# Name "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\SOCK_Send_Recv_Test.cpp

diff --git a/tests/SOCK_Test.bpr b/tests/SOCK_Test.bpr
new file mode 100644
index 00000000000..8763a3c5110
--- /dev/null
+++ b/tests/SOCK_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = SOCK_Test.exe
+OBJFILES = objs\SOCK_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 1b7756dfb38..c7073966e14 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -39,7 +39,7 @@ static void *
 client (void *arg)
 {
   ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg;
-  ACE_INET_Addr server_addr (remote_addr->get_port_number (), ACE_LOCALHOST);
+  ACE_INET_Addr server_addr (remote_addr->get_port_number (), ASYS_TEXT ("localhost"));
   ACE_SOCK_Stream cli_stream;
   ACE_SOCK_Connector con;
 
diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp
index ccfbba5b06e..50422ca9aa0 100644
--- a/tests/SOCK_Test.dsp
+++ b/tests/SOCK_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Test - Win32 PharLap ETS Debug

+CFG=SOCK_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=SOCK_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "SOCK_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "SOCK_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SOCK_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SOCK_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SOCK_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "SOCK_Test - Win32 Debug"

 # Name "SOCK_Test - Win32 Alpha Debug"

-# Name "SOCK_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -191,6 +159,7 @@ DEP_CPP_SOCK_=\
 	"..\ace\SOCK_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -210,11 +179,6 @@ DEP_CPP_SOCK_=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SOCK_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/SOCK_Test.icc b/tests/SOCK_Test.icc
deleted file mode 100644
index bff3f281b73..00000000000
--- a/tests/SOCK_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SOCK_Test.exe"
-	{
-	   source type (cpp) "SOCK_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/SPIPE_Test.bpr b/tests/SPIPE_Test.bpr
new file mode 100644
index 00000000000..29635091d4b
--- /dev/null
+++ b/tests/SPIPE_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = SPIPE_Test.exe
+OBJFILES = objs\SPIPE_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index ca977366c58..0fdcb2c56d7 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -50,14 +50,14 @@ client (void *)
   ACE_OS::sleep (10);
 
   if (con.connect (cli_stream, ACE_SPIPE_Addr (ACE_WIDE_STRING (rendezvous))) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), rendezvous));
+    ACE_ERROR ((LM_ERROR, "%p\n", rendezvous));
 
   for (char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (cli_stream.send (c, 1) == -1)
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n")));
+      ACE_ERROR ((LM_ERROR, "%p\n", "send_n"));
 
   if (cli_stream.close () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("close")));
+    ACE_ERROR ((LM_ERROR, "%p\n", "close"));
 
 #if !defined (ACE_WIN32)
   ACE_OS::exit (0);
@@ -78,22 +78,22 @@ server (void *)
   // Initialize named pipe listener.
 
   if (acceptor.open (ACE_SPIPE_Addr (ACE_WIDE_STRING (rendezvous))) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")));
+    ACE_ERROR ((LM_ERROR, "%p\n", "open"));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for connection\n")));
+  ACE_DEBUG ((LM_DEBUG, "waiting for connection\n"));
 
   // Accept a client connection
   if (acceptor.accept (new_stream, 0) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("accept")));
+    ACE_ERROR ((LM_ERROR, "%p\n", "accept"));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Accepted connection\n")));
+  ACE_DEBUG ((LM_DEBUG, "Accepted connection\n"));
 
   while (new_stream.recv (buf, 1) > 0)
     {
       ACE_ASSERT (*t == buf[0]);
       t++;
     }
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("End of connection. Closing handle\n")));
+  ACE_DEBUG ((LM_DEBUG, "End of connection. Closing handle\n"));
   new_stream.close ();
   acceptor.close ();
   return 0;
@@ -101,16 +101,16 @@ server (void *)
 #endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */
 
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("SPIPE_Test"));
+  ACE_START_TEST ("SPIPE_Test");
 
 #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)
 #if !defined (ACE_LACKS_FORK)
   switch (ACE_OS::fork ())
     {
     case -1:
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("fork failed")));
+      ACE_ERROR ((LM_ERROR, "%p\n%a", "fork failed"));
       exit (-1);
     case 0:
       client (0);
@@ -121,18 +121,18 @@ main (int, ASYS_TCHAR *[])
   if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (client),
                                               (void *) 0,
                                               THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("thread create failed")));
+    ACE_ERROR ((LM_ERROR, "%p\n%a", "thread create failed"));
 
   if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (server),
                                               (void *) 0,
                                               THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("thread create failed")));
+    ACE_ERROR ((LM_ERROR, "%p\n%a", "thread create failed"));
 
   ACE_Thread_Manager::instance ()->wait ();
 #endif /* !ACE_LACKS_EXEC */
 #else
   ACE_DEBUG ((LM_INFO,
-              ASYS_TEXT ("SPIPE is not supported on this platform\n")));
+              "SPIPE is not supported on this platform\n"));
 #endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */
   ACE_END_TEST;
   return 0;
diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp
index ce5bae020e9..e39190bf411 100644
--- a/tests/SPIPE_Test.dsp
+++ b/tests/SPIPE_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SPIPE_Test - Win32 PharLap ETS Debug

+CFG=SPIPE_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=SPIPE_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SPIPE_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "SPIPE_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SPIPE_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "SPIPE_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SPIPE_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SPIPE_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SPIPE_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SPIPE_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SPIPE_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "SPIPE_Test - Win32 Debug"

 # Name "SPIPE_Test - Win32 Alpha Debug"

-# Name "SPIPE_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -186,6 +155,7 @@ DEP_CPP_SPIPE=\
 	"..\ace\SPIPE_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -204,11 +174,6 @@ DEP_CPP_SPIPE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SPIPE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/SPIPE_Test.icc b/tests/SPIPE_Test.icc
deleted file mode 100644
index 06adf2cd6fd..00000000000
--- a/tests/SPIPE_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SPIPE_Test.exe"
-	{
-	   source type (cpp) "SPIPE_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/SString_Test.bpr b/tests/SString_Test.bpr
new file mode 100644
index 00000000000..308fd5181a0
--- /dev/null
+++ b/tests/SString_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = SString_Test.exe
+OBJFILES = objs\SString_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp
index 67efd24cf45..0791ba47eec 100644
--- a/tests/SString_Test.dsp
+++ b/tests/SString_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SString_Test - Win32 PharLap ETS Debug

+CFG=SString_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=SString_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SString_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SString_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "SString_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SString_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "SString_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "SString_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SString_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SString_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SString_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SString_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SString_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "SString_Test - Win32 Debug"

 # Name "SString_Test - Win32 Alpha Debug"

-# Name "SString_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -162,8 +131,6 @@ NODEP_CPP_SSTRI=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/SString_Test.icc b/tests/SString_Test.icc
deleted file mode 100644
index b78d81ee967..00000000000
--- a/tests/SString_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SString_Test.exe"
-	{
-	   source type (cpp) "SString_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/SV_Shared_Memory_Test.bpr b/tests/SV_Shared_Memory_Test.bpr
new file mode 100644
index 00000000000..37ed9effcbb
--- /dev/null
+++ b/tests/SV_Shared_Memory_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = SV_Shared_Memory_Test.exe
+OBJFILES = objs\SV_Shared_Memory_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index c612e868b6f..cbc5ee7a35a 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -68,16 +68,16 @@ parent (char *shm)
     shm[i] = SHMDATA[i];
 
   if (mutex.release () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent mutex.release")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p", "parent mutex.release"));
   else if (synch.acquire () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent synch.acquire")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p", "parent synch.acquire"));
 
   if (myallocator ().remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent allocator.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent allocator.remove"));
   if (mutex.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent mutex.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent mutex.remove"));
   if (synch.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent synch.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent synch.remove"));
   return 0;
 }
 
@@ -102,15 +102,15 @@ child (char *shm)
   // semaphore wrappers.
   while (mutex.tryacquire () == -1)
     if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P) spinning in child!\n")));
+      ACE_DEBUG ((LM_DEBUG, "(%P) spinning in child!\n"));
     else
-      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child mutex.tryacquire")), 1);
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P) child mutex.tryacquire"), 1);
 
   for (int i = 0; i < SHMSZ; i++)
     ACE_ASSERT (SHMDATA[i] == shm[i]);
 
   if (synch.release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child synch.release")), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, "(%P) child synch.release"), 1);
   return 0;
 }
 
@@ -127,9 +127,9 @@ template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_SYSV_IPC */
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("SV_Shared_Memory_Test"));
+  ACE_START_TEST ("SV_Shared_Memory_Test");
 
 #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && !defined(ACE_LACKS_SYSV_SHMEM)
   char *shm = (char *) myallocator ().malloc (27);
@@ -137,7 +137,7 @@ main (int, ASYS_TCHAR *[])
   switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp"))
     {
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) fork failed\n")), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P) fork failed\n"), -1);
       /* NOTREACHED */
     case 0:
       child (shm);
@@ -148,7 +148,7 @@ main (int, ASYS_TCHAR *[])
     }
 #else
   ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n")));
+              "SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n"));
 #endif /* ACE_HAS_SYSV_IPC */
   ACE_END_TEST;
   return 0;
diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp
index c1878793d42..e20eaa1c43a 100644
--- a/tests/SV_Shared_Memory_Test.dsp
+++ b/tests/SV_Shared_Memory_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SV_Shared_Memory_Test - Win32 PharLap ETS Debug

+CFG=SV_Shared_Memory_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=SV_Shared_Memory_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak"\

+ CFG="SV_Shared_Memory_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SV_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "SV_Shared_Memory_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SV_Shared_Memory_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "SV_Shared_Memory_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SV_Shared_Memory_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SV_Shared_Memory_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SV_Shared_Memory_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SV_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "SV_Shared_Memory_Test - Win32 Debug"

 # Name "SV_Shared_Memory_Test - Win32 Alpha Debug"

-# Name "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -173,6 +143,7 @@ DEP_CPP_SV_SH=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -189,11 +160,6 @@ DEP_CPP_SV_SH=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SV_SH=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/SV_Shared_Memory_Test.icc b/tests/SV_Shared_Memory_Test.icc
deleted file mode 100644
index b9523b7f01d..00000000000
--- a/tests/SV_Shared_Memory_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SV_Shared_Memory_Test.exe"
-	{
-	   source type (cpp) "SV_Shared_Memory_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Semaphore_Test.bpr b/tests/Semaphore_Test.bpr
new file mode 100644
index 00000000000..829bdedb6e0
--- /dev/null
+++ b/tests/Semaphore_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Semaphore_Test.exe
+OBJFILES = objs\Semaphore_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp
index c4fe806b463..e2686bbdd0e 100644
--- a/tests/Semaphore_Test.dsp
+++ b/tests/Semaphore_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Semaphore_Test - Win32 PharLap ETS Debug

+CFG=Semaphore_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Semaphore_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Semaphore_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Semaphore_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Semaphore_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Semaphore_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Semaphore_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Semaphore_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Semaphore_Test - Win32 Debug"

 # Name "Semaphore_Test - Win32 Alpha Debug"

-# Name "Semaphore_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp"

@@ -197,8 +166,6 @@ NODEP_CPP_SEMAP=\
 	"..\ace\stdcpp.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 PharLap ETS Debug"

-

 !ENDIF 

 

 # End Source File

diff --git a/tests/Semaphore_Test.icc b/tests/Semaphore_Test.icc
deleted file mode 100644
index ddea71a4643..00000000000
--- a/tests/Semaphore_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Semaphore_Test.exe"
-	{
-	   source type (cpp) "Semaphore_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Service_Config_Test.bpr b/tests/Service_Config_Test.bpr
new file mode 100644
index 00000000000..11dc793ef39
--- /dev/null
+++ b/tests/Service_Config_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Service_Config_Test.exe
+OBJFILES = objs\Service_Config_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 969df5f69c0..6f6e3b912a9 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -91,7 +91,7 @@ Test_Singleton::Test_Singleton (u_short variety)
   if (variety_ != current_++)
     {
       ACE_DEBUG ((LM_ERROR,
-                  ASYS_TEXT ("ERROR: instance %u created out of order!\n"),
+                  "ERROR: instance %u created out of order!\n",
                  variety_));
       ++error;
     }
@@ -102,21 +102,21 @@ Test_Singleton::Test_Singleton (u_short variety)
 
 Test_Singleton::~Test_Singleton (void)
 {
-  /* ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Test_Singleton %u dtor\n"), variety_)); */
+  /* ACE_DEBUG ((LM_DEBUG, "Test_Singleton %u dtor\n", variety_)); */
 
   if (variety_ != --current_)
     {
       ACE_OS::fprintf (stderr,
-                       ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"),
+                       "ERROR: instance %u destroyed out of order!\n",
                        variety_);
-      /* ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"),
+      /* ACE_DEBUG ((LM_ERROR, "ERROR: instance %u destroyed out of order!\n",
                  variety_)); */
       ++error;
     }
 }
 
 static void
-run_test (int argc, ASYS_TCHAR *argv[])
+run_test (int argc, char *argv[])
 {
   // We need this scope to make sure that the destructor for the
   // <ACE_Service_Config> gets called.
@@ -124,15 +124,15 @@ run_test (int argc, ASYS_TCHAR *argv[])
 
   ACE_ASSERT (daemon.open (argc, argv) != -1 || errno == ENOENT);
 
-  ACE_Time_Value tv (argc > 1 ? ACE_OS::atoi (argv[1]) : 2);
+  ACE_Time_Value tv (argc > 1 ? atoi (argv[1]) : 2);
 
   ACE_ASSERT (ACE_Reactor::run_event_loop (tv) == 0);
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, char *argv[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Service_Config_Test"));
+  ACE_START_TEST ("Service_Config_Test");
 
   for (u_int i = 0; i < VARIETIES; ++i)
     {
@@ -140,7 +140,7 @@ main (int argc, ASYS_TCHAR *argv[])
 
       if (s == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("instance () allocate failed!\n")),
+                           "instance () allocate failed!\n"),
                           1);
     }
 
diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp
index e727f4a99c2..7f804785939 100644
--- a/tests/Service_Config_Test.dsp
+++ b/tests/Service_Config_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Service_Config_Test - Win32 PharLap ETS Debug

+CFG=Service_Config_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Service_Config_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Service_Config_Test.mak"\

+ CFG="Service_Config_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Service_Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Service_Config_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Service_Config_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Service_Config_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Service_Config_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Service_Config_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Service_Config_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Service_Config_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Service_Config_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Service_Config_Test - Win32 Debug"

 # Name "Service_Config_Test - Win32 Alpha Debug"

-# Name "Service_Config_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -184,6 +154,7 @@ DEP_CPP_SERVI=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -205,11 +176,6 @@ DEP_CPP_SERVI=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SERVI=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Service_Config_Test.icc b/tests/Service_Config_Test.icc
deleted file mode 100644
index ad6a2672a33..00000000000
--- a/tests/Service_Config_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Service_Config_Test.exe"
-	{
-	   source type (cpp) "Service_Config_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Shared_Memory_SV_Test.cpp b/tests/Shared_Memory_SV_Test.cpp
deleted file mode 100644
index a3654a7745b..00000000000
--- a/tests/Shared_Memory_SV_Test.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Shared_Memory_SV_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of ACE_Shared_Memory_SV
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-
-#include "ace/Shared_Memory_SV.h"
-#include "test_config.h"
-
-const int SHMSZ = 27;
-const int SHM_KEY = 5678;
-
-static void
-client (void)
-{
-  char t = 'a';
-  ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ,
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_client.malloc ();
-
-  for (char *s = shm; *s != '\0'; s++)
-    {
-      ACE_ASSERT (t == s[0]);
-      t++;
-    }
-  *shm = '*';
-  ACE_OS::exit (0);
-}
-
-static void
-server (void)
-{
-  ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, 
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_server.malloc ();
-  char *s   = shm;
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  while (*shm != '*')
-    ACE_OS::sleep (1);
-
-  if (shm_server.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n", "remove"));
-}
-
-int
-main (int, char *argv [])
-{
-  ACE_START_TEST ("Shared_Memory_SV_Test.cpp");
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1);
-    case 0: 
-      client ();
-      break;
-    default:
-      server ();
-      break;
-    }
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/Sigset_Ops_Test.bpr b/tests/Sigset_Ops_Test.bpr
new file mode 100644
index 00000000000..3d31cf4fb60
--- /dev/null
+++ b/tests/Sigset_Ops_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Sigset_Ops_Test.exe
+OBJFILES = objs\Sigset_Ops_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp
index 42194db0df1..fd237041cd9 100644
--- a/tests/Sigset_Ops_Test.dsp
+++ b/tests/Sigset_Ops_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Sigset_Ops_Test - Win32 PharLap ETS Debug

+CFG=Sigset_Ops_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Sigset_Ops_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Sigset_Ops_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Sigset_Ops_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Sigset_Ops_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Sigset_Ops_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Sigset_Ops_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Sigset_Ops_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Sigset_Ops_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Sigset_Ops_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Sigset_Ops_Test - Win32 Debug"

 # Name "Sigset_Ops_Test - Win32 Alpha Debug"

-# Name "Sigset_Ops_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -153,16 +122,12 @@ DEP_CPP_SIGSE=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SIGSE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Sigset_Ops_Test.icc b/tests/Sigset_Ops_Test.icc
deleted file mode 100644
index 402f4a58cc5..00000000000
--- a/tests/Sigset_Ops_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Sigset_Ops_Test.exe"
-	{
-	   source type (cpp) "Sigset_Ops_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Simple_Message_Block_Test.bpr b/tests/Simple_Message_Block_Test.bpr
new file mode 100644
index 00000000000..12e9d75fc12
--- /dev/null
+++ b/tests/Simple_Message_Block_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Simple_Message_Block_Test.exe
+OBJFILES = objs\Simple_Message_Block_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp
index a5a155e5ce5..bc56373c538 100644
--- a/tests/Simple_Message_Block_Test.dsp
+++ b/tests/Simple_Message_Block_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Simple_Message_Block_Test - Win32 PharLap ETS Debug

+CFG=Simple_Message_Block_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Simple_Message_Block_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak"\

+ CFG="Simple_Message_Block_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple_Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Simple_Message_Block_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Simple_Message_Block_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Simple_Message_Block_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Simple_Message_Block_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Simple_Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Simple_Message_Block_Test - Win32 Debug"

 # Name "Simple_Message_Block_Test - Win32 Alpha Debug"

-# Name "Simple_Message_Block_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -175,6 +145,7 @@ DEP_CPP_SIMPL=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +162,6 @@ DEP_CPP_SIMPL=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SIMPL=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Simple_Message_Block_Test.icc b/tests/Simple_Message_Block_Test.icc
deleted file mode 100644
index 491d98b82ab..00000000000
--- a/tests/Simple_Message_Block_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Simple_Message_Block_Test.exe"
-	{
-	   source type (cpp) "Simple_Message_Block_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Svc_Handler_Test.dsp b/tests/Svc_Handler_Test.dsp
index 74749471720..2425d913f88 100644
--- a/tests/Svc_Handler_Test.dsp
+++ b/tests/Svc_Handler_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Svc_Handler_Test - Win32 PharLap ETS Debug

+CFG=Svc_Handler_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=Svc_Handler_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Svc_Handler_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Svc_Handler_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Svc_Handler_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Svc_Handler_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Svc_Handler_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Svc_Handler_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Svc_Handler_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Svc_Handler_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Svc_Handler_Test - Win32 Debug"

 # Name "Svc_Handler_Test - Win32 Alpha Debug"

-# Name "Svc_Handler_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -131,7 +99,7 @@ SOURCE=.\Svc_Handler_Test.cpp
 

 !ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 Alpha Debug"

 

-DEP_CPP_SVC_H=\

+DEP_CPP_TASK_=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -197,6 +165,7 @@ DEP_CPP_SVC_H=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -234,11 +203,6 @@ DEP_CPP_SVC_H=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_SVC_H=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/TSS_Test.bpr b/tests/TSS_Test.bpr
new file mode 100644
index 00000000000..e811d8a650c
--- /dev/null
+++ b/tests/TSS_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = TSS_Test.exe
+OBJFILES = objs\TSS_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp
index 88a5b9297cf..72f95171f62 100644
--- a/tests/TSS_Test.dsp
+++ b/tests/TSS_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=TSS_Test - Win32 PharLap ETS Debug

+CFG=TSS_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=TSS_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "TSS_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "TSS_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TSS_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "TSS_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "TSS_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "TSS_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./TSS_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "TSS_Test - Win32 Debug"

 # Name "TSS_Test - Win32 Alpha Debug"

-# Name "TSS_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -173,6 +141,7 @@ DEP_CPP_TSS_T=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -192,11 +161,6 @@ DEP_CPP_TSS_T=\
 	".\test_config.h"\

 	".\TSS_Test_Errno.h"\

 	

-NODEP_CPP_TSS_T=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/TSS_Test.icc b/tests/TSS_Test.icc
deleted file mode 100644
index aa297680546..00000000000
--- a/tests/TSS_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "TSS_Test.exe"
-	{
-	   source type (cpp) "TSS_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Task_Test.bpr b/tests/Task_Test.bpr
new file mode 100644
index 00000000000..57d0a4ba97a
--- /dev/null
+++ b/tests/Task_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Task_Test.exe
+OBJFILES = objs\Task_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp
index bd504437729..49c872e9e54 100644
--- a/tests/Task_Test.dsp
+++ b/tests/Task_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Task_Test - Win32 PharLap ETS Debug

+CFG=Task_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,16 @@ CFG=Task_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Task_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Task_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Task_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +82,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Task_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Task_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Task_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Task_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Task_Test - Win32 Debug"

 # Name "Task_Test - Win32 Alpha Debug"

-# Name "Task_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -197,6 +165,7 @@ DEP_CPP_TASK_=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -234,11 +203,6 @@ DEP_CPP_TASK_=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_TASK_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Task_Test.icc b/tests/Task_Test.icc
deleted file mode 100644
index b8ca8f285eb..00000000000
--- a/tests/Task_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Task_Test.exe"
-	{
-	   source type (cpp) "Task_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Thread_Manager_Test.bpr b/tests/Thread_Manager_Test.bpr
new file mode 100644
index 00000000000..d01c42d3247
--- /dev/null
+++ b/tests/Thread_Manager_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Thread_Manager_Test.exe
+OBJFILES = objs\Thread_Manager_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index da7aaec3e3c..8d1711e9f10 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -214,7 +214,7 @@ main (int, ASYS_TCHAR *[])
                   n_threads,
                   (ACE_THR_FUNC) worker,
                   (void *) n_iterations,
-                  THR_BOUND
+                  THR_BOUND | THR_DETACHED
 #if defined (VXWORKS)
                   , ACE_DEFAULT_THREAD_PRIORITY
                   , -1
@@ -235,8 +235,7 @@ main (int, ASYS_TCHAR *[])
       // so it's allowed to ENOTSUP; anything else is a hard fail.
       ACE_ASSERT (errno == ENOTSUP);
       ACE_DEBUG((LM_DEBUG,
-                 ASYS_TEXT (" OK: suspend_grp isn't supported with ")
-                 ASYS_TEXT ("Pthreads\n")));
+                 ASYS_TEXT (" OK: suspend_grp isn't supported with Pthreads\n")));
     }
 
   // Wait for 1 more second and then resume every thread in the
@@ -250,8 +249,7 @@ main (int, ASYS_TCHAR *[])
     {
       ACE_ASSERT (errno == ENOTSUP);
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT (" OK: resume_grp isn't supported with ")
-                  ASYS_TEXT ("Pthreads\n")));
+                  ASYS_TEXT (" OK: resume_grp isn't supported with Pthreads\n")));
     }
 
   // Wait for 1 more second and then send a SIGINT to every thread in
@@ -264,6 +262,10 @@ main (int, ASYS_TCHAR *[])
 #if defined (ACE_HAS_WTHREADS)
   thr_mgr->kill_grp (grp_id,
                      SIGINT);
+#elif defined (sun)
+  // thr_self () can't be used safely on Solaris within a signal
+  // handler.  It's not documented as being Async-Signal-Safe.
+  // So, don't signal them in this test on Solaris.
 #elif !defined (ACE_HAS_PTHREADS_DRAFT4)
   ACE_ASSERT (thr_mgr->kill_grp (grp_id,
                                  SIGINT) != -1);
@@ -283,7 +285,7 @@ main (int, ASYS_TCHAR *[])
 
   // Perform a barrier wait until all the threads have shut down.
   // But, wait for a limited time, just in case.
-  const ACE_Time_Value max_wait (600);
+  const ACE_Time_Value max_wait (60);
   const ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait);
   if (thr_mgr->wait (&wait_time) == -1)
     {
@@ -293,7 +295,7 @@ main (int, ASYS_TCHAR *[])
                                max_wait.msec ()));
       else
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%p\n"), ASYS_TEXT ("wait")));
+                    "%p\n", "wait"));
       status = -1;
     }
 
diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp
index c471c079905..ca62f5abe6e 100644
--- a/tests/Thread_Manager_Test.dsp
+++ b/tests/Thread_Manager_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Manager_Test - Win32 PharLap ETS Debug

+CFG=Thread_Manager_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,18 @@ CFG=Thread_Manager_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Thread_Manager_Test.mak"\

+ CFG="Thread_Manager_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Thread_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Manager_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Thread_Manager_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +84,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_Manager_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Thread_Manager_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Thread_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Thread_Manager_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Thread_Manager_Test - Win32 Debug"

 # Name "Thread_Manager_Test - Win32 Alpha Debug"

-# Name "Thread_Manager_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -173,6 +143,7 @@ DEP_CPP_THREA=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -191,11 +162,6 @@ DEP_CPP_THREA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_THREA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Thread_Manager_Test.icc b/tests/Thread_Manager_Test.icc
deleted file mode 100644
index dded477b8fd..00000000000
--- a/tests/Thread_Manager_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Manager_Test.exe"
-	{
-	   source type (cpp) "Thread_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Thread_Mutex_Test.bpr b/tests/Thread_Mutex_Test.bpr
new file mode 100644
index 00000000000..467da61d732
--- /dev/null
+++ b/tests/Thread_Mutex_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Thread_Mutex_Test.exe
+OBJFILES = objs\Thread_Mutex_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Thread_Mutex_Test.dsp b/tests/Thread_Mutex_Test.dsp
index 4e3631aca14..113314f484a 100644
--- a/tests/Thread_Mutex_Test.dsp
+++ b/tests/Thread_Mutex_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug

+CFG=Thread_Mutex_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,20 @@ CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Thread_M"

@@ -51,40 +48,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Thread_Mutex_Test - Win32 Debug"

-# Name "Thread_Mutex_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Thread_Mutex_Test.cpp

diff --git a/tests/Thread_Mutex_Test.icc b/tests/Thread_Mutex_Test.icc
deleted file mode 100644
index 7faf8bd52fd..00000000000
--- a/tests/Thread_Mutex_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Mutex_Test.exe"
-	{
-	   source type (cpp) "Thread_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index 66ff5199632..9d5489e2777 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -61,7 +61,7 @@ typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR;
 // Accepting end point.  This is actually "localhost:10010", but some
 // platform couldn't resolve the name so we use the IP address
 // directly here.
-static const ASYS_TCHAR *rendezvous = ASYS_TEXT ("127.0.0.1:10010");
+static LPCTSTR rendezvous = ASYS_TEXT ("127.0.0.1:10010");
 
 // Total number of server threads.
 static size_t svr_thrno = ACE_MAX_THREADS;
@@ -247,7 +247,7 @@ static void *
 worker (void *)
 {
   ACE_OS::sleep (3);
-  const ASYS_TCHAR *msg = ASYS_TEXT ("Message from Connection worker");
+  LPCTSTR msg = ASYS_TEXT ("Message from Connection worker");
   ASYS_TCHAR buf [BUFSIZ];
   buf[0] = (ACE_OS::strlen (msg) + 1) * sizeof (ASYS_TCHAR);
   ACE_OS::strcpy (&buf[1], msg);
diff --git a/tests/Thread_Pool_Reactor_Test.dsp b/tests/Thread_Pool_Reactor_Test.dsp
index b254a4c8a85..5003602b975 100644
--- a/tests/Thread_Pool_Reactor_Test.dsp
+++ b/tests/Thread_Pool_Reactor_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug

+CFG=Thread_Pool_Reactor_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_Pool_Reactor_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Thread_Pool_Reactor_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Thread_Pool_Reactor_Test - Win32 Debug"

 # Name "Thread_Pool_Reactor_Test - Win32 Alpha Debug"

-# Name "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -131,7 +100,7 @@ SOURCE=.\Thread_Pool_Reactor_Test.cpp
 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Alpha Debug"

 

-DEP_CPP_THREA=\

+DEP_CPP_ATOMI=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -156,6 +125,7 @@ DEP_CPP_THREA=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -172,11 +142,6 @@ DEP_CPP_THREA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_THREA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Thread_Pool_Reactor_Test.icc b/tests/Thread_Pool_Reactor_Test.icc
deleted file mode 100644
index fc15a6ae3cf..00000000000
--- a/tests/Thread_Pool_Reactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Pool_Reactor_Test.exe"
-	{
-	   source type (cpp) "Thread_Pool_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Thread_Pool_Test.bpr b/tests/Thread_Pool_Test.bpr
new file mode 100644
index 00000000000..2d4160ff267
--- /dev/null
+++ b/tests/Thread_Pool_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Thread_Pool_Test.exe
+OBJFILES = objs\Thread_Pool_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index b840cbe28bd..14bc973287d 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -203,9 +203,7 @@ Thread_Pool::open (void *)
                                      &this->lock_adapter_),
                   -1);
 
-  int i; // We need to define 'i' here to keep EGCS from complaining...
-
-  for (i = this->thr_count (); i > 0; i--)
+  for (int i = this->thr_count (); i > 0; i--)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"),
diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp
index a525b25d1a2..97b2b5fba34 100644
--- a/tests/Thread_Pool_Test.dsp
+++ b/tests/Thread_Pool_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Pool_Test - Win32 PharLap ETS Debug

+CFG=Thread_Pool_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Thread_Pool_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Pool_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Thread_Pool_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Thread_Pool_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_Pool_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Thread_Pool_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Thread_Pool_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Thread_Pool_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Thread_Pool_Test - Win32 Debug"

 # Name "Thread_Pool_Test - Win32 Alpha Debug"

-# Name "Thread_Pool_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -197,6 +166,7 @@ DEP_CPP_THREA=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -234,11 +204,6 @@ DEP_CPP_THREA=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_THREA=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Thread_Pool_Test.icc b/tests/Thread_Pool_Test.icc
deleted file mode 100644
index 4b90a1380a8..00000000000
--- a/tests/Thread_Pool_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Pool_Test.exe"
-	{
-	   source type (cpp) "Thread_Pool_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Time_Service_Test.bpr b/tests/Time_Service_Test.bpr
new file mode 100644
index 00000000000..d7a283344df
--- /dev/null
+++ b/tests/Time_Service_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Time_Service_Test.exe
+OBJFILES = objs\Time_Service_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index acea9415223..ecb5436bb28 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -39,9 +39,9 @@ ACE_TEXT ("main") ACE_PLATFORM_EXE_SUFFIX \
 ACE_TEXT (" -f ") ACE_PLATFORM
 
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Time_Service_Test"));
+  ACE_START_TEST ("Time_Service_Test");
 
   // Make sure that the backing store is not there. We need to make
   // sure because this test kills the Time Clerk and on some platforms
@@ -56,10 +56,10 @@ main (int, ASYS_TCHAR *[])
   ACE_Process server;
 
   if (server.spawn (server_options) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s).\n"),
-                       ASYS_TEXT ("Server fork failed"), server_cl), -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p (%s).\n",
+                       "Server fork failed", server_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"), server.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", server.getpid ()));
 
   ACE_OS::sleep (3);
 
@@ -69,19 +69,19 @@ main (int, ASYS_TCHAR *[])
   ACE_Process clerk;
 
   if (clerk.spawn (clerk_options) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p: (%s).\n"),
-                       ASYS_TEXT ("Clerk fork failed"), clerk_cl), -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p: (%s).\n",
+                       "Clerk fork failed", clerk_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"), clerk.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, "Clerk forked with pid = %d.\n", clerk.getpid ()));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Sleeping...\n")));
+  ACE_DEBUG ((LM_DEBUG, "Sleeping...\n"));
   ACE_OS::sleep (10);
 
   if (clerk.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "Terminate failed for clerk.\n"), -1);
 
   if (server.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "Terminate failed for server.\n"), -1);
 
   // Since we kill the clerk process, on Win32 it may not do a
   // graceful shutdown and the backing store file is left behind.
diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp
index eecdd2c504a..77456a2b9b2 100644
--- a/tests/Time_Service_Test.dsp
+++ b/tests/Time_Service_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Time_Service_Test - Win32 PharLap ETS Debug

+CFG=Time_Service_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Time_Service_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Service_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Time_Service_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Service_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Time_Service_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Time_Service_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Time_Service_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Time_Service_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Time_Service_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Service_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Time_Service_Test - Win32 Debug"

 # Name "Time_Service_Test - Win32 Alpha Debug"

-# Name "Time_Service_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -155,16 +124,12 @@ DEP_CPP_TIME_=\
 	"..\ace\Process.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_TIME_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Time_Service_Test.icc b/tests/Time_Service_Test.icc
deleted file mode 100644
index 563240411b2..00000000000
--- a/tests/Time_Service_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Time_Service_Test.exe"
-	{
-	   source type (cpp) "Time_Service_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Time_Value_Test.bpr b/tests/Time_Value_Test.bpr
new file mode 100644
index 00000000000..1832f6af3f9
--- /dev/null
+++ b/tests/Time_Value_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Time_Value_Test.exe
+OBJFILES = objs\Time_Value_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp
index 540632e9ce4..737673e2586 100644
--- a/tests/Time_Value_Test.dsp
+++ b/tests/Time_Value_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Time_Value_Test - Win32 PharLap ETS Debug

+CFG=Time_Value_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Time_Value_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Time_Value_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Value_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Time_Value_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Time_Value_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Time_Value_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Time_Value_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Time_Value_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Time_Value_Test - Win32 Debug"

 # Name "Time_Value_Test - Win32 Alpha Debug"

-# Name "Time_Value_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -153,16 +122,12 @@ DEP_CPP_TIME_=\
 	"..\ace\OS.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Trace.h"\

 	"..\ace\Version.h"\

 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_TIME_=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Time_Value_Test.icc b/tests/Time_Value_Test.icc
deleted file mode 100644
index f88e9c66963..00000000000
--- a/tests/Time_Value_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Time_Value_Test.exe"
-	{
-	   source type (cpp) "Time_Value_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Timeprobe_Test.bpr b/tests/Timeprobe_Test.bpr
new file mode 100644
index 00000000000..f47d0b9e6f7
--- /dev/null
+++ b/tests/Timeprobe_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Timeprobe_Test.exe
+OBJFILES = objs\Timeprobe_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Timeprobe_Test.dsp b/tests/Timeprobe_Test.dsp
index 0371ce07940..b5e5c697652 100644
--- a/tests/Timeprobe_Test.dsp
+++ b/tests/Timeprobe_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Timeprobe_Test - Win32 PharLap ETS Debug

+CFG=Timeprobe_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,19 @@ CFG=Timeprobe_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timeprobe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timeprobe_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timeprobe_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Timeprobe_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -52,41 +48,9 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 # SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Timeprobe_Test - Win32 Debug"

-# Name "Timeprobe_Test - Win32 PharLap ETS Debug"

 # Begin Source File

 

 SOURCE=.\Timeprobe_Test.cpp

diff --git a/tests/Timeprobe_Test.icc b/tests/Timeprobe_Test.icc
deleted file mode 100644
index c1d9dc3a194..00000000000
--- a/tests/Timeprobe_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Timeprobe_Test.exe"
-	{
-	   source type (cpp) "Timeprobe_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Timer_Queue_Test.bpr b/tests/Timer_Queue_Test.bpr
new file mode 100644
index 00000000000..9470aefc357
--- /dev/null
+++ b/tests/Timer_Queue_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Timer_Queue_Test.exe
+OBJFILES = objs\Timer_Queue_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index aff963cec17..c985f5c762e 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -10,16 +10,13 @@
 //
 // = DESCRIPTION
 //      This is a simple test of <ACE_Timer_Queue> and four of its
-//      subclasses (<ACE_Timer_List>, <ACE_Timer_Heap>,
-//      <ACE_Timer_Wheel>, and <ACE_Timer_Hash>).  The test sets up a
-//      bunch of timers and then adds them to a timer queue. The
-//      functionality of the timer queue is then tested. No command
-//      line arguments are needed to run the test.
+//      subclasses (<ACE_Timer_List>, <ACE_Timer_Heap>, <ACE_Timer_Wheel>, and 
+//      <ACE_Timer_Hash>).  The test sets up a bunch of timers and then adds 
+//      them to a timer queue. The functionality of the timer queue is then 
+//      tested. No command line arguments are needed to run the test.
 //
 // = AUTHORS
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>, 
-//    Prashant Jain <pjain@cs.wustl.edu>, and 
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
+//    Douglas C. Schmidt, Prashant Jain, and Darrell Brunsch
 // 
 // ============================================================================
 
@@ -55,9 +52,9 @@ randomize_array (T array[], size_t size)
     }
 }
 
-// Number of iterations for the performance tests.  Some platforms
-// have a very high ACE_DEFAULT_TIMERS (HP-UX is 400), so limit this
-// to a reasonable run time.
+// Number of iterations for the performance tests.  Some platforms have a very
+// high ACE_DEFAULT_TIMERS (HP-UX is 400), so limit this to a reasonable run
+// time.
 #if (ACE_DEFAULT_TIMERS > 20)
 static int max_iterations = 2000;
 #else
@@ -83,8 +80,7 @@ public:
 			      const void *arg)
   {
     ACE_ASSERT (arg == (const void *) 42 || arg == (const void *)007);
-
-    if (arg != (const void *) 42)
+    if (arg != (const void *)42)
       return -1;
     else
       return 0;
@@ -103,17 +99,16 @@ test_functionality (ACE_Timer_Queue *tq)
   ACE_ASSERT (ACE_Time_Value::zero == ACE_Time_Value (0));
   long timer_id, timer_id2; 
  
-  // Do a test on earliest_time.
+  // Do a test on earliest_time
+
   ACE_Time_Value earliest_time = tq->gettimeofday ();
 
-  timer_id = tq->schedule (&eh,
-                           (const void *) 1,
+  timer_id = tq->schedule (&eh, (const void *) 1,
                            earliest_time);
   
   ACE_OS::sleep (ACE_Time_Value (0, 10));
     
-  timer_id2 = tq->schedule (&eh,
-                            (const void *) 1,
+  timer_id2 = tq->schedule (&eh, (const void *) 1,
                             tq->gettimeofday ());
 
   ACE_ASSERT (tq->earliest_time () == earliest_time);
@@ -121,51 +116,42 @@ test_functionality (ACE_Timer_Queue *tq)
   tq->cancel (timer_id);
   tq->cancel (timer_id2);
 
-  timer_id = tq->schedule (&eh,
-                           (const void *) 1, 
+  timer_id = tq->schedule (&eh, (const void *) 1, 
 			   tq->gettimeofday ());
   ACE_ASSERT (timer_id != -1);
   ACE_ASSERT (tq->is_empty () == 0); //==
 
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 42,
-                            tq->gettimeofday ()) != -1);
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 42,
+			   tq->gettimeofday ()) != -1);
   ACE_ASSERT (tq->is_empty () == 0); //==
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 42,
-                            tq->gettimeofday ()) != -1);
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 42,
+			   tq->gettimeofday ()) != -1);
   ACE_ASSERT (tq->is_empty () == 0); //==
-
   // The following method will trigger a call to <handle_close>.
   ACE_ASSERT (tq->cancel (timer_id, 0, 0) == 1);
   ACE_ASSERT (tq->is_empty () == 0);
 
   ACE_ASSERT (tq->expire () == 2);
 
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 007, 
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 007, 
 			    tq->gettimeofday ()) != -1);
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 42,
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 42,
 			   tq->gettimeofday () + ACE_Time_Value (100)) != -1);
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 42,
-                            tq->gettimeofday () + ACE_Time_Value (100)) != -1);
-
-  // The following will trigger a call to <handle_close> when it
-  // cancels the second timer.  This happens because the first timer
-  // has an <act> of 007, which causes eh.handle_timeout () to return
-  // -1.  Since -1 is returned, all timers that use <eh> will be
-  // cancelled (and <handle_close> will only be called on the first
-  // timer that is cancelled).
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 42,
+			   tq->gettimeofday () + ACE_Time_Value (100)) != -1);
+
+  // The following will trigger a call to <handle_close> when 
+  // it cancels the second timer.  This happens because the first
+  // timer has an <act> of 007, which causes eh.handle_timeout () to 
+  // return -1.  Since -1 is returned, all timers that use <eh> will
+  // be cancelled (and <handle_close> will only be called on the first 
+  // timer that is cancelled).  
   ACE_ASSERT (tq->expire () == 1);
   ACE_ASSERT (tq->is_empty () != 0);
   
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 4, 
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 4, 
 			    tq->gettimeofday ()) != -1);
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 5, 
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 5, 
 			    tq->gettimeofday ()) != -1);
   
   // The following method will trigger a call to <handle_close>.
@@ -175,17 +161,14 @@ test_functionality (ACE_Timer_Queue *tq)
 
   // This tests to make sure that <handle_close> is called when there
   // is only one timer of the type in the queue
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 007, 
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 007, 
 			    tq->gettimeofday ()) != -1);
   ACE_ASSERT (tq->expire () == 1);
 
-  timer_id = tq->schedule (&eh,
-                           (const void *) 6,
+  timer_id = tq->schedule (&eh, (const void *) 6,
 			   tq->gettimeofday ());
   ACE_ASSERT (timer_id != -1);
-  ACE_ASSERT (tq->schedule (&eh,
-                            (const void *) 7, 
+  ACE_ASSERT (tq->schedule (&eh, (const void *) 7, 
 			    tq->gettimeofday ()) != -1);
 
   // The following method will *not* trigger a call to <handle_close>.
@@ -237,7 +220,7 @@ test_performance (ACE_Timer_Queue *tq,
 	      max_iterations, test_name));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
-              et.real_time, et.user_time, et.system_time));
+	    et.real_time, et.user_time, et.system_time));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("time per call = %f usecs\n"), 
 	      (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
@@ -260,7 +243,7 @@ test_performance (ACE_Timer_Queue *tq,
 	      max_iterations, test_name));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
-              et.real_time, et.user_time, et.system_time));
+	    et.real_time, et.user_time, et.system_time));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("time per call = %f usecs\n"), 
 	      (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
@@ -283,10 +266,10 @@ test_performance (ACE_Timer_Queue *tq,
   timer.stop ();
 
   if (!tq->is_empty ())
-    {
-      ACE_OS::sleep (ACE_Time_Value (1));
-      tq->expire ();
-    }
+  {
+    ACE_OS::sleep (ACE_Time_Value (1));
+    tq->expire ();
+  }
 
   ACE_ASSERT (tq->is_empty ());
 
@@ -321,10 +304,10 @@ test_performance (ACE_Timer_Queue *tq,
     tq->cancel (timer_ids[i]);
 
   if (!tq->is_empty ())
-    {
-      ACE_OS::sleep (ACE_Time_Value (1));
-      tq->expire ();
-    }
+  {
+    ACE_OS::sleep (ACE_Time_Value (1));
+    tq->expire ();
+  }
 
   ACE_ASSERT (tq->is_empty ());
 
@@ -333,17 +316,14 @@ test_performance (ACE_Timer_Queue *tq,
   timer.elapsed_time (et);
 
   ACE_DEBUG ((LM_DEBUG, 
-              ASYS_TEXT ("time to randomly cancel %d timers for %s\n"), 
-              max_iterations,
-              test_name));
+             ASYS_TEXT ("time to randomly cancel %d timers for %s\n"), 
+             max_iterations, test_name));
   ACE_DEBUG ((LM_DEBUG, 
-              ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
-              et.real_time,
-              et.user_time,
-              et.system_time));
+             ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
+             et.real_time, et.user_time, et.system_time));
   ACE_DEBUG ((LM_DEBUG, 
-              ASYS_TEXT ("time per call = %f usecs\n"), 
-              (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
+             ASYS_TEXT ("time per call = %f usecs\n"), 
+             (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
 
   // Test the amount of time required to randomly schedule all the timers.
 
@@ -373,9 +353,7 @@ test_performance (ACE_Timer_Queue *tq,
 	      max_iterations, test_name));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
-              et.real_time,
-              et.user_time,
-              et.system_time));
+              et.real_time, et.user_time, et.system_time));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("time per call = %f usecs\n"), 
 	      (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
@@ -387,10 +365,10 @@ test_performance (ACE_Timer_Queue *tq,
   tq->expire ();
 
   if (!tq->is_empty ())
-    {
-      ACE_OS::sleep (ACE_Time_Value (1));
-      tq->expire ();
-    }
+  {
+    ACE_OS::sleep (ACE_Time_Value (1));
+    tq->expire ();
+  }
 
   ACE_ASSERT (tq->is_empty ());
 
@@ -403,7 +381,7 @@ test_performance (ACE_Timer_Queue *tq,
 	      max_iterations, test_name));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
-              et.real_time, et.user_time, et.system_time));
+	    et.real_time, et.user_time, et.system_time));
   ACE_DEBUG ((LM_DEBUG, 
 	      ASYS_TEXT ("time per call = %f usecs\n"), 
 	      (et.user_time / ACE_timer_t (max_iterations)) * 1000000));
@@ -411,23 +389,13 @@ test_performance (ACE_Timer_Queue *tq,
   delete [] times;
 }
 
-class Timer_Queue_Stack
+struct Timer_Queue_List
 {
-  // = TITLE
-  //   Keeps track of the <Timer_Queue>s that we're going to test.
-  // 
-  // = DESCRIPTION
-  //   This data structure is organized as a stack to make it easy to implement. 
-public:
-  // = Initialization method
-  Timer_Queue_Stack (ACE_Timer_Queue *queue,
-                     const ASYS_TCHAR *name,
-                     Timer_Queue_Stack *next = NULL)
+  Timer_Queue_List (ACE_Timer_Queue *queue, const ASYS_TCHAR *name, Timer_Queue_List *next = NULL)
     : queue_ (queue),
       name_ (name),
       next_ (next)
   {}
-  // "Push" a new <queue> on the stack of <queue>s.
 
   ACE_Timer_Queue *queue_;
   // Pointer to the subclass of <ACE_Timer_Queue> that we're testing.
@@ -435,8 +403,8 @@ public:
   const ASYS_TCHAR *name_;
   // Name of the Queue that we're testing.
 
-  Timer_Queue_Stack *next_;
-  // Pointer to the next <Timer_Queue>.
+  Timer_Queue_List *next_;
+  // Pointer to the next <Timer_Queues> structure
 };
 
 int
@@ -451,78 +419,88 @@ main (int argc, ASYS_TCHAR *argv[])
 
   // = Perform initializations.
   
-  Timer_Queue_Stack *tq_stack = NULL;
+  Timer_Queue_List *tq_list = NULL;
 
-  // Add new Timer_Queue implementations here.  Note that these will
-  // be executed in "reverse order" since we treat
+  // Add new Timer_Queue implementations here.
+ 
 
   // Timer_Hash (Heap)
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Hash_Heap,
-                                     ASYS_TEXT ("ACE_Timer_Hash (Heap)"),
-                                     tq_stack),
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Hash_Heap,
+                                    ASYS_TEXT ("ACE_Timer_Hash (Heap)"),
+                                    tq_list),
                   -1);
 
   // Timer_Hash
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Hash,
-                                     ASYS_TEXT ("ACE_Timer_Hash"),
-                                     tq_stack),
+  
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Hash,
+                                    ASYS_TEXT ("ACE_Timer_Hash"),
+                                    tq_list),
                   -1);
 
-  // Timer_stack
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_List,
-                                     ASYS_TEXT ("ACE_Timer_List"),
-                                     tq_stack),
+  // Timer_List
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_List,
+                                    ASYS_TEXT ("ACE_Timer_List"),
+                                    tq_list),
                   -1);
 
   // Timer_Wheel without preallocated memory
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Wheel,
-                                     ASYS_TEXT ("ACE_Timer_Wheel (non-preallocated)"),
-                                     tq_stack),
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Wheel,
+                                    ASYS_TEXT ("ACE_Timer_Wheel (non-preallocated)"),
+                                    tq_list),
                   -1);
 
   // Timer_Wheel with preallocated memory.
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Wheel (ACE_DEFAULT_TIMER_WHEEL_SIZE, 
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Wheel (ACE_DEFAULT_TIMER_WHEEL_SIZE, 
                                                          ACE_DEFAULT_TIMER_WHEEL_RESOLUTION, 
                                                          max_iterations),
-                                     ASYS_TEXT ("ACE_Timer_Wheel (preallocated)"),
-                                     tq_stack),
+                                    ASYS_TEXT ("ACE_Timer_Wheel (preallocated)"),
+                                    tq_list),
                   -1);
+
+
+
   // Timer_Heap without preallocated memory.
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Heap,
-                                     ASYS_TEXT ("ACE_Timer_Heap (non-preallocated)"),
-                                     tq_stack),
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Heap,
+                                    ASYS_TEXT ("ACE_Timer_Heap (non-preallocated)"),
+                                    tq_list),
                   -1);
 
   // Timer_Heap with preallocate memory.
-  ACE_NEW_RETURN (tq_stack,
-                  Timer_Queue_Stack (new ACE_Timer_Heap (max_iterations, 1),
-                                     ASYS_TEXT ("ACE_Timer_Heap (preallocated)"),
-                                     tq_stack),
+
+  ACE_NEW_RETURN (tq_list,
+                  Timer_Queue_List (new ACE_Timer_Heap (max_iterations, 1),
+                                    ASYS_TEXT ("ACE_Timer_Heap (preallocated)"),
+                                    tq_list),
                   -1);
   
   // Create the Timer ID array
+
   ACE_NEW_RETURN (timer_ids,
 		  long[max_iterations],
 		  -1);
   
-  Timer_Queue_Stack *tq_ptr = tq_stack;
+  Timer_Queue_List *tq_ptr = tq_list;
 
   while (tq_ptr != NULL)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("**** starting test of %s\n"), 
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("**** starting test of %s\n"), 
 		  tq_ptr->name_));
       test_functionality (tq_ptr->queue_);
       test_performance (tq_ptr->queue_, 
 			tq_ptr->name_);
       delete tq_ptr->queue_;
-      Timer_Queue_Stack *temp = tq_ptr;
+      Timer_Queue_List *temp = tq_ptr;
       tq_ptr = tq_ptr->next_;
       delete temp;
     }
diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp
index 892ae5afdcf..e78360f5dff 100644
--- a/tests/Timer_Queue_Test.dsp
+++ b/tests/Timer_Queue_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Timer_Queue_Test - Win32 PharLap ETS Debug

+CFG=Timer_Queue_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Timer_Queue_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Timer_Queue_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timer_Queue_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Timer_Queue_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Timer_Queue_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Timer_Queue_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Timer_Queue_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Timer_Queue_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timer_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Timer_Queue_Test - Win32 Debug"

 # Name "Timer_Queue_Test - Win32 Alpha Debug"

-# Name "Timer_Queue_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -177,6 +146,7 @@ DEP_CPP_TIMER=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -210,11 +180,6 @@ DEP_CPP_TIMER=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_TIMER=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Timer_Queue_Test.icc b/tests/Timer_Queue_Test.icc
deleted file mode 100644
index 37276b4070f..00000000000
--- a/tests/Timer_Queue_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Timer_Queue_Test.exe"
-	{
-	   source type (cpp) "Timer_Queue_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Tokens_Test.bpr b/tests/Tokens_Test.bpr
new file mode 100644
index 00000000000..c2ea1b68935
--- /dev/null
+++ b/tests/Tokens_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Tokens_Test.exe
+OBJFILES = objs\Tokens_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index d6678b9a168..b4b75cb6c7d 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -45,7 +45,7 @@ USELIB("..\ace\aced.lib");
 
 typedef ACE_Token_Invariant_Manager TOKEN_INVARIANTS;
 
-static const ASYS_TCHAR *server_host = ACE_DEFAULT_SERVER_HOST;
+static const char *server_host = ACE_DEFAULT_SERVER_HOST;
 static const int server_port = 23456;
 
 // Synchronize starts of threads, so that they all start before one
@@ -59,7 +59,7 @@ struct Test_Params
 public:
   ACE_Token_Proxy *token1_;
   ACE_Token_Proxy *token2_;
-  const ASYS_TCHAR *collection_name_;
+  const char *collection_name_;
 };
 
 static void *
@@ -70,7 +70,7 @@ run_thread (void *vp)
   collection.insert (*(tp->token1_));
   collection.insert (*(tp->token2_));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) new thread.\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) new thread.\n"));
   thread_start->wait ();
 
   int count = 50;
@@ -80,19 +80,17 @@ run_thread (void *vp)
         {
           if (ACE_OS::last_error () == EDEADLK)
             {
-              ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("deadlock detected in acquire")));
+              ACE_DEBUG ((LM_DEBUG, "deadlock detected in acquire"));
               continue;
             }
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%t) %p acquire failed\n"),
-                      ASYS_TEXT ("run_thread")));
+          ACE_ERROR ((LM_ERROR, "(%t) %p acquire failed\n","run_thread"));
           return (void *) -1;
         }
 
       ACE_ASSERT ((TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1) ||
                   (TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1));
 
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s acquired.\n"), collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, "(%t) %s acquired.\n", collection.name ()));
 
       TOKEN_INVARIANTS::instance ()->releasing (tp->token1_);
       TOKEN_INVARIANTS::instance ()->releasing (tp->token2_);
@@ -101,18 +99,17 @@ run_thread (void *vp)
         {
           if (ACE_OS::last_error () == EDEADLK)
             {
-              ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("deadlock detected")));
+              ACE_DEBUG ((LM_DEBUG, "deadlock detected"));
               goto deadlock;
             }
-          ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p renew failed\n"),
-                      ASYS_TEXT ("run_thread")));
+          ACE_ERROR ((LM_ERROR, "(%t) %p renew failed\n","run_thread"));
           return (void *) -1;
         }
 
       ACE_ASSERT (TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1 ||
                   TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1);
 
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s renewed.\n"), collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, "(%t) %s renewed.\n", collection.name ()));
 
     deadlock:
 
@@ -121,15 +118,15 @@ run_thread (void *vp)
 
       if (collection.release () == -1)
         {
-          ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p release failed\n"),ASYS_TEXT ("run_thread")));
+          ACE_ERROR ((LM_ERROR, "(%t) %p release failed\n","run_thread"));
           return (void *) -1;
         }
 
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s released.\n"), collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, "(%t) %s released.\n", collection.name ()));
     }
 
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) thread finished.\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) thread finished.\n"));
 
   return 0;
 }
@@ -145,15 +142,15 @@ run_test (ACE_Token_Proxy *A,
 
   // tp1 and tp2 can run concurrently.  Neither tp1 or tp3 can run
   // when tp2 is running.
-  tp1.collection_name_ = ASYS_TEXT ("A and Reader");
+  tp1.collection_name_ = "A and Reader";
   tp1.token1_ = A;
   tp1.token2_ = R;
 
-  tp2.collection_name_ = ASYS_TEXT ("A and Writer");
+  tp2.collection_name_ = "A and Writer";
   tp2.token1_ = A;
   tp2.token2_ = W;
 
-  tp3.collection_name_ = ASYS_TEXT ("B and Reader");
+  tp3.collection_name_ = "B and Reader";
   tp3.token1_ = B;
   tp3.token2_ = R;
 
@@ -162,35 +159,35 @@ run_test (ACE_Token_Proxy *A,
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
                  (void *) &tp1, THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 1 failed")), -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 1 failed"), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
                  (void *) &tp2, THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 2 failed")), -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 2 failed"), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
                  (void *) &tp3, THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 3 failed")), -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 3 failed"), -1);
 
   // Wait for all threads to exit.
   mgr->wait ();
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Test finished.\n")));
+  ACE_DEBUG ((LM_DEBUG, "Test finished.\n"));
   return 0;
 }
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Tokens_Test"));
+  ACE_START_TEST ("Tokens_Test");
 #if defined (ACE_HAS_THREADS)
   ACE_Token_Proxy *A = 0, *B = 0, *R = 0, *W = 0;
 
-  ACE_NEW_RETURN (A, ACE_Local_Mutex (ASYS_TEXT ("L Mutex A"), 0, 0), -1);
-  ACE_NEW_RETURN (B, ACE_Local_Mutex (ASYS_TEXT ("L Mutex B"), 0, 0), -1);
-  ACE_NEW_RETURN (R, ACE_Local_RLock (ASYS_TEXT ("L Reader Lock"), 0, 0), -1);
-  ACE_NEW_RETURN (W, ACE_Local_WLock (ASYS_TEXT ("L Writer Lock"), 0, 0), -1);
+  ACE_NEW_RETURN (A, ACE_Local_Mutex ("L Mutex A", 0, 0), -1);
+  ACE_NEW_RETURN (B, ACE_Local_Mutex ("L Mutex B", 0, 0), -1);
+  ACE_NEW_RETURN (R, ACE_Local_RLock ("L Reader Lock", 0, 0), -1);
+  ACE_NEW_RETURN (W, ACE_Local_WLock ("L Writer Lock", 0, 0), -1);
   ACE_NEW_RETURN (thread_start, ACE_Barrier (3), -1);
 
   run_test (A, B, R, W);
@@ -206,23 +203,23 @@ main (int, ASYS_TCHAR *[])
   ACE_Process_Options options;
   options.command_line (cl);
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Forking Token Service.\n")));
+  ACE_DEBUG ((LM_DEBUG, "Forking Token Service.\n"));
 
   // Start up the token server for the remote test.
   ACE_Process new_process;
   if (new_process.spawn (options) == -1)
-    ACE_ERROR ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s), will not run remote test.\n"),
-               ASYS_TEXT ("Server fork failed"), cl));
+    ACE_ERROR ((LM_DEBUG, "%n; %p (%s), will not run remote test.\n",
+               "Server fork failed", cl));
   else
     {
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"),
+      ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n",
                   new_process.getpid ()));
 
       // Wait for the server to start.
       ACE_OS::sleep (3);
 
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("Using Token Server on %s at port %d.\n"),
+                  "Using Token Server on %s at port %d.\n",
                   server_host, server_port));
       ACE_Remote_Mutex::set_server_address (ACE_INET_Addr (server_port,
                                                            server_host));
@@ -232,10 +229,10 @@ main (int, ASYS_TCHAR *[])
       delete R;
       delete W;
 
-      ACE_NEW_RETURN (A, ACE_Remote_Mutex (ASYS_TEXT ("R Mutex A"), 0, 1), -1);
-      ACE_NEW_RETURN (B, ACE_Remote_Mutex (ASYS_TEXT ("R Mutex B"), 0, 1), -1);
-      ACE_NEW_RETURN (R, ACE_Remote_RLock (ASYS_TEXT ("R Reader Lock"), 0, 1), -1);
-      ACE_NEW_RETURN (W, ACE_Remote_WLock (ASYS_TEXT ("R Writer Lock"), 0, 1), -1);
+      ACE_NEW_RETURN (A, ACE_Remote_Mutex ("R Mutex A", 0, 1), -1);
+      ACE_NEW_RETURN (B, ACE_Remote_Mutex ("R Mutex B", 0, 1), -1);
+      ACE_NEW_RETURN (R, ACE_Remote_RLock ("R Reader Lock", 0, 1), -1);
+      ACE_NEW_RETURN (W, ACE_Remote_WLock ("R Writer Lock", 0, 1), -1);
 
       run_test (A, B, R, W);
 
@@ -244,7 +241,7 @@ main (int, ASYS_TCHAR *[])
 
       // Kill the token server.
       if (new_process.terminate () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Kill failed.\n")), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "Kill failed.\n"), -1);
     }
 
   delete thread_start;
@@ -254,10 +251,10 @@ main (int, ASYS_TCHAR *[])
   delete R;
   delete W;
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) main thread exiting.\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) main thread exiting.\n"));
 #else
   ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("threads not supported on this platform\n")));
+              "threads not supported on this platform\n"));
 #endif /* ACE_HAS_THREADS */
   ACE_END_TEST;
   return 0;
diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp
index d407a8937d9..2501564ea85 100644
--- a/tests/Tokens_Test.dsp
+++ b/tests/Tokens_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Tokens_Test - Win32 PharLap ETS Debug

+CFG=Tokens_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=Tokens_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Tokens_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "Tokens_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Tokens_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Tokens_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Tokens_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "Tokens_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "Tokens_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "Tokens_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Tokens_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Tokens_Test - Win32 Debug"

 # Name "Tokens_Test - Win32 Alpha Debug"

-# Name "Tokens_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -209,6 +178,7 @@ DEP_CPP_TOKEN=\
 	"..\ace\SOCK_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -240,11 +210,6 @@ DEP_CPP_TOKEN=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_TOKEN=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/Tokens_Test.icc b/tests/Tokens_Test.icc
deleted file mode 100644
index 3381ea44ca5..00000000000
--- a/tests/Tokens_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Tokens_Test.exe"
-	{
-	   source type (cpp) "Tokens_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/UPIPE_SAP_Test.bpr b/tests/UPIPE_SAP_Test.bpr
new file mode 100644
index 00000000000..b8668f7d04f
--- /dev/null
+++ b/tests/UPIPE_SAP_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = UPIPE_SAP_Test.exe
+OBJFILES = objs\UPIPE_SAP_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 4401fc202d8..04fcd624c91 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -45,11 +45,11 @@ connector (void *)
 
   ACE_OS::sleep (5);
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector starting connect\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) connector starting connect\n"));
   ACE_UPIPE_Connector con;
 
   if (con.connect (c_stream, addr) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector ACE_UPIPE_Connector failed\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) connector ACE_UPIPE_Connector failed\n"));
 
   ACE_Message_Block *mb;
 
@@ -58,10 +58,10 @@ connector (void *)
   mb->copy ("hello");
 
   if (c_stream.send (mb) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) error connector send\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) error connector send\n"));
 
   if (c_stream.recv (mb) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) error connector recv\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) error connector recv\n"));
 
   ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), "thanks") == 0);
 
@@ -71,10 +71,10 @@ connector (void *)
   // Now try the send()/recv() interface.
   char mytext[] = "This string is sent by connector as a buffer";
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector sending text\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) connector sending text\n"));
   if (c_stream.send (mytext, sizeof (mytext)) == -1)
     ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) buffer send from connector failed\n")));
+                "(%t) buffer send from connector failed\n"));
 
   char conbuf[BUFSIZ];  // Buffer to receive response.
 
@@ -84,17 +84,17 @@ connector (void *)
     {
       if (c_stream.recv (&c, 1) == -1)
         ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("(%t) buffer recv from connector failed\n")));
+                    "(%t) buffer recv from connector failed\n"));
       else
         conbuf[i] = c;
     }
 
   conbuf[i] = '\0';
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) conbuf = %s\n"), conbuf));
+  ACE_DEBUG ((LM_DEBUG, "(%t) conbuf = %s\n", conbuf));
   ACE_ASSERT (ACE_OS::strcmp (conbuf, "this is the acceptor response!") == 0);
 
   c_stream.close ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) exiting thread\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n"));
   return 0;
 }
 
@@ -106,12 +106,12 @@ acceptor (void *args)
 
   if (acceptor->accept (s_stream) == -1)
     ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("(%t) ACE_UPIPE_Acceptor.accept failed\n")));
+                "(%t) ACE_UPIPE_Acceptor.accept failed\n"));
 
   ACE_Message_Block *mb = 0;
 
   if (s_stream.recv (mb) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor recv failed\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) acceptor recv failed\n"));
 
   ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), "hello") == 0);
 
@@ -119,13 +119,13 @@ acceptor (void *args)
   mb->copy ("thanks");
 
   if (s_stream.send (mb) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor send failed\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) acceptor send failed\n"));
 
   char s_buf[BUFSIZ];
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor sleeping on recv\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) acceptor sleeping on recv\n"));
 
   if (s_stream.recv (s_buf, sizeof (s_buf)) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor recv failed\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) acceptor recv failed\n"));
   else
     ACE_ASSERT (ACE_OS::strcmp (s_buf,
                                 "This string is sent by connector as a buffer") == 0);
@@ -134,18 +134,18 @@ acceptor (void *args)
   ACE_OS::strcpy (s_buf, svr_response);
 
   if (s_stream.send (s_buf, sizeof (svr_response)) == -1)
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor send failed\n")));
+    ACE_DEBUG ((LM_DEBUG, "(%t) acceptor send failed\n"));
 
   s_stream.close ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) exiting thread\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n"));
   return 0;
 }
 #endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/
 
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("UPIPE_SAP_Test"));
+  ACE_START_TEST ("UPIPE_SAP_Test");
 
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
         (defined (ACE_WIN32) && \
@@ -158,17 +158,17 @@ main (int, ASYS_TCHAR *[])
                                               (void *) &acc,
                                               THR_NEW_LWP,
                                               0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn")), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1);
 
   // Spawn a connector thread.
   if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (connector),
                                               (void *) 0,
                                               THR_NEW_LWP,
                                               0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn")), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1);
 
   ACE_Thread_Manager::instance ()->wait ();
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) joined with acceptor thread\n")));
+  ACE_DEBUG ((LM_DEBUG, "(%t) joined with acceptor thread\n"));
 
   // Close the acceptor
   acc.close ();
@@ -176,9 +176,9 @@ main (int, ASYS_TCHAR *[])
 #else
 
 #if !defined (ACE_HAS_THREADS)
-  ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n")));
+  ACE_ERROR ((LM_INFO, "threads not supported on this platform\n"));
 #else
-  ACE_ERROR ((LM_INFO, ASYS_TEXT ("UPIPE is not supported on this platform\n")));
+  ACE_ERROR ((LM_INFO, "UPIPE is not supported on this platform\n"));
 #endif /* !defined (ACE_HAS_THREADS) */
 #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */
 
diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp
index 192c018820b..3a72501c0cc 100644
--- a/tests/UPIPE_SAP_Test.dsp
+++ b/tests/UPIPE_SAP_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=UPIPE_SAP_Test - Win32 PharLap ETS Debug

+CFG=UPIPE_SAP_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,17 +14,17 @@ CFG=UPIPE_SAP_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "UPIPE_SAP_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "UPIPE_SAP_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -83,43 +83,12 @@ LINK32=link.exe
 # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "UPIPE_SAP_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\PharLap ETS Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "UPIPE_SAP_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "UPIPE_SAP_Test"

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./UPIPE_SAP_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "UPIPE_SAP_Test - Win32 Debug"

 # Name "UPIPE_SAP_Test - Win32 Alpha Debug"

-# Name "UPIPE_SAP_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -208,6 +177,7 @@ DEP_CPP_UPIPE=\
 	"..\ace\SPIPE_Stream.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

+	"..\ace\stdcpp.h"\

 	"..\ace\Strategies.h"\

 	"..\ace\Strategies_T.cpp"\

 	"..\ace\Strategies_T.h"\

@@ -256,11 +226,6 @@ DEP_CPP_UPIPE=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

-NODEP_CPP_UPIPE=\

-	"..\ace\stdcpp.h"\

-	

-

-!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 PharLap ETS Debug"

 

 !ENDIF 

 

diff --git a/tests/UPIPE_SAP_Test.icc b/tests/UPIPE_SAP_Test.icc
deleted file mode 100644
index 785888c0180..00000000000
--- a/tests/UPIPE_SAP_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "UPIPE_SAP_Test.exe"
-	{
-	   source type (cpp) "UPIPE_SAP_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/Upgradable_RW_Test.bpr b/tests/Upgradable_RW_Test.bpr
new file mode 100644
index 00000000000..8bbc99e6898
--- /dev/null
+++ b/tests/Upgradable_RW_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = Upgradable_RW_Test.exe
+OBJFILES = objs\Upgradable_RW_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index 791b6d89d1b..90e76e41331 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -110,9 +110,9 @@ static void
 print_usage_and_die (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n")
-              ASYS_TEXT ("   [-e max_entries] [-u try update] ")
-              ASYS_TEXT ("[-n iteration_count] [-f for FIFO threads]\n")));
+              ASYS_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n"
+                         "   [-e max_entries] [-u try update] "
+                         "[-n iteration_count] [-f for FIFO threads]\n")));
   ACE_OS::exit (1);
 }
 
@@ -295,11 +295,11 @@ Time_Calculation ::print_stats (void)
       double tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("\n")
-                  ASYS_TEXT ("\treal_time\t = %0.06f ms, \n")
-                  ASYS_TEXT ("\tuser_time\t = %0.06f ms, \n")
-                  ASYS_TEXT ("\tsystem_time\t = %0.06f ms, \n")
-                  ASYS_TEXT ("\t%0.00f calls/second\n"),
+                  ASYS_TEXT ("\n"
+                             "\treal_time\t = %0.06f ms, \n"
+                             "\tuser_time\t = %0.06f ms, \n"
+                             "\tsystem_time\t = %0.06f ms, \n"
+                             "\t%0.00f calls/second\n"),
                   elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
                   elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
                   elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time,
@@ -311,7 +311,7 @@ Time_Calculation ::print_stats (void)
     }
   else
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("\tNo time stats printed.  Zero iterations or error ocurred.\n")));
+                "\tNo time stats printed.  Zero iterations or error ocurred.\n"));
 }
 
 static int
diff --git a/tests/Upgradable_RW_Test.dsp b/tests/Upgradable_RW_Test.dsp
index a993d5e5519..37933f6d07c 100644
--- a/tests/Upgradable_RW_Test.dsp
+++ b/tests/Upgradable_RW_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug

+CFG=Upgradable_RW_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,23 +13,21 @@ CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Upgradable_RW_Test.mak"\

+ CFG="Upgradable_RW_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Upgradable_RW_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Upgradable_RW_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -51,40 +49,9 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 PharLap ETS Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\ETS_LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

 # Name "Upgradable_RW_Test - Win32 Debug"

-# Name "Upgradable_RW_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source files"

 

 # PROP Default_Filter "*.cpp"

diff --git a/tests/Upgradable_RW_Test.icc b/tests/Upgradable_RW_Test.icc
deleted file mode 100644
index 117be19b9f2..00000000000
--- a/tests/Upgradable_RW_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Upgradable_RW_Test.exe"
-	{
-	   source type (cpp) "Upgradable_RW_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/XtReactor_Test.bpr b/tests/XtReactor_Test.bpr
new file mode 100644
index 00000000000..7ac903df2f9
--- /dev/null
+++ b/tests/XtReactor_Test.bpr
@@ -0,0 +1,177 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = XtReactor_Test.exe
+OBJFILES = objs\XtReactor_Test.obj
+RESFILES =
+RESDEPEN = $(RESFILES)
+LIBFILES = ..\ace\aced.lib
+LIBRARIES =
+SPARELIBS = 
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0x32.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES)  import32.lib cw32mt.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=Executable (Console)
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=..;$(BCB)\include
+Item1=$(ACE_ROOT);$(BCB)\include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_NO_VCL
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/tests/XtReactor_Test.icc b/tests/XtReactor_Test.icc
deleted file mode 100644
index c37c4d06afb..00000000000
--- a/tests/XtReactor_Test.icc
+++ /dev/null
@@ -1,22 +0,0 @@
-option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "XtReactor_Test.exe"
-	{
-	   source type (cpp) "XtReactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
-	}
-   }
diff --git a/tests/icc.bat b/tests/icc.bat
deleted file mode 100644
index a54461b85ea..00000000000
--- a/tests/icc.bat
+++ /dev/null
@@ -1,223 +0,0 @@
-vacbld -SEV=E Aio_Platform_Test.icc
-vacbld -SEV=E Atomic_Op_Test.icc
-vacbld -SEV=E Barrier_Test.icc
-vacbld -SEV=E Basic_Types_Test.icc
-vacbld -SEV=E Buffer_Stream_Test.icc
-vacbld -SEV=E CDR_Test.icc
-vacbld -SEV=E Collection_Test.icc
-vacbld -SEV=E Conn_Test.icc
-vacbld -SEV=E DLL_Test.icc
-vacbld -SEV=E DLList_Test.icc
-vacbld -SEV=E Dynamic_Priority_Test.icc
-vacbld -SEV=E Enum_Interfaces_Test.icc
-vacbld -SEV=E Env_Value_Test.icc
-vacbld -SEV=E Future_Test.icc
-vacbld -SEV=E Future_Set_Test.icc
-vacbld -SEV=E Handle_Set_Test.icc
-vacbld -SEV=E Hash_Map_Manager_Test.icc
-vacbld -SEV=E High_Res_Timer_Test.icc
-vacbld -SEV=E IOStream_Test.icc
-vacbld -SEV=E MM_Shared_Memory_Test.icc
-vacbld -SEV=E MT_Reactor_Timer_Test.icc
-vacbld -SEV=E MT_SOCK_Test.icc
-vacbld -SEV=E Map_Manager_Test.icc
-vacbld -SEV=E Map_Test.icc
-vacbld -SEV=E Mem_Map_Test.icc
-vacbld -SEV=E Message_Block_Test.icc
-vacbld -SEV=E Message_Queue_Notifications_Test.icc
-vacbld -SEV=E Message_Queue_Test.icc
-vacbld -SEV=E Naming_Test.icc
-vacbld -SEV=E Notify_Performance_Test.icc
-vacbld -SEV=E OrdMultiSet_Test.icc
-vacbld -SEV=E Pipe_Test.icc
-vacbld -SEV=E Priority_Buffer_Test.icc
-vacbld -SEV=E Priority_Reactor_Test.icc
-vacbld -SEV=E Priority_Task_Test.icc
-vacbld -SEV=E Process_Mutex_Test.icc
-vacbld -SEV=E Process_Strategy_Test.icc
-vacbld -SEV=E Purgable_Map_Manager_Test.icc
-vacbld -SEV=E RB_Tree_Test.icc
-vacbld -SEV=E Reactor_Exceptions_Test.icc
-vacbld -SEV=E Reactor_Notify_Test.icc
-vacbld -SEV=E Reactor_Performance_Test.icc
-vacbld -SEV=E Reactor_Timer_Test.icc
-vacbld -SEV=E Reactors_Test.icc
-vacbld -SEV=E Reader_Writer_Test.icc
-vacbld -SEV=E Recursive_Mutex_Test.icc
-vacbld -SEV=E SOCK_Connector_Test.icc
-vacbld -SEV=E SOCK_Test.icc
-vacbld -SEV=E SPIPE_Test.icc
-vacbld -SEV=E SString_Test.icc
-vacbld -SEV=E SV_Shared_Memory_Test.icc
-vacbld -SEV=E Semaphore_Test.icc
-vacbld -SEV=E Service_Config_Test.icc
-vacbld -SEV=E Sigset_Ops_Test.icc
-vacbld -SEV=E Simple_Message_Block_Test.icc
-vacbld -SEV=E TSS_Test.icc
-vacbld -SEV=E Task_Test.icc
-vacbld -SEV=E Thread_Manager_Test.icc
-vacbld -SEV=E Thread_Mutex_Test.icc
-vacbld -SEV=E Thread_Pool_Reactor_Test.icc
-vacbld -SEV=E Thread_Pool_Test.icc
-vacbld -SEV=E Time_Service_Test.icc
-vacbld -SEV=E Time_Value_Test.icc
-vacbld -SEV=E Timeprobe_Test.icc
-vacbld -SEV=E Timer_Queue_Test.icc
-vacbld -SEV=E Tokens_Test.icc
-vacbld -SEV=E UPIPE_SAP_Test.icc
-vacbld -SEV=E Upgradable_RW_Test.icc
-vacbld -SEV=E XtReactor_Test.icc
-vacbld -SEV=E Aio_Platform_Test.icc
-vacbld -SEV=E Atomic_Op_Test.icc
-vacbld -SEV=E Barrier_Test.icc
-vacbld -SEV=E Basic_Types_Test.icc
-vacbld -SEV=E Buffer_Stream_Test.icc
-vacbld -SEV=E CDR_Test.icc
-vacbld -SEV=E CLASSIX_Addr_Test.icc
-vacbld -SEV=E CLASSIX_CLD_Connector_Test.icc
-vacbld -SEV=E CLASSIX_Con_Acc_Test.icc
-vacbld -SEV=E CLASSIX_Group_Test.icc
-vacbld -SEV=E CLASSIX_Notify_Test.icc
-vacbld -SEV=E CLASSIX_OS_Test.icc
-vacbld -SEV=E CLASSIX_Reactor_Test.icc
-vacbld -SEV=E CLASSIX_Select_Reactor_Test.icc
-vacbld -SEV=E CLASSIX_Stream_Test.icc
-vacbld -SEV=E Collection_Test.icc
-vacbld -SEV=E Conn_Test.icc
-vacbld -SEV=E DLL_Test.icc
-vacbld -SEV=E DLList_Test.icc
-vacbld -SEV=E Dynamic_Priority_Test.icc
-vacbld -SEV=E Enum_Interfaces_Test.icc
-vacbld -SEV=E Env_Value_Test.icc
-vacbld -SEV=E Future_Test.icc
-vacbld -SEV=E Handle_Set_Test.icc
-vacbld -SEV=E Hash_Map_Manager_Test.icc
-vacbld -SEV=E High_Res_Timer_Test.icc
-vacbld -SEV=E IOStream_Test.icc
-vacbld -SEV=E MM_Shared_Memory_Test.icc
-vacbld -SEV=E MT_Reactor_Timer_Test.icc
-vacbld -SEV=E MT_SOCK_Test.icc
-vacbld -SEV=E Map_Manager_Test.icc
-vacbld -SEV=E Map_Test.icc
-vacbld -SEV=E Mem_Map_Test.icc
-vacbld -SEV=E Message_Block_Test.icc
-vacbld -SEV=E Message_Queue_Notifications_Test.icc
-vacbld -SEV=E Message_Queue_Test.icc
-vacbld -SEV=E Naming_Test.icc
-vacbld -SEV=E Notify_Performance_Test.icc
-vacbld -SEV=E OrdMultiSet_Test.icc
-vacbld -SEV=E Pipe_Test.icc
-vacbld -SEV=E Priority_Buffer_Test.icc
-vacbld -SEV=E Priority_Reactor_Test.icc
-vacbld -SEV=E Priority_Task_Test.icc
-vacbld -SEV=E Process_Mutex_Test.icc
-vacbld -SEV=E Process_Strategy_Test.icc
-vacbld -SEV=E Purgable_Map_Manager_Test.icc
-vacbld -SEV=E RB_Tree_Test.icc
-vacbld -SEV=E Reactor_Exceptions_Test.icc
-vacbld -SEV=E Reactor_Notify_Test.icc
-vacbld -SEV=E Reactor_Performance_Test.icc
-vacbld -SEV=E Reactor_Timer_Test.icc
-vacbld -SEV=E Reactors_Test.icc
-vacbld -SEV=E Reader_Writer_Test.icc
-vacbld -SEV=E Recursive_Mutex_Test.icc
-vacbld -SEV=E SOCK_Connector_Test.icc
-vacbld -SEV=E SOCK_Test.icc
-vacbld -SEV=E SPIPE_Test.icc
-vacbld -SEV=E SString_Test.icc
-vacbld -SEV=E SV_Shared_Memory_Test.icc
-vacbld -SEV=E Semaphore_Test.icc
-vacbld -SEV=E Service_Config_Test.icc
-vacbld -SEV=E Sigset_Ops_Test.icc
-vacbld -SEV=E Simple_Message_Block_Test.icc
-vacbld -SEV=E TSS_Test.icc
-vacbld -SEV=E Task_Test.icc
-vacbld -SEV=E Thread_Manager_Test.icc
-vacbld -SEV=E Thread_Mutex_Test.icc
-vacbld -SEV=E Thread_Pool_Reactor_Test.icc
-vacbld -SEV=E Thread_Pool_Test.icc
-vacbld -SEV=E Time_Service_Test.icc
-vacbld -SEV=E Time_Value_Test.icc
-vacbld -SEV=E Timeprobe_Test.icc
-vacbld -SEV=E Timer_Queue_Test.icc
-vacbld -SEV=E Tokens_Test.icc
-vacbld -SEV=E UPIPE_SAP_Test.icc
-vacbld -SEV=E Upgradable_RW_Test.icc
-vacbld -SEV=E XtReactor_Test.icc
-vacbld -SEV=E Aio_Platform_Test.icc
-vacbld -SEV=E Atomic_Op_Test.icc
-vacbld -SEV=E Barrier_Test.icc
-vacbld -SEV=E Basic_Types_Test.icc
-vacbld -SEV=E Buffer_Stream_Test.icc
-vacbld -SEV=E CDR_Test.icc
-vacbld -SEV=E CLASSIX_Addr_Test.icc
-vacbld -SEV=E CLASSIX_CLD_Connector_Test.icc
-vacbld -SEV=E CLASSIX_Con_Acc_Test.icc
-vacbld -SEV=E CLASSIX_Group_Test.icc
-vacbld -SEV=E CLASSIX_Notify_Test.icc
-vacbld -SEV=E CLASSIX_OS_Test.icc
-vacbld -SEV=E CLASSIX_Reactor_Test.icc
-vacbld -SEV=E CLASSIX_Select_Reactor_Test.icc
-vacbld -SEV=E CLASSIX_Stream_Test.icc
-vacbld -SEV=E Collection_Test.icc
-vacbld -SEV=E Conn_Test.icc
-vacbld -SEV=E DLL_Test.icc
-vacbld -SEV=E DLList_Test.icc
-vacbld -SEV=E Dynamic_Priority_Test.icc
-vacbld -SEV=E Enum_Interfaces_Test.icc
-vacbld -SEV=E Env_Value_Test.icc
-vacbld -SEV=E Future_Test.icc
-vacbld -SEV=E Handle_Set_Test.icc
-vacbld -SEV=E Hash_Map_Manager_Test.icc
-vacbld -SEV=E High_Res_Timer_Test.icc
-vacbld -SEV=E IOStream_Test.icc
-vacbld -SEV=E MM_Shared_Memory_Test.icc
-vacbld -SEV=E MT_Reactor_Timer_Test.icc
-vacbld -SEV=E MT_SOCK_Test.icc
-vacbld -SEV=E Map_Manager_Test.icc
-vacbld -SEV=E Map_Test.icc
-vacbld -SEV=E Mem_Map_Test.icc
-vacbld -SEV=E Message_Block_Test.icc
-vacbld -SEV=E Message_Queue_Notifications_Test.icc
-vacbld -SEV=E Message_Queue_Test.icc
-vacbld -SEV=E Naming_Test.icc
-vacbld -SEV=E Notify_Performance_Test.icc
-vacbld -SEV=E OrdMultiSet_Test.icc
-vacbld -SEV=E Pipe_Test.icc
-vacbld -SEV=E Priority_Buffer_Test.icc
-vacbld -SEV=E Priority_Reactor_Test.icc
-vacbld -SEV=E Priority_Task_Test.icc
-vacbld -SEV=E Process_Mutex_Test.icc
-vacbld -SEV=E Process_Strategy_Test.icc
-vacbld -SEV=E Purgable_Map_Manager_Test.icc
-vacbld -SEV=E RB_Tree_Test.icc
-vacbld -SEV=E Reactor_Exceptions_Test.icc
-vacbld -SEV=E Reactor_Notify_Test.icc
-vacbld -SEV=E Reactor_Performance_Test.icc
-vacbld -SEV=E Reactor_Timer_Test.icc
-vacbld -SEV=E Reactors_Test.icc
-vacbld -SEV=E Reader_Writer_Test.icc
-vacbld -SEV=E Recursive_Mutex_Test.icc
-vacbld -SEV=E SOCK_Connector_Test.icc
-vacbld -SEV=E SOCK_Test.icc
-vacbld -SEV=E SPIPE_Test.icc
-vacbld -SEV=E SString_Test.icc
-vacbld -SEV=E SV_Shared_Memory_Test.icc
-vacbld -SEV=E Semaphore_Test.icc
-vacbld -SEV=E Service_Config_Test.icc
-vacbld -SEV=E Sigset_Ops_Test.icc
-vacbld -SEV=E Simple_Message_Block_Test.icc
-vacbld -SEV=E TSS_Test.icc
-vacbld -SEV=E Task_Test.icc
-vacbld -SEV=E Thread_Manager_Test.icc
-vacbld -SEV=E Thread_Mutex_Test.icc
-vacbld -SEV=E Thread_Pool_Reactor_Test.icc
-vacbld -SEV=E Thread_Pool_Test.icc
-vacbld -SEV=E Time_Service_Test.icc
-vacbld -SEV=E Time_Value_Test.icc
-vacbld -SEV=E Timeprobe_Test.icc
-vacbld -SEV=E Timer_Queue_Test.icc
-vacbld -SEV=E Tokens_Test.icc
-vacbld -SEV=E UPIPE_SAP_Test.icc
-vacbld -SEV=E Upgradable_RW_Test.icc
-vacbld -SEV=E XtReactor_Test.icc
diff --git a/tests/makeicc.pl b/tests/makeicc.pl
deleted file mode 100755
index d810dbc1d02..00000000000
--- a/tests/makeicc.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-@ls = `ls -1 *.cpp`;
-$allicc = "icc.bat";
-
-foreach $tmp (@ls)
-{
-	($a1, $a2) = split("cpp",$tmp);
-	$tmp2 = "$a1\icc";
-
-open(T,"> $a1\icc");
-	print T "option\n";
-        print T "    define (\"ACE_HAS_WINSOCK2\",\"1\"),\n";
-        print T "    define (\"__ACE_INLINE__\",\"0\"),\n";
-        print T "    define (\"WIN32\",\"1\"),\n";
-        print T "    define (\"_WINDOWS\",\"1\"),\n";
-        print T "    define(\"ACE_HAS_DLL\",\"0\"),\n";
-
-        print T "    link(libSearchPath,'H:\\ACE_wrappers\\ace'),\n";
-	print T "    incl(searchPath,'H:\\ACE_wrappers'),\n";
-	print T "    link(linkWithMultiThreadLib,yes)\n";
-	print T "     {\n";
-	chop($a1);
-	print T "	target \"$a1\.exe\"\n";
-	print T "	{\n";
-
-
-	print T "	   source type (cpp) \"$a1\.cpp\"\n\n";
-	print T "	   source type (lib) \"aced.lib\"\n";
-	print T "   	   source type (lib) \"advapi32.lib\"\n";
-	print T "	   source type (lib) \"user32.lib\"\n";
-	print T "	   source type (lib) \"ws2_32.lib\"\n";
-	print T "	   source type (lib) \"wsock32.lib\"\n";
-	print T "	   source type (lib) \"mswsock.lib\"\n";
-	print T "	}\n";
-	print T "   }\n";
-close T;
-
-open(ALLICC,">> $allicc");
-	print ALLICC "vacbld -SEV=E $a1\.icc\n";
-close ALLICC;
-	print "$a1\n";
-}
-
diff --git a/tests/run_pharlap_tests.bat b/tests/run_pharlap_tests.bat
deleted file mode 100755
index 8b34bfcf42c..00000000000
--- a/tests/run_pharlap_tests.bat
+++ /dev/null
@@ -1,125 +0,0 @@
-@echo off
-rem $Id$
-
-rem    This file runs all the tests on PharLap ETS.
-rem    To use this either give it no arguments to run all the tests or
-rem    pass it the test name (without the extention) to run only one
-rem    test
-
-setlocal
-
-set arg=%1
-
-if not "%1" == "" goto runtest
-
-:runall
-
-rem call %0 ACE_Init_Test
-call %0 Atomic_Op_Test
-call %0 Barrier_Test
-call %0 Basic_Types_Test
-call %0 Buffer_Stream_Test
-call %0 CDR_Test
-call %0 Collection_Test
-call %0 Conn_Test
-call %0 DLL_Test
-call %0 DLList_Test
-call %0 Enum_Interfaces_Test
-call %0 Env_Value_Test
-call %0 Future_Test
-call %0 Handle_Set_Test
-call %0 Hash_Map_Manager_Test
-call %0 High_Res_Timer_Test
-call %0 IOStream_Test
-call %0 Map_Manager_Test
-call %0 Cache_Map_Manager_Test
-call %0 Map_Test
-rem call %0 Mem_Map_Test            not supported
-call %0 Message_Block_Test
-call %0 Message_Queue_Notifications_Test
-call %0 Message_Queue_Test
-call %0 MT_Reactor_Timer_Test
-rem call %0 MM_Shared_Memory_Test   not supported
-call %0 MT_SOCK_Test
-call %0 Naming_Test
-call %0 New_Fail_Test
-call %0 Notify_Performance_Test
-call %0 OrdMultiSet_Test
-call %0 Pipe_Test
-call %0 Priority_Buffer_Test
-call %0 Dynamic_Priority_Test
-call %0 Priority_Reactor_Test
-call %0 Priority_Task_Test
-call %0 Process_Mutex_Test
-call %0 Process_Strategy_Test
-call %0 RB_Tree_Test
-call %0 Reactors_Test
-call %0 Reactor_Exceptions_Test
-call %0 Reactor_Notify_Test
-call %0 Reactor_Performance_Test
-call %0 Reactor_Timer_Test
-call %0 Reader_Writer_Test
-call %0 Thread_Pool_Reactor_Test
-call %0 Recursive_Mutex_Test
-call %0 Reverse_Lock_Test
-call %0 Semaphore_Test
-call %0 Service_Config_Test
-call %0 Sigset_Ops_Test
-call %0 Simple_Message_Block_Test
-call %0 Svc_Handler_Test
-call %0 SOCK_Test
-call %0 SOCK_Connector_Test
-call %0 SOCK_Send_Recv_Test
-rem call %0 SPIPE_Test             not supported
-call %0 SString_Test
-call %0 SV_Shared_Memory_Test
-call %0 Task_Test
-call %0 Thread_Manager_Test
-call %0 Thread_Mutex_Test
-call %0 Thread_Pool_Test
-call %0 Timer_Queue_Test
-call %0 Timeprobe_Test
-if exist ..\netsvcs\servers\main.exe call %0 Time_Service_Test
-call %0 Time_Value_Test
-call %0 Tokens_Test
-call %0 TSS_Test
-call %0 UPIPE_SAP_Test
-call %0 Upgradable_RW_Test
-goto done
-
-:runtest
-
-echo Running %arg%
-if not exist %arg%_ETS.exe goto nofile
-
-RUNEMB -LOGHOST -NODIALOG %arg%_ETS.exe > log\%arg%.log
-if errorlevel 0 goto fine
-echo.
-echo %arg% has FAILED!!!
-echo.
-type log\%arg%.log | find /I "Abnormal program termination"
-type log/%arg%.log | find /I "target halted"
-type log/%arg%.log | find /I "Fatal error"
-type log\%arg%.log | find /I "assertion failed"
-type log\%arg%.log | find /I "not supported"
-type log\%arg%.log | find /I "no such file or directory"
-type log\%arg%.log | find /I "invalid argument"
-type log\%arg%.log | find /I "timeout"
-type log\%arg%.log | find /I "bad file number"
-type log\%arg%.log | find /I "Win32 structured exception"
-echo.
-
-goto done
-
-:nofile
-echo %arg%.exe not found
-goto done
-
-:fine
-
-rem We should check the log files here to make sure the test ended correctly
-rem type log\%arg%.log | find "Ending"
-
-:done
-
-endlocal
diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index f0625695664..33816c48eba 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -1,59 +1,20 @@
 @echo off
 rem $Id$
 
-rem    To run this script, the first argument must be either bor
-rem    or msc.  This will determine if the borland tests are run, or
-rem    msvc tests are run.
-rem    You can provide an optional second parameter, the name of
-rem    the test to be run.
-rem    An optional first argument of "purify" can be provided as well.
+rem    To use this either give it no arguments to run all the tests or
+rem    pass it the test name (without the extention) to run only one
+rem    test
 
 setlocal
 
-set arg=
-set deco=
-set exedir=
-set dopure=
-
-set run_cmd=%0
-
-if "%1" == "help" goto usage
-if "%1" == "?" goto usage
-if "%1" == "/?" goto usage
 if "%1" == "purify" goto setuppurify
-if "%1" == "bor" goto setupbor_arg
-if "%1" == "msc" goto setupmsc_arg
-goto setupmsc
-
-:setuppurify
-shift
-set dopure=purify
-if "%1" == "bor" goto setupbor_arg
-if "%1" == "msc" goto setupmsc_arg
-goto setupmsc
-
-:setupbor_arg
-shift
-:setupbor
-set arg=%1
-set exedir=.\bor\bin\
-rem Set deco to whatever decoration you have for the executables
-set deco=
-set platform=bor
-goto endsetup
-
-:setupmsc_arg
-shift
-:setupmsc
+set dopure=
 set arg=%1
-set exedir=
-set deco=
-set platform=
 goto endsetup
 
-:usage
-echo "usage: run_tests [purify] bor|msc [program-name]"
-goto done
+:setuppurify
+set dopure=purify
+set arg=%2
 
 :endsetup
 
@@ -61,78 +22,76 @@ if not "%arg%" == "" goto runtest
 
 :runall
 
-call %run_cmd% %dopure% %platform% ACE_Init_Test
-call %run_cmd% %dopure% %platform% Atomic_Op_Test
-call %run_cmd% %dopure% %platform% Barrier_Test
-call %run_cmd% %dopure% %platform% Basic_Types_Test
-call %run_cmd% %dopure% %platform% Buffer_Stream_Test
-call %run_cmd% %dopure% %platform% CDR_Test
-call %run_cmd% %dopure% %platform% Collection_Test
-call %run_cmd% %dopure% %platform% Conn_Test
-call %run_cmd% %dopure% %platform% DLL_Test
-call %run_cmd% %dopure% %platform% DLList_Test
-call %run_cmd% %dopure% %platform% Enum_Interfaces_Test
-call %run_cmd% %dopure% %platform% Env_Value_Test
-call %run_cmd% %dopure% %platform% Future_Test
-call %run_cmd% %dopure% %platform% Future_Set_Test
-call %run_cmd% %dopure% %platform% Handle_Set_Test
-call %run_cmd% %dopure% %platform% Hash_Map_Manager_Test
-call %run_cmd% %dopure% %platform% High_Res_Timer_Test
-call %run_cmd% %dopure% %platform% IOStream_Test
-call %run_cmd% %dopure% %platform% Map_Manager_Test
-call %run_cmd% %dopure% %platform% Cache_Map_Manager_Test
-call %run_cmd% %dopure% %platform% Map_Test
-call %run_cmd% %dopure% %platform% Mem_Map_Test
-call %run_cmd% %dopure% %platform% Message_Block_Test
-call %run_cmd% %dopure% %platform% Message_Queue_Notifications_Test
-call %run_cmd% %dopure% %platform% Message_Queue_Test
-call %run_cmd% %dopure% %platform% MT_Reactor_Timer_Test
-call %run_cmd% %dopure% %platform% MM_Shared_Memory_Test
-call %run_cmd% %dopure% %platform% MT_SOCK_Test
-call %run_cmd% %dopure% %platform% Naming_Test
-rem call %run_cmd% %dopure% %platform% New_Fail_Test
-call %run_cmd% %dopure% %platform% Notify_Performance_Test
-call %run_cmd% %dopure% %platform% OrdMultiSet_Test
-call %run_cmd% %dopure% %platform% Pipe_Test
-call %run_cmd% %dopure% %platform% Priority_Buffer_Test
-call %run_cmd% %dopure% %platform% Dynamic_Priority_Test
-call %run_cmd% %dopure% %platform% Priority_Reactor_Test
-call %run_cmd% %dopure% %platform% Priority_Task_Test
-call %run_cmd% %dopure% %platform% Process_Mutex_Test
-call %run_cmd% %dopure% %platform% Process_Strategy_Test
-call %run_cmd% %dopure% %platform% RB_Tree_Test
-call %run_cmd% %dopure% %platform% Reactors_Test
-call %run_cmd% %dopure% %platform% Reactor_Exceptions_Test
-call %run_cmd% %dopure% %platform% Reactor_Notify_Test
-call %run_cmd% %dopure% %platform% Reactor_Performance_Test
-call %run_cmd% %dopure% %platform% Reactor_Timer_Test
-call %run_cmd% %dopure% %platform% Reader_Writer_Test
-call %run_cmd% %dopure% %platform% Thread_Pool_Reactor_Test
-call %run_cmd% %dopure% %platform% Recursive_Mutex_Test
-call %run_cmd% %dopure% %platform% Reverse_Lock_Test
-call %run_cmd% %dopure% %platform% Semaphore_Test
-call %run_cmd% %dopure% %platform% Service_Config_Test
-call %run_cmd% %dopure% %platform% Sigset_Ops_Test
-call %run_cmd% %dopure% %platform% Simple_Message_Block_Test
-call %run_cmd% %dopure% %platform% Svc_Handler_Test
-call %run_cmd% %dopure% %platform% SOCK_Test
-call %run_cmd% %dopure% %platform% SOCK_Connector_Test
-call %run_cmd% %dopure% %platform% SOCK_Send_Recv_Test
-call %run_cmd% %dopure% %platform% SPIPE_Test
-call %run_cmd% %dopure% %platform% SString_Test
-call %run_cmd% %dopure% %platform% SV_Shared_Memory_Test
-call %run_cmd% %dopure% %platform% Task_Test
-call %run_cmd% %dopure% %platform% Thread_Manager_Test
-call %run_cmd% %dopure% %platform% Thread_Mutex_Test
-call %run_cmd% %dopure% %platform% Thread_Pool_Test
-call %run_cmd% %dopure% %platform% Timer_Queue_Test
-call %run_cmd% %dopure% %platform% Timeprobe_Test
-if exist ..\netsvcs\servers\main.exe call %run_cmd% %dopure% %platform% Time_Service_Test
-call %run_cmd% %dopure% %platform% Time_Value_Test
-call %run_cmd% %dopure% %platform% Tokens_Test
-call %run_cmd% %dopure% %platform% TSS_Test
-call %run_cmd% %dopure% %platform% UPIPE_SAP_Test
-call %run_cmd% %dopure% %platform% Upgradable_RW_Test
+call %0 %dopure% ACE_Init_Test
+call %0 %dopure% Atomic_Op_Test
+call %0 %dopure% Barrier_Test
+call %0 %dopure% Basic_Types_Test
+call %0 %dopure% Buffer_Stream_Test
+call %0 %dopure% CDR_Test
+call %0 %dopure% Collection_Test
+call %0 %dopure% Conn_Test
+call %0 %dopure% DLL_Test
+call %0 %dopure% DLList_Test
+call %0 %dopure% Enum_Interfaces_Test
+call %0 %dopure% Env_Value_Test
+call %0 %dopure% Future_Test
+call %0 %dopure% Handle_Set_Test
+call %0 %dopure% Hash_Map_Manager_Test
+call %0 %dopure% High_Res_Timer_Test
+call %0 %dopure% IOStream_Test
+call %0 %dopure% Map_Manager_Test
+call %0 %dopure% Map_Test
+call %0 %dopure% Mem_Map_Test
+call %0 %dopure% Message_Block_Test
+call %0 %dopure% Message_Queue_Notifications_Test
+call %0 %dopure% Message_Queue_Test
+call %0 %dopure% MT_Reactor_Timer_Test
+call %0 %dopure% MM_Shared_Memory_Test
+call %0 %dopure% MT_SOCK_Test
+call %0 %dopure% Naming_Test
+call %0 %dopure% New_Fail_Test
+call %0 %dopure% Notify_Performance_Test
+call %0 %dopure% OrdMultiSet_Test
+call %0 %dopure% Pipe_Test
+call %0 %dopure% Priority_Buffer_Test
+call %0 %dopure% Dynamic_Priority_Test
+call %0 %dopure% Priority_Reactor_Test
+call %0 %dopure% Priority_Task_Test
+call %0 %dopure% Process_Mutex_Test
+call %0 %dopure% Process_Strategy_Test
+call %0 %dopure% RB_Tree_Test
+call %0 %dopure% Reactors_Test
+call %0 %dopure% Reactor_Exceptions_Test
+call %0 %dopure% Reactor_Notify_Test
+call %0 %dopure% Reactor_Performance_Test
+call %0 %dopure% Reactor_Timer_Test
+call %0 %dopure% Reader_Writer_Test
+call %0 %dopure% Thread_Pool_Reactor_Test
+call %0 %dopure% Recursive_Mutex_Test
+call %0 %dopure% Reverse_Lock_Test
+call %0 %dopure% Semaphore_Test
+call %0 %dopure% Service_Config_Test
+call %0 %dopure% Sigset_Ops_Test
+call %0 %dopure% Simple_Message_Block_Test
+call %0 %dopure% Svc_Handler_Test
+call %0 %dopure% SOCK_Test
+call %0 %dopure% SOCK_Connector_Test
+call %0 %dopure% SOCK_Send_Recv_Test
+call %0 %dopure% SPIPE_Test
+call %0 %dopure% SString_Test
+call %0 %dopure% SV_Shared_Memory_Test
+call %0 %dopure% Task_Test
+call %0 %dopure% Thread_Manager_Test
+call %0 %dopure% Thread_Mutex_Test
+call %0 %dopure% Thread_Pool_Test
+call %0 %dopure% Timer_Queue_Test
+call %0 %dopure% Timeprobe_Test
+if exist ..\netsvcs\servers\main.exe call %0 %dopure% Time_Service_Test
+call %0 %dopure% Time_Value_Test
+call %0 %dopure% Tokens_Test
+call %0 %dopure% TSS_Test
+call %0 %dopure% UPIPE_SAP_Test
+call %0 %dopure% Upgradable_RW_Test
 
 goto done
 
@@ -149,14 +108,13 @@ goto done
 
 :justrun
 
-set exefile=%exedir%%arg%%deco%
-echo Running %exefile%
-if not exist %exefile%.exe goto nofile
+echo Running %arg%
+if not exist %arg%.exe goto nofile
 
-%exefile%.exe
+%arg%.exe
 if errorlevel 0 goto fine
 echo.
-echo %exefile% has FAILED!!!
+echo %arg% has FAILED!!!
 echo.
 type %temp%\log\%arg%.log | find /I "assertion failed"
 type %temp%\log\%arg%.log | find /I "not supported"
@@ -170,7 +128,7 @@ echo.
 goto done
 
 :nofile
-echo %exefile%.exe not found
+echo %arg%.exe not found
 goto done
 
 :fine
diff --git a/tests/run_tests.ksh b/tests/run_tests.ksh
deleted file mode 100755
index a4d7f0d8b17..00000000000
--- a/tests/run_tests.ksh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/ksh -f
-
-. ./run_tests.sh
-
-# EOF
-
diff --git a/tests/run_tests.psosim b/tests/run_tests.psosim
index 0d810f84ede..9d1a7846302 100755
--- a/tests/run_tests.psosim
+++ b/tests/run_tests.psosim
@@ -81,9 +81,6 @@ run SOCK_Connector_Test                 # uses SOCK_Connector
 #Future_Test: threads not supported on this platform
 #run Future_Test                         # uses Thread_Manager, Task
 
-#Future_Set_Test: threads not supported on this platform
-#run Future_Set_Test                         # uses Thread_Manager, Task
-
 #Reactors_Test: threads not supported on this platform
 #run Reactors_Test                       # uses Task, Mutex, Reactor
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9ef06a9bf17..7b933d8e37f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -153,8 +153,7 @@ run Task_Test                           # tests ACE_Thread_Manager, ACE_Task
 # Thread_Manager_Test: UNICOS fails due to no pthread_kill nor pthread_cancel
 test $Unicos || run Thread_Manager_Test                 # tests ACE_Thread_Manager, ACE_Task
 run Thread_Pool_Test                    # tests ACE_Thread_Manager, ACE_Task
-run Future_Test                         # tests ACE_Thread_Manager, ACE_Task, ACE_Future
-# run Future_Set_Test                     # tests ACE_Thread_Manager, ACE_Task, ACE_Future_Set
+run Future_Test                         # tests ACE_Thread_Manager, ACE_Task
 run RB_Tree_Test                        # tests ACE_RB_Tree, ACE_RB_Tree_Iterator
 run Reactors_Test                       # tests ACE_Task, ACE_Mutex, ACE_Reactor
 run Reactor_Exceptions_Test             # tests ACE_Reactor and C++ exceptions
@@ -187,8 +186,7 @@ fi
 # Tokens_Test: UNICOS fails dlopen() - no shared libs on UNICOS
 test $TOKEN && (test $chorus || test $Unicos || run Tokens_Test) # tests ACE_Token
 
-run Cache_Map_Manager_Test              # tests ACE_Cache_Map_Manager and ACE_Hash_Cache_Manager and caching features.
-run Map_Manager_Test                    # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
+#### run Map_Manager_Test                    # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
 run Map_Test                            # tests ACE_Map + Forward and Reverse Map Iterators.
 run Message_Queue_Notifications_Test    # tests ACE_Message_Queue + ACE_Reactor
 test $chorus || run Message_Queue_Test  # tests ACE_Message_Queue + Forward and Reverse Message Queue Iterators.
diff --git a/tests/run_tests.vxworks b/tests/run_tests.vxworks
index 4b7d45e8f5d..8d0257cdabf 100644
--- a/tests/run_tests.vxworks
+++ b/tests/run_tests.vxworks
@@ -135,10 +135,6 @@ ld < Future_Test
 write 2, "Future_Test ", 12
 ace_main; unld "Future_Test"
 
-#### ld < Future_Set_Test
-#### write 2, "Future_Set_Test ", 12
-#### ace_main; unld "Future_Set_Test"
-
 ld < Reactors_Test
 write 2, "Reactors_Test ", 14
 ace_main; unld "Reactors_Test"
diff --git a/tests/t.icc b/tests/t.icc
deleted file mode 100644
index bdd9992b852..00000000000
--- a/tests/t.icc
+++ /dev/null
@@ -1,277 +0,0 @@
-option
-	link(libSearchPath,'H:\ACE+TAO\ACE_wrappers\ace'),
-        incl(searchPath,'H:\ACE+TAO\ACE_wrappers'),
-        link(linkWithMultiThreadLib,yes)
-
-       	target "Reactor_Timer_Test.exe"
-        {
-	     source type(cpp) "Aio_Platform_Test.cpp"
-	}
-	target "Atomic_Op_Test.exe"
-	{
-             source type(cpp) "Atomic_Op_Test.cpp"
-	}
-	target "Barrier_Test.exe"
-	{
-	     source type(cpp) "Barrier_Test.cpp"
-	}
-        target "Basic_Types_Test.exe"
-	{
-             source type(cpp) "Basic_Types_Test.cpp"
-	}
-        target "Buffer_Stream_Test.exe"
-	{
-             source type(cpp) "Buffer_Stream_Test.cpp"
-	}
-        target "CDR_Test.exe"
-	{
-             source type(cpp) "CDR_Test.cpp"
-	}
-        target "Collection_Test.exe"
-	{
-             source type(cpp) "Collection_Test.cpp"
-	}
-        target "Conn_Test.exe"
-	{
-             source type(cpp) "Conn_Test.cpp"
-	}
-        target "DLL_Test.cpp"
-	{
-             source type(cpp) "DLL_Test.cpp"
-	}
-        target "DLList_Test.exe"
-	{
-             source type(cpp) "DLList_Test.cpp"
-	}
-        target "Dynamic_Priority_Test.exe"
-	{
-             source type(cpp) "Dynamic_Priority_Test.cpp"
-	}
-        target "Enum_Interfaces_Test.exe"
-	{
-             source type(cpp) "Enum_Interfaces_Test.cpp"
-	}
-        target "Env_Value_Test.exe"
-	{
-             source type(cpp) "Env_Value_Test.cpp"
-	}
-        target "Future_Test.exe"
-	{
-             source type(cpp) "Future_Test.cpp"
-	}
-        target "Handle_Set_Test.exe"
-	{
-             source type(cpp) "Handle_Set_Test.cpp"
-	}
-        target "Hash_Map_Manager_Test.exe"
-	{
-             source type(cpp) "Hash_Map_Manager_Test.cpp"
-	}
-        target "High_Res_Timer_Test.exe"
-	{
-             source type(cpp) "High_Res_Timer_Test.cpp"
-	}
-        target "IOStream_Test.exe"
-	{
-             source type(cpp) "IOStream_Test.cpp"
-	}
-        target "MM_Shared_Memory_Test.exe"
-	{
-             source type(cpp) "MM_Shared_Memory_Test.cpp"
-	}
-        target "MT_Reactor_Timer_Test.cpp"
-	{
-             source type(cpp) "MT_Reactor_Timer_Test.cpp"
-	}
-        target "MT_SOCK_Test.exe"
-	{
-             source type(cpp) "MT_SOCK_Test.cpp"
-	}
-        target "Map_Manager_Test.exe"
-	{
-             source type(cpp) "Map_Manager_Test.cpp"
-	}
-        target "Map_Test.exe"
-	{
-             source type(cpp) "Map_Test.cpp"
-	}
-        target "Mem_Map_Test.exe"
-	{
-             source type(cpp) "Mem_Map_Test.cpp"
-	}
-        target "Message_Block_Test.cpp"
-	{
-	     source type(cpp) "Message_Block_Test.cpp"
-	}
-        target "Message_Queue_Notifications_Test.exe"
-	{
-             source type(cpp) "Message_Queue_Notifications_Test.cpp"
-	}
-        target "Message_Queue_Test.exe"
-	{
-             source type(cpp) "Message_Queue_Test.cpp"
-	}
-        target "Naming_Test.exe"
-	{
-             source type(cpp) "Naming_Test.cpp"
-	}
-        target "Notify_Performance_Test.exe"
-	{
-             source type(cpp) "Notify_Performance_Test.cpp"
-	}
-        target "OrdMultiSet_Test.exe"
-	{
-             source type(cpp) "OrdMultiSet_Test.cpp"
-	}
-        target "Pipe_Test.exe"
-	{
-             source type(cpp) "Pipe_Test.cpp"
-	}
-        target "Priority_Buffer_Test.exe"
-	{
-             source type(cpp) "Priority_Buffer_Test.cpp"
-	}
-        target "Priority_Reactor_Test.exe"
-	{
-             source type(cpp) "Priority_Reactor_Test.cpp"
-	}
-        target "Priority_Task_Test.exe"
-	{
-             source type(cpp) "Priority_Task_Test.cpp"
-	}
-        target "Process_Mutex_Test.exe"
-	{
-             source type(cpp) "Process_Mutex_Test.cpp"
-	}
-        target "Process_Strategy_Test.exe"
-	{
-             source type(cpp) "Process_Strategy_Test.cpp"
-	}
-        target "Purgable_Map_Manager_Test.exe"
-	{
-             source type(cpp) "Purgable_Map_Manager_Test.cpp"
-	}
-        target "RB_Tree_Test.exe"
-	{
-             source type(cpp) "RB_Tree_Test.cpp"
-	}
-        target "Reactor_Exceptions_Test.exe"
-	{
-             source type(cpp) "Reactor_Exceptions_Test.cpp"
-	}
-        target "Reactor_Notify_Test.exe"
-	{
-             source type(cpp) "Reactor_Notify_Test.cpp"
-	}
-        target "Reactor_Performance_Test.exe"
-	{
-             source type(cpp) "Reactor_Performance_Test.cpp"
-	}
-        target "Reactor_Timer_Test.exe"
-	{
-             source type(cpp) "Reactor_Timer_Test.cpp"
-	}
-        target "Reactors_Test.exe"
-	{
-             source type(cpp) "Reactors_Test.cpp"
-	}
-        target "Reader_Writer_Test.exe"
-	{
-             source type(cpp) "Reader_Writer_Test.cpp"
-	}
-        target "Recursive_Mutex_Test.exe"
-	{
-             source type(cpp) "Recursive_Mutex_Test.cpp"
-	}
-        target "SOCK_Connector_Test.exe"
-	{
-             source type(cpp) "SOCK_Connector_Test.cpp"
-	}
-        target "SOCK_Test.exe"
-	{
-             source type(cpp) "SOCK_Test.cpp"
-	}
-        target "SPIPE_Test.exe"
-	{
-             source type(cpp) "SPIPE_Test.cpp"
-	}
-        target "SString_Test.exe"
-	{
-             source type(cpp) "SString_Test.cpp"
-	}
-        target "SV_Shared_Memory_Test.exe"
-	{
-             source type(cpp) "SV_Shared_Memory_Test.cpp"
-	}
-        target "Semaphore_Test.exe"
-	{
-             source type(cpp) "Semaphore_Test.cpp"
-	}
-        target "Service_Config_Test.exe"
-	{
-             source type(cpp) "Service_Config_Test.cpp"
-	}
-        target "Sigset_Ops_Test.exe"
-	{
-             source type(cpp) "Sigset_Ops_Test.cpp"
-	}
-        target "Simple_Message_Block_Test.exe"
-	{
-             source type(cpp) "Simple_Message_Block_Test.cpp"
-	}
-        target "TSS_Test.exe"
-	{
-             source type(cpp) "TSS_Test.cpp"
-	}
-        target "Task_Test.exe"
-	{
-             source type(cpp) "Task_Test.cpp"
-	}
-        target "Thread_Manager_Test.exe"
-	{
-             source type(cpp) "Thread_Manager_Test.cpp"
-	}
-        target "Thread_Mutex_Test.exe"
-	{
-             source type(cpp) "Thread_Mutex_Test.cpp"
-	}
-        target "Thread_Pool_Reactor_Test.exe"
-	{
-             source type(cpp) "Thread_Pool_Reactor_Test.cpp"
-	}
-        target "Thread_Pool_Test.exe"
-	{
-             source type(cpp) "Thread_Pool_Test.cpp"
-	}
-        target "Time_Service_Test.exe"
-	{
-             source type(cpp) "Time_Service_Test.cpp"
-	}
-        target "Time_Value_Test.exe"
-	{
-             source type(cpp) "Time_Value_Test.cpp"
-	}
-        target "Timeprobe_Test.exe"
-	{
-             source type(cpp) "Timeprobe_Test.cpp"
-	}
-        target "Timer_Queue_Test.exe"
-	{
-             source type(cpp) "Timer_Queue_Test.cpp"
-	}
-        target "Tokens_Test.exe"
-	{
-             source type(cpp) "Tokens_Test.cpp"
-	}
-        target "UPIPE_SAP_Test.exe"
-	{
-             source type(cpp) "UPIPE_SAP_Test.cpp"
-	}
-        target "Upgradable_RW_Test.exe"
-	{
-             source type(cpp) "Upgradable_RW_Test.cpp"
-	}
-        target "XtReactor_Test.exe"
-	{
-             source type(cpp) "XtReactor_Test.cpp"
-	}
diff --git a/tests/test_config.h b/tests/test_config.h
index 218d41bbe2e..cd825452cc7 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -6,15 +6,9 @@
 // = FILENAME
 //    test_config.h
 //
-// = DESCRIPTION
-//
-//   This file factors out common macros and other utilities used by the
-//   ACE automated regression tests.
-//
 // = AUTHOR
-//    Prashant Jain <pjain@cs.wustl.edu>,
-//    Tim Harrison <harrison@cs.wustl.edu>,
-//    and David Levine <levine@cs.wustl.edu>
+//    Prashant Jain <pjain@cs.wustl.edu>, Tim Harrison
+//    <harrison@cs.wustl.edu>, and David Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -114,7 +108,7 @@
 #define MAKE_PIPE_NAME MAKE_PIPE_NAME_A
 #endif /* UNICODE */
 
-#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_WINCE)
 const size_t ACE_MAX_CLIENTS = 4;
 #else
 const size_t ACE_MAX_CLIENTS = 30;
@@ -126,8 +120,13 @@ const size_t ACE_MAX_TIMERS = 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_THREADS = 4;
+#if defined (__Lynx__)
+  const size_t ACE_MAX_PROCESSES = 4;
+  const size_t ACE_MAX_THREADS = 2;
+#else  /* ! __Lynx__ */
+  const size_t ACE_MAX_PROCESSES = 10;
+  const size_t ACE_MAX_THREADS = 4;
+#endif /* ! __Lynx__ */
 
 char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 
@@ -168,12 +167,12 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
   // 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) \
-  ASYS_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ASYS_TEXT ("%s%s%s"), \
-                   ASYS_TEXT (ACE_LOG_DIRECTORY_A), \
-                   ACE::basename (NAME, ASYS_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A)), \
-                   ASYS_TEXT (ACE_LOG_FILE_EXT_NAME_A)); \
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) Deleting old log file %s (if any)\n\n"), temp)); \
+  char temp[MAXPATHLEN]; \
+  ACE_OS::sprintf (temp, "%s%s%s", \
+                   ACE_LOG_DIRECTORY_A, \
+                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
+                   ACE_LOG_FILE_EXT_NAME_A); \
+  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) \
@@ -189,12 +188,12 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 #endif /* ghs */
 #else /* ! VXWORKS */
 #define ACE_INIT_LOG(NAME) \
-  ASYS_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ASYS_TEXT ("%s%s%s"), \
-                   ASYS_TEXT (ACE_LOG_DIRECTORY_A), \
-                   ACE::basename (NAME, ASYS_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A)), \
-                   ASYS_TEXT (ACE_LOG_FILE_EXT_NAME_A)); \
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) Deleting old log file %s (if any)\n\n"), temp)); \
+  char temp[MAXPATHLEN]; \
+  ACE_OS::sprintf (temp, "%s%s%s", \
+                   ACE_LOG_DIRECTORY_A, \
+                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
+                   ACE_LOG_FILE_EXT_NAME_A); \
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting old log file %s (if any)\n\n", temp)); \
   ACE_OS::unlink (temp);
 #endif /* ! VXWORKS */
 
@@ -236,7 +235,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
   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)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   delete this->output_file_;
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 }
@@ -244,23 +243,16 @@ ACE_Test_Output::~ACE_Test_Output (void)
 int
 ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append)
 {
-#if defined (ACE_HAS_PHARLAP)
-  // For PharLap, just send it all to the host console for now - redirect
-  // to a file there for saving/analysis.
-  EtsSelectConsole(ETS_CO_HOST);
-  ACE_LOG_MSG->msg_ostream (&cout);
-
-#else
   ASYS_TCHAR temp[MAXPATHLEN];
   // Ignore the error value since the directory may already exist.
   LPCTSTR test_dir;
 
 #if !defined (ACE_HAS_WINCE)
-  test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR"));
+  test_dir = ACE_OS::getenv ("ACE_TEST_DIR");
 
   if (test_dir == 0)
 #endif /* ACE_HAS_WINCE */
-    test_dir = ACE_TEXT ("");
+    test_dir = ASYS_TEXT ("");
 
   ACE_OS::sprintf (temp,
                    ASYS_TEXT ("%s%s%s%s"),
@@ -270,35 +262,36 @@ ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append)
                    ACE_LOG_FILE_EXT_NAME_A);
 
 #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.
-  ACE_HANDLE fd = ACE_OS::open (temp, O_WRONLY | O_CREAT, 0x644);
+  // 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 = ACE_OS::open (temp, O_WRONLY | O_CREAT, 0x644);
   if (fd != ERROR)
     {
       ACE_OS::close (fd);
       ACE_OS::unlink (temp);
     }
-# else /* ! VXWORKS */
+#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
+  // 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 (ASYS_TEXT (ACE_LOG_DIRECTORY_A));
-# endif /* ! VXWORKS */
+  ACE_OS::mkdir (ACE_LOG_DIRECTORY_A);
+#endif /* ! VXWORKS */
 
-# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   int flags = ios::out;
   if (append)
     flags |= ios::app;
   else
     flags |= ios::trunc;
 
-  this->output_file_->open (ASYS_ONLY_MULTIBYTE_STRING (temp),
-                            flags);
+  this->output_file_->open (temp, flags);
   if (this->output_file_->bad ())
-    return -1;
+    {
+      return -1;
+    }
 #else /* when ACE_LACKS_IOSTREAM_TOTALLY */
   ASYS_TCHAR *fmode = 0;
   if (append)
@@ -306,11 +299,9 @@ ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append)
   else
     fmode = ASYS_TEXT ("w");
   this->output_file_ = ACE_OS::fopen (temp, fmode);
-# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
+#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
   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 );
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
diff --git a/tests/tests.bpg b/tests/tests.bpg
new file mode 100644
index 00000000000..548dc0c9501
--- /dev/null
+++ b/tests/tests.bpg
@@ -0,0 +1,202 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = Aio_Platform_Test Atomic_Op_Test Barrier_Test Basic_Types_Test \
+  Buffer_Stream_Test Conn_Test Dynamic_Priority_Test Enum_Interfaces_Test Env_Value_Test Future_Test \
+  Handle_Set_Test Hash_Map_Manager_Test Map_Manager_Test MM_Shared_Memory_Test \
+  MT_Reactor_Timer_Test MT_SOCK_Test Mem_Map_Test Message_Block_Test \
+  Message_Queue_Notifications_Test.cpp Message_Queue_Test Naming_Test \
+  Notify_Performance_Test OrdMultiSet_Test Pipe_Test Priority_Buffer_Test \
+  Priority_Reactor_Test Priority_Task_Test Process_Mutex_Test \
+  Process_Strategy_Test Reactor_Exceptions_Test Reactor_Notify_Test \
+  Reactor_Performance_Test Reactor_Timer_Test Reactors_Test Reader_Writer_Test \
+  Recursive_Mutex_Test SOCK_Connector_Test SOCK_Test SPIPE_Test SString_Test \
+  SV_Shared_Memory_Test Semaphore_Test Service_Config_Test Sigset_Ops_Test \
+  Simple_Message_Block_Test TSS_Test Task_Test Thread_Manager_Test \
+  Thread_Mutex_Test Thread_Pool_Test Timeprobe_Test Time_Service_Test Time_Value_Test \
+  Timer_Queue_Test Tokens_Test Upgradable_RW_Test UPIPE_SAP_Test XtReactor_Test
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+Aio_Platform_Test: Aio_Platform_Test.bpr
+  $(MAKE)
+
+Atomic_Op_Test: Atomic_Op_Test.bpr
+  $(MAKE)
+
+Barrier_Test: Barrier_Test.bpr
+  $(MAKE)
+
+Basic_Types_Test: Basic_Types_Test.bpr
+  $(MAKE)
+
+Buffer_Stream_Test: Buffer_Stream_Test.bpr
+  $(MAKE)
+
+Conn_Test: Conn_Test.bpr
+  $(MAKE)
+
+Dynamic_Priority_Test: Dynamic_Priority_Test.bpr
+  $(MAKE)
+
+Enum_Interfaces_Test: Enum_Interfaces_Test.bpr
+  $(MAKE)
+
+Env_Value_Test: Env_Value_Test.bpr
+  $(MAKE)
+
+Future_Test: Future_Test.bpr
+  $(MAKE)
+
+Handle_Set_Test: Handle_Set_Test.bpr
+  $(MAKE)
+
+Hash_Map_Manager_Test: Hash_Map_Manager_Test.bpr
+  $(MAKE)
+
+Map_Manager_Test: Map_Manager_Test.bpr
+  $(MAKE)
+
+MM_Shared_Memory_Test: MM_Shared_Memory_Test.bpr
+  $(MAKE)
+
+MT_Reactor_Timer_Test: MT_Reactor_Timer_Test.bpr
+  $(MAKE)
+
+MT_SOCK_Test: MT_SOCK_Test.bpr
+  $(MAKE)
+
+Mem_Map_Test: Mem_Map_Test.bpr
+  $(MAKE)
+
+Message_Block_Test: Message_Block_Test.bpr
+  $(MAKE)
+
+Message_Queue_Notifications_Test.cpp: Message_Queue_Notifications_Test.cpp.bpr
+  $(MAKE)
+
+Message_Queue_Test: Message_Queue_Test.bpr
+  $(MAKE)
+
+Naming_Test: Naming_Test.bpr
+  $(MAKE)
+
+Notify_Performance_Test: Notify_Performance_Test.bpr
+  $(MAKE)
+
+OrdMultiSet_Test: OrdMultiSet_Test.bpr
+  $(MAKE)
+
+Pipe_Test: Pipe_Test.bpr
+  $(MAKE)
+
+Priority_Buffer_Test: Priority_Buffer_Test.bpr
+  $(MAKE)
+
+Priority_Reactor_Test: Priority_Reactor_Test.bpr
+  $(MAKE)
+
+Priority_Task_Test: Priority_Task_Test.bpr
+  $(MAKE)
+
+Process_Mutex_Test: Process_Mutex_Test.bpr
+  $(MAKE)
+
+Process_Strategy_Test: Process_Strategy_Test.bpr
+  $(MAKE)
+
+Reactor_Exceptions_Test: Reactor_Exceptions_Test.bpr
+  $(MAKE)
+
+Reactor_Notify_Test: Reactor_Notify_Test.bpr
+  $(MAKE)
+
+Reactor_Performance_Test: Reactor_Performance_Test.bpr
+  $(MAKE)
+
+Reactor_Timer_Test: Reactor_Timer_Test.bpr
+  $(MAKE)
+
+Reactors_Test: Reactors_Test.bpr
+  $(MAKE)
+
+Reader_Writer_Test: Reader_Writer_Test.bpr
+  $(MAKE)
+
+Recursive_Mutex_Test: Recursive_Mutex_Test.bpr
+  $(MAKE)
+
+SOCK_Connector_Test: SOCK_Connector_Test.bpr
+  $(MAKE)
+
+SOCK_Test: SOCK_Test.bpr
+  $(MAKE)
+
+SPIPE_Test: SPIPE_Test.bpr
+  $(MAKE)
+
+SString_Test: SString_Test.bpr
+  $(MAKE)
+
+SV_Shared_Memory_Test: SV_Shared_Memory_Test.bpr
+  $(MAKE)
+
+Semaphore_Test: Semaphore_Test.bpr
+  $(MAKE)
+
+Service_Config_Test: Service_Config_Test.bpr
+  $(MAKE)
+
+Sigset_Ops_Test: Sigset_Ops_Test.bpr
+  $(MAKE)
+
+Simple_Message_Block_Test: Simple_Message_Block_Test.bpr
+  $(MAKE)
+
+TSS_Test: TSS_Test.bpr
+  $(MAKE)
+
+Task_Test: Task_Test.bpr
+  $(MAKE)
+
+Thread_Manager_Test: Thread_Manager_Test.bpr
+  $(MAKE)
+
+Thread_Mutex_Test: Thread_Mutex_Test.bpr
+  $(MAKE)
+
+Thread_Pool_Test: Thread_Pool_Test.bpr
+  $(MAKE)
+
+Timeprobe_Test: Timeprobe_Test.bpr
+  $(MAKE)
+
+Time_Service_Test: Time_Service_Test.bpr
+  $(MAKE)
+
+Time_Value_Test: Time_Value_Test.bpr
+  $(MAKE)
+
+Timer_Queue_Test: Timer_Queue_Test.bpr
+  $(MAKE)
+
+Tokens_Test: Tokens_Test.bpr
+  $(MAKE)
+
+Upgradable_RW_Test: Upgradable_RW_Test.bpr
+  $(MAKE)
+
+UPIPE_SAP_Test: UPIPE_SAP_Test.bpr
+  $(MAKE)
+
+XtReactor_Test: XtReactor_Test.bpr
+  $(MAKE)
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 4bf8393e600..48f082785e8 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>

+Project: "ACE_Init_Test"=".\ACE_Init_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+Project: "Atomic_Op_Test"=".\Atomic_Op_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -27,7 +27,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>

+Project: "Barrier_Test"=".\Barrier_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +39,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>

+Project: "Basic_Types_Test"=".\Basic_Types_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -51,7 +51,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>

+Project: "Buffer_Stream_Test"=".\Buffer_Stream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

+Project: "CDR_Test"=".\CDR_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,7 +75,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Collection_Test"=".\Collection_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -87,7 +87,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

+Project: "Conn_Test"=".\Conn_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -99,7 +99,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>

+Project: "DLL_Test"=".\DLL_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -111,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>

+Project: "DLList_Test"=".\DLList_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,7 +123,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>

+Project: "Dynamic_Priority_Test"=".\Dynamic_Priority_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -135,7 +135,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>

+Project: "Enum_Interfaces_Test"=".\Enum_Interfaces_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -147,7 +147,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>

+Project: "Env_Value_Test"=".\Env_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +159,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>

+Project: "Future_Test"=".\Future_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -171,7 +171,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>

+Project: "Handle_Set_Test"=".\Handle_Set_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -183,7 +183,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Manager_Test"=".\Hash_Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -195,7 +195,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>

+Project: "High_Res_Timer_Test"=".\High_Res_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -207,7 +207,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "IOStream_Test"=".\IOStream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -219,7 +219,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

+Project: "MM_Shared_Memory_Test"=".\MM_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -231,7 +231,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>

+Project: "MT_Reactor_Timer_Test"=".\MT_Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -243,7 +243,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "MT_SOCK_Test"=".\MT_SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -255,7 +255,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "Map_Manager_Test"=".\Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -267,7 +267,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>

+Project: "Map_Test"=".\Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -279,7 +279,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Mem_Map_Test"=".\Mem_Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -291,7 +291,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>

+Project: "Message_Block_Test"=".\Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -303,7 +303,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Notifications_Test"=".\Message_Queue_Notifications_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -315,7 +315,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Test"=".\Message_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -327,7 +327,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+Project: "Naming_Test"=".\Naming_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -339,7 +339,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>

+Project: "New_Fail_Test"=".\New_Fail_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -351,7 +351,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>

+Project: "Notify_Performance_Test"=".\Notify_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -363,7 +363,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>

+Project: "OrdMultiSet_Test"=".\OrdMultiSet_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -375,7 +375,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

+Project: "Pipe_Test"=".\Pipe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -387,7 +387,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

+Project: "Priority_Buffer_Test"=".\Priority_Buffer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -399,7 +399,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>

+Project: "Priority_Reactor_Test"=".\Priority_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -411,7 +411,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>

+Project: "Priority_Task_Test"=".\Priority_Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -423,7 +423,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>

+Project: "Process_Mutex_Test"=".\Process_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -435,7 +435,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>

+Project: "Process_Strategy_Test"=".\Process_Strategy_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -447,7 +447,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>

+Project: "RB_Tree_Test"=".\RB_Tree_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -459,7 +459,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>

+Project: "Reactor_Exceptions_Test"=".\Reactor_Exceptions_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -471,7 +471,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>

+Project: "Reactor_Notify_Test"=".\Reactor_Notify_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -483,7 +483,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Exceptions_Test"=.\Reactor_Exceptions_Test.dsp - Package Owner=<4>

+Project: "Reactor_Performance_Test"=".\Reactor_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -495,7 +495,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>

+Project: "Reactor_Timer_Test"=".\Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -507,7 +507,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>

+Project: "Reactors_Test"=".\Reactors_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -519,7 +519,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "Reader_Writer_Test"=".\Reader_Writer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -531,7 +531,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>

+Project: "Recursive_Mutex_Test"=".\Recursive_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -543,7 +543,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>

+Project: "Reverse_Lock_Test"=".\Reverse_Lock_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -555,7 +555,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>

+Project: "SOCK_Connector_Test"=".\SOCK_Connector_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -567,7 +567,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

+Project: "SOCK_Send_Recv_Test"=".\SOCK_Send_Recv_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -579,7 +579,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

+Project: "SOCK_Test"=".\SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -591,7 +591,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

+Project: "SPIPE_Test"=".\SPIPE_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -603,7 +603,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>

+Project: "SString_Test"=".\SString_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -615,7 +615,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>

+Project: "SV_Shared_Memory_Test"=".\SV_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -627,7 +627,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>

+Project: "Semaphore_Test"=".\Semaphore_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -639,7 +639,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "Service_Config_Test"=".\Service_Config_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -651,7 +651,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>

+Project: "Sigset_Ops_Test"=".\Sigset_Ops_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -663,7 +663,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>

+Project: "Simple_Message_Block_Test"=".\Simple_Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -675,7 +675,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Sigset_Ops_Test"=.\Sigset_Ops_Test.dsp - Package Owner=<4>

+Project: "Svc_Handler_Test"=".\Svc_Handler_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -687,7 +687,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>

+Project: "TSS_Test"=".\TSS_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -699,7 +699,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>

+Project: "Task_Test"=".\Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -711,7 +711,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>

+Project: "Thread_Manager_Test"=".\Thread_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -723,7 +723,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>

+Project: "Thread_Mutex_Test"=".\Thread_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -735,7 +735,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Reactor_Test"=".\Thread_Pool_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -747,7 +747,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Test"=".\Thread_Pool_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -759,7 +759,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

+Project: "Time_Service_Test"=".\Time_Service_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -771,7 +771,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>

+Project: "Time_Value_Test"=".\Time_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -783,7 +783,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>

+Project: "Timeprobe_Test"=".\Timeprobe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -795,7 +795,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>

+Project: "Timer_Queue_Test"=".\Timer_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -807,7 +807,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>

+Project: "Tokens_Test"=".\Tokens_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -819,7 +819,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>

+Project: "UPIPE_SAP_Test"=".\UPIPE_SAP_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -831,31 +831,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>

+Project: "Upgradable_RW_Test"=".\Upgradable_RW_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/tests/tests_bcc.ide b/tests/tests_bcc.ide
new file mode 100644
index 00000000000..ad4a71ea784
--- /dev/null
+++ b/tests/tests_bcc.ide
diff --git a/tests/tests_pharlap_msvc.lnk b/tests/tests_pharlap_msvc.lnk
deleted file mode 100644
index 39af043e409..00000000000
--- a/tests/tests_pharlap_msvc.lnk
+++ /dev/null
@@ -1,72 +0,0 @@
-! $Id$
-! Application linker command file for ACE tests.
-
-! Visual C++ Compiler with PC-Compatible Target
-@vc.emb
-
-! PC-Compatible Screen Driver
-!@pcat_sc.emb
-
-! PC-Compatible Keyboard Driver
-!@pcat_kb.emb
-
-! Multithread Support, Debug version
-@vcmtd.emb
-
-! Structured Exception Handling
-@strucexc.emb
-
-! Floating Point Emulator
-!@fpem.emb
-
-! MS-DOS Compatible File System
-!@lfs.emb
-
-! DLL Loader
-!@ldr.emb
-
-! TCP/IP Support
-@winsock.emb
-
-! TCP/IP Driver
-!@eth-smc.emb      ! SMC 8003/8216/8416
-!@eth-smc9.emb     ! SMC 91C92/91C94
-@eth-3com.emb     ! 3Com 3C509
-!@eth-ne2k.emb     ! NE2000
-!@eth-dec.emb      ! Digital 2114x
-!@ppp16550.emb     ! PPP 8250/16450/16550
-!@slp16550.emb     ! SLIP/CSLIP  8250/16450/16550
-
-! MicroWeb Server
-!@microweb.emb
-
-! FTP Server
-!@ftpserve.emb
-
-! Event Logging
-!@log.emb
-
-! PC Card Support
-!@pccard.emb
-
-! PC Card Enablers
-!@cs-ser.emb   ! Serial Ports
-!@cs-ide.emb   ! ATA Disk Drives
-!@cs-3com.emb  ! 3Com Ethernet
-!@cs-ne2k.emb  ! NE2000 Ethernet
-
-! M-Systems Flash Support
-!@pcfd.emb         ! PC-FD
-!@dochip2.emb      ! DiskOnChip 2000
-
-! The section below contains the user-specified switches from the
-! Extra Application Link File Switches section of the Extra Linker Switches
-! property sheet.
-!
-
-! 32K stack works well. The 8K default is way too small
--stack 32767
-
-! Many of the ACE tests are too large to load in the default space without
-! running over the ROM area at some point, so go up.
--offset 10_0000h
diff --git a/tests/version_tests/Cache_Map_Manager_Test.dsp b/tests/version_tests/Cache_Map_Manager_Test.dsp
deleted file mode 100644
index 0b346f34c23..00000000000
--- a/tests/version_tests/Cache_Map_Manager_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Cache_Map_Manager_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Cache_Map_Manager_Test - Win32 DLL Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "atomic_op_test.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "atomic_op_test.mak" CFG="Cache_Map_Manager_Test - Win32 DLL Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Release"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Debug"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Release"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Cache_Map_Manager_Test"

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Cache_Map_Manager_Test - Win32 DLL Debug"

-# Name "Cache_Map_Manager_Test - Win32 DLL Release"

-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"

-# Name "Cache_Map_Manager_Test - Win32 static Debug"

-# Name "Cache_Map_Manager_Test - Win32 static Release"

-# Name "Cache_Map_Manager_Test - Win32 static Unicode Debug"

-# Name "Cache_Map_Manager_Test - Win32 static Unicode Release"

-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Cache_Map_Manager_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=..\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/version_tests/Future_Set_Test.dsp b/tests/version_tests/Future_Set_Test.dsp
deleted file mode 100644
index 00bd74156ef..00000000000
--- a/tests/version_tests/Future_Set_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Future_Set_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Future_Set_Test - Win32 DLL Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "atomic_op_test.mak".

-!MESSAGE

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "atomic_op_test.mak" CFG="Future_Set_Test - Win32 DLL Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Future_Set_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Future_Set_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Release"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Future_Set_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Debug"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Future_Set_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Release"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Future_Set_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Future_Set_Test"

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Future_Set_Test - Win32 DLL Debug"

-# Name "Future_Set_Test - Win32 DLL Release"

-# Name "Future_Set_Test - Win32 DLL Unicode Debug"

-# Name "Future_Set_Test - Win32 static Debug"

-# Name "Future_Set_Test - Win32 static Release"

-# Name "Future_Set_Test - Win32 static Unicode Debug"

-# Name "Future_Set_Test - Win32 static Unicode Release"

-# Name "Future_Set_Test - Win32 DLL Unicode Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Future_Set_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=..\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw
index 46a393ec13d..87a67aa721d 100644
--- a/tests/version_tests/version_tests.dsw
+++ b/tests/version_tests/version_tests.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Ace_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>

+Project: "Ace_Init_Test"=".\ACE_Init_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+Project: "Atomic_Op_Test"=".\Atomic_Op_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -27,7 +27,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>

+Project: "Barrier_Test"=".\Barrier_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +39,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>

+Project: "Basic_Types_Test"=".\Basic_Types_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -51,7 +51,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>

+Project: "Buffer_Stream_Test"=".\Buffer_Stream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

+Project: "CDR_Test"=".\CDR_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,7 +75,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Collection_Test"=".\Collection_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -87,7 +87,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

+Project: "Conn_Test"=".\Conn_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -99,7 +99,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>

+Project: "DLL_Test"=".\DLL_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -111,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>

+Project: "DLList_Test"=".\DLList_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,7 +123,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>

+Project: "Dynamic_Priority_Test"=".\Dynamic_Priority_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -135,7 +135,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>

+Project: "Enum_Interfaces_Test"=".\Enum_Interfaces_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -147,7 +147,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>

+Project: "Env_Value_Test"=".\Env_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +159,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>

+Project: "Future_Test"=".\Future_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -171,7 +171,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>

+Project: "Handle_Set_Test"=".\Handle_Set_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -183,7 +183,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Manager_Test"=".\Hash_Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -195,7 +195,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>

+Project: "High_Res_Timer_Test"=".\High_Res_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -207,7 +207,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "IOStream_Test"=".\IOStream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -219,7 +219,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

+Project: "MM_Shared_Memory_Test"=".\MM_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -231,7 +231,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>

+Project: "MT_SOCK_Test"=".\MT_SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -243,7 +243,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "Map_Manager_Test"=".\Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -255,7 +255,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>

+Project: "Map_Test"=".\Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -267,7 +267,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Mem_Map_Test"=".\Mem_Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -279,7 +279,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>

+Project: "Message_Block_Test"=".\Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -291,7 +291,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Notifications_Test"=".\Message_Queue_Notifications_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -303,7 +303,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Test"=".\Message_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -315,7 +315,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+Project: "Mt_Reactor_Timer_Test"=".\MT_Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -327,7 +327,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>

+Project: "Naming_Test"=".\Naming_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -339,7 +339,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Mt_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "New_Fail_Test"=".\New_Fail_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -351,7 +351,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>

+Project: "Notify_Performance_Test"=".\Notify_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -363,7 +363,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>

+Project: "OrdMultiSet_Test"=".\OrdMultiSet_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -375,7 +375,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

+Project: "Pipe_Test"=".\Pipe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -387,7 +387,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

+Project: "Priority_Buffer_Test"=".\Priority_Buffer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -399,7 +399,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>

+Project: "Priority_Reactor_Test"=".\Priority_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -411,7 +411,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>

+Project: "Priority_Task_Test"=".\Priority_Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -423,7 +423,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>

+Project: "Process_Mutex_Test"=".\Process_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -435,7 +435,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>

+Project: "Process_Strategy_Test"=".\Process_Strategy_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -447,7 +447,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>

+Project: "RB_Tree_Test"=".\RB_Tree_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -459,7 +459,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>

+Project: "Reactor_Exception_Test"=".\Reactor_Exception_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -471,7 +471,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>

+Project: "Reactor_Notify_Test"=".\Reactor_Notify_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -483,7 +483,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Exception_Test"=.\Reactor_Exception_Test.dsp - Package Owner=<4>

+Project: "Reactor_Performance_Test"=".\Reactor_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -495,7 +495,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>

+Project: "Reactor_Timer_Test"=".\Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -507,7 +507,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>

+Project: "Reactors_Test"=".\Reactors_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -519,7 +519,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "Reader_Writer_Test"=".\Reader_Writer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -531,7 +531,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>

+Project: "Recursive_Mutex_Test"=".\Recursive_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -543,7 +543,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>

+Project: "Reverse_Lock_Test"=".\Reverse_Lock_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -555,7 +555,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>

+Project: "SOCK_Connector_Test"=".\SOCK_Connector_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -567,7 +567,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

+Project: "SOCK_Send_Recv_Test"=".\SOCK_Send_Recv_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -579,7 +579,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

+Project: "SOCK_Test"=".\SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -591,7 +591,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

+Project: "SPIPE_Test"=".\SPIPE_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -603,7 +603,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>

+Project: "SString_Test"=".\SString_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -615,7 +615,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>

+Project: "SV_Shared_Memory_Test"=".\SV_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -627,7 +627,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>

+Project: "Semaphore_Test"=".\Semaphore_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -639,7 +639,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "Service_Config_Test"=".\Service_Config_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -651,7 +651,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>

+Project: "Sigset_Op_Test"=".\Sigset_Op_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -663,7 +663,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>

+Project: "Simple_Message_Block_Test"=".\Simple_Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -675,7 +675,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Sigset_Op_Test"=.\Sigset_Op_Test.dsp - Package Owner=<4>

+Project: "Svc_Handler_Test"=".\Svc_Handler_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -687,7 +687,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>

+Project: "TSS_Test"=".\TSS_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -699,7 +699,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>

+Project: "Task_Test"=".\Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -711,7 +711,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>

+Project: "Thread_Manager_Test"=".\Thread_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -723,7 +723,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>

+Project: "Thread_Mutex_Test"=".\Thread_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -735,7 +735,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Reactor_Test"=".\Thread_Pool_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -747,7 +747,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Test"=".\Thread_Pool_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -759,7 +759,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

+Project: "Time_Service_Test"=".\Time_Service_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -771,7 +771,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>

+Project: "Time_Value_Test"=".\Time_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -783,7 +783,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>

+Project: "Timeprobe_Test"=".\Timeprobe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -795,7 +795,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>

+Project: "Timer_Queue_Test"=".\Timer_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -807,7 +807,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>

+Project: "Tokens_Test"=".\Tokens_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -819,7 +819,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>

+Project: "UPIPE_SAP_Test"=".\UPIPE_SAP_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -831,31 +831,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>

+Project: "Upgradable_RW_Test"=".\Upgradable_RW_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/websvcs/lib/Makefile b/websvcs/lib/Makefile
index 127a1ade77e..5b1ac0069ea 100644
--- a/websvcs/lib/Makefile
+++ b/websvcs/lib/Makefile
@@ -47,15 +47,21 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
diff --git a/websvcs/lib/URL_Addr.cpp b/websvcs/lib/URL_Addr.cpp
index 53d71e504e5..23de49c704b 100644
--- a/websvcs/lib/URL_Addr.cpp
+++ b/websvcs/lib/URL_Addr.cpp
@@ -200,8 +200,7 @@ ACE_HTTP_Addr::ACE_HTTP_Addr (LPCTSTR host_name,
 }
 
 ACE_HTTP_Addr::ACE_HTTP_Addr (const ACE_HTTP_Addr &addr)
-  :  ACE_URL_Addr (),
-     hostname_ (0),
+  :  hostname_ (0),
      port_number_ (0),
      path_ (0),
      query_ (0)
@@ -270,7 +269,7 @@ ACE_HTTP_Addr::set (const ACE_HTTP_Addr &addr)
   return 0;
 }
 
-void
+void 
 ACE_HTTP_Addr::clear (void)
 {
   if (this->hostname_ != 0)
@@ -286,7 +285,7 @@ ACE_HTTP_Addr::url_size (int flags) const
 {
   // Notice that we cannot hard-code the value because the size in
   // wchar's may be different.
-  size_t size =
+  size_t size = 
     + sizeof (ASYS_TEXT ("http://"))
     + sizeof (ASYS_TEXT ("/:?")); // separators
 
@@ -320,7 +319,7 @@ path_copy (LPCTSTR begin,
            LPTSTR& target,
            LPCTSTR src)
 {
-  // Copy one character at a time, if we find a /../ we go back to the
+  // Copy one character at a time, if we find a /../ we go back to the 
   // previous '/'
   for (; *src != 0; ++src)
     {
@@ -377,7 +376,7 @@ ACE_HTTP_Addr::create_relative_address (LPCTSTR url) const
                       ASYS_TCHAR [n],
                       0);
 
-      // We copy the contens of <path> into <buf>; but simplifying the
+      // We copy the contens of <path> into <buf>; but simplifying the 
       // path, to avoid infinite loop like:
       // "foo/../foo/../foo/../foo/../foo/index.html"
       //
@@ -451,7 +450,8 @@ ACE_HTTP_Addr::string_to_addr (LPCTSTR address)
 
   LPCTSTR string = address;
   string += http_size;
-  string += 2; // == strlen ("//");
+  ASYS_TCHAR separator[] = ASYS_TEXT("//");
+  string += sizeof(separator)/sizeof(separator[0]) - 1;
 
   // Make a copy of the string to manipulate it.
   ACE_ALLOCATOR_RETURN (this->hostname_, ACE_OS::strdup (string), -1);
@@ -473,7 +473,7 @@ ACE_HTTP_Addr::string_to_addr (LPCTSTR address)
         }
       ACE_ALLOCATOR_RETURN (this->path_, ACE_OS::strdup (path_start), -1);
     }
-
+  
   // By now t is null terminated at the start of the path, find the
   // port (if present).
   ASYS_TCHAR *port_start = ACE_OS::strchr(this->hostname_, ':');
@@ -496,7 +496,7 @@ ACE_HTTP_Addr::addr_to_string (LPTSTR buffer,
 {
   if (size < this->url_size (flags))
     return -1;
-
+  
   if (this->hostname_ == 0)
     return -1;
 
@@ -511,7 +511,7 @@ ACE_HTTP_Addr::addr_to_string (LPTSTR buffer,
     {
      n += ACE_OS::sprintf (buffer + n, "%s", this->hostname_);
     }
-
+  
   if (this->port_number_ != ACE_DEFAULT_HTTP_PORT)
     {
       n += ACE_OS::sprintf (buffer + n, ":%d", this->port_number_);
@@ -556,8 +556,7 @@ ACE_FTP_Addr::ACE_FTP_Addr (LPCTSTR host_name,
 }
 
 ACE_FTP_Addr::ACE_FTP_Addr (const ACE_FTP_Addr& addr)
-  :  ACE_URL_Addr (),
-     user_ (0),
+  :  user_ (0),
      passwd_ (0),
      hostname_ (0),
      path_ (0)
@@ -640,7 +639,7 @@ ACE_FTP_Addr::url_size (int flags) const
 {
   // Notice that we cannot hard-code the value because the size in
   // wchar's may be different.
-  size_t size =
+  size_t size = 
     + sizeof (ASYS_TEXT ("ftp://"))
     + sizeof (ASYS_TEXT ("@:/")); // separators
 
@@ -722,7 +721,8 @@ ACE_FTP_Addr::string_to_addr (LPCTSTR address)
 
   LPCTSTR string = address;
   string += ftp_size;
-  string += 2; // == strlen ("//");
+  ASYS_TCHAR separator[] = ASYS_TEXT("//");
+  string += sizeof(separator)/sizeof(separator[0]) - 1;
 
   // Make a copy of the string to manipulate it.
   ASYS_TCHAR *t;
@@ -844,7 +844,7 @@ ACE_Mailto_Addr::set (const ACE_Mailto_Addr &addr)
   return 0;
 }
 
-void
+void 
 ACE_Mailto_Addr::clear (void)
 {
   if (this->user_ != 0)
@@ -889,7 +889,7 @@ ACE_Mailto_Addr::addr_to_string (LPTSTR buffer,
       n += ACE_OS::sprintf (buffer + n, ASYS_TEXT ("?%s"),
                             this->headers_);
     }
-
+  
   return 0;
 }
 
@@ -947,3 +947,4 @@ ACE_Mailto_Addr::accept (ACE_URL_Addr_Visitor* visitor)
 {
   return visitor->visit (this);
 }
+
diff --git a/websvcs/lib/URL_Addr.i b/websvcs/lib/URL_Addr.i
index fe07bdf5a59..6d4d03d300c 100644
--- a/websvcs/lib/URL_Addr.i
+++ b/websvcs/lib/URL_Addr.i
@@ -4,8 +4,7 @@
 
 ACE_INLINE
 ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr& address)
-  :  ACE_Addr (),
-     url_ (address.url_ == 0 ? 0 : ACE_OS::strdup (address.url_))
+  :  url_ (address.url_ == 0 ? 0 : ACE_OS::strdup (address.url_))
 {
 }
 
@@ -31,7 +30,7 @@ ACE_URL_Addr::set_url (LPTSTR url)
   this->url_ = url;
 }
 
-ACE_INLINE u_long
+ACE_INLINE u_long 
 ACE_URL_Addr::hash (void) const
 {
   return ACE::hash_pjw (this->url_);
diff --git a/websvcs/tests/Makefile b/websvcs/tests/Makefile
index 28412f212b5..cdd9a16c3fc 100644
--- a/websvcs/tests/Makefile
+++ b/websvcs/tests/Makefile
@@ -13,8 +13,6 @@ BIN =   Test_URL_Addr
 
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-LDLIBS := -lwebsvcs
-
 BUILD = $(VBIN)
 
 #----------------------------------------------------------------------------
@@ -28,6 +26,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+VLDLIBS := -lwebsvcs $(VLDLIBS)
+
 # 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...
@@ -51,15 +51,21 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \